Project modernization (#630)
* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides
This commit is contained in:
@@ -14,17 +14,17 @@ SquidModel::SquidModel() : Model()
|
||||
{
|
||||
tentacles[i] = new ModelPart(this, 48, 0);
|
||||
|
||||
double angle = i * PI * 2.0 / (double) TENTACLES_LENGTH; // 4J - 8 was tentacles.length
|
||||
float xo = Mth::cos((float)angle) * 5;
|
||||
float yo = Mth::sin((float)angle) * 5;
|
||||
double angle = i * PI * 2.0 / static_cast<double>(TENTACLES_LENGTH); // 4J - 8 was tentacles.length
|
||||
float xo = Mth::cos(static_cast<float>(angle)) * 5;
|
||||
float yo = Mth::sin(static_cast<float>(angle)) * 5;
|
||||
tentacles[i]->addBox(-1, 0, -1, 2, 18, 2);
|
||||
|
||||
tentacles[i]->x = xo;
|
||||
tentacles[i]->z = yo;
|
||||
tentacles[i]->y = (float)(31 + yoffs);
|
||||
tentacles[i]->y = static_cast<float>(31 + yoffs);
|
||||
|
||||
angle = i * PI * -2.0 / (double) TENTACLES_LENGTH + PI * .5; // 4J - 8 was tentacles.length
|
||||
tentacles[i]->yRot = (float) angle;
|
||||
angle = i * PI * -2.0 / static_cast<double>(TENTACLES_LENGTH) + PI * .5; // 4J - 8 was tentacles.length
|
||||
tentacles[i]->yRot = static_cast<float>(angle);
|
||||
|
||||
// 4J added - compile now to avoid random performance hit first time cubes are rendered
|
||||
tentacles[i]->compile(1.0f/16.0f);
|
||||
|
||||
Reference in New Issue
Block a user