Changeset 1922 for code/branches/physics/src/ogreode/OgreOdeDebugContact.cpp

Timestamp:

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

Author:

rgrieder

Message:

Minor adjustments to OgreODE when compiling under gcc.

File:

• code/branches/physics/src/ogreode/OgreOdeDebugContact.cpp (modified) (4 diffs)

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