Changeset 6150 in orxonox.OLD for trunk/src/story_entities/world.h

Timestamp:

Dec 17, 2005, 5:56:25 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: cleanup of the world begin

File:

• trunk/src/story_entities/world.h (modified) (8 diffs)

trunk/src/story_entities/world.h

@@ -32 +32 @@
 
  public:
-  World (const char* name);
-  World (int worldID);
   World (const TiXmlElement* root = NULL);
   virtual ~World ();
@@ -51 +49 @@
   virtual ErrorMessage destroy ();
 
-  void loadDebugWorld(int worldID);
-
   virtual void displayLoadScreen();
   virtual void releaseLoadScreen();
@@ -61 +57 @@
   /* interface to world */
   void spawn (WorldEntity* entity);
-  void spawn (WorldEntity* entity, Vector* absCoor, Quaternion* absDir);
-  void spawn(WorldEntity* entity, PNode* parentNode, Vector* relCoor, Quaternion* relDir);
 
   /** @param speed sets the speed of the Game */
@@ -68 +62 @@
   const char* getPath();
   void setPath( const char* name);
-
-  inline Camera* getLocalCamera() { return this->localCamera; };
 
   void togglePNodeVisibility() { this->showPNodes = !this->showPNodes; };
@@ -77 +69 @@
   void constuctorInit(const char* name, int worldID);
   /* function for main-loop */
-  void mainLoop ();
   void synchronize ();
   void handleInput ();
@@ -85 +76 @@
   void collide ();
   void draw ();
+  void mainLoop ();
+
   void display ();
   void debug ();
 
   private:
+    char* path;                         //!< The file from which this world is loaded
+
     bool   showPNodes;                  //!< if the PNodes should be visible.
     bool   showBV;                      //!< if the Bounding Volumes should be visible.
+
     Uint32 lastFrame;                   //!< last time of frame
     Uint32 cycle;                       //!< The cycle we are in (starts with 0 and rises with every frame)
@@ -105 +101 @@
     GLMenuImageScreen* glmis;           //!< The Level-Loader Display
 
-    int debugWorldNr;                   //!< The Debug Nr. needed, if something goes wrong
-    char* path;                         //!< The file from which this world is loaded
-
     Shell*     shell;
     OggPlayer* music;
@@ -116 +109 @@
     Terrain* terrain;                   //!< The Terrain of the World.
 
-    GLuint objectList;                  //!< temporary: @todo this will be ereased soon
-
     Player* localPlayer;                //!< The Player, you fly through the level.
 };