Changeset 6126 in orxonox.OLD

Timestamp:

Dec 15, 2005, 10:57:45 AM (18 years ago)

Author:

bensch

Message:

orxonox/OM: draw works with new interface

Location:

branches/objectmanager/src

Files:

• lib/graphics/graphics_engine.cc (modified) (2 diffs)
• lib/graphics/graphics_engine.h (modified) (2 diffs)
• story_entities/world.cc (modified) (3 diffs)
• util/object_manager.cc (modified) (2 diffs)
• world_entities/weapons/guided_missile.cc (modified) (1 diff)

branches/objectmanager/src/lib/graphics/graphics_engine.cc

@@ -19 +19 @@
 #include "resource_manager.h"
 #include "event_handler.h"
+
+#include "world_entity.h"
 
 #include "render_2d.h"
@@ -573 +575 @@
 }
 
+void GraphicsEngine::draw(const std::list<WorldEntity*>& drawList ) const
+{
+  std::list<WorldEntity*>::const_iterator entity;
+  for (entity = drawList.begin(); entity != drawList.end(); entity++)
+    if ((*entity)->isVisible()) 
+      (*entity)->draw(); 
+}
+
+
 /**
  * displays the Frames per second

branches/objectmanager/src/lib/graphics/graphics_engine.h

@@ -15 +15 @@
 #include "glincl.h"
 
+#include <list>
+
 // Forward Declaration
 class Text;
 class IniParser;
 class SubString;
+class WorldEntity;
 
 //! class to handle graphics
@@ -66 +69 @@
     void tick(float dt);
     void draw() const;
+    void draw(const std::list<WorldEntity*>& drawList) const;
     void displayFPS(bool display);
 

branches/objectmanager/src/story_entities/world.cc

@@ -721 +721 @@
       this->gameTime += this->dtS;
 
+
       tIterator<WorldEntity>* iterator = this->entities->getIterator();
       WorldEntity* entity = iterator->firstElement();
@@ -805 +806 @@
 void World::draw ()
 {
+  GraphicsEngine* engine = GraphicsEngine::getInstance();
+  engine->draw(State::getObjectManager()->getObjectList(OM_ENVIRON_NOTICK));
+  engine->draw(State::getObjectManager()->getObjectList(OM_ENVIRON));
+  engine->draw(State::getObjectManager()->getObjectList(OM_COMMON));
+  engine->draw(State::getObjectManager()->getObjectList(OM_GROUP_00));
+  engine->draw(State::getObjectManager()->getObjectList(OM_GROUP_01));
+  engine->draw(State::getObjectManager()->getObjectList(OM_GROUP_01_PROJ));
+  
+  
   /* draw entities */
   WorldEntity* entity;
@@ -825 +835 @@
     PNode::getNullParent()->debugDraw(0);
 
-  GraphicsEngine::getInstance()->draw();
+  engine->draw();
   //TextEngine::getInstance()->draw();
 }

branches/objectmanager/src/util/object_manager.cc

@@ -133 +133 @@
   if (omList != OM_INIT || omList == OM_SIZE)
   {
-    PRINT(0)(" +ObjectManager-LIST: '%s'-size='%d'-----\n", ObjectManager::OMListToString((OM_LIST)omList), this->objectLists[omList].size());
+    PRINT(0)(" +ObjectManager-LIST: '%s'==size='%d'==---\n", ObjectManager::OMListToString((OM_LIST)omList), this->objectLists[omList].size());
   //  if (level >= 1)
     {
@@ -144 +144 @@
   }
   else
-    PRINTF(2)("Invalid query. for OM_INIT-LIST\n");
+    PRINTF(2)("Invalid query. for OM_INIT-LIST or OM_SIZE\n");
 }
 

branches/objectmanager/src/world_entities/weapons/guided_missile.cc

@@ -153 +153 @@
   if (this->target != NULL && this->target->getParent() != PNode::getNullParent())
    {
-     printf("========%s::%s\n", target->getParent()->getClassName(), target->getParent()->getName() );
      velocity += ((target->getAbsCoor() - this->getAbsCoor()).getNormalized())*agility;
      float speed = velocity.len();