Changeset 2101 in orxonox.OLD for orxonox/branches/chris/src/world.cc

Timestamp:

Jul 10, 2004, 2:00:04 PM (21 years ago)

Author:

chris

Message:

orxonox/branches/chris: Finished the "GETITTOCOMPILE" project… compiling should work now, but linking is a different story

File:

• orxonox/branches/chris/src/world.cc (modified) (9 diffs)

orxonox/branches/chris/src/world.cc

@@ -15 +15 @@
 */
 
-#include <iostream>
-#include <stdlib.h>
-#include <cmath>
-
 #include "world.h"
-
+#include "world_entity.h"
+#include "collision.h"
+#include "track.h"
+#include "player.h"
+#include "command_node.h"
+#include "camera.h"
 
 using namespace std;
@@ -32 +33 @@
 World::World ()
 {
-        entities = new List<WorldEntitites>();
+        entities = new List<WorldEntity>();
 }
 
@@ -42 +43 @@
 }
 
-template<class T> T* World::spawn<T>(Location* loc = NULL, WorldEntity* owner = NULL)
-{
-        Location zeroloc;
-        T* entity = new T();
-        entities->add ((WorldEntity*)entity, LIST_ADD_NEXT);
-        if( loc == NULL)
-        {
-                zeroloc.dist = 0;
-                zeroloc.part = 0;
-                zeroloc.pos = Vector();
-                zeroloc.rot = Rotation();
-                loc = &zeroloc;
-        }
-        entity->init (loc, owner);
-        if (entity->bFree)
-        {
-                track[loc->part].map_coords( loc, entity->get_placement())
-        }
-        entity->post_spawn ();
-        return entity;
-}
-
-template<class T> T* World::spawn<T>(Placement* plc, WorldEntity* owner = NULL)
-{
-        T* entity = new T();
-        entities->add ((WorldEntity*)entity, LIST_ADD_NEXT);
-        entity->init (plc, owner);
-        if (!entity->bFree)
-        {
-                printf("Can't spawn unfree entity with placement\n"); 
-                entities->remove( (WorldEntity*)entity, LIST_FIND_FW);
-                return NULL;
-        }
-        entity->post_spawn ();
-        return entity;
-}
-
-World::collide ()
+void World::collide ()
 {
         List<WorldEntity> *a, *b;
@@ -97 +61 @@
                                 if( bobj->bCollide && bobj->collisioncluster != NULL)
                                 {
-                                        Uint32 ahitflg, bhitflg;
-                                        if check_collision ( aobj->place, aobj->collisioncluster, &ahitflg, bobj->place, bobj->collisioncluster, &bhitflg);
+                                        unsigned long ahitflg, bhitflg;
+                                        if( check_collision ( &aobj->place, aobj->collisioncluster, &ahitflg, &bobj->place, bobj->collisioncluster, &bhitflg));
                                         {
                                                 aobj->collide (bobj, ahitflg, bhitflg);
@@ -141 +105 @@
                 entity = l->get_object();
                 
-                if( entity != bFree)
+                if( !entity->isFree())
                 {
                         loc = entity->get_location();
@@ -156 +120 @@
                                 while( track[t].map_coords( loc, plc))
                                 {
-                                        track[t]->post_leave (entity);
+                                        track[t].post_leave (entity);
                                         if( loc->part >= tracklen)
                                         {
@@ -163 +127 @@
                                                 break;
                                         }
-                                        track[loc->part]->post_enter (entity);
+                                        track[loc->part].post_enter (entity);
                                 }
                         }
@@ -194 +158 @@
         }
         
-        for( int i = 0; i < tracklen) track[i].tick (seconds);
+        for( int i = 0; i < tracklen; i++) track[i].tick (seconds);
 }
 
@@ -223 +187 @@
         
         // create a player
-        Worldentity* myPlayer = spawn<Player>();
+        WorldEntity* myPlayer = (WorldEntity*) spawn<Player>();
         
         // bind input