Changeset 1922 for code

Timestamp:

Oct 14, 2008, 5:58:59 PM (16 years ago)

Author:

rgrieder

Message:

Minor adjustments to OgreODE when compiling under gcc.

Location:

code/branches/physics/src/ogreode

Files:

• CMakeLists.txt (modified) (1 diff)
• OgreOdeBody.cpp (modified) (3 diffs)
• OgreOdeBody.h (modified) (1 diff)
• OgreOdeCollision.cpp (modified) (1 diff)
• OgreOdeDebugContact.cpp (modified) (4 diffs)
• OgreOdeDebugContact.h (modified) (1 diff)
• OgreOdeDebugObject.cpp (modified) (1 diff)
• OgreOdeEntityInformer.cpp (modified) (2 diffs)
• OgreOdeEntityInformer.h (modified) (1 diff)
• OgreOdeGeometry.cpp (modified) (2 diffs)
• OgreOdeGeometry.h (modified) (1 diff)
• OgreOdeSpace.cpp (modified) (1 diff)
• OgreOdeStepper.cpp (modified) (3 diffs)
• OgreOdeWorld.cpp (modified) (1 diff)

code/branches/physics/src/ogreode/CMakeLists.txt

@@ -18 +18 @@
 
 ADD_LIBRARY(ogreode_orxonox SHARED ${OGREODE_SRC_FILES})
+
+TARGET_LINK_LIBRARIES(ogreode_orxonox ${ODE_LIBRARIES})
+

code/branches/physics/src/ogreode/OgreOdeBody.cpp

@@ -91 +91 @@
     //UserDefinedObject(),
     _name(name), 
-    _world(world),
-        _modify_parent_orientation(true)
+        _modify_parent_orientation(true),
+    _world(world)
 { 
         _body_count++;
@@ -818 +818 @@
         // We can't do this properly without mesh collision
         geom = *proxy;
-        Ogre::Real maxdist = -1.0f;
-        const Ogre::Plane* bestPlane = 0;
+                // Two unused variables
+        //Ogre::Real maxdist = -1.0f;
+        //const Ogre::Plane* bestPlane = 0;
         for (pi = wf->planes->begin(); pi != piend; ++pi)
         {
@@ -853 +854 @@
     return collided;
 }
+

code/branches/physics/src/ogreode/OgreOdeBody.h

@@ -418 +418 @@
 
 #endif
+

code/branches/physics/src/ogreode/OgreOdeCollision.cpp

@@ -322 +322 @@
 }
 //------------------------------------------------------------------------------------------------
+

code/branches/physics/src/ogreode/OgreOdeDebugContact.cpp

@@ -28 +28 @@
     //------------------------------------------------------------------------------------------------
     DebugContact::DebugContact(const String &name, World *world) : 
+        _enabled(false),
         _name(name), 
-        _world(world),
-        _enabled(false)
+        _world(world)
     {
         // scene node 
@@ -115 +115 @@
                                 int charHeight, 
                                 const ColourValue &color)
-        : mpCam(NULL)
-        , mpWin(NULL)
-        , mpFont(NULL)
+        : mFontName(fontName)
+        , mType("DebugContact")
         , mName(name)
         , mCaption(caption)
-        , mFontName(fontName)
+        , mHorizontalAlignment(H_LEFT)
+        , mVerticalAlignment(V_BELOW)
+        , mColor(color)
         , mCharHeight(charHeight)
-        , mColor(color)
-        , mType("DebugContact")
-        , mTimeUntilNextToggle(0)
         , mSpaceWidth(0)
         , mUpdateColors(true)
         , mOnTop(false)
-        , mHorizontalAlignment(H_LEFT)
-        , mVerticalAlignment(V_BELOW)
+        , mTimeUntilNextToggle(0)
         , mAdditionalHeight(0.0)
+        , mpCam(NULL)
+        , mpWin(NULL)
+        , mpFont(NULL)
         , mNode(node)
 
@@ -317 +317 @@
         bind->setBinding(COLOUR_BINDING, cbuf);
 
-        size_t charlen = mCaption.size();
+                // Unused variable
+        //size_t charlen = mCaption.size();
         Real *pPCBuff = static_cast<Real*>(ptbuf->lock(HardwareBuffer::HBL_DISCARD));
 
@@ -326 +327 @@
         // Derive space width from a capital A
         if (mSpaceWidth == 0)
-            mSpaceWidth = mpFont->getGlyphAspectRatio('A') * mCharHeight * 2.0;
+            mSpaceWidth = (unsigned int)(mpFont->getGlyphAspectRatio('A') * mCharHeight * 2.0);
 
         // for calculation of AABB

code/branches/physics/src/ogreode/OgreOdeDebugContact.h

@@ -161 +161 @@
 
 #endif
+

code/branches/physics/src/ogreode/OgreOdeDebugObject.cpp

@@ -160 +160 @@
                         case DebugObject::Mode_Static:
                                 setMaterial("OgreOdeDebugLines/Static");
+                        break;
+
+                        case DebugObject::Mode_Unknown:
+                                // don't do anything. Not handled.
                         break;
                 }

