Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10911


Ignore:
Timestamp:
Dec 1, 2015, 5:52:53 PM (8 years ago)
Author:
fvultier
Message:
 
Location:
code/branches/particleEffectsHS15
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • code/branches/particleEffectsHS15/data/levels/includes/weaponSettingsEscort.oxi

    r10908 r10911  
    1414        </links>
    1515        <Weapon>
    16           <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/>
     16          <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/>
    1717        </Weapon>
    1818        <Weapon>
  • code/branches/particleEffectsHS15/src/modules/weapons/projectiles/IceGunProjectile.cc

    r10836 r10911  
    4848    RegisterClass(IceGunProjectile);
    4949
     50    const float IceGunProjectile::particleDestructionDelay_ = 15.0f;
     51
    5052    IceGunProjectile::IceGunProjectile(Context* context) : Projectile(context)
    5153    {
     
    6769        this->attach(emitter_);
    6870        emitter_->setOrientation(this->getOrientation());
    69         emitter_->setSource("Orxonox/ice");       
     71        emitter_->setSource("Orxonox/ice");   
     72        emitter_->setDeleteWithParent(false);     
    7073    }
    7174
     
    8386
    8487            const ExecutorPtr& executor = createExecutor(createFunctor(&ParticleEmitter::destroy, emitter_));
    85             new Timer(15, false, executor, true);
     88            new Timer(particleDestructionDelay_, false, executor, true);
    8689        }
    8790    }
  • code/branches/particleEffectsHS15/src/modules/weapons/projectiles/IceGunProjectile.h

    r10836 r10911  
    6363        protected:
    6464            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
     65            static const float particleDestructionDelay_;
    6566        private:
    6667            ParticleEmitter* emitter_;
  • code/branches/particleEffectsHS15/src/modules/weapons/projectiles/MineProjectile.cc

    r10908 r10911  
    117117        {
    118118            this->setMass(10.0f);
    119             this->setFriction(100.0f);
     119            this->setLinearDamping(0.5f);
     120            this->setAngularDamping(0.1f);
    120121            this->enableCollisionCallback();
    121             this->setCollisionResponse(false);
     122            this->setCollisionResponse(true);
    122123            this->setCollisionType(Dynamic);
    123124
     
    150151            modelRing4_->destroy();
    151152
    152             distanceTrigger_->destroy();
    153 
     153            if (distanceTrigger_)
     154            {
     155                distanceTrigger_->destroy();
     156            }
    154157            if (emitter_)
    155158            {
  • code/branches/particleEffectsHS15/src/modules/weapons/weaponmodes/MineGun.cc

    r10889 r10911  
    5151        RegisterObject(MineGun);
    5252
    53         this->speed_ = 0.0f;
     53        this->speed_ = 1000.0f;
    5454        this->reloadTime_ = 1.0f;
    5555        this->damage_ = 0.0f;
Note: See TracChangeset for help on using the changeset viewer.