celisej567/mcpe
1
0
Fork 0
mirror of https://github.com/celisej567/mcpe.git synced 2026-09-23 20:09:46 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Entity, Renderer: Add (incomplete) pig, remake entity renderer"

Browse Source 
This reverts commit d6bf825c11.
This commit is contained in:
Er2
2023-12-06 19:39:37 +03:00
parent 470291c7e5
commit 149cd3127b
25 changed files with 70 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/client/renderer/ItemInHandRenderer.cpp
View File

@@ -7,7 +7,6 @@
********************************************************************/
#include "ItemInHandRenderer.hpp"
#include "entity/HumanoidMobRenderer.hpp"
#include "client/app/Minecraft.hpp"
ItemInHandRenderer::ItemInHandRenderer(Minecraft* pMC) :
@@ -187,8 +186,7 @@ void ItemInHandRenderer::render(float f)
glRotatef(Mth::sin(float(M_PI) * Mth::sqrt(fAnim)) * 70.0f, 0.0f, 1.0f, 0.0f);
glRotatef(Mth::sin(float(M_PI) * fAnim * fAnim) * -20.0f, 0.0f, 0.0f, 1.0f);
HumanoidMobRenderer* pRenderer = (HumanoidMobRenderer*)EntityRenderDispatcher::getInstance()->getRenderer(m_pMinecraft->m_pLocalPlayer);
m_pMinecraft->m_pTextures->loadAndBindTexture(pRenderer->m_pModel->m_texture);
m_pMinecraft->m_pTextures->loadAndBindTexture("mob/char.png");
glTranslatef(-1.0f, 3.6f, 3.5f);
glRotatef(120.0f, 0.0f, 0.0f, 1.0f);
glRotatef(200.0f, 1.0f, 0.0f, 0.0f);
@@ -196,6 +194,7 @@ void ItemInHandRenderer::render(float f)
glScalef(1.0f, 1.0f, 1.0f);
glTranslatef(5.6f, 0.0f, 0.0f);
HumanoidMobRenderer* pRenderer = (HumanoidMobRenderer*)EntityRenderDispatcher::getInstance()->getRenderer(m_pMinecraft->m_pLocalPlayer);
glScalef(1.0f, 1.0f, 1.0f);
pRenderer->renderHand();

15
source/client/renderer/entity/EntityRenderDispatcher.cpp
View File

