shared_ptr -> std::shared_ptr
This is one of the first commits in a plan to remove all `using namespace std;` lines in the entire codebase as it is considered anti-pattern today.
This commit is contained in:
@@ -8,11 +8,11 @@ LavaSlimeRenderer::LavaSlimeRenderer() : MobRenderer(new LavaSlimeModel(), .25f)
|
||||
this->modelVersion = ((LavaSlimeModel *) model)->getModelVersion();
|
||||
}
|
||||
|
||||
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 -
|
||||
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 -
|
||||
// do some casting around instead
|
||||
shared_ptr<LavaSlime> mob = dynamic_pointer_cast<LavaSlime>(_mob);
|
||||
std::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(shared_ptr<Entity> _mob, double x, double y, doub
|
||||
MobRenderer::render(mob, x, y, z, rot, a);
|
||||
}
|
||||
|
||||
void LavaSlimeRenderer::scale(shared_ptr<Mob> _slime, float a)
|
||||
void LavaSlimeRenderer::scale(std::shared_ptr<Mob> _slime, float a)
|
||||
{
|
||||
// 4J - original version used generics and thus had an input parameter of type LavaSlime rather than shared_ptr<Mob> we have here -
|
||||
// 4J - original version used generics and thus had an input parameter of type LavaSlime rather than std::shared_ptr<Mob> we have here -
|
||||
// do some casting around instead
|
||||
shared_ptr<LavaSlime> slime = dynamic_pointer_cast<LavaSlime>(_slime);
|
||||
std::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);
|
||||
|
||||
Reference in New Issue
Block a user