Changeset 5389 in orxonox.OLD for trunk/src

Timestamp:

Oct 16, 2005, 2:15:03 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: toggling PNode-visibility, and added t_stack.h to the Makefile

Location:

trunk/src

Files:

• lib/Makefile.am (modified) (1 diff)
• lib/Makefile.in (modified) (1 diff)
• story_entities/world.cc (modified) (3 diffs)
• story_entities/world.h (modified) (2 diffs)

trunk/src/lib/Makefile.am

@@ -52 +52 @@
                         util/array.h \
                         util/list.h \
+                        util/t_stack.h \
                         util/color.h \
                         util/helper_functions.h \

trunk/src/lib/Makefile.in

@@ -245 +245 @@
                         util/array.h \
                         util/list.h \
+                        util/t_stack.h \
                         util/color.h \
                         util/helper_functions.h \

trunk/src/story_entities/world.cc

@@ -76 +76 @@
 
 SHELL_COMMAND(speed, World, setSpeed);
+SHELL_COMMAND(togglePNodeVisibility, World, togglePNodeVisibility);
 
 using namespace std;
@@ -173 +174 @@
   this->shell = NULL;
   this->entities = NULL;
+
+  this->showPNodes = false;
 }
 
@@ -980 +983 @@
   ParticleEngine::getInstance()->draw();
 
+  if (unlikely(this->showPNodes))
+    NullParent::getInstance()->debugDraw(0);
+
   GraphicsEngine::getInstance()->draw();
   //TextEngine::getInstance()->draw();

trunk/src/story_entities/world.h

@@ -74 +74 @@
   void setPath( const char* name);
 
-  inline Camera* getLocalCamera() {return this->localCamera;}
+  inline Camera* getLocalCamera() { return this->localCamera; };
+
+  void togglePNodeVisibility() { this->showPNodes = !this->showPNodes; };
 
  private:
   void constuctorInit(const char* name, int worldID);
-
-  Uint32 lastFrame;                   //!< last time of frame
-  Uint32 cycle;                       //!< The cycle we are in (starts with 0 and rises with every frame)
-  Uint32 dt;                          //!< time needed to calculate this frame (in milliSeconds)
-  float dtS;                          //!< The time needed for caluculations in seconds
-  float speed;                        //!< how fast the game flows
-  double gameTime;                    //!< this is where the game time is saved
-  bool bQuitOrxonox;                  //!< quit this application
-  bool bQuitCurrentGame;              //!< quit only the current game and return to menu
-  bool bPause;                        //!< pause mode
-
-  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;
-
-  // IMPORTANT WORLD-ENTITIES
-  Camera* localCamera;                //!< The current Camera
-  WorldEntity* sky;                   //!< The Environmental Heaven of orxonox @todo insert this to environment insted
-  Terrain* terrain;                   //!< The Terrain of the World.
-
-  GLuint objectList;                  //!< temporary: @todo this will be ereased soon
-  tList<WorldEntity>* entities;       //!< A template List of all entities. Every moving thing should be included here, and world automatically updates them.
-  Player* localPlayer;                //!< The Player, you fly through the level.
-  PilotNode* pilotNode;               //!< THe pilot node to fly with the mouse
-
   /* function for main-loop */
   void mainLoop ();
@@ -118 +91 @@
   void debug ();
 
+  private:
+    bool   showPNodes;                  //!< if the PNodes should be visible.
+    Uint32 lastFrame;                   //!< last time of frame
+    Uint32 cycle;                       //!< The cycle we are in (starts with 0 and rises with every frame)
+    Uint32 dt;                          //!< time needed to calculate this frame (in milliSeconds)
+    float dtS;                          //!< The time needed for caluculations in seconds
+    float speed;                        //!< how fast the game flows
+    double gameTime;                    //!< this is where the game time is saved
+    bool bQuitOrxonox;                  //!< quit this application
+    bool bQuitCurrentGame;              //!< quit only the current game and return to menu
+    bool bPause;                        //!< pause mode
+
+    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;
+
+  // IMPORTANT WORLD-ENTITIES
+    Camera* localCamera;                //!< The current Camera
+    WorldEntity* sky;                   //!< The Environmental Heaven of orxonox @todo insert this to environment insted
+    Terrain* terrain;                   //!< The Terrain of the World.
+
+    GLuint objectList;                  //!< temporary: @todo this will be ereased soon
+    tList<WorldEntity>* entities;       //!< A template List of all entities. Every moving thing should be included here, and world automatically updates them.
+    Player* localPlayer;                //!< The Player, you fly through the level.
+    PilotNode* pilotNode;               //!< THe pilot node to fly with the mouse
+
+
 };