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

Timestamp:

Jul 17, 2004, 7:40:40 PM (20 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())

Location:

orxonox/branches/chris/src

Files:

• message_structures.h (modified) (1 diff)
• player.cc (modified) (1 diff)
• player.h (modified) (1 diff)
• world.cc (modified) (6 diffs)
• world.h (modified) (3 diffs)
• world_entity.cc (modified) (7 diffs)
• world_entity.h (modified) (1 diff)

orxonox/branches/chris/src/message_structures.h

@@ -26 +26 @@
 } Command;
 
+enum DAMAGETYPE{ DMG_ENERY};
+
+//! structure that contains a damage message
+typedef struct
+{
+        DAMAGETYPE type;        //!< The type of the damage delivered
+        float dmg; //!< The amount of damage delivered
+} Damage;
+
 #endif

orxonox/branches/chris/src/player.cc

@@ -47 +47 @@
 }
 
-void Player::hit (WorldEntity* weapon, Vector loc)
+void Player::hit (Damage* dmg, WorldEntity* instigator, Uint32 hitflags)
 {
 }

orxonox/branches/chris/src/player.h

@@ -20 +20 @@
         virtual void post_spawn ();
   virtual void tick (float time);
-  virtual void hit (WorldEntity* weapon, Vector loc);
+  virtual void hit (Damage* dmg, WorldEntity* instigator, Uint32 hitflags);
   virtual void destroy ();
   virtual void collide (WorldEntity* other,  Uint32 ownhitflags, Uint32 otherhitflags);

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();
+        }
+}

orxonox/branches/chris/src/world.h

@@ -30 +30 @@
         void calc_camera_pos (Location* loc, Placement* plc);
         
+        void explosion (Location* loc, Damage* dmg, float r, WorldEntity* instigator);
+        void explosion (Placement* plc, Damage* dmg, float r, WorldEntity* instigator);
+        
         void unload ();
         
@@ -39 +42 @@
         
                 // base level data
-        Track* track;
+        Track** track;
         Uint32 tracklen;
         Vector* pathnodes;
@@ -72 +75 @@
         if (entity->bFree)
         {
-                track[loc->part].map_coords( loc, entity->get_placement());
+                track[loc->part]->map_coords( loc, entity->get_placement());
         }
         entity->post_spawn ();

orxonox/branches/chris/src/world_entity.cc

@@ -94 +94 @@
         Handle all stuff that should update with time inside this method (movement, animation, etc.)
 */
-void WorldEntity::tick(float time) 
-{
-}
+void WorldEntity::tick(float time) {}
 
 /**
@@ -103 +101 @@
    This is a central function of an entity: call it to let the entity painted to the screen. Just override this function with whatever you want to be drawn.
 */
-void WorldEntity::draw() 
-{
-}
+void WorldEntity::draw() {}
 
 /**
@@ -118 +114 @@
 
 /**
-   \brief this function is called, when the ship is hit by a waepon
-   \param weapon: the laser/rocket/shoot that hits.
-   \param loc: place where it is hit
-
-   calculate the damage depending
+   \brief this function is called when the entity takes damage
+   \param dmg: a pointer to a structure containing information about the damage
+   \param instigator: the world entity that dealt the damage
+   \param hitflags: an integer full of flags signifying the places the enitiy had been hit
+   
+   You're free to do what you want with the damage you register here. This function is called from World::explosion() when
+   dealing splash damage, but can be called from virtually anywhere you want.
 */
-void WorldEntity::hit(WorldEntity* weapon, Vector loc) {}
+void WorldEntity::hit (Damage* dmg, WorldEntity* instigator, Uint32 hitflags) {}
 
 /**
@@ -158 +156 @@
         DO NOT place such code in the constructor, those variables are set AFTER the entity is constucted.
 */
-void WorldEntity::post_spawn ()
-{
-}
+void WorldEntity::post_spawn () {}
 
 /**
@@ -169 +165 @@
         to send commands from one WorldEntity to another.
 */
-void WorldEntity::command (Command* cmd)
-{
-}
+void WorldEntity::command (Command* cmd) {}
 
 /**
@@ -180 +174 @@
         to look at the location you return with this.
 */
-void WorldEntity::get_lookat (Location* locbuf)
-{
-}
+void WorldEntity::get_lookat (Location* locbuf) {}
 
 /**
@@ -190 +182 @@
         place that is not in the world anymore. In both cases you might have to take extreme measures (a.k.a. call destroy).
 */
-void WorldEntity::left_world ()
-{
-}
+void WorldEntity::left_world () {}

orxonox/branches/chris/src/world_entity.h

@@ -31 +31 @@
         virtual void post_spawn ();
   virtual void tick (float time);
-  virtual void hit (WorldEntity* weapon, Vector loc);
+  virtual void hit (Damage* dmg, WorldEntity* instigator, Uint32 hitflags);
   virtual void destroy ();
   virtual void collide (WorldEntity* other,  Uint32 ownhitflags, Uint32 otherhitflags);