Changeset 3194 in orxonox.OLD

Timestamp:

Dec 16, 2004, 5:05:16 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk/src: state-freeze - redefinig destroy functions, some comments

Location:

orxonox/trunk/src

Files:

• command_node.cc (modified) (1 diff)
• environment.cc (modified) (3 diffs)
• list.cc (modified) (1 diff)
• list.h (modified) (3 diffs)
• player.cc (modified) (2 diffs)
• world.cc (modified) (4 diffs)

orxonox/trunk/src/command_node.cc

@@ -62 +62 @@
 
 
+/**
+  \brief this resets the command node
+
+   deleting all data contained in the command node to fill it up again
+
+  \todo coppling to different game-entities
+  \todo reset/destroy has to be redesigned
+*/
+
 void CommandNode::reset()
 {
-  this->bound->clear();
+  this->bound->destroy();
 }
 

orxonox/trunk/src/environment.cc

@@ -67 +67 @@
 void Environment::draw () 
 {
-  printf("Environment::draw()");
-
   glMatrixMode(GL_MODELVIEW);
   glLoadIdentity();
@@ -78 +76 @@
 
   glBegin(GL_TRIANGLES);
-  glColor3f(1,1,1);
+  glColor3f(1,0,1);
   glVertex3f(0,0,0.5);
   glVertex3f(-0.5,0,-1);
@@ -89 +87 @@
     
   glBegin(GL_QUADS);
-  glColor3f(0,0,1);
+  glColor3f(1,0,1);
   glVertex3f(0.5,0.5,-1);
   glVertex3f(0.5,-0.5,-1);

orxonox/trunk/src/list.cc

@@ -77 +77 @@
 
 
-void List::clear()
+void List::destroy()
 {
   printf("List::clear() - clearing all world objects, releasing mem\n");

orxonox/trunk/src/list.h

@@ -22 +22 @@
   void add(WorldEntity* entity);
   void remove(WorldEntity* entity);
-  void clear();
+  void destroy();
   WorldEntity* firstElement();
   bool isEmpty();
@@ -80 +80 @@
   void add(WorldEntity* entity);
   void remove(WorldEntity* entity);
-  void clear();
+  void destroy();
   T* firstElement();
   bool isEmpty();
@@ -148 +148 @@
 
 template<class T>
-void tList<T>::clear()
+void tList<T>::destroy()
 {
   printf("tList<T>::clear() - clearing all world objects, releasing mem\n");

orxonox/trunk/src/player.cc

@@ -26 +26 @@
 {
 
-  obj = new Object ("reaplow.obj");
+  this->obj = new Object ("reaplow.obj");
   /*
   objectList = glGenLists(1);
@@ -55 +55 @@
 
 Player::~Player () 
+{
 
-{
+  delete this->obj;
 }
 

orxonox/trunk/src/world.cc

@@ -75 +75 @@
   this->bQuitCurrentGame = true;
   this->localCamera->setWorld(NULL);
-  this->entities->clear();
+  WorldEntity* entity = entities->enumerate();  
+  while( entity != NULL ) 
+    { 
+      entity->destroy();
+      entity = entities->nextElement();
+    }
+  this->entities->destroy();
   Orxonox::getInstance()->get_localinput()->reset();
-  this->~World();
 }
 
@@ -114 +119 @@
                 this->track[i] = Track( i, (i+1)%this->tracklen, &this->pathnodes[i], &this->pathnodes[(i+1)%this->tracklen]);
               }
-            
+            // !\todo old track-system has to be removed
+
             // create a player
             WorldEntity* myPlayer = new Player();
@@ -154 +160 @@
                 this->track[i] = Track( i, (i+1)%this->tracklen, &this->pathnodes[i], &this->pathnodes[(i+1)%this->tracklen]);
               }
-            
+
             // create a player
-            //WorldEntity* myPlayer = (WorldEntity*) this->spawn<Player>();
             WorldEntity* myPlayer = new Player();
             this->spawn(myPlayer);
-            this->localPlayer = myPlayer;
+            this->localPlayer = myPlayer;           
             
             // bind input
@@ -539 +544 @@
       else
         {
-          printf("fps = 1000 but 0ms!\n");
+          printf("fps = 1000 - frame rate is adjusted\n");
+          SDL_Delay(10);
+          dt = 10;
         }