Changeset 10196 for code/trunk

Timestamp:

Jan 13, 2015, 10:55:12 PM (10 years ago)

Author:

landauf

Message:

added BulletDebugDrawer to Scene.
added console command to enable/disable debug drawing of bullet objects.

Location:

code/trunk/src/orxonox

Files:

• Scene.cc (modified) (7 diffs)
• Scene.h (modified) (2 diffs)

code/trunk/src/orxonox/Scene.cc

@@ -44 +44 @@
 #include "core/GUIManager.h"
 #include "core/XMLPort.h"
+#include "core/command/ConsoleCommand.h"
 #include "tools/BulletConversions.h"
+#include "tools/BulletDebugDrawer.h"
+#include "tools/DebugDrawer.h"
 #include "Radar.h"
 #include "worldentities/WorldEntity.h"
@@ -53 +56 @@
     RegisterClass(Scene);
 
+    SetConsoleCommand("Scene", "debugDrawPhysics", &Scene::consoleCommand_debugDrawPhysics).addShortcut().defaultValue(1, true).defaultValue(2, 0.5f);
+
     Scene::Scene(Context* context) : BaseObject(context), Synchronisable(context), Context(context)
     {
@@ -59 +64 @@
         this->setScene(SmartPtr<Scene>(this, false), OBJECTID_UNKNOWN);
         this->bShadows_ = true;
+        this->bDebugDrawPhysics_ = false;
+        this->debugDrawer_ = NULL;
         this->soundReferenceDistance_ = 20.0;
 
@@ -198 +205 @@
             this->physicalWorld_->setGravity(multi_cast<btVector3>(this->gravity_));
 
+            this->debugDrawer_ = new BulletDebugDrawer(this->sceneManager_);
+            this->physicalWorld_->setDebugDrawer(this->debugDrawer_);
+
             // also set the collision callback variable.
             // Note: This is a global variable which we assign a static function.
@@ -214 +224 @@
             this->physicalObjects_.clear();
 
+            delete this->debugDrawer_;
             delete this->physicalWorld_;
             delete this->solver_;
@@ -253 +264 @@
             //       Under that mark, the simulation will "loose time" and get unusable.
             physicalWorld_->stepSimulation(dt, 60);
+
+            if (this->bDebugDrawPhysics_)
+                physicalWorld_->debugDrawWorld();
         }
     }
@@ -358 +372 @@
         return modified;
     }
+
+    void Scene::setDebugDrawPhysics(bool bDraw, bool bFill, float fillAlpha)
+    {
+        this->bDebugDrawPhysics_ = bDraw;
+        if (this->debugDrawer_)
+            this->debugDrawer_->configure(bFill, fillAlpha);
+    }
+
+    /*static*/ void Scene::consoleCommand_debugDrawPhysics(bool bDraw, bool bFill, float fillAlpha)
+    {
+        for (ObjectListIterator<Scene> it = ObjectList<Scene>::begin(); it != ObjectList<Scene>::end(); ++it)
+            it->setDebugDrawPhysics(bDraw, bFill, fillAlpha);
+    }
 }

code/trunk/src/orxonox/Scene.h

@@ -129 +129 @@
             void removePhysicalObject(WorldEntity* object);
 
+            void setDebugDrawPhysics(bool bDraw, bool bFill, float fillAlpha);
+
+            static void consoleCommand_debugDrawPhysics(bool bDraw, bool bFill, float fillAlpha);
+
         private:
             inline void networkcallback_hasPhysics()
@@ -156 +160 @@
             Vector3                              positiveWorldRange_;
             Vector3                              gravity_;
+
+            BulletDebugDrawer*                   debugDrawer_;
+            bool                                 bDebugDrawPhysics_;
     };
 }