Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9686 in orxonox.OLD for branches/new_class_id/src/lib/particles


Ignore:
Timestamp:
Aug 22, 2006, 2:36:54 PM (18 years ago)
Author:
bensch
Message:

new_class_id: many more classes done

Location:
branches/new_class_id/src/lib/particles
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • branches/new_class_id/src/lib/particles/box_emitter.cc

    r9406 r9686  
    2323#include "util/loading/factory.h"
    2424#include "debug.h"
    25 #include "stdlibincl.h"
    2625
    27 
    28 
     26#include "class_id.h"
    2927
    3028CREATE_FACTORY(BoxEmitter, CL_BOX_EMITTER);
    31 
     29NewObjectListDefinitionID(BoxEmitter, CL_BOX_EMITTER);
    3230/**
    3331 *  standard constructor
    … …  
    6866void BoxEmitter::init()
    6967{
    70   this->setClassID(CL_BOX_EMITTER, "BoxEmitter");
     68  this->registerObject(this, BoxEmitter::_objectList);
    7169  this->setSize(1.0f,1.0f,1.0f);
    7270}
    … …  
    103101
    104102    Vector box = this->getAbsCoor() +
    105         xDir * ((float)rand()/RAND_MAX -.5) +
    106         yDir * ((float)rand()/RAND_MAX -.5) +
    107         zDir * ((float)rand()/RAND_MAX -.5);
     103                 xDir * ((float)rand()/RAND_MAX -.5) +
     104                 yDir * ((float)rand()/RAND_MAX -.5) +
     105                 zDir * ((float)rand()/RAND_MAX -.5);
    108106
    109107    // ROTATIONAL CALCULATION (this must not be done for all types of particles.)

  • branches/new_class_id/src/lib/particles/box_emitter.h

    r6826 r9686  
    1919class BoxEmitter : public ParticleEmitter
    2020{
     21  NewObjectListDeclaration(BoxEmitter);
    2122  friend class ParticleSystem;
    2223public:

  • branches/new_class_id/src/lib/particles/dot_emitter.cc

    r9406 r9686  
    2626
    2727
    28 
     28#include "class_id.h"
    2929CREATE_FACTORY(DotEmitter, CL_DOT_EMITTER);
     30NewObjectListDefinitionID(DotEmitter, CL_DOT_EMITTER);
    3031
    3132/**
    … …  
    6667void DotEmitter::init()
    6768{
    68   this->setClassID(CL_DOT_EMITTER, "DotEmitter");
     69  this->registerObject(this, DotEmitter::_objectList);
    6970}
    7071

  • branches/new_class_id/src/lib/particles/dot_emitter.h

    r6825 r9686  
    1212class DotEmitter : public ParticleEmitter
    1313{
     14  NewObjectListDeclaration(DotEmitter);
     15
    1416  friend class ParticleSystem;
    1517public:

  • branches/new_class_id/src/lib/particles/dot_particles.cc

    r9406 r9686  
    2929
    3030CREATE_FACTORY(DotParticles, CL_DOT_PARTICLES);
     31NewObjectListDefinitionID(DotParticles, CL_DOT_PARTICLES);
    3132
    3233SHELL_COMMAND(texture, DotParticles, setMaterialTexture)
    … …  
    6869void DotParticles::init()
    6970{
    70   this->setClassID(CL_DOT_PARTICLES, "DotParticles");
     71  this->registerObject(this, DotParticles::_objectList);
    7172
    7273  this->material.setDiffuseMap("maps/radial-trans-noise.png");

  • branches/new_class_id/src/lib/particles/dot_particles.h

    r7221 r9686  
    1313class DotParticles : public ParticleSystem
    1414{
     15  NewObjectListDeclaration(DotParticles);
    1516
    1617public:

  • branches/new_class_id/src/lib/particles/model_particles.cc

    r9406 r9686  
    2929
    3030CREATE_FACTORY(ModelParticles, CL_MODEL_PARTICLES);
     31NewObjectListDefinitionID(ModelParticles, CL_MODEL_PARTICLES);
    3132
    3233SHELL_COMMAND(texture, ModelParticles, setMaterialTexture)
    … …  
    6869void ModelParticles::init()
    6970{
    70   this->setClassID(CL_MODEL_PARTICLES, "ModelParticles");
     71  this->registerObject(this, ModelParticles::_objectList);
    7172
    7273  this->material.setDiffuseMap("maps/radial-trans-noise.png");

  • branches/new_class_id/src/lib/particles/model_particles.h

    r7221 r9686  
    1313class ModelParticles : public ParticleSystem
    1414{
     15  NewObjectListDeclaration(ModelParticles);
     16
    1517public:
    1618  ModelParticles(unsigned int maxCount = PARTICLE_DEFAULT_MAX_COUNT);

  • branches/new_class_id/src/lib/particles/particle_emitter.cc

    r9406 r9686  
    2222#include "util/loading/load_param.h"
    2323#include "debug.h"
    24 #include "stdlibincl.h"
    25 
    26 
     24
     25NewObjectListDefinition(ParticleEmitter);
    2726
    2827/**
    … …  
    3130ParticleEmitter::ParticleEmitter(float emissionRate, float velocity, float angle)
    3231{
    33   this->setClassID(CL_PARTICLE_EMITTER, "ParticleEmitter");
     32  this->registerObject(this, ParticleEmitter::_objectList);
    3433
    3534  this->system = NULL;

  • branches/new_class_id/src/lib/particles/particle_emitter.h

    r6825 r9686  
    2323class ParticleEmitter : public PNode
    2424{
     25  NewObjectListDeclaration(ParticleEmitter);
    2526  friend class ParticleSystem;
    2627public:

  • branches/new_class_id/src/lib/particles/particle_system.cc

    r9656 r9686  
    3232#include <algorithm>
    3333
     34NewObjectListDefinition(ParticleSystem);
    3435
    3536/**
    … …  
    4041ParticleSystem::ParticleSystem (unsigned int maxCount)
    4142{
    42   this->setClassID(CL_PARTICLE_SYSTEM, "ParticleSystem");
     43  this->registerObject(this, ParticleSystem::_objectList);
    4344
    4445  this->setMaxCount(PARTICLE_DEFAULT_MAX_COUNT);
    … …  
    134135    if (emitter != NULL)
    135136    {
    136       if (emitter->isA(CL_PARTICLE_EMITTER))
     137      if (emitter->isA(ParticleEmitter::classID()))
    137138        this->addEmitter(dynamic_cast<ParticleEmitter*>(emitter));
    138139      else

  • branches/new_class_id/src/lib/particles/particle_system.h

    r9656 r9686  
    5656//! A class to handle ParticleSystems
    5757class ParticleSystem : public WorldEntity, public PhysicsInterface {
     58  NewObjectListDeclaration(ParticleSystem);
    5859
    5960 public:

  • branches/new_class_id/src/lib/particles/plane_emitter.cc

    r9406 r9686  
    2323#include "util/loading/factory.h"
    2424#include "debug.h"
    25 #include "stdlibincl.h"
    2625
    27 
    28 
     26#include "class_id.h"
    2927
    3028CREATE_FACTORY(PlaneEmitter, CL_PLANE_EMITTER);
     29NewObjectListDefinitionID(PlaneEmitter, CL_PLANE_EMITTER);
    3130
    3231/**
    … …  
    6867void PlaneEmitter::init()
    6968{
    70   this->setClassID(CL_PLANE_EMITTER, "PlaneEmitter");
     69  this->registerObject(this, PlaneEmitter::_objectList);
    7170  this->setSize(1.0f, 1.0f);
    7271}

  • branches/new_class_id/src/lib/particles/plane_emitter.h

    r6873 r9686  
    2121class PlaneEmitter : public ParticleEmitter
    2222{
     23  NewObjectListDeclaration(PlaneEmitter);
     24
    2325  friend class ParticleSystem;
    2426public:
    2527  PlaneEmitter(const Vector2D& size = PLANE_EMITTER_DEFAULT_SIZE,
    26              float emissionRate = PARTICLE_EMITTER_DEFAULT_EMISSION_RATE,
    27              float velocity = PARTICLE_EMITTER_DEFAULT_VELOCITY,
    28              float angle = PARTICLE_EMITTER_DEFAULT_SPREAD);
     28               float emissionRate = PARTICLE_EMITTER_DEFAULT_EMISSION_RATE,
     29               float velocity = PARTICLE_EMITTER_DEFAULT_VELOCITY,
     30               float angle = PARTICLE_EMITTER_DEFAULT_SPREAD);
    2931  PlaneEmitter(const TiXmlElement* root);
    3032  virtual ~PlaneEmitter();

  • branches/new_class_id/src/lib/particles/spark_particles.cc

    r9406 r9686  
    3232
    3333CREATE_FACTORY(SparkParticles, CL_SPARK_PARTICLES);
     34NewObjectListDefinitionID(SparkParticles, CL_SPARK_PARTICLES);
    3435
    3536/**
    … …  
    6768void SparkParticles::init()
    6869{
    69   this->setClassID(CL_SPARK_PARTICLES, "SparkParticles");
     70  this->registerObject(this, SparkParticles::_objectList);
    7071}
    7172

  • branches/new_class_id/src/lib/particles/spark_particles.h

    r6623 r9686  
    1313class SparkParticles : public ParticleSystem
    1414{
     15  NewObjectListDeclaration(SparkParticles);
    1516
    1617public:

  • branches/new_class_id/src/lib/particles/sprite_particles.cc

    r9406 r9686  
    2929
    3030CREATE_FACTORY(SpriteParticles, CL_SPRITE_PARTICLES);
     31NewObjectListDefinitionID(SpriteParticles, CL_SPRITE_PARTICLES);
    3132
    3233SHELL_COMMAND(texture, SpriteParticles, setMaterialTexture)
    … …  
    6869void SpriteParticles::init()
    6970{
    70   this->setClassID(CL_SPRITE_PARTICLES, "SpriteParticles");
     71  this->registerObject(this, SpriteParticles::_objectList);
    7172
    7273  this->material.setDiffuseMap("maps/radial-trans-noise.png");

  • branches/new_class_id/src/lib/particles/sprite_particles.h

    r7221 r9686  
    1313class SpriteParticles : public ParticleSystem
    1414{
     15  NewObjectListDeclaration(SpriteParticles);
    1516
    1617public:
Note: See TracChangeset for help on using the changeset viewer.