Changeset 6459 in orxonox.OLD

Timestamp:

Jan 10, 2006, 2:00:20 AM (18 years ago)

Author:

patrick

Message:

network: skybox parenting fix

Location:

branches/network/src

Files:

• lib/network/network_game_manager.cc (modified) (2 diffs)
• story_entities/game_world.cc (modified) (1 diff)
• story_entities/game_world.h (modified) (2 diffs)
• story_entities/multi_player_world_data.cc (modified) (3 diffs)
• util/state.cc (modified) (1 diff)
• util/state.h (modified) (3 diffs)

branches/network/src/lib/network/network_game_manager.cc

@@ -25 +25 @@
 
 #include "p_node.h"
+#include "state.h"
+#include "game_world.h"
+#include "world_entity.h"
 
 
@@ -474 +477 @@
       s->setIsOutOfSync( true );
     PRINTF(0)("Fabricated %s with id %d\n", s->getClassName(), s->getUniqueID());
+
+
+    if( !strcmp( s->getClassName(), "SkyBox"))
+    {
+      PRINTF(0)("==> Created the Sky!\n");
+      (dynamic_cast<GameWorld*>(State::getCurrentStoryEntity()))->setSky( dynamic_cast<WorldEntity*>(s) );
+    }
+//       this->sky = dynamic_cast<WorldEntity*>(created);
+    if( !strcmp( s->getClassName(), "Terrain"))
+    {
+      PRINTF(0)("==> Created the Terrain\n");
+//       this->terrain = dynamic_cast<Terrain*>(created);
+//       CDEngine::getInstance()->setTerrain(terrain);
+    }
+
     return b;
   }

branches/network/src/story_entities/game_world.cc

@@ -200 +200 @@
   this->isRunning = true;
 
+  State::setCurrentStoryEntity(dynamic_cast<StoryEntity*>(this));
+
   this->run();
 }

branches/network/src/story_entities/game_world.h

@@ -9 +9 @@
 
 #include "story_entity.h"
-
+#include "game_world_data.h"
 
 class TiXmlElement;
@@ -56 +56 @@
 
 
+    inline void setSky(WorldEntity* sky) { this->dataTank->sky = sky; }
+
+
   protected:
     /* world - running functions */

branches/network/src/story_entities/multi_player_world_data.cc

@@ -48 +48 @@
 
 #include "glmenu_imagescreen.h"
+
 
 
@@ -177 +178 @@
     this->localPlayer = new Player();
     Playable* playable;
-    const list<BaseObject*>* playableList = ClassList::getList(CL_PLAYABLE);
+    const std::list<BaseObject*>* playableList = ClassList::getList(CL_PLAYABLE);
+    assert( playableList != NULL);
+
+    std::list<BaseObject*>::const_iterator entity;
+    for (entity = playableList->begin(); entity != playableList->end(); entity++)
+      PRINTF(0)("Got a playable, class: %s, name: %s\n", (*entity)->getClassName(), (*entity)->getName());
+
+
     if (playableList != NULL)
     {
@@ -184 +192 @@
     }
 
-
     /* init the pnode tree */
     PNode::getNullParent()->init();

branches/network/src/util/state.cc

@@ -31 +31 @@
 ObjectManager* State::objectManager = NULL;
 
+StoryEntity* State::storyEntity = NULL;
+
 /**
  *  sets camera and target of the current Camera

branches/network/src/util/state.h

@@ -7 +7 @@
 #define _STATE_H
 
+
 // FORWARD DECLARATION
 class PNode;
 class WorldEntity;
 class ObjectManager;
+class StoryEntity;
 
 //! handles states about orxonox's most importatn objects
@@ -39 +41 @@
   static inline ObjectManager* getObjectManager() { return State::objectManager; };
 
+  //////////////////////
+  /// STORY-ENTITY   ///
+  //////////////////////
+  /** @param storyEntity sets the current StoryEntity that is been played */
+  static inline void setCurrentStoryEntity(StoryEntity* storyEntity) { State::storyEntity = storyEntity; };
+  /** @returns the current StoryEntity played */
+  static inline StoryEntity* getCurrentStoryEntity() { return State::storyEntity; };
+
+
   /////////////////////////
   /// WORLD_ENTITY_LIST ///
@@ -49 +60 @@
   static PNode*                 cameraTarget;       //!< A reference to the cameraTarget
   static PNode*                 nullParent;         //!< A reference to the Null-PNode.
-  static ObjectManager*         objectManager;      //!< A referenct to the current ObjectManager
+  static ObjectManager*         objectManager;      //!< A reference to the current ObjectManager
+  static StoryEntity*           storyEntity;        //!< A reference to the current StoryEntity played
 
 };