Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6622 in orxonox.OLD for trunk/src/world_entities


Ignore:
Timestamp:
Jan 20, 2006, 12:08:41 AM (18 years ago)
Author:
bensch
Message:

orxonox/trunk: Material can now be copied
ParticleSprite used for all Projectiles

Location:
trunk/src/world_entities/projectiles
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/world_entities/projectiles/bomb.h

    r6512 r6622  
    1010
    1111class FastFactory;
    12 class ParticleSystem;
     12class SpriteParticles;
    1313class ParticleEmitter;
    1414class Material;
    … …  
    3939 private:
    4040  static FastFactory*               fastFactory;
    41   static ParticleSystem*            trailParticles;
    42   static ParticleSystem*            explosionParticles;
     41  static SpriteParticles*           trailParticles;
     42  static SpriteParticles*           explosionParticles;
    4343
    4444  ParticleEmitter*                  emitter;

  • trunk/src/world_entities/projectiles/guided_missile.cc

    r6621 r6622  
    7575}
    7676
    77 ParticleSystem* GuidedMissile::trailParticles = NULL;
    78 ParticleSystem* GuidedMissile::explosionParticles = NULL;
     77SpriteParticles* GuidedMissile::trailParticles = NULL;
     78SpriteParticles* GuidedMissile::explosionParticles = NULL;
    7979
    8080

  • trunk/src/world_entities/projectiles/guided_missile.h

    r6434 r6622  
    1010
    1111class Weapon;
    12 class ParticleSystem;
     12class SpriteParticles;
    1313class ParticleEmitter;
    1414class FastFactory;
    … …  
    3434  private:
    3535    static FastFactory*               fastFactory;
    36     static ParticleSystem*            trailParticles;
    37     static ParticleSystem*            explosionParticles;
     36    static SpriteParticles*           trailParticles;
     37    static SpriteParticles*           explosionParticles;
    3838
    3939    ParticleEmitter*                  emitter;

  • trunk/src/world_entities/projectiles/laser.cc

    r6621 r6622  
    7171}
    7272
    73 ParticleSystem* Laser::explosionParticles = NULL;
     73SpriteParticles* Laser::explosionParticles = NULL;
    7474
    7575void Laser::activate()

  • trunk/src/world_entities/projectiles/laser.h

    r6434 r6622  
    1111class Vector;
    1212class Weapon;
    13 class ParticleSystem;
     13class SpriteParticles;
    1414class ParticleEmitter;
    1515class FastFactory;
    … …  
    3636    static FastFactory*               fastFactory;
    3737
    38     static ParticleSystem*            explosionParticles;
     38    static SpriteParticles*           explosionParticles;
    3939
    4040    ParticleEmitter*                  emitter;

  • trunk/src/world_entities/projectiles/rocket.cc

    r6621 r6622  
    7474}
    7575
    76 ParticleSystem* Rocket::trailParticles = NULL;
    77 ParticleSystem* Rocket::explosionParticles = NULL;
     76SpriteParticles* Rocket::trailParticles = NULL;
     77SpriteParticles* Rocket::explosionParticles = NULL;
    7878
    7979void Rocket::activate()

  • trunk/src/world_entities/projectiles/rocket.h

    r6434 r6622  
    1111class Vector;
    1212class Weapon;
    13 class ParticleSystem;
     13class SpriteParticles;
    1414class ParticleEmitter;
    1515class FastFactory;
    … …  
    3535  private:
    3636    static FastFactory*               fastFactory;
    37     static ParticleSystem*            trailParticles;
    38     static ParticleSystem*            explosionParticles;
     37    static SpriteParticles*           trailParticles;
     38    static SpriteParticles*           explosionParticles;
    3939
    4040    ParticleEmitter*                  emitter;

  • trunk/src/world_entities/projectiles/test_bullet.cc

    r6621 r6622  
    7474}
    7575
    76 ParticleSystem* TestBullet::trailParticles = NULL;
    77 ParticleSystem* TestBullet::explosionParticles = NULL;
     76SpriteParticles* TestBullet::trailParticles = NULL;
     77SpriteParticles* TestBullet::explosionParticles = NULL;
    7878
    7979void TestBullet::activate()

  • trunk/src/world_entities/projectiles/test_bullet.h

    r6434 r6622  
    1111class Vector;
    1212class Weapon;
    13 class ParticleSystem;
     13class SpriteParticles;
    1414class ParticleEmitter;
    1515class FastFactory;
    … …  
    3535  private:
    3636    static FastFactory*               fastFactory;
    37     static ParticleSystem*            trailParticles;
    38     static ParticleSystem*            explosionParticles;
     37    static SpriteParticles*           trailParticles;
     38    static SpriteParticles*           explosionParticles;
    3939
    4040    ParticleEmitter*                  emitter;
Note: See TracChangeset for help on using the changeset viewer.