code/branches/physics/src/ogreode/OgreOdeEntityInformer.cpp

@@ -262 +262 @@
 //------------------------------------------------------------------------------------------------
 EntityInformer::EntityInformer(Entity *entity,const Matrix4 &transform) :
+        _radius (-1),
+        _size (Vector3(-1,-1,-1)),
+        _center (Vector3(-1,-1,-1)),
         _vertices (0),
         _indices (0),
         _vertex_count (0),
         _index_count (0),
-        _size (Vector3(-1,-1,-1)),
-        _center (Vector3(-1,-1,-1)),
-        _radius (-1),
         _bone_mapping (0)
 {
@@ -275 +275 @@
 //------------------------------------------------------------------------------------------------
 EntityInformer::EntityInformer() :
+                _radius (-1),
+                _size (Vector3(-1,-1,-1)),
+                _center (Vector3(-1,-1,-1)),
                 _vertices (0),
                 _indices (0),
                 _vertex_count (0),
                 _index_count (0),
-                _size (Vector3(-1,-1,-1)),
-                _center (Vector3(-1,-1,-1)),
-                _radius (-1),
         _bone_mapping (0)
 {

code/branches/physics/src/ogreode/OgreOdeEntityInformer.h

@@ -77 +77 @@
                 EntityInformerReuse(const Ogre::MeshPtr &mesh, const Ogre::Vector3 &scale = Ogre::Vector3::UNIT_SCALE, bool forceRecreate = false);
                 
-                ~EntityInformerReuse();
+                virtual ~EntityInformerReuse();
                 
                 /** Creates TriangleMeshGeometry using TriangleMeshDataPtr 

code/branches/physics/src/ogreode/OgreOdeGeometry.cpp

@@ -20 +20 @@
 Geometry::Geometry(World *world, Space* space):
     UserDefinedObject(),
+        _geom (0),
+        _max_contacts (32),
         _contact_high_water_mark (0),
     _last_contact_num(0),
-        _max_contacts (32),
-    _debug_contacts (0),
         _contacts (0),
-        _encapsulator (0),
         _debug_obj (0),
         _debug_node (0),
+    _debug_contacts (0),
+        _encapsulator (0),
         _user_data (0),
         _user_object (0),
-        _geom (0),
     _world(world)
 {
@@ -1211 +1211 @@
                                 Ogre::Real thickness) :
                         Geometry(world, space),
+                        _max_height (scale.y),
                         _sample_width(scale.x),
                         _sample_height(scale.z),
-                        _max_height (scale.y),
+                        _centered(centered),
                         _halfWorldSizeX(worldSizeX * 0.5),
-                        _halfWorldSizeZ(worldSizeZ * 0.5),
-                        _centered(centered)
+                        _halfWorldSizeZ(worldSizeZ * 0.5)
 {
         dHeightfieldDataID heightid = dGeomHeightfieldDataCreate();

code/branches/physics/src/ogreode/OgreOdeGeometry.h

@@ -395 +395 @@
                 void changeTriangleMeshData(TriangleMeshDataPtr dataPtr);
                 
-                TriangleMeshDataPtr TriangleMeshGeometry::getTriangleMeshData(){ return _dataPtr; }
+                TriangleMeshDataPtr getTriangleMeshData(){ return _dataPtr; }
                 
                 ~TriangleMeshGeometry();

code/branches/physics/src/ogreode/OgreOdeSpace.cpp

@@ -14 +14 @@
 //------------------------------------------------------------------------------------------------
 Space::Space(World *world, const Space* space) :
-    _world(world),
-    _internal_collisions (true)
+    _internal_collisions (true),
+    _world(world)
 {
 }

code/branches/physics/src/ogreode/OgreOdeStepper.cpp

@@ -21 +21 @@
     _world  (world),
     _paused (false),
-    _listener (0),
     _auto_pre (false),
     _auto_post (false), 
+    _listener (0),
     _root  (0),
     _step_size (step_size),
@@ -267 +267 @@
         StepHandler(world, stepModeType, step_size, max_interval, time_scale),
         _dbl_step_size(step_size * 2),
-        _frame_rate (frame_rate),
-        _inv_step_size(1.0 / frame_rate)
+        _inv_step_size(1.0 / frame_rate),
+        _frame_rate (frame_rate)
 {
     if (frame_rate == Ogre::Real(0))
@@ -278 +278 @@
     {
         _fixed_frame_rate = true;
-        _next_frame_step_count = _frame_rate / (_step_size * _time_scale);
+        _next_frame_step_count = (unsigned int)(_frame_rate / (_step_size * _time_scale));
         if (_next_frame_step_count == 0)
             _next_frame_step_count = 1;

code/branches/physics/src/ogreode/OgreOdeWorld.cpp

@@ -158 +158 @@
 size_t World::getAutoSleepAverageSamplesCount()
 {
-    return (Real)dWorldGetAutoDisableAverageSamplesCount(_world);
+    return dWorldGetAutoDisableAverageSamplesCount(_world);
 }
 //------------------------------------------------------------------------------------------------