Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3956 in orxonox.OLD


Ignore:
Timestamp:
Apr 25, 2005, 2:02:55 PM (20 years ago)
Author:
bensch
Message:

orxonox/branches/particleEngine: some definitions

Location:
orxonox/branches/particleEngine/src
Files:
2 edited

Legend:

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

    r3951 r3956  
    1010#include "vector.h"
    1111
     12#define PARTICLE_DOT_MASK           0x00001
     13#define PARTICLE_SPRITE_MASK        0x00010
     14#define PARTICLE_MODEL_MASK         0x00100
     15#define PARTICLE_WORDL_ENTITY_MASK  0x01000
     16#define PARTICLE_MULTI_MASK         0x10000
     17
    1218//! An enumerator for the different types of particles.
    13 typedef enum PARTICLE_TYPE {PARTICLE_DOT,
    14                             PARTICLE_SPRITE,
    15                             PARTICLE_MULTI_SPRITE,
    16                             PARTICLE_OBJECT,
    17                             PARTICLE_MULTI_OBJECT,
    18                             PARTICLE_PRIMITIVE};
     19typedef enum PARTICLE_TYPE {PARTICLE_DOT = PARTICLE_DOT_MASK,
     20                            PARTICLE_SPRITE = PARTICLE_SPRITE_MASK,
     21                            PARTICLE_MULTI_SPRITE = PARTICLE_SPRITE_MASK | PARTICLE_MULTI_MASK,
     22                            PARTICLE_MODEL = PARTICLE_MODEL_MASK,
     23                            PARTICLE_MULTI_MODE = PARTICLE_MODEL_MASK | PARTICLE_MULTI_MASK};
    1924
    2025#define PARTICLE_DEFAULT_MAX_COUNT    200               //!< a default count of particles in the system.
  • orxonox/branches/particleEngine/src/story_entities/world.cc

    r3951 r3956  
    152152  cn->reset();
    153153
    154   ResourceManager::getInstance()->debug();
    155154  ResourceManager::getInstance()->unloadAllByPriority(RP_LEVEL);
    156   ResourceManager::getInstance()->debug();
    157155
    158156  delete WorldInterface::getInstance();
     
    381379            ParticleEmitter* testEmitter,* testEmitter2;
    382380            ParticleSystem* testSystem;
    383             testEmitter = new ParticleEmitter(Vector(-1,0,0), .4, 600.0, 0);
     381            testEmitter = new ParticleEmitter(Vector(-1,0,0), M_PI_2, 60.0, 0);
    384382            testEmitter->setParent(localPlayer);
    385383            testEmitter->setRelCoor(Vector(-3, 0, 0));
     
    393391            testSystem->setLifeSpan(1, .2);
    394392            testSystem->setRadius(3.0, 0.0, .5);
    395             testSystem->setConserve(1);
     393            testSystem->setConserve(.9);
    396394            testSystem->setInheritSpeed(1);
    397395            testSystem->setName("system");
Note: See TracChangeset for help on using the changeset viewer.