Changeset 3605 in orxonox.OLD for orxonox/branches/levelloader/src/story_entities/world.h

Timestamp:

Mar 18, 2005, 11:52:15 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged trunk back to levelloader
merged with command:
svn merge -r 3499:HEAD trunk branches/levelloader

Conflicts in
C track_manager.h
C world_entities/player.cc
C world_entities/player.h
C world_entities/environment.h
C lib/coord/p_node.cc
C defs/debug.h
C track_manager.cc
C story_entities/campaign.h

solved in merge-favouring. It was quite easy because Chris only worked on the headers, and he didi it quite clean. Thats the spirit

Conflits in world.cc are a MESS: fix it

File:

• orxonox/branches/levelloader/src/story_entities/world.h (modified) (5 diffs)

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

@@ -10 +10 @@
 
 #include "story_entity.h"
+#include "p_node.h"
 
 class TrackManager;
@@ -17 +18 @@
 class GLMenuImageScreen;
 class Skysphere;
-class Light;
+class LightManager;
 class FontSet;
+class Terrain;
+
 
 //! The game world
@@ -55 +58 @@
   void spawn (WorldEntity* entity);
   void spawn (WorldEntity* entity, Vector* absCoor, Quaternion* absDir);
+  void spawn(WorldEntity* entity, PNode* parentNode, Vector* relCoor, Quaternion* relDir, 
+             int parentingMode);
+
         
         void setPath( char* name);
         char* getPath();
 
+ private:
+  void init(char* name, int worldID);
 
- private:
   Uint32 lastFrame;             //!< last time of frame
   bool bQuitOrxonox;            //!< quit this application
@@ -74 +81 @@
 
   PNode* nullParent;            //!< The zero-point, that everything has as its parent.
-  TrackManager* trackManager;  //!< The reference of the TrackManager that handles the course through the Level.
-  Camera* localCamera;         //!< The current Camera
+  TrackManager* trackManager;   //!< The reference of the TrackManager that handles the course through the Level.
+  Camera* localCamera;          //!< The current Camera
   Skysphere* skySphere;         //!< The Environmental Heaven of orxonox \todo insert this to environment insted
-  Light* light;                 //!< The Lights of the Level
+  LightManager* lightMan;       //!< The Lights of the Level
+  Terrain* terrain;             //!< The Terrain of the World.
 
   GLuint objectList;            //!< temporary: \todo this will be ereased soon
@@ -87 +95 @@
   void synchronize ();
   void handleInput ();
-  void timeSlice ();
+  void tick ();
+  void update ();
   void collide ();
   void draw ();