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:
@@ -18,22 +18,22 @@ MinecartModel::MinecartModel() : Model()
|
||||
|
||||
cubes[0]->addBox((float)(-w / 2), (float)(-h / 2), -1, w, h, 2, 0);
|
||||
cubes[0]->setPos(0, (float)(0 + yOff), 0);
|
||||
|
||||
|
||||
cubes[5]->addBox((float)(-w / 2 + 1), (float)(-h / 2 + 1), -1, w - 2, h - 2, 1, 0);
|
||||
cubes[5]->setPos(0, (float)(0 + yOff), 0);
|
||||
|
||||
|
||||
cubes[1]->addBox((float)(-w / 2 + 2), (float)(-d - 1), -1, w - 4, d, 2, 0);
|
||||
cubes[1]->setPos((float)(-w / 2 + 1), (float)(0 + yOff), 0);
|
||||
|
||||
|
||||
cubes[2]->addBox((float)(-w / 2 + 2), (float)(-d - 1), -1, w - 4, d, 2, 0);
|
||||
cubes[2]->setPos((float)(+w / 2 - 1), (float)(0 + yOff), 0);
|
||||
|
||||
|
||||
cubes[3]->addBox((float)(-w / 2 + 2), (float)(-d - 1), -1, w - 4, d, 2, 0);
|
||||
cubes[3]->setPos(0, (float)(0 + yOff), (float)(-h / 2 + 1));
|
||||
|
||||
|
||||
cubes[4]->addBox((float)(-w / 2 + 2), (float)(-d - 1), -1, w - 4, d, 2, 0);
|
||||
cubes[4]->setPos(0, (float)(0 + yOff), (float)(+h / 2 - 1));
|
||||
|
||||
|
||||
cubes[0]->xRot = PI / 2;
|
||||
cubes[1]->yRot = PI / 2 * 3;
|
||||
cubes[2]->yRot = PI / 2 * 1;
|
||||
@@ -47,7 +47,7 @@ MinecartModel::MinecartModel() : Model()
|
||||
}
|
||||
}
|
||||
|
||||
void MinecartModel::render(shared_ptr<Entity> entity, float time, float r, float bob, float yRot, float xRot, float scale, bool usecompiled)
|
||||
void MinecartModel::render(std::shared_ptr<Entity> entity, float time, float r, float bob, float yRot, float xRot, float scale, bool usecompiled)
|
||||
{
|
||||
cubes[5]->y = 4 - bob;
|
||||
for (int i = 0; i < MINECART_LENGTH; i++)
|
||||
|
||||
Reference in New Issue
Block a user