@@ -14,8 +14,7 @@ EntityRenderDispatcher* EntityRenderDispatcher::instance;
float EntityRenderDispatcher::xOff, EntityRenderDispatcher::yOff, EntityRenderDispatcher::zOff;
EntityRenderDispatcher::EntityRenderDispatcher() :
m_ModelRenderer(nullptr, 0),
m_HumanoidRenderer(new HumanoidModel(0.0f, 0.0f), 0.0f)
m_HumanoidMobRenderer(new HumanoidModel(0.0f, 0.0f), 0.0f)
{
m_pItemInHandRenderer = nullptr;
m_pTextures = nullptr;
@@ -27,8 +26,7 @@ EntityRenderDispatcher::EntityRenderDispatcher() :
m_pOptions = nullptr;
m_pFont = nullptr;
m_HumanoidRenderer.init(this);
m_ModelRenderer.init(this);
m_HumanoidMobRenderer.init(this);
m_TntRenderer.init(this);
m_CameraRenderer.init(this);
@@ -76,11 +74,7 @@ EntityRenderer* EntityRenderDispatcher::getRenderer(Entity* pEnt)
case RENDER_CAMERA:
return &m_CameraRenderer;
case RENDER_HUMANOID:
m_HumanoidRenderer.m_pModel = m_HumanoidRenderer.m_pHumanoidModel = (HumanoidModel *)pEnt->getModel();
return &m_HumanoidRenderer;
case RENDER_MODEL:
m_ModelRenderer.m_pModel = pEnt->getModel();
return &m_ModelRenderer;
return &m_HumanoidMobRenderer;
#ifdef ENH_ALLOW_SAND_GRAVITY
case RENDER_FALLING_TILE:
return &m_FallingTileRenderer;
@@ -92,8 +86,7 @@ EntityRenderer* EntityRenderDispatcher::getRenderer(Entity* pEnt)
void EntityRenderDispatcher::onGraphicsReset()
{
m_HumanoidRenderer.onGraphicsReset();
m_ModelRenderer.onGraphicsReset();
m_HumanoidMobRenderer.onGraphicsReset();
}
void EntityRenderDispatcher::prepare(Level* level, Textures* textures, Font* font, Mob* mob, Options* options, float f)

6
source/client/renderer/entity/EntityRenderDispatcher.hpp
View File

@@ -9,12 +9,11 @@
#pragma once
#include "EntityRenderer.hpp"
#include "HumanoidMobRenderer.hpp"
#include "TripodCameraRenderer.hpp"
#include "TntRenderer.hpp"
#include "ItemRenderer.hpp"
#include "FallingTileRenderer.hpp"
#include "MobRenderer.hpp"
#include "HumanoidMobRenderer.hpp"
class Minecraft;
class Font;
@@ -41,8 +40,7 @@ public:
public:
ItemInHandRenderer* m_pItemInHandRenderer;
MobRenderer m_ModelRenderer;
HumanoidMobRenderer m_HumanoidRenderer;
HumanoidMobRenderer m_HumanoidMobRenderer;
TntRenderer m_TntRenderer;
ItemRenderer m_ItemRenderer;
TripodCameraRenderer m_CameraRenderer;

2
source/client/renderer/entity/EntityRenderer.cpp
View File

@@ -9,7 +9,7 @@
#include "EntityRenderer.hpp"
#include "EntityRenderDispatcher.hpp"
EntityRenderer::EntityRenderer()
EntityRenderer::EntityRenderer() : m_model(0.0f, 0.0f)
{
field_4 = 0.0f;
field_8 = 1.0f;

6
source/client/renderer/entity/EntityRenderer.hpp
View File

@@ -9,7 +9,7 @@
#pragma once
#include "world/phys/AABB.hpp"
#include "client/model/Model.hpp"
#include "client/model/HumanoidModel.hpp"
#include "client/renderer/Font.hpp"
class EntityRenderDispatcher;
@@ -31,4 +31,8 @@ public:
float field_4;
float field_8;
EntityRenderDispatcher* m_pDispatcher;
// @HUH: Why is there a HumanoidModel here? There's another
// in HumanoidMobRenderer...
HumanoidModel m_model;
};

1
source/client/renderer/entity/HumanoidMobRenderer.hpp
View File

@@ -9,7 +9,6 @@
#pragma once
#include "MobRenderer.hpp"
#include "client/model/HumanoidModel.hpp"
class HumanoidMobRenderer : public MobRenderer
{

4
source/client/renderer/entity/MobRenderer.cpp
View File

@@ -104,7 +104,7 @@ void MobRenderer::render(Entity* entity, float x, float y, float z, float unused
x1 = 1.0f;
float x2 = pMob->field_130 - pMob->field_12C * (1.0f - f);
bindTexture(m_pModel->m_texture);
bindTexture("mob/char.png");
glEnable(GL_ALPHA_TEST);
m_pModel->setBrightness(entity->getBrightness(1.0f));
@@ -165,7 +165,7 @@ void MobRenderer::renderName(Mob* mob, float x, float y, float z)
void MobRenderer::renderNameTag(Mob* mob, const std::string& str, float x, float y, float z, int a)
{
if (mob->distanceToSqr(m_pDispatcher->m_pMob) > float(a * a) || str.length() == 0)
if (mob->distanceToSqr(m_pDispatcher->m_pMob) > float(a * a))
return;
Font* font = getFont();