Changeset 3365 in orxonox.OLD for orxonox/trunk/src/world.h

Timestamp:

Jan 7, 2005, 1:14:33 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/parenting back to the.
merged with command:
svn merge branches/parenting trunk -r 3247:HEAD
resolved all conflicts in favor of parenting.

File:

• orxonox/trunk/src/world.h (modified) (7 diffs)

orxonox/trunk/src/world.h

@@ -11 +11 @@
 
 
-
+class TrackManager;
 class Track;
 class WorldEntity;
 class Camera;
+class PNode;
+class GLMenuImageScreen;
 
 //! The game environment
@@ -23 +25 @@
   World (int worldID);
   virtual ~World ();
-
-  template<typename T> 
-    T* spawn (Location* loc, WorldEntity* owner);       // template to be able to spawn any derivation of WorldEntity
-  template<typename T> 
-    T* spawn (Placement* plc, WorldEntity* owner);
   
   virtual ErrorMessage init ();
@@ -38 +35 @@
   virtual void destroy ();
 
+  //static void vertexCallback (GLfloat* vertex);
+
   void timeSlice (Uint32 deltaT);
   void collide ();
   void draw ();
   void update ();       // maps Locations to Placements
-  void calcCameraPos (Location* loc, Placement* plc);
+  //void calcCameraPos (Location* loc, Placement* plc);
         
   void unload ();
   bool command (Command* cmd);
+  virtual void displayLoadScreen();
+  virtual void releaseLoadScreen();
   
   void setTrackLen (Uint32 tracklen);
@@ -53 +54 @@
 
   void spawn (WorldEntity* entity);
-  void spawn (WorldEntity* entity, Location* loc);
-  void spawn (WorldEntity* entity, Placement* plc);
+  void spawn (WorldEntity* entity, Vector* absCoor, Quaternion* absDir);
 
   tList<WorldEntity>* entities;
   
   // base level data
+  TrackManager* trackManager;
   Track* track;
   Uint32 tracklen;   // number of Tracks the World consist of
@@ -64 +65 @@
   Camera* localCamera;  
 
+
+  UPointCurve* testCurve;
  private:
   Uint32 lastFrame; //!> last time of frame
@@ -70 +73 @@
   bool bPause;
 
+  GLMenuImageScreen* glmis;
+
   char* worldName;
   int debugWorldNr;
   GLuint objectList;
+  SDL_Surface *loadImage;
 
   WorldEntity* localPlayer;
-  
+ 
+  PNode* nullParent;
+ 
   void mainLoop ();
   void synchronize ();
@@ -83 +91 @@
   void display ();
   void debug ();
+
+  void swap (unsigned char &a, unsigned char &b); /* \todo: this function doesn't belong here, this should be part of a image class*/
 };