Changeset 10168 in orxonox.OLD

Timestamp:

Jan 3, 2007, 4:39:18 PM (17 years ago)

Author:

marcscha

Message:

Acid Launcher and Acid Splash (projectile) finished.
Temporally dist check instead of collision on swarm projectile (collision manager problem which needs to be tracked down first)

Location:

branches/playability/src/world_entities

Files:

• WorldEntities.am (modified) (2 diffs)
• effects/wobblegrid.cc (modified) (2 diffs)
• projectiles/mbolt.cc (modified) (2 diffs)
• projectiles/swarm_projectile.cc (modified) (3 diffs)

branches/playability/src/world_entities/WorldEntities.am

@@ -54 +54 @@
                 world_entities/projectiles/boomerang_projectile.cc \
                 world_entities/projectiles/hyperblast.cc \
+                world_entities/projectiles/acid_splash.cc \
                 \
                 world_entities/power_ups/turret_power_up.cc \
@@ -167 +168 @@
                 projectiles/boomerang_projectile.h \
                 projectiles/hyperblast.h \
+                projectiles/acid_splash.h \
                 \
                 power_ups/turret_power_up.h \

branches/playability/src/world_entities/effects/wobblegrid.cc

@@ -80 +80 @@
   this->setName("Wobblegrid");
 
-  this->toList(OM_COMMON);
-
   this->material = new Material();
   this->setAbsCoor(0, 0, 0);
@@ -117 +115 @@
 void Wobblegrid::setTexture(const std::string& textureFile)
 {
+  this->material->setBlendFunc(GL_SRC_ALPHA,GL_ONE);
   this->material->setDiffuseMap(textureFile);
 }

branches/playability/src/world_entities/projectiles/mbolt.cc

@@ -91 +91 @@
 MBolt::~MBolt ()
 {
-  // delete this->emitter;
 
   if (MBolt::explosionParticles != NULL && MBolt::objectList().size() <= 1)
@@ -100 +99 @@
     PRINTF(1)("Deleting MBolt Explosion Particles\n");
   }
-  
+
+  delete this->emitter;
+  delete this->trail;
 }
 

branches/playability/src/world_entities/projectiles/swarm_projectile.cc

@@ -88 +88 @@
 void SwarmProjectile::activate()
 {
+  this->toList(OM_ENVIRON);
   if (unlikely(SwarmProjectile::explosionParticles == NULL))
   {
@@ -103 +104 @@
   }
 
-
-  this->updateNode(0);
   this->emitter->setEmissionRate(50.0);
   this->emitter->setEmissionVelocity(0.0);
@@ -272 +271 @@
   this->lastDir = this->curDir;
   this->curDir = this->velocity;
-/*
   if( (this->getAbsCoor() - this->target->getAbsCoor()).len() < 3)   // FIXME  Temp fake workaround for collision :)
   {
     dynamic_cast<WorldEntity*>(target)->destroy( this);
     this->destroy( this);
-  }*/
+  }
 }