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

Timestamp:

Jul 17, 2004, 7:40:40 PM (21 years ago)

Author:

chris

Message:

orxonox/branches/chris: it's now possible to add derivations of Track to the World; hit function declaration finalized; implemented splash damage function (World::explosion())

File:

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

orxonox/branches/chris/src/world.cc

@@ -70 +70 @@
                                 {
                                         unsigned long ahitflg, bhitflg;
-                                        if( check_collision ( &aobj->place, aobj->collisioncluster, &ahitflg, &bobj->place, bobj->collisioncluster, &bhitflg));
+                                        if( check_collision ( &aobj->place, aobj->collisioncluster, &ahitflg, &bobj->place, bobj->collisioncluster, &bhitflg))
                                         {
                                                 aobj->collide (bobj, ahitflg, bhitflg);
@@ -183 +183 @@
                         else
                         {
-                                while( track[t].map_coords( loc, plc))
+                                while( track[t]->map_coords( loc, plc))
                                 {
-                                        track[t].post_leave (entity);
+                                        track[t]->post_leave (entity);
                                         if( loc->part >= tracklen)
                                         {
@@ -192 +192 @@
                                                 break;
                                         }
-                                        track[loc->part].post_enter (entity);
+                                        track[loc->part]->post_enter (entity);
                                 }
                         }
@@ -227 +227 @@
         }
         
-        for( int i = 0; i < tracklen; i++) track[i].tick (seconds);
+        for( int i = 0; i < tracklen; i++) track[i]->tick (seconds);
 }
 
@@ -255 +255 @@
         // create the tracks
         tracklen = 6;
-        track = new Track[6];
+        track = new Track*[6];
         for( int i = 0; i < tracklen; i++)
         {
-                track[i] = Track( i, (i+1)%tracklen, &pathnodes[i], &pathnodes[(i+1)%tracklen]);
+                track[i] = new Track( i, (i+1)%tracklen, &pathnodes[i], &pathnodes[(i+1)%tracklen]);
         }
         
@@ -277 +277 @@
 void World::calc_camera_pos (Location* loc, Placement* plc)
 {
-  track[loc->part].map_camera (loc, plc);
-}
+  track[loc->part]->map_camera (loc, plc);
+}
+
+void World::explosion (Location* loc, Damage* dmg, float r, WorldEntity* instigator)
+{
+        Placement mapped;
+        
+        track[loc->part]->map_coords (loc, &mapped);
+        CollisionCluster boom( r, Vector(0,0,0));
+        
+        unsigned long boomflags, hflags;
+        List<WorldEntity> *a;
+        WorldEntity *aobj;
+        
+        a = entities->get_next();
+        
+        while( a != NULL)
+        {
+                aobj = a->get_object();
+                if( aobj->bCollide && aobj->collisioncluster != NULL)
+                {
+                        hflags = 0;
+                        if( check_collision ( &aobj->place, aobj->collisioncluster, &hflags, &mapped, &boom, &boomflags))
+                        {
+                                aobj->hit (dmg, instigator, hflags);
+                        }
+                }
+                a = a->get_next();
+        }
+}
+
+void World::explosion (Placement* plc, Damage* dmg, float r, WorldEntity* instigator)
+{
+        CollisionCluster boom( r, Vector(0,0,0));
+        
+        unsigned long boomflags, hflags;
+        List<WorldEntity> *a;
+        WorldEntity *aobj;
+        
+        a = entities->get_next();
+        
+        while( a != NULL)
+        {
+                aobj = a->get_object();
+                if( aobj->bCollide && aobj->collisioncluster != NULL)
+                {
+                        hflags = 0;
+                        if( check_collision ( &aobj->place, aobj->collisioncluster, &hflags, plc, &boom, &boomflags))
+                        {
+                                aobj->hit (dmg, instigator, hflags);
+                        }
+                }
+                a = a->get_next();
+        }
+}