Changeset 10195 for code/trunk

Timestamp:

Jan 13, 2015, 10:54:15 PM (10 years ago)

Author:

landauf

Message:

removed unnecessary material from BulletDebugDrawer.
fixed crash with ogre 1.7 if the number of vertices dropped to 0 in DebugDrawer.

Location:

code/trunk/src/libraries/tools

Files:

• BulletDebugDrawer.cc (modified) (4 diffs)
• DebugDrawer.cc (modified) (3 diffs)

code/trunk/src/libraries/tools/BulletDebugDrawer.cc

@@ -11 +11 @@
 #include <OgreRoot.h>
 #include <OgreManualObject.h>
-#include <OgreMaterialManager.h>
 #include <OgreSceneManager.h>
 
@@ -25 +24 @@
 
         mContactPoints = &mContactPoints1;
-
-        static const char* matName = "OgreBulletCollisionsDebugDefault";
-        Ogre::MaterialPtr mtl = Ogre::MaterialManager::getSingleton().getDefaultSettings()->clone(matName);
-        mtl->setReceiveShadows(false);
-        mtl->setSceneBlending(Ogre::SBT_TRANSPARENT_ALPHA);
-        mtl->setDepthBias(0.1, 0);
-        Ogre::TextureUnitState* tu = mtl->getTechnique(0)->getPass(0)->createTextureUnitState();
-        tu->setColourOperationEx(Ogre::LBX_SOURCE1, Ogre::LBS_DIFFUSE);
-        mtl->getTechnique(0)->setLightingEnabled(false);
-        //mtl->getTechnique(0)->setSelfIllumination(Ogre::ColourValue::White);
 
         mDebugMode = (DebugDrawModes) DBG_DrawWireframe;
@@ -135 +124 @@
         // Right before the frame is rendered, call DebugDrawer::build().
         this->drawer_->build();
+
         return true;
     }
@@ -142 +132 @@
         // After the frame is rendered, call DebugDrawer::clear()
         this->drawer_->clear();
+
         return true;
     }

code/trunk/src/libraries/tools/DebugDrawer.cc

@@ -15 +15 @@
 #include <OgreManualObject.h>
 #include <OgreAxisAlignedBox.h>
-
-#include "util/Output.h"
 
 #define DEFAULT_ICOSPHERE_RECURSION_LEVEL 1
@@ -402 +400 @@
                 manualObject->index(*i);
         }
+        else
+            manualObject->index(0); // this is necessary to avoid crashes with ogre 1.7 if there's a light source in the level
         manualObject->end();
 
@@ -417 +417 @@
                 manualObject->index(*i);
         }
+        else
+            manualObject->index(0); // this is necessary to avoid crashes with ogre 1.7 if there's a light source in the level
         manualObject->end();
     }