Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5389 in orxonox.OLD


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/Makefile.am

    r5350 r5389  
    5252                        util/array.h \
    5353                        util/list.h \
     54                        util/t_stack.h \
    5455                        util/color.h \
    5556                        util/helper_functions.h \

  • trunk/src/lib/Makefile.in

    r5351 r5389  
    245245                        util/array.h \
    246246                        util/list.h \
     247                        util/t_stack.h \
    247248                        util/color.h \
    248249                        util/helper_functions.h \

  • trunk/src/story_entities/world.cc

    r5355 r5389  
    7676
    7777SHELL_COMMAND(speed, World, setSpeed);
     78SHELL_COMMAND(togglePNodeVisibility, World, togglePNodeVisibility);
    7879
    7980using namespace std;
    … …  
    173174  this->shell = NULL;
    174175  this->entities = NULL;
     176
     177  this->showPNodes = false;
    175178}
    176179
    … …  
    980983  ParticleEngine::getInstance()->draw();
    981984
     985  if (unlikely(this->showPNodes))
     986    NullParent::getInstance()->debugDraw(0);
     987
    982988  GraphicsEngine::getInstance()->draw();
    983989  //TextEngine::getInstance()->draw();

  • trunk/src/story_entities/world.h

    r5206 r5389  
    7474  void setPath( const char* name);
    7575
    76   inline Camera* getLocalCamera() {return this->localCamera;}
     76  inline Camera* getLocalCamera() { return this->localCamera; };
     77
     78  void togglePNodeVisibility() { this->showPNodes = !this->showPNodes; };
    7779
    7880 private:
    7981  void constuctorInit(const char* name, int worldID);
    80 
    81   Uint32 lastFrame;                   //!< last time of frame
    82   Uint32 cycle;                       //!< The cycle we are in (starts with 0 and rises with every frame)
    83   Uint32 dt;                          //!< time needed to calculate this frame (in milliSeconds)
    84   float dtS;                          //!< The time needed for caluculations in seconds
    85   float speed;                        //!< how fast the game flows
    86   double gameTime;                    //!< this is where the game time is saved
    87   bool bQuitOrxonox;                  //!< quit this application
    88   bool bQuitCurrentGame;              //!< quit only the current game and return to menu
    89   bool bPause;                        //!< pause mode
    90 
    91   GLMenuImageScreen* glmis;           //!< The Level-Loader Display
    92 
    93   int debugWorldNr;                   //!< The Debug Nr. needed, if something goes wrong
    94   char* path;                         //!< The file from which this world is loaded
    95 
    96   Shell*     shell;
    97   OggPlayer* music;
    98 
    99   // IMPORTANT WORLD-ENTITIES
    100   Camera* localCamera;                //!< The current Camera
    101   WorldEntity* sky;                   //!< The Environmental Heaven of orxonox @todo insert this to environment insted
    102   Terrain* terrain;                   //!< The Terrain of the World.
    103 
    104   GLuint objectList;                  //!< temporary: @todo this will be ereased soon
    105   tList<WorldEntity>* entities;       //!< A template List of all entities. Every moving thing should be included here, and world automatically updates them.
    106   Player* localPlayer;                //!< The Player, you fly through the level.
    107   PilotNode* pilotNode;               //!< THe pilot node to fly with the mouse
    108 
    10982  /* function for main-loop */
    11083  void mainLoop ();
    … …  
    11891  void debug ();
    11992
     93  private:
     94    bool   showPNodes;                  //!< if the PNodes should be visible.
     95    Uint32 lastFrame;                   //!< last time of frame
     96    Uint32 cycle;                       //!< The cycle we are in (starts with 0 and rises with every frame)
     97    Uint32 dt;                          //!< time needed to calculate this frame (in milliSeconds)
     98    float dtS;                          //!< The time needed for caluculations in seconds
     99    float speed;                        //!< how fast the game flows
     100    double gameTime;                    //!< this is where the game time is saved
     101    bool bQuitOrxonox;                  //!< quit this application
     102    bool bQuitCurrentGame;              //!< quit only the current game and return to menu
     103    bool bPause;                        //!< pause mode
     104
     105    GLMenuImageScreen* glmis;           //!< The Level-Loader Display
     106
     107    int debugWorldNr;                   //!< The Debug Nr. needed, if something goes wrong
     108    char* path;                         //!< The file from which this world is loaded
     109
     110    Shell*     shell;
     111    OggPlayer* music;
     112
     113  // IMPORTANT WORLD-ENTITIES
     114    Camera* localCamera;                //!< The current Camera
     115    WorldEntity* sky;                   //!< The Environmental Heaven of orxonox @todo insert this to environment insted
     116    Terrain* terrain;                   //!< The Terrain of the World.
     117
     118    GLuint objectList;                  //!< temporary: @todo this will be ereased soon
     119    tList<WorldEntity>* entities;       //!< A template List of all entities. Every moving thing should be included here, and world automatically updates them.
     120    Player* localPlayer;                //!< The Player, you fly through the level.
     121    PilotNode* pilotNode;               //!< THe pilot node to fly with the mouse
     122
     123
    120124};
    121125
Note: See TracChangeset for help on using the changeset viewer.