Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3462 in orxonox.OLD for orxonox/trunk


Ignore:
Timestamp:
Mar 9, 2005, 1:36:23 AM (20 years ago)
Author:
patrick
Message:

orxonox/trunk: cleaning up old stuff in world.cc and its relatives. task
finished for now. there are some serious thoughts that i will have to do
about this class. im not happy with:

  1. the separation mainloop and level-data, this are two very diffrent things.
  2. command-node and the hole command structure has to be redesigned
  3. there are some diffrencies in naming: timeSlice(), tick(), update()

they are all the same…

  1. separation between graphics engine an world itself, display/draw

processes are very different

  1. currently there is a limit of one camera in the world due to the

code. there could arise the need for more camreas…
so loooong…

Location:
orxonox/trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/world.cc

    r3461 r3462  
    639639void World::draw ()
    640640{
    641   // draw entities
     641  /* draw entities */
    642642  WorldEntity* entity;
    643643  entity = this->entities->enumerate();
    … …  
    648648    }
    649649 
    650   //glmis = new GLMenuImageScreen();
    651   ///glmis->init();
    652 
    653   // draw debug coord system
    654650  glCallList (objectList);
    655651  //! \todo skysphere is a WorldEntity and should be inside of the world-entity-list.
    … …  
    907903}
    908904
    909 
    910 
    911 /**
    912    \brief swaps two values
    913    \todo make this a global function, and take it out of world
    914 */
    915 void World::swap (unsigned char &a, unsigned char &b)
    916 {
    917   unsigned char temp;
    918   temp = a;
    919   a    = b;
    920   b    = temp;
    921 }

  • orxonox/trunk/src/world.h

    r3461 r3462  
    5555
    5656 private:
    57   TrackManager* trackManager;  //!< The reference of the TrackManager that handles the course through the Level.
    58   Camera* localCamera;         //!< The current Camera
    59   tList<WorldEntity>* entities;//!< A template List of all entities. Every moving thing should be included here, and world automatically updates them.
    60 
    6157  Uint32 lastFrame;             //!< last time of frame
    6258  bool bQuitOrxonox;            //!< quit this application
    … …  
    6965  char* worldName;              //!< The name of this World
    7066  int debugWorldNr;             //!< The Debug Nr. needed, if something goes wrong
    71   GLuint objectList;            //!< temporary: \todo this will be ereased soon
     67
     68  PNode* nullParent;            //!< The zero-point, that everything has as its parent.
     69  TrackManager* trackManager;  //!< The reference of the TrackManager that handles the course through the Level.
     70  Camera* localCamera;         //!< The current Camera
    7271  Skysphere* skySphere;         //!< The Environmental Heaven of orxonox \todo insert this to environment insted
    7372  Light* light;                 //!< The Lights of the Level
    7473
     74  GLuint objectList;            //!< temporary: \todo this will be ereased soon
     75  tList<WorldEntity>* entities;//!< A template List of all entities. Every moving thing should be included here, and world automatically updates them.
    7576  WorldEntity* localPlayer;     //!< The Player, you fly through the level.
    7677 
    77   PNode* nullParent;            //!< The zero-point, that everything has as its parent.
    78  
     78  /* function for main-loop */
    7979  void mainLoop ();
    8080  void synchronize ();
    … …  
    8686  void debug ();
    8787
    88   void swap (unsigned char &a, unsigned char &b); /* \todo: this function doesn't belong here, this should be part of a image class*/
    8988};
    9089
Note: See TracChangeset for help on using the changeset viewer.