diff options
| author | Loki Rautio <lokirautio@gmail.com> | 2026-03-04 03:56:03 -0600 |
|---|---|---|
| committer | Loki Rautio <lokirautio@gmail.com> | 2026-03-04 03:56:03 -0600 |
| commit | 42aec6dac53dffa6afe072560a7e1d4986112538 (patch) | |
| tree | 0836426857391df1b6a83f6368a183f83ec9b104 /Minecraft.Client/CreeperRenderer.cpp | |
| parent | c9d58eeac7c72f0b3038e084667b4d89a6249fce (diff) | |
| parent | ef9b6fd500dfabd9463267b0dd9e29577eea8a2b (diff) | |
Merge branch 'main' into pr/win64-world-saves
# Conflicts:
# Minecraft.Client/MinecraftServer.cpp
# README.md
Diffstat (limited to 'Minecraft.Client/CreeperRenderer.cpp')
| -rw-r--r-- | Minecraft.Client/CreeperRenderer.cpp | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/Minecraft.Client/CreeperRenderer.cpp b/Minecraft.Client/CreeperRenderer.cpp index 483d14e3..a9d16314 100644 --- a/Minecraft.Client/CreeperRenderer.cpp +++ b/Minecraft.Client/CreeperRenderer.cpp @@ -4,12 +4,15 @@ #include "..\Minecraft.World\net.minecraft.world.entity.monster.h" #include "..\Minecraft.World\Mth.h" -CreeperRenderer::CreeperRenderer() : MobRenderer( new CreeperModel(), 0.5f ) +ResourceLocation CreeperRenderer::POWER_LOCATION = ResourceLocation(TN_POWERED_CREEPER); +ResourceLocation CreeperRenderer::CREEPER_LOCATION = ResourceLocation(TN_MOB_CREEPER); + +CreeperRenderer::CreeperRenderer() : MobRenderer(new CreeperModel(), 0.5f) { armorModel = new CreeperModel(2); } -void CreeperRenderer::scale(shared_ptr<Mob> mob, float a) +void CreeperRenderer::scale(shared_ptr<LivingEntity> mob, float a) { shared_ptr<Creeper> creeper = dynamic_pointer_cast<Creeper>(mob); @@ -25,7 +28,7 @@ void CreeperRenderer::scale(shared_ptr<Mob> mob, float a) glScalef(s, hs, s); } -int CreeperRenderer::getOverlayColor(shared_ptr<Mob> mob, float br, float a) +int CreeperRenderer::getOverlayColor(shared_ptr<LivingEntity> mob, float br, float a) { shared_ptr<Creeper> creeper = dynamic_pointer_cast<Creeper>(mob); @@ -44,7 +47,7 @@ int CreeperRenderer::getOverlayColor(shared_ptr<Mob> mob, float br, float a) return (_a << 24) | (r << 16) | (g << 8) | b; } -int CreeperRenderer::prepareArmor(shared_ptr<Mob> _mob, int layer, float a) +int CreeperRenderer::prepareArmor(shared_ptr<LivingEntity> _mob, int layer, float a) { // 4J - dynamic cast required because we aren't using templates/generics in our version shared_ptr<Creeper> mob = dynamic_pointer_cast<Creeper>(_mob); @@ -56,7 +59,7 @@ int CreeperRenderer::prepareArmor(shared_ptr<Mob> _mob, int layer, float a) if (layer == 1) { float time = mob->tickCount + a; - bindTexture(TN_POWERED_CREEPER);// was L"/armor/power.png"); + bindTexture(&POWER_LOCATION); glMatrixMode(GL_TEXTURE); glLoadIdentity(); float uo = time * 0.01f; @@ -84,7 +87,12 @@ int CreeperRenderer::prepareArmor(shared_ptr<Mob> _mob, int layer, float a) } -int CreeperRenderer::prepareArmorOverlay(shared_ptr<Mob> mob, int layer, float a) +int CreeperRenderer::prepareArmorOverlay(shared_ptr<LivingEntity> mob, int layer, float a) { return -1; +} + +ResourceLocation *CreeperRenderer::getTextureLocation(shared_ptr<Entity> mob) +{ + return &CREEPER_LOCATION; }
\ No newline at end of file |