diff --git a/examples/ExtendedTutorials/InclinedPlane.cpp b/examples/ExtendedTutorials/InclinedPlane.cpp index dfe099094..dceafdbe8 100644 --- a/examples/ExtendedTutorials/InclinedPlane.cpp +++ b/examples/ExtendedTutorials/InclinedPlane.cpp @@ -89,7 +89,7 @@ void InclinedPlaneExample::initPhysics() { // create slider to change the ramp tilt SliderParams slider("Ramp Tilt",&gTilt); slider.m_minVal=0; - slider.m_maxVal=M_PI/2.0f; + slider.m_maxVal=SIMD_PI/2.0f; slider.m_clampToNotches = false; slider.m_callback = onRampInclinationChanged; m_guiHelper->getParameterInterface()->registerSliderFloatParameter(slider); diff --git a/examples/ExtendedTutorials/MultiPendulum.cpp b/examples/ExtendedTutorials/MultiPendulum.cpp index 8c4cff2e2..0d29ce12d 100644 --- a/examples/ExtendedTutorials/MultiPendulum.cpp +++ b/examples/ExtendedTutorials/MultiPendulum.cpp @@ -355,7 +355,7 @@ bool MultiPendulumExample::keyboardCallback(int key, int state) { case 49 /*ASCII for 1*/: { //assumption: Sphere are aligned in Z axis - btScalar newLimit = gCurrentPendulumLength + 0.1; + btScalar newLimit = btScalar(gCurrentPendulumLength + 0.1); changePendulaLength(newLimit); gCurrentPendulumLength = newLimit; @@ -366,7 +366,7 @@ bool MultiPendulumExample::keyboardCallback(int key, int state) { case 50 /*ASCII for 2*/: { //assumption: Sphere are aligned in Z axis - btScalar newLimit = gCurrentPendulumLength - 0.1; + btScalar newLimit = btScalar(gCurrentPendulumLength - 0.1); //is being shortened beyond it's own length, we don't let the lower sphere to go over the upper one if (0 <= newLimit) { @@ -378,7 +378,7 @@ bool MultiPendulumExample::keyboardCallback(int key, int state) { return true; } case 51 /*ASCII for 3*/: { - for (int i = gPendulaQty-1; i >= gPendulaQty-gDisplacedPendula; i--) { + for (int i = floor(gPendulaQty)-1; i >= gPendulaQty-gDisplacedPendula; i--) { if (gDisplacedPendula >= 0 && gDisplacedPendula < gPendulaQty) pendula[i]->applyCentralForce(btVector3(gDisplacementForce, 0, 0)); } diff --git a/examples/ExtendedTutorials/NewtonsCradle.cpp b/examples/ExtendedTutorials/NewtonsCradle.cpp index 76bbf6622..a1c51f1fe 100644 --- a/examples/ExtendedTutorials/NewtonsCradle.cpp +++ b/examples/ExtendedTutorials/NewtonsCradle.cpp @@ -153,7 +153,7 @@ void NewtonsCradleExample::initPhysics() { for (int i = 0; i < floor(gPendulaQty); i++) { // create pendulum - createPendulum(pendulumShape, xPosition, yPosition,zPosition, + createPendulum(pendulumShape, xPosition, yPosition, zPosition, gInitialPendulumLength, pendulumMass); // displace the pendula 1.05 sphere size, so that they all nearly touch (small spacings in between @@ -289,7 +289,7 @@ bool NewtonsCradleExample::keyboardCallback(int key, int state) { case 49 /*ASCII for 1*/: { //assumption: Sphere are aligned in Z axis - btScalar newLimit = gCurrentPendulumLength + 0.1; + btScalar newLimit = btScalar(gCurrentPendulumLength + 0.1); changePendulaLength(newLimit); gCurrentPendulumLength = newLimit; @@ -300,7 +300,7 @@ bool NewtonsCradleExample::keyboardCallback(int key, int state) { case 50 /*ASCII for 2*/: { //assumption: Sphere are aligned in Z axis - btScalar newLimit = gCurrentPendulumLength - 0.1; + btScalar newLimit = btScalar(gCurrentPendulumLength - 0.1); //is being shortened beyond it's own length, we don't let the lower sphere to go over the upper one if (0 <= newLimit) {