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

Timestamp:

Mar 9, 2005, 1:00:30 AM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: cleaning up old stuff in world.cc and its relatives. first step…

File:

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

orxonox/trunk/src/world.h

@@ -31 +31 @@
   World (int worldID);
   virtual ~World ();
-  
+
+
+  /* classes from story-entity */
+  virtual ErrorMessage load ();
   virtual ErrorMessage init ();
   virtual ErrorMessage start ();
@@ -37 +40 @@
   virtual ErrorMessage pause ();
   virtual ErrorMessage resume ();
+  virtual ErrorMessage destroy ();
 
-  virtual void load ();
-  virtual void destroy ();
+  virtual void displayLoadScreen();
+  virtual void releaseLoadScreen();
 
-  //static void vertexCallback (GLfloat* vertex);
 
-  void timeSlice (Uint32 deltaT);
-  void collide ();
+  /* main functions for world-looping */
+
   void draw ();
   void update ();       // maps Locations to Placements
   //void calcCameraPos (Location* loc, Placement* plc);
         
-  void unload ();
   bool command (Command* cmd);
-  virtual void displayLoadScreen();
-  virtual void releaseLoadScreen();
+
   
   //bool system_command (Command* cmd);
@@ -90 +91 @@
   void handleInput ();
   void timeSlice ();
-  void collision ();
+  void collide ();
   void display ();
   void debug ();