Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 43 insertions, 0 deletions

diff --git a/Minecraft.Client/OcelotRenderer.cpp b/Minecraft.Client/OcelotRenderer.cpp
new file mode 100644
index 00000000..3672714b
--- /dev/null
+++ b/Minecraft.Client/OcelotRenderer.cpp
@@ -0,0 +1,43 @@
+#include "stdafx.h"
+#include "OcelotRenderer.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
+
+ResourceLocation OcelotRenderer::CAT_BLACK_LOCATION = ResourceLocation(TN_MOB_CAT_BLACK);
+ResourceLocation OcelotRenderer::CAT_OCELOT_LOCATION = ResourceLocation(TN_MOB_OCELOT);
+ResourceLocation OcelotRenderer::CAT_RED_LOCATION = ResourceLocation(TN_MOB_CAT_RED);
+ResourceLocation OcelotRenderer::CAT_SIAMESE_LOCATION = ResourceLocation(TN_MOB_CAT_SIAMESE);
+
+OcelotRenderer::OcelotRenderer(Model *model, float shadow) : MobRenderer(model, shadow)
+{
+}
+
+void OcelotRenderer::render(shared_ptr<Entity> _mob, double x, double y, double z, float rot, float a)
+{
+	MobRenderer::render(_mob, x, y, z, rot, a);
+}
+
+ResourceLocation *OcelotRenderer::getTextureLocation(shared_ptr<Entity> entity)
+{
+	shared_ptr<Ocelot> cat = dynamic_pointer_cast<Ocelot>(entity);
+
+    switch (cat->getCatType())
+	{
+		default:
+		case Ocelot::TYPE_OCELOT:	return &CAT_OCELOT_LOCATION;
+		case Ocelot::TYPE_BLACK:	return &CAT_BLACK_LOCATION;
+		case Ocelot::TYPE_RED:		return &CAT_RED_LOCATION;
+		case Ocelot::TYPE_SIAMESE:	return &CAT_SIAMESE_LOCATION;
+    }
+}
+
+void OcelotRenderer::scale(shared_ptr<LivingEntity> _mob, float a)
+{
+	// 4J - original version used generics and thus had an input parameter of type Blaze rather than shared_ptr<Entity>  we have here - 
+	// do some casting around instead
+	shared_ptr<Ocelot> mob = dynamic_pointer_cast<Ocelot>(_mob);
+	MobRenderer::scale(mob, a);
+	if (mob->isTame())
+	{
+		glScalef(.8f, .8f, .8f);
+	}
+}
\ No newline at end of file