Changeset 3956 in orxonox.OLD

Timestamp:

Apr 25, 2005, 2:02:55 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/particleEngine: some definitions

Location:

orxonox/branches/particleEngine/src

Files:

• lib/graphics/particles/particle_system.h (modified) (1 diff)
• story_entities/world.cc (modified) (3 diffs)

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

@@ -10 +10 @@
 #include "vector.h"
 
+#define PARTICLE_DOT_MASK           0x00001
+#define PARTICLE_SPRITE_MASK        0x00010
+#define PARTICLE_MODEL_MASK         0x00100
+#define PARTICLE_WORDL_ENTITY_MASK  0x01000
+#define PARTICLE_MULTI_MASK         0x10000
+
 //! An enumerator for the different types of particles.
-typedef enum PARTICLE_TYPE {PARTICLE_DOT,
-                            PARTICLE_SPRITE,
-                            PARTICLE_MULTI_SPRITE,
-                            PARTICLE_OBJECT,
-                            PARTICLE_MULTI_OBJECT,
-                            PARTICLE_PRIMITIVE};
+typedef enum PARTICLE_TYPE {PARTICLE_DOT = PARTICLE_DOT_MASK,
+                            PARTICLE_SPRITE = PARTICLE_SPRITE_MASK,
+                            PARTICLE_MULTI_SPRITE = PARTICLE_SPRITE_MASK | PARTICLE_MULTI_MASK,
+                            PARTICLE_MODEL = PARTICLE_MODEL_MASK,
+                            PARTICLE_MULTI_MODE = PARTICLE_MODEL_MASK | PARTICLE_MULTI_MASK};
 
 #define PARTICLE_DEFAULT_MAX_COUNT    200               //!< a default count of particles in the system.

orxonox/branches/particleEngine/src/story_entities/world.cc

@@ -152 +152 @@
   cn->reset();
 
-  ResourceManager::getInstance()->debug();
   ResourceManager::getInstance()->unloadAllByPriority(RP_LEVEL);
-  ResourceManager::getInstance()->debug();
 
   delete WorldInterface::getInstance();
@@ -381 +379 @@
             ParticleEmitter* testEmitter,* testEmitter2;
             ParticleSystem* testSystem;
-            testEmitter = new ParticleEmitter(Vector(-1,0,0), .4, 600.0, 0);
+            testEmitter = new ParticleEmitter(Vector(-1,0,0), M_PI_2, 60.0, 0);
             testEmitter->setParent(localPlayer);
             testEmitter->setRelCoor(Vector(-3, 0, 0));
@@ -393 +391 @@
             testSystem->setLifeSpan(1, .2);
             testSystem->setRadius(3.0, 0.0, .5);
-            testSystem->setConserve(1);
+            testSystem->setConserve(.9);
             testSystem->setInheritSpeed(1);
             testSystem->setName("system");