Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4307 in orxonox.OLD


Ignore:
Timestamp:
May 26, 2005, 8:26:49 PM (19 years ago)
Author:
bensch
Message:

orxonox/branches/physics: new definitions of particle-return-values

Location:
orxonox/branches/physics/src
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/physics/src/lib/graphics/particles/particle_emitter.cc

    r4274 r4307  
    3737   this->setSpread(angle);
    3838   this->setEmissionRate(emissionRate);
    39    this->setVelocity(velocity);
     39   this->setEmissionVelocity(velocity);
    4040
    4141   this->saveTime = 0.0;
    … …  
    119119   you may want to use the animation class
    120120*/
    121 void ParticleEmitter::setVelocity(float velocity, float randomVelocity)
     121void ParticleEmitter::setEmissionVelocity(float velocity, float randomVelocity)
    122122{
    123123  this->velocity = velocity;

  • orxonox/branches/physics/src/lib/graphics/particles/particle_emitter.h

    r4274 r4307  
    3737  void setEmissionRate(float emissionRate);
    3838  void setSpread(float angle, float randomAngle = 0.0);
    39   void setVelocity(float velocity, float randomVelocity = 0.0);
     39  void setEmissionVelocity(float velocity, float randomVelocity = 0.0);
     40
     41  /** \returns the type of the emitter */
     42  inline EMITTER_TYPE getType(void) const { return this->type; };
     43  /** \returns the Size of the emitter */
     44  inline float getSize(void) const { return this->emitterSize; };
     45  /** \returns the emissionRate */
     46  inline float getEmissionRate(void) const { return this->emissionRate; };
     47  /** \returns the SpreadAngle of the emitter */
     48  inline float getSpread(void) { return this->angle; };
     49  /** \returns the EmissionVelocity of the emitter */
     50  inline float getEmissionVelocity(void) { return this->velocity; };
    4051
    4152  void debug(void);

  • orxonox/branches/physics/src/lib/graphics/particles/particle_system.h

    r4192 r4307  
    7878                GLfloat er, GLfloat eg, GLfloat eb, GLfloat ea);
    7979
     80  /** \returns the Type of the particles */
     81  inline PARTICLE_TYPE getType(void) const { return this->particleType; };
     82  /** \returns the Material that lies on this particles */
     83  inline const Material* getMaterial(void) const { return this->material; };
     84  /** \returns the inherit-speed-factor */
     85  inline float getInheritSpeed(void) const { return this->inheritSpeed; };
     86  /** \returns the lifespan of the particles */
     87  inline float getLifeSpan(void) const { return this->lifeSpan; };
     88  /** \returns the starting-radius of the particles */
     89  inline float getStartRadius(void) const { return this->startRadius; };
     90  /** \returns the end-radius of the particles */
     91  inline float getEndRadius(void) const { return this->endRadius; };
     92  /** \returns the conserve-factor of the particles */
     93  inline float getConserve(void) const { return this->conserve; };
     94  /** \returns the initial mass of the particles */
     95  inline float getMass(void) const { return this->initialMass; };
     96
    8097  void applyField(float dt, Field* field);
    8198

  • orxonox/branches/physics/src/subprojects/particles/framework.cc

    r4306 r4307  
    168168            //zoomTo *=2;
    169169            break;
     170          case SDLK_h:
     171            this->printHelp();
     172            break;
    170173          }
    171174        break;
    … …  
    228231}
    229232
     233
     234
     235void Framework::printHelp(void) const
     236{
     237  PRINT(0)("Help for the frameWork \n");
     238  PRINT(0)("----------------------");
     239  PRINT(0)("h - print Help\n");
     240  PRINT(0)("i - state Information\n");
     241  PRINT(0)("1,2 - increase/decrease emissionRate\n");
     242  PRINT(0)("3,4 - increase/decrease emission velocity\n");
     243  PRINT(0)("5,6 - increase/decrease spread angle\n");
     244  PRINT(0)("\n");
     245  PRINT(0)("7,8 - increase-decrease emitter-size\n");
     246  PRINT(0)("9 - swap emitterType\n");
     247  PRINT(0)("\n");
     248
     249
     250}
     251
     252
     253
    230254int main(int argc, char *argv[])
    231255{

  • orxonox/branches/physics/src/subprojects/particles/framework.h

    r4306 r4307  
    3232  float tick();
    3333  bool keyHandler();
     34
     35  void printHelp(void) const;
    3436};
    3537#endif /* _FRAMEWORK_H */
Note: See TracChangeset for help on using the changeset viewer.