Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "shared_ptr -> std::shared_ptr"

Browse Source 
This reverts commit 7074f35e4b.
This commit is contained in:
void_17
2026-03-02 17:37:16 +07:00
parent 8a2a62ea1d
commit 119bff3514
1373 changed files with 12049 additions and 12049 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
Minecraft.Client/PlayerRenderer.cpp
View File

@@ -13,7 +13,7 @@
#include "..\Minecraft.World\net.minecraft.h"
#include "..\Minecraft.World\StringHelpers.h"
const unsigned int PlayerRenderer::s_nametagColors[MINECRAFT_NET_MAX_PLAYERS] =
const unsigned int PlayerRenderer::s_nametagColors[MINECRAFT_NET_MAX_PLAYERS] =
{
0xff000000, // WHITE (represents the "white" player, but using black as the colour)
0xff33cc33, // GREEN
@@ -46,10 +46,10 @@ unsigned int PlayerRenderer::getNametagColour(int index)
return 0xFF000000;
}
int PlayerRenderer::prepareArmor(std::shared_ptr<Mob> _player, int layer, float a)
int PlayerRenderer::prepareArmor(shared_ptr<Mob> _player, int layer, float a)
{
// 4J - dynamic cast required because we aren't using templates/generics in our version
std::shared_ptr<Player> player = dynamic_pointer_cast<Player>(_player);
shared_ptr<Player> player = dynamic_pointer_cast<Player>(_player);
// 4J-PB - need to disable rendering armour for some special skins (Daleks)
unsigned int uiAnimOverrideBitmask=player->getAnimOverrideBitmask();
@@ -58,7 +58,7 @@ int PlayerRenderer::prepareArmor(std::shared_ptr<Mob> _player, int layer, float
return -1;
}
std::shared_ptr<ItemInstance> itemInstance = player->inventory->getArmor(3 - layer);
shared_ptr<ItemInstance> itemInstance = player->inventory->getArmor(3 - layer);
if (itemInstance != NULL)
{
Item *item = itemInstance->getItem();
@@ -108,11 +108,11 @@ int PlayerRenderer::prepareArmor(std::shared_ptr<Mob> _player, int layer, float
}
void PlayerRenderer::prepareSecondPassArmor(std::shared_ptr<Mob> _player, int layer, float a)
void PlayerRenderer::prepareSecondPassArmor(shared_ptr<Mob> _player, int layer, float a)
{
// 4J - dynamic cast required because we aren't using templates/generics in our version
std::shared_ptr<Player> player = dynamic_pointer_cast<Player>(_player);
std::shared_ptr<ItemInstance> itemInstance = player->inventory->getArmor(3 - layer);
shared_ptr<Player> player = dynamic_pointer_cast<Player>(_player);
shared_ptr<ItemInstance> itemInstance = player->inventory->getArmor(3 - layer);
if (itemInstance != NULL)
{
Item *item = itemInstance->getItem();
@@ -127,14 +127,14 @@ void PlayerRenderer::prepareSecondPassArmor(std::shared_ptr<Mob> _player, int la
}
}
void PlayerRenderer::render(std::shared_ptr<Entity> _mob, double x, double y, double z, float rot, float a)
void PlayerRenderer::render(shared_ptr<Entity> _mob, double x, double y, double z, float rot, float a)
{
// 4J - dynamic cast required because we aren't using templates/generics in our version
std::shared_ptr<Player> mob = dynamic_pointer_cast<Player>(_mob);
shared_ptr<Player> mob = dynamic_pointer_cast<Player>(_mob);
if(mob->hasInvisiblePrivilege()) return;
std::shared_ptr<ItemInstance> item = mob->inventory->getSelected();
shared_ptr<ItemInstance> item = mob->inventory->getSelected();
armorParts1->holdingRightHand = armorParts2->holdingRightHand = humanoidModel->holdingRightHand = item != NULL ? 1 : 0;
if (item != NULL)
{
@@ -228,10 +228,10 @@ void PlayerRenderer::render(std::shared_ptr<Entity> _mob, double x, double y, do
}
void PlayerRenderer::renderName(std::shared_ptr<Mob> _mob, double x, double y, double z)
void PlayerRenderer::renderName(shared_ptr<Mob> _mob, double x, double y, double z)
{
// 4J - dynamic cast required because we aren't using templates/generics in our version
std::shared_ptr<Player> mob = dynamic_pointer_cast<Player>(_mob);
shared_ptr<Player> mob = dynamic_pointer_cast<Player>(_mob);
if (Minecraft::renderNames() && mob != entityRenderDispatcher->cameraEntity
&& !mob->isInvisibleTo(Minecraft::GetInstance()->player) ) // 4J-JEV: Todo, move to LivingEntityRenderer.
@@ -256,7 +256,7 @@ void PlayerRenderer::renderName(std::shared_ptr<Mob> _mob, double x, double y, d
{
if ( app.GetGameSettings(eGameSetting_DisplayHUD)==0 )
{
// 4J-PB - turn off gamertag render
// 4J-PB - turn off gamertag render
return;
}
@@ -316,14 +316,14 @@ void PlayerRenderer::renderName(std::shared_ptr<Mob> _mob, double x, double y, d
}
void PlayerRenderer::additionalRendering(std::shared_ptr<Mob> _mob, float a)
void PlayerRenderer::additionalRendering(shared_ptr<Mob> _mob, float a)
{
MobRenderer::additionalRendering(_mob,a);
// 4J - dynamic cast required because we aren't using templates/generics in our version
std::shared_ptr<Player> mob = dynamic_pointer_cast<Player>(_mob);
shared_ptr<Player> mob = dynamic_pointer_cast<Player>(_mob);
std::shared_ptr<ItemInstance> headGear = mob->inventory->getArmor(3);
shared_ptr<ItemInstance> headGear = mob->inventory->getArmor(3);
if (headGear != NULL)
{
// don't render the pumpkin for the skins
@@ -426,9 +426,9 @@ void PlayerRenderer::additionalRendering(std::shared_ptr<Mob> _mob, float a)
humanoidModel->renderCloak(1 / 16.0f,true);
glPopMatrix();
}
std::shared_ptr<ItemInstance> item = mob->inventory->getSelected();
shared_ptr<ItemInstance> item = mob->inventory->getSelected();
if (item != NULL)
{
@@ -438,7 +438,7 @@ void PlayerRenderer::additionalRendering(std::shared_ptr<Mob> _mob, float a)
if (mob->fishing != NULL)
{
item = std::shared_ptr<ItemInstance>( new ItemInstance(Item::stick) );
item = shared_ptr<ItemInstance>( new ItemInstance(Item::stick) );
}
UseAnim anim = UseAnim_none;//null;
@@ -521,7 +521,7 @@ void PlayerRenderer::additionalRendering(std::shared_ptr<Mob> _mob, float a)
}
void PlayerRenderer::scale(std::shared_ptr<Mob> player, float a)
void PlayerRenderer::scale(shared_ptr<Mob> player, float a)
{
float s = 15 / 16.0f;
glScalef(s, s, s);
@@ -540,10 +540,10 @@ void PlayerRenderer::renderHand()
}
}
void PlayerRenderer::setupPosition(std::shared_ptr<Mob> _mob, double x, double y, double z)
void PlayerRenderer::setupPosition(shared_ptr<Mob> _mob, double x, double y, double z)
{
// 4J - dynamic cast required because we aren't using templates/generics in our version
std::shared_ptr<Player> mob = dynamic_pointer_cast<Player>(_mob);
shared_ptr<Player> mob = dynamic_pointer_cast<Player>(_mob);
if (mob->isAlive() && mob->isSleeping())
{
@@ -556,10 +556,10 @@ void PlayerRenderer::setupPosition(std::shared_ptr<Mob> _mob, double x, double y
}
}
void PlayerRenderer::setupRotations(std::shared_ptr<Mob> _mob, float bob, float bodyRot, float a)
void PlayerRenderer::setupRotations(shared_ptr<Mob> _mob, float bob, float bodyRot, float a)
{
// 4J - dynamic cast required because we aren't using templates/generics in our version
std::shared_ptr<Player> mob = dynamic_pointer_cast<Player>(_mob);
shared_ptr<Player> mob = dynamic_pointer_cast<Player>(_mob);
if (mob->isAlive() && mob->isSleeping())
{
@@ -574,11 +574,11 @@ void PlayerRenderer::setupRotations(std::shared_ptr<Mob> _mob, float bob, float
}
// 4J Added override to stop rendering shadow if player is invisible
void PlayerRenderer::renderShadow(std::shared_ptr<Entity> e, double x, double y, double z, float pow, float a)
void PlayerRenderer::renderShadow(shared_ptr<Entity> e, double x, double y, double z, float pow, float a)
{
if(app.GetGameHostOption(eGameHostOption_HostCanBeInvisible) > 0)
{
std::shared_ptr<Player> player = dynamic_pointer_cast<Player>(e);
shared_ptr<Player> player = dynamic_pointer_cast<Player>(e);
if(player != NULL && player->hasInvisiblePrivilege()) return;
}
EntityRenderer::renderShadow(e,x,y,z,pow,a);