Changeset 2816 in orxonox.OLD for orxonox/trunk/src/world.cc

Timestamp:

Nov 11, 2004, 10:32:34 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk/src: new list implemented

File:

• orxonox/trunk/src/world.cc (modified) (21 diffs)

orxonox/trunk/src/world.cc

@@ -22 +22 @@
 #include "command_node.h"
 #include "camera.h"
+#include "environment.h"
 
 using namespace std;
@@ -35 +36 @@
   this->worldName = name;
   this->debugWorldNr = -1;
-  this->entities = new List<WorldEntity>();
+  this->entities = new List();
 }
 
@@ -42 +43 @@
   this->debugWorldNr = worldID;
   this->worldName = NULL;
-  this->entities = new List<WorldEntity>();
+  this->entities = new List();
 }
 
@@ -74 +75 @@
   this->bQuitCurrentGame = true;
   this->localCamera->setWorld(NULL);
+  this->entities->clear();
+  Orxonox::getInstance()->get_localinput()->reset();
   this->~World();
 }
@@ -105 +108 @@
             
             // create the tracks
-            this->tracklen = 6;
-            this->track = new Track[6];
+            this->tracklen = 2;
+            this->track = new Track[2];
             for( int i = 0; i < this->tracklen; i++)
               {
@@ -113 +116 @@
             
             // create a player
-            //WorldEntity* myPlayer = (WorldEntity*) this->spawn<Player>();
             WorldEntity* myPlayer = new Player();
             this->spawn(myPlayer);
@@ -125 +127 @@
             this->localCamera = new Camera(this);
             this->getCamera()->bind (myPlayer); 
+
+            Placement* plc = new Placement;
+            plc->r = Vector(100, 10, 10);
+            plc->w = Quaternion();
+            WorldEntity* env = new Environment();
+            this->spawn(env, plc);
+
+            this->entities->debug();
             break;
           }
@@ -260 +270 @@
 void World::collide ()
 {
-  List<WorldEntity> *a, *b;
+  /*
+  List *a, *b;
   WorldEntity *aobj, *bobj;
-  
-  a = entities->get_next();
+   
+  a = entities;
   
   while( a != NULL)
     {
-      aobj = a->get_object();
+      aobj = a->nextElement();
       if( aobj->bCollide && aobj->collisioncluster != NULL)
         {
-          b = a->get_next();
+          b = a->nextElement();
           while( b != NULL )
             {
-              bobj = b->get_object();
+              bobj = b->nextElement();
               if( bobj->bCollide && bobj->collisioncluster != NULL )
                 {
@@ -285 +296 @@
                   }
                 }
-              b = b->get_next();
+              b = b->nextElement();
             }
         }
-      a = a->get_next();
-    }
+      a = a->enumerate();
+    }
+  */
 }
 
@@ -300 +312 @@
   
   // draw entities
-  List<WorldEntity> *l;
+  List *l;
   WorldEntity* entity;
   
-  l = entities->get_next();  
-  while( l != NULL ) 
+  l = entities; 
+  entity = l->enumerate();
+  while( entity != NULL ) 
     { 
-      entity = l->get_object();
       if( entity->bDraw ) entity->draw();
-      l = l->get_next();
+      entity = l->nextElement();
     }
   
@@ -328 +340 @@
 void World::update ()
 {
-  List<WorldEntity> *l;
+  //List<WorldEntity> *l;
   WorldEntity* entity;
   Location* loc;
@@ -334 +346 @@
   Uint32 t;
   
-  l = entities->get_next();  
-  while( l != NULL ) 
+  //  l = entities->enumerate(); 
+  entity = this->entities->enumerate();
+  while( entity != NULL ) 
     { 
-      entity = l->get_object();
+
       
       if( !entity->isFree() )
@@ -375 +388 @@
         }
       
-      l = l->get_next();
+      entity = entities->nextElement();
     }
   
@@ -386 +399 @@
 void World::time_slice (Uint32 deltaT)
 {
-  List<WorldEntity> *l;
+  //List<WorldEntity> *l;
   WorldEntity* entity;
   float seconds = deltaT;
@@ -392 +405 @@
   seconds /= 1000;
   
-  l = entities->get_next();  
-  while( l != NULL) 
+  entity = entities->enumerate(); 
+  while( entity != NULL) 
     { 
-      entity = l->get_object();
       entity->tick (seconds);
-      l = l->get_next();
-    }
-  
+      entity = entities->nextElement();
+    }
+
   for( int i = 0; i < tracklen; i++) track[i].tick (seconds);
 }
@@ -436 +448 @@
 void World::debug()
 {
-  List<WorldEntity> *l;
+  //List<WorldEntity> *l;
   WorldEntity* entity;
   
   printf("counting all entities\n");
-  l = entities->get_next();  
-  while( l != NULL ) 
+  printf("World::debug() - enumerate()\n");
+  entity = entities->enumerate();  
+  while( entity != NULL ) 
     { 
-      entity = l->get_object();
       if( entity->bDraw ) printf("got an entity\n");
-      l = l->get_next();
+      entity = entities->nextElement();
     }
 }
@@ -470 +482 @@
       // Draw
       display();
+  
+      for(int i = 0; i < 1000000; i++){}
+
     }
   printf("World|Exiting the main loop\n");
@@ -502 +517 @@
     {
       Uint32 dt = currentFrame - this->lastFrame;
-      /*
+      
       if(dt > 0)
         {
@@ -510 +525 @@
       else
         {
-          printf("fps = 1000\n");
-        }
-      */
+          printf("fps = 1000 but 0ms!\n");
+        }
+      
       this->time_slice (dt);
       this->update ();
@@ -570 +585 @@
   Location* loc = NULL;
   WorldEntity* owner;
-  //T* entity = new T();
-  entities->add (entity, LIST_ADD_NEXT);
-  //if( loc == NULL)
-  //{
-      zeroloc.dist = 0;
-      zeroloc.part = 0;
-      zeroloc.pos = Vector();
-      zeroloc.rot = Quaternion();
-      loc = &zeroloc;
-      //}
+
+  entities->add (entity);
+  zeroloc.dist = 0;
+  zeroloc.part = 0;
+  zeroloc.pos = Vector();
+  zeroloc.rot = Quaternion();
+  loc = &zeroloc;
   entity->init (loc, owner);
   if (entity->bFree)
@@ -586 +598 @@
     }
   entity->post_spawn ();
+}
+
+
+void World::spawn(WorldEntity* entity, Location* loc)
+{
+  Location zeroLoc;
+  WorldEntity* owner;
+  this->entities->add (entity);
+  if( loc == NULL)
+    {
+      zeroLoc.dist = 0;
+      zeroLoc.part = 0;
+      zeroLoc.pos = Vector();
+      zeroLoc.rot = Quaternion();
+      loc = &zeroLoc;
+    }
+  entity->init (loc, owner);
+  if (entity->bFree)
+    {
+      this->track[loc->part].map_coords( loc, entity->get_placement());
+    }
+  entity->post_spawn ();
   //return entity;
 }
+
+
+void World::spawn(WorldEntity* entity, Placement* plc)
+{
+  Placement zeroPlc;
+  WorldEntity* owner;
+  if( plc == NULL)
+    {
+      zeroPlc.r = Vector();
+      zeroPlc.w = Quaternion();
+      plc = &zeroPlc;
+    }
+  this->entities->add (entity);
+  entity->init (plc, owner);
+  entity->post_spawn ();
+  //return entity;
+}