Changeset 10911

Timestamp:

Dec 1, 2015, 5:52:53 PM (9 years ago)

Author:

fvultier

Message:

 

Location:

code/branches/particleEffectsHS15

Files:

• data/levels/includes/weaponSettingsEscort.oxi (modified) (1 diff)
• src/modules/weapons/projectiles/IceGunProjectile.cc (modified) (3 diffs)
• src/modules/weapons/projectiles/IceGunProjectile.h (modified) (1 diff)
• src/modules/weapons/projectiles/MineProjectile.cc (modified) (2 diffs)
• src/modules/weapons/weaponmodes/MineGun.cc (modified) (1 diff)

code/branches/particleEffectsHS15/data/levels/includes/weaponSettingsEscort.oxi

@@ -14 +14 @@
         </links>
         <Weapon>
-          <MineGun mode=0 munitionpershot=0 delay=0.125 damage=50 shielddamage=15 healthdamage=10 muzzleoffset=" 0.1, 1.4,-3" maxtimeuntilexplosion=25 timeuntilactivation=2.5/>
+          <MineGun mode=0 munitionpershot=0 delay=0.125 damage=50 shielddamage=15 healthdamage=10 muzzleoffset=" 0.1, 1.4,-10" maxtimeuntilexplosion=25 timeuntilactivation=2.5/>
         </Weapon>
         <Weapon>

code/branches/particleEffectsHS15/src/modules/weapons/projectiles/IceGunProjectile.cc

@@ -48 +48 @@
     RegisterClass(IceGunProjectile);
 
+    const float IceGunProjectile::particleDestructionDelay_ = 15.0f;
+
     IceGunProjectile::IceGunProjectile(Context* context) : Projectile(context)
     {
@@ -67 +69 @@
         this->attach(emitter_);
         emitter_->setOrientation(this->getOrientation());
-        emitter_->setSource("Orxonox/ice");        
+        emitter_->setSource("Orxonox/ice");   
+        emitter_->setDeleteWithParent(false);     
     }
 
@@ -83 +86 @@
 
             const ExecutorPtr& executor = createExecutor(createFunctor(&ParticleEmitter::destroy, emitter_));
-            new Timer(15, false, executor, true);
+            new Timer(particleDestructionDelay_, false, executor, true);
         }
     }

code/branches/particleEffectsHS15/src/modules/weapons/projectiles/IceGunProjectile.h

@@ -63 +63 @@
         protected:
             virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
+            static const float particleDestructionDelay_;
         private:
             ParticleEmitter* emitter_;

code/branches/particleEffectsHS15/src/modules/weapons/projectiles/MineProjectile.cc

@@ -117 +117 @@
         {
             this->setMass(10.0f);
-            this->setFriction(100.0f);
+            this->setLinearDamping(0.5f);
+            this->setAngularDamping(0.1f);
             this->enableCollisionCallback();
-            this->setCollisionResponse(false);
+            this->setCollisionResponse(true);
             this->setCollisionType(Dynamic);
 
@@ -150 +151 @@
             modelRing4_->destroy();
 
-            distanceTrigger_->destroy();
-
+            if (distanceTrigger_)
+            {
+                distanceTrigger_->destroy();
+            }
             if (emitter_)
             {

code/branches/particleEffectsHS15/src/modules/weapons/weaponmodes/MineGun.cc

@@ -51 +51 @@
         RegisterObject(MineGun);
 
-        this->speed_ = 0.0f;
+        this->speed_ = 1000.0f;
         this->reloadTime_ = 1.0f;
         this->damage_ = 0.0f;