feat: TU19 (Dec 2014) Features & Content (#155)
* try to resolve merge conflict
* feat: TU19 (Dec 2014) Features & Content (#32)
* December 2014 files
* Working release build
* Fix compilation issues
* Add sound to Windows64Media
* Add DLC content and force Tutorial DLC
* Revert "Add DLC content and force Tutorial DLC"
This reverts commit 97a4399472.
* Disable broken light packing
* Disable breakpoint during DLC texture map load
Allows DLC loading but the DLC textures are still broken
* Fix post build not working
* ...
* fix vs2022 build
* fix cmake build
---------
Co-authored-by: Loki <lokirautio@gmail.com>
This commit is contained in:
@@ -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
|
||||
};
|
||||
Reference in New Issue
Block a user