From: <me...@us...> - 2009-03-29 17:00:38
|
Revision: 2677 http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2677&view=rev Author: melven2 Date: 2009-03-29 17:00:34 +0000 (Sun, 29 Mar 2009) Log Message: ----------- some bug fixes added parameter tolerance to some CollisionPrimitives Modified Paths: -------------- branches/ogrenewt/newton20/demos/Demo08_RagdollExample/Ragdoll.h branches/ogrenewt/newton20/inc/OgreNewt_CollisionPrimitives.h branches/ogrenewt/newton20/src/OgreNewt_BasicFrameListener.cpp branches/ogrenewt/newton20/src/OgreNewt_BasicJoints.cpp branches/ogrenewt/newton20/src/OgreNewt_CollisionPrimitives.cpp Modified: branches/ogrenewt/newton20/demos/Demo08_RagdollExample/Ragdoll.h =================================================================== --- branches/ogrenewt/newton20/demos/Demo08_RagdollExample/Ragdoll.h 2009-03-24 23:18:46 UTC (rev 2676) +++ branches/ogrenewt/newton20/demos/Demo08_RagdollExample/Ragdoll.h 2009-03-29 17:00:34 UTC (rev 2677) @@ -8,7 +8,9 @@ #include <OgreNewt.h> #include <Ogre.h> +#ifndef TIXML_USE_STL #define TIXML_USE_STL +#endif #include <tinyxml.h> Modified: branches/ogrenewt/newton20/inc/OgreNewt_CollisionPrimitives.h =================================================================== --- branches/ogrenewt/newton20/inc/OgreNewt_CollisionPrimitives.h 2009-03-24 23:18:46 UTC (rev 2676) +++ branches/ogrenewt/newton20/inc/OgreNewt_CollisionPrimitives.h 2009-03-29 17:00:34 UTC (rev 2677) @@ -219,9 +219,10 @@ \param node pointer to an Ogre::SceneNode with a single entity attached \param orient orientation offset of the primitive \param pos position offset of the primitive + \parem tolerance a tolerance passed to newton */ ConvexHull( const World* world, Ogre::Entity* ent, - const Ogre::Quaternion& orient = Ogre::Quaternion::IDENTITY, const Ogre::Vector3& pos = Ogre::Vector3::ZERO ); + const Ogre::Quaternion& orient = Ogre::Quaternion::IDENTITY, const Ogre::Vector3& pos = Ogre::Vector3::ZERO, Ogre::Real tolerance = 0.001f ); /*! Overloaded constructor. pass a pointer to an array of vertices and the hull will be made from that. @@ -230,9 +231,10 @@ \param vertcount number ot vetices in the array \param orient orientation offset of the primitive \param pos position offset of the primitive + \param tolerance a tolerance passed to newton */ ConvexHull( const World* world, const Ogre::Vector3* verts, int vertcount, - const Ogre::Quaternion& orient = Ogre::Quaternion::IDENTITY, const Ogre::Vector3& pos = Ogre::Vector3::ZERO ); + const Ogre::Quaternion& orient = Ogre::Quaternion::IDENTITY, const Ogre::Vector3& pos = Ogre::Vector3::ZERO, Ogre::Real tolerance = 0.001f ); //! destructor ~ConvexHull() {} @@ -416,9 +418,10 @@ \param size Ogre::Vector3 size. \param orient orientation offset of the primitive \param pos position offset of the primitive + \param tolerance a tolerance passed to newton */ Pyramid( const World* world, const Ogre::Vector3& size, - const Ogre::Quaternion& orient = Ogre::Quaternion::IDENTITY, const Ogre::Vector3& pos = Ogre::Vector3::ZERO ); + const Ogre::Quaternion& orient = Ogre::Quaternion::IDENTITY, const Ogre::Vector3& pos = Ogre::Vector3::ZERO, Ogre::Real tolerance = 0.001f ); //! destructor ~Pyramid() {} Modified: branches/ogrenewt/newton20/src/OgreNewt_BasicFrameListener.cpp =================================================================== --- branches/ogrenewt/newton20/src/OgreNewt_BasicFrameListener.cpp 2009-03-24 23:18:46 UTC (rev 2676) +++ branches/ogrenewt/newton20/src/OgreNewt_BasicFrameListener.cpp 2009-03-29 17:00:34 UTC (rev 2677) @@ -2,7 +2,7 @@ #include "OgreNewt_Debugger.h" #include "OgreNewt_World.h" -#ifdef __APPLE_ +#ifdef __APPLE__ # include <Ogre/OgreFrameListener.h> # include <Ogre/OgreRenderWindow.h> #else Modified: branches/ogrenewt/newton20/src/OgreNewt_BasicJoints.cpp =================================================================== --- branches/ogrenewt/newton20/src/OgreNewt_BasicJoints.cpp 2009-03-24 23:18:46 UTC (rev 2676) +++ branches/ogrenewt/newton20/src/OgreNewt_BasicJoints.cpp 2009-03-29 17:00:34 UTC (rev 2677) @@ -2,6 +2,14 @@ #include "OgreNewt_World.h" #include "OgreNewt_Body.h" +#ifdef __APPLE__ +# include <Ogre/OgreLogManager.h> +# include <Ogre/OgreStringConverter.h> +#else +# include <OgreLogManager.h> +# include <OgreStringConverter.h> +#endif + namespace OgreNewt { Modified: branches/ogrenewt/newton20/src/OgreNewt_CollisionPrimitives.cpp =================================================================== --- branches/ogrenewt/newton20/src/OgreNewt_CollisionPrimitives.cpp 2009-03-24 23:18:46 UTC (rev 2676) +++ branches/ogrenewt/newton20/src/OgreNewt_CollisionPrimitives.cpp 2009-03-29 17:00:34 UTC (rev 2677) @@ -118,7 +118,7 @@ ConvexHull::ConvexHull(const World* world) : ConvexCollision( world ) {} - ConvexHull::ConvexHull( const World* world, Ogre::Entity* obj, const Ogre::Quaternion& orient, const Ogre::Vector3& pos ) : ConvexCollision( world ) + ConvexHull::ConvexHull( const World* world, Ogre::Entity* obj, const Ogre::Quaternion& orient, const Ogre::Vector3& pos, Ogre::Real tolerance ) : ConvexCollision( world ) { Ogre::Vector3 scale(1.0,1.0,1.0); @@ -232,7 +232,7 @@ OgreNewt::Converters::QuatPosToMatrix( orient, pos, &matrix[0] ); //okay, let's try making the ConvexHull! - m_col = NewtonCreateConvexHull( m_world->getNewtonWorld(), (int)total_verts, (float*)&vertices[0].x, sizeof(Ogre::Vector3), 0.001f, &matrix[0] ); + m_col = NewtonCreateConvexHull( m_world->getNewtonWorld(), (int)total_verts, (float*)&vertices[0].x, sizeof(Ogre::Vector3), tolerance, &matrix[0] ); delete []vertices; @@ -240,13 +240,13 @@ // OgreNewt::CollisionPrimitives::ConvexHull - ConvexHull::ConvexHull( const World* world, const Ogre::Vector3* verts, int vertcount, const Ogre::Quaternion& orient, const Ogre::Vector3& pos ) : ConvexCollision( world ) + ConvexHull::ConvexHull( const World* world, const Ogre::Vector3* verts, int vertcount, const Ogre::Quaternion& orient, const Ogre::Vector3& pos, Ogre::Real tolerance ) : ConvexCollision( world ) { float matrix[16]; OgreNewt::Converters::QuatPosToMatrix( orient, pos, &matrix[0] ); //make the collision primitive. - m_col = NewtonCreateConvexHull( m_world->getNewtonWorld(), vertcount, (float*)&verts[0].x, sizeof(Ogre::Vector3), 0.001f, &matrix[0]); + m_col = NewtonCreateConvexHull( m_world->getNewtonWorld(), vertcount, (float*)&verts[0].x, sizeof(Ogre::Vector3), tolerance, &matrix[0]); } @@ -741,7 +741,7 @@ Pyramid::Pyramid(const World* world) : ConvexCollision( world ) {} - Pyramid::Pyramid( const World* world, const Ogre::Vector3& size, const Ogre::Quaternion& orient, const Ogre::Vector3& pos ) : ConvexCollision( world ) + Pyramid::Pyramid( const World* world, const Ogre::Vector3& size, const Ogre::Quaternion& orient, const Ogre::Vector3& pos, Ogre::Real tolerance ) : ConvexCollision( world ) { float matrix[16]; @@ -770,7 +770,7 @@ vertices [idx++] = 0.0f; //make the collision primitive. - m_col = NewtonCreateConvexHull( m_world->getNewtonWorld(), 5, vertices, sizeof(float)*3, 0.001f, &matrix[0]); + m_col = NewtonCreateConvexHull( m_world->getNewtonWorld(), 5, vertices, sizeof(float)*3, tolerance, &matrix[0]); delete []vertices; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |