diff options
Diffstat (limited to 'Minecraft.Client/PlayerRenderer.h')
| -rw-r--r-- | Minecraft.Client/PlayerRenderer.h | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/Minecraft.Client/PlayerRenderer.h b/Minecraft.Client/PlayerRenderer.h index 10564104..25c32a30 100644 --- a/Minecraft.Client/PlayerRenderer.h +++ b/Minecraft.Client/PlayerRenderer.h @@ -1,11 +1,17 @@ #pragma once #include "MobRenderer.h" #include "..\Minecraft.World\Player.h" + class HumanoidModel; + using namespace std; -class PlayerRenderer : public MobRenderer +class PlayerRenderer : public LivingEntityRenderer { +public: + // 4J: Made public for use in skull renderer + static ResourceLocation DEFAULT_LOCATION; + private: // 4J Added static const unsigned int s_nametagColors[MINECRAFT_NET_MAX_PLAYERS]; @@ -23,20 +29,30 @@ private: static const wstring MATERIAL_NAMES[5]; protected: - virtual int prepareArmor(shared_ptr<Mob> _player, int layer, float a); - virtual void prepareSecondPassArmor(shared_ptr<Mob> mob, int layer, float a); + virtual int prepareArmor(shared_ptr<LivingEntity> _player, int layer, float a); + virtual void prepareSecondPassArmor(shared_ptr<LivingEntity> mob, int layer, float a); + public: virtual void render(shared_ptr<Entity> _mob, double x, double y, double z, float rot, float a); + protected: - virtual void renderName(shared_ptr<Mob> _mob, double x, double y, double z); - virtual void additionalRendering(shared_ptr<Mob> _mob, float a); - virtual void scale(shared_ptr<Mob> _player, float a); + virtual void additionalRendering(shared_ptr<LivingEntity> _mob, float a); + void renderNameTags(shared_ptr<LivingEntity> player, double x, double y, double z, wstring msg, float scale, double dist); + + virtual void scale(shared_ptr<LivingEntity> _player, float a); public: void renderHand(); + protected: - virtual void setupPosition(shared_ptr<Mob> _mob, double x, double y, double z); - virtual void setupRotations(shared_ptr<Mob> _mob, float bob, float bodyRot, float a); + virtual void setupPosition(shared_ptr<LivingEntity> _mob, double x, double y, double z); + virtual void setupRotations(shared_ptr<LivingEntity> _mob, float bob, float bodyRot, float a); private: virtual void renderShadow(shared_ptr<Entity> e, double x, double y, double z, float pow, float a); // 4J Added override + +public: + virtual ResourceLocation *getTextureLocation(shared_ptr<Entity> entity); + + using LivingEntityRenderer::bindTexture; + virtual void bindTexture(shared_ptr<Entity> entity); // 4J Added override };
\ No newline at end of file |