Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4128 in orxonox.OLD for orxonox/branches/particleEngine/src/lib


Ignore:
Timestamp:
May 9, 2005, 4:10:16 PM (20 years ago)
Author:
bensch
Message:

orxonox/branches/particleEngine: renders some particles again

Location:
orxonox/branches/particleEngine/src/lib
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r3966 r4128  
    2222
    2323 public:
    24   ParticleEmitter(const Vector& direction, float angle = .5, float emissionRate = 1.0,
    25                   float velocity = 1.0);
     24  ParticleEmitter(const Vector& direction, float angle = .5,
     25                  float emissionRate = 1.0, float velocity = 1.0);
    2626  virtual ~ParticleEmitter(void);
    2727

  • orxonox/branches/particleEngine/src/lib/graphics/particles/particle_engine.h

    r3966 r4128  
    88
    99#include "base_object.h"
     10#include "particle_system.h"
     11#include "particle_emitter.h"
    1012
    1113// FORWARD DEFINITION

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

    r4125 r4128  
    5454
    5555 public:
    56   ParticleSystem(unsigned int maxCount = PARTICLE_DEFAULT_MAX_COUNT, PARTICLE_TYPE type = PARTICLE_DEFAULT_TYPE);
     56  ParticleSystem(unsigned int maxCount = PARTICLE_DEFAULT_MAX_COUNT,
     57                 PARTICLE_TYPE type = PARTICLE_DEFAULT_TYPE);
    5758  virtual ~ParticleSystem();
    5859  void setName(const char* name);
    … …  
    6364  void setInheritSpeed(float value);
    6465  void setLifeSpan(float lifeSpan, float randomLifeSpan = 0.0);
    65   void setRadius(float startRadius, float endRadius, float randomStartRadius = 0.0, float randomEndRadius = 0.0);
     66  void setRadius(float startRadius, float endRadius,
     67                 float randomStartRadius = 0.0, float randomEndRadius = 0.0);
    6668  void setConserve(float conserve);
    6769  void setMass(float mass, float randomMass);

  • orxonox/branches/particleEngine/src/lib/gui/gui/gui_video.cc

    r4091 r4128  
    104104      Label* modelDetailLabel;  //!< Label for model-detail.
    105105      Menu* modelDetail;        //!< model-detail.
     106      CheckButton* particles;   //!< If the Particles should be enabled
    106107      Label* antiAliasingLabel; //!< Label for the anti-aliasing mode.
    107108      Menu* antiAliasing;       //!< Menu for the Antialiasing-mode.
    … …  
    139140      advancedBox->fill(modelDetail);
    140141     
     142      particles = new CheckButton(CONFIG_NAME_PARTICLES_ENABLED);
     143      particles->saveability();
     144      particles->setDefaultValue(1);
     145      advancedBox->fill(particles);
     146
    141147      antiAliasingLabel = new Label("Anti-Aliasing-depth:");
    142148      advancedBox->fill(antiAliasingLabel);
    … …  
    152158      filterMethod->saveability();
    153159      advancedBox->fill(filterMethod);
     160
     161
    154162 
    155163      closeButton = new Button("close");
Note: See TracChangeset for help on using the changeset viewer.