Changeset 3756 in orxonox.OLD for orxonox/branches/convention/src/story_entities

Timestamp:

Apr 8, 2005, 12:54:23 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches: added new branche convention for some showing stuff at the convention

Location:

orxonox/branches/convention

Files:

• . (copied) (copied from orxonox/trunk)
• src/story_entities/world.cc (modified) (5 diffs)
• src/story_entities/world.h (modified) (2 diffs)

orxonox/branches/convention/src/story_entities/world.cc

@@ -41 +41 @@
 #include "glmenu_imagescreen.h"
 #include "fontset.h"
+#include "test_mat.h"
 #include "list.h"
 
@@ -179 +180 @@
   this->debugWorldNr = worldID;
   this->entities = new tList<WorldEntity>();
+
+  this->testMat = NULL;
 }
 
@@ -367 +370 @@
         case DEBUG_WORLD_1:
           {
+            this->testMat = new TestMat();
             lightMan->setPosition(.0, .0, .0);
             lightMan->setAttenuation(1.0, .01, 0.0);
@@ -406 +410 @@
             this->nullParent = NullParent::getInstance ();
             this->nullParent->setName ("NullParent");
-
+            
             // !\todo old track-system has to be removed
 
@@ -738 +742 @@
     }
   delete iterator;
-  
+
+  if (this->testMat)
+    this->testMat->draw();
+
   glCallList (objectList);
   //! \todo skysphere is a WorldEntity and should be inside of the world-entity-list.

orxonox/branches/convention/src/story_entities/world.h

@@ -25 +25 @@
 class GarbageCollector;
 class SimpleAnimation;
+class TestMat;
 
 //! The game world Interface
@@ -97 +98 @@
 
   FontSet* testFont;                  //!< A test Font. \todo fix this, so it is for real.
+  TestMat* testMat;                   //!< only for convention
   GLMenuImageScreen* glmis;           //!< The Level-Loader Display