Changeset 7692 in orxonox.OLD for branches

Timestamp:

May 18, 2006, 3:51:16 PM (19 years ago)

Author:

patrick

Message:

water: added the reflection list to the object list. temporary. bensch will decide if this stays here…

Location:

branches/water/src

Files:

• story_entities/game_world.cc (modified) (2 diffs)
• util/object_manager.cc (modified) (1 diff)
• util/object_manager.h (modified) (3 diffs)

branches/water/src/story_entities/game_world.cc

@@ -471 +471 @@
 
 
+
+/**
+ * reflection rendering for water surfaces
+ */
 void GameWorld::renderPassReflection()
 {
-
   const std::list<BaseObject*>* reflectedWaters;
   MappedWater* mw;
@@ -498 +501 @@
 }
 
+
+/**
+ *  refraction rendering for water surfaces
+ */
 void GameWorld::renderPassRefraction()
 {}
 
+
+/**
+ *  this render pass renders the whole wolrd
+ */
 void GameWorld::renderPassAll()
 {

branches/water/src/util/object_manager.cc

@@ -64 +64 @@
     while(!this->objectLists[i].empty())
       delete this->objectLists[i].front();
+
+  // delete reflectin list
+  while( !this->reflectionList.empty())
+    delete this->reflectionList.front();
 }
 

branches/water/src/util/object_manager.h

@@ -19 +19 @@
   OM_ENVIRON,
   OM_COMMON,
-
-  OM_REFLECTION,                            //!< list of all object that need to be drawn in the reflection image
 
   OM_GROUP_00,
@@ -96 +94 @@
   static const char* OMListToString(OM_LIST omList);
 
+
+  void toReflectionList( WorldEntity* entity) { this->reflectionList.push_back(entity); }
+  /** @returns the list of all reflected objects in the world */
+  EntityList& getReflectionList() { return this->reflectionList; }
+  /** @returns the static list of all reflected objects in the world */
+  const EntityList& getReflectionList() const { return this->reflectionList; }
+
+
+
+
 private:
   const std::list<BaseObject>*            pNodeList;                //!< The List of PNodes.
@@ -102 +110 @@
 
   static const char*                      objectManagerListNames[]; //!< Names of all the lists
+
+  EntityList                              reflectionList;           //!< A list of all reflected objects in the world
 };