diff --git a/data/slope.bullet b/data/slope.bullet index 035cc6a6b..ef8d13408 100644 Binary files a/data/slope.bullet and b/data/slope.bullet differ diff --git a/examples/ExampleBrowser/OpenGLExampleBrowser.cpp b/examples/ExampleBrowser/OpenGLExampleBrowser.cpp index 8ff0a7bf3..37a602c93 100644 --- a/examples/ExampleBrowser/OpenGLExampleBrowser.cpp +++ b/examples/ExampleBrowser/OpenGLExampleBrowser.cpp @@ -266,9 +266,8 @@ void openFileDemo(const char* filename) s_parameterInterface->removeAllParameters(); - CommonExampleOptions options(s_guiHelper,0); + CommonExampleOptions options(s_guiHelper,1); options.m_fileName = filename; - char fullPath[1024]; sprintf(fullPath, "%s", filename); b3FileUtils::toLower(fullPath); diff --git a/examples/Importers/ImportURDFDemo/UrdfParser.cpp b/examples/Importers/ImportURDFDemo/UrdfParser.cpp index 2e42525d5..cb3ed0816 100644 --- a/examples/Importers/ImportURDFDemo/UrdfParser.cpp +++ b/examples/Importers/ImportURDFDemo/UrdfParser.cpp @@ -794,8 +794,8 @@ bool UrdfParser::loadUrdf(const char* urdfText, ErrorLogger* logger, bool forceF vis.m_localMaterial = **mat; } else { - logger->reportError("Cannot find material with name:"); - logger->reportError(vis.m_materialName.c_str()); + //logger->reportError("Cannot find material with name:"); + //logger->reportError(vis.m_materialName.c_str()); } } } diff --git a/examples/OpenGLWindow/stb_image_write.h b/examples/OpenGLWindow/stb_image_write.h index 41b703388..1a51a939f 100644 --- a/examples/OpenGLWindow/stb_image_write.h +++ b/examples/OpenGLWindow/stb_image_write.h @@ -493,7 +493,10 @@ int stbi_write_png(char const *filename, int x, int y, int comp, const void *dat unsigned char *png = stbi_write_png_to_mem((unsigned char *) data, stride_bytes, x, y, comp, &len); if (!png) return 0; f = fopen(filename, "wb"); - if (!f) { free(png); return 0; } + if (!f) { + free(png); + return 0; + } fwrite(png, 1, len, f); fclose(f); free(png); diff --git a/examples/Tutorial/Tutorial.cpp b/examples/Tutorial/Tutorial.cpp index b924f682a..946139fa6 100644 --- a/examples/Tutorial/Tutorial.cpp +++ b/examples/Tutorial/Tutorial.cpp @@ -61,6 +61,9 @@ struct LWRightBody //Exponential map //google for "Practical Parameterization of Rotations Using the Exponential Map", F. Sebastian Grassia + //btQuaternion q_w = [ sin(|w|*dt/2) * w/|w| , cos(|w|*dt/2)] + //btQuaternion q_new = q_w * q_old; + btVector3 axis; btScalar fAngle = m_angularVelocity.length(); //limit the angular motion @@ -88,6 +91,7 @@ struct LWRightBody predictedOrn.normalize(); m_worldPose.m_worldOrientation = predictedOrn; } + } @@ -99,13 +103,9 @@ struct LWRightBody -///quick demo showing the right-handed coordinate system and positive rotations around each axis class Tutorial : public CommonExampleInterface { CommonGraphicsApp* m_app; - float m_x; - float m_y; - float m_z; int m_tutorialIndex; LWRightBody* m_body; @@ -114,14 +114,14 @@ public: Tutorial(CommonGraphicsApp* app, int tutorialIndex) :m_app(app), - m_x(0), - m_y(0), - m_z(0), m_tutorialIndex(tutorialIndex) { m_app->setUpAxis(2); - + switch (m_tutorialIndex) + { + + } { int boxId = m_app->registerCubeShape(100,100,1); @@ -186,10 +186,6 @@ public: } virtual void stepSimulation(float deltaTime) { - m_x+=0.01f; - m_y+=0.01f; - m_z+=0.01f; - //m_body->m_worldPose.m_worldPosition+= btVector3(0,0.01,0); //m_body->m_linearVelocity=btVector3(0,0.1,0); m_body->m_angularVelocity =btVector3(0,0.1,0); m_body->integrateTransform(deltaTime);