Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6622 in orxonox.OLD for trunk


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

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

Location:
trunk/src
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/graphics/importer/material.cc

    r6467 r6622  
    6868    ResourceManager::getInstance()->unload(this->specularTexture);
    6969}
     70
     71Material& Material::operator=(const Material& m)
     72{
     73  this->setIllum(m.illumModel);
     74  this->setDiffuse(m.diffuse[0],m.diffuse[1],m.diffuse[2]);
     75  this->setAmbient(m.ambient[0],m.ambient[1],m.ambient[2]);
     76  this->setSpecular(m.specular[0],m.specular[1],m.specular[2]);
     77  this->setShininess(m.shininess);
     78  this->setTransparency(m.transparency);
     79
     80  if (this->diffuseTexture != NULL)
     81    ResourceManager::getInstance()->unload(this->diffuseTexture);
     82  if (m.diffuseTexture != NULL)
     83    this->diffuseTexture = m.diffuseTexture; /// HACK shoudl be:(Texture*)ResourceManager::getInstance()->load();
     84  this->ambientTexture = NULL; /// FIXME
     85  this->specularTexture = NULL; /// FIXME
     86
     87  this->setName(m.getName());
     88}
     89
    7090
    7191/**
    … …  
    282302  //! @todo check if RESOURCE MANAGER is availiable
    283303  //! @todo Textures from .mtl-file need special care.
    284   if (dMap!= NULL)
     304  if (dMap != NULL)
    285305    this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE, RP_GAME, (void*)&target);
    286306  else

  • trunk/src/lib/graphics/importer/material.h

    r6467 r6622  
    2828  virtual ~Material ();
    2929
     30  Material& operator=(const Material& material);
     31
    3032  bool select () const;
    3133
    3234  void setIllum (int illum);
    3335  void setIllum (char* illum);
     36  int getIllumModel() const { return this->illumModel; };
    3437  void setDiffuse (float r, float g, float b);
    3538  void setDiffuse (char* rgb);
    … …  
    5861    float       shininess;        //!< The shininess of the Material.
    5962    float       transparency;     //!< The transperency of the Material.
    60   public:
     63
    6164    Texture*    diffuseTexture;   //!< The diffuse texture of the Material.
    6265    Texture*    ambientTexture;   //!< The ambient texture of the Material.

  • 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.