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

14
Minecraft.Client/LavaSlimeRenderer.cpp
View File

@@ -8,11 +8,11 @@ LavaSlimeRenderer::LavaSlimeRenderer() : MobRenderer(new LavaSlimeModel(), .25f)
this->modelVersion = ((LavaSlimeModel *) model)->getModelVersion();
}
void LavaSlimeRenderer::render(std::shared_ptr<Entity> _mob, double x, double y, double z, float rot, float a)
{
// 4J - original version used generics and thus had an input parameter of type LavaSlime rather than std::shared_ptr<Entity> we have here -
void LavaSlimeRenderer::render(shared_ptr<Entity> _mob, double x, double y, double z, float rot, float a)
{
// 4J - original version used generics and thus had an input parameter of type LavaSlime rather than shared_ptr<Entity> we have here -
// do some casting around instead
std::shared_ptr<LavaSlime> mob = dynamic_pointer_cast<LavaSlime>(_mob);
shared_ptr<LavaSlime> mob = dynamic_pointer_cast<LavaSlime>(_mob);
int modelVersion = ((LavaSlimeModel *) model)->getModelVersion();
if (modelVersion != this->modelVersion)
{
@@ -23,11 +23,11 @@ void LavaSlimeRenderer::render(std::shared_ptr<Entity> _mob, double x, double y,
MobRenderer::render(mob, x, y, z, rot, a);
}
void LavaSlimeRenderer::scale(std::shared_ptr<Mob> _slime, float a)
void LavaSlimeRenderer::scale(shared_ptr<Mob> _slime, float a)
{
// 4J - original version used generics and thus had an input parameter of type LavaSlime rather than std::shared_ptr<Mob> we have here -
// 4J - original version used generics and thus had an input parameter of type LavaSlime rather than shared_ptr<Mob> we have here -
// do some casting around instead
std::shared_ptr<LavaSlime> slime = dynamic_pointer_cast<LavaSlime>(_slime);
shared_ptr<LavaSlime> slime = dynamic_pointer_cast<LavaSlime>(_slime);
int size = slime->getSize();
float ss = (slime->oSquish + (slime->squish - slime->oSquish) * a) / (size * 0.5f + 1);
float w = 1 / (ss + 1);