Changeset 9758 in orxonox.OLD for branches/new_class_id/src/world_entities

Timestamp:

Sep 19, 2006, 3:25:46 PM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: moved the Particle-engine

Location:

branches/new_class_id/src/world_entities

Files:

• WorldEntities.am (modified) (2 diffs)
• effects/explosion.cc (modified) (1 diff)
• particles (moved) (moved from branches/new_class_id/src/lib/particles)
• playable.cc (modified) (1 diff)
• projectiles/bomb.cc (modified) (1 diff)
• projectiles/boomerang_projectile.cc (modified) (1 diff)
• projectiles/guided_missile.cc (modified) (1 diff)
• projectiles/hyperblast.cc (modified) (1 diff)
• projectiles/laser.cc (modified) (1 diff)
• projectiles/rail_projectile.cc (modified) (1 diff)
• projectiles/rocket.cc (modified) (1 diff)
• projectiles/test_bullet.cc (modified) (1 diff)
• space_ships/cruizer.cc (modified) (1 diff)
• space_ships/space_ship.cc (modified) (1 diff)
• space_ships/spacecraft_2d.cc (modified) (1 diff)
• space_ships/turbine_hover.cc (modified) (1 diff)

branches/new_class_id/src/world_entities/WorldEntities.am

@@ -72 +72 @@
                 world_entities/effects/lightning_bolt.cc \
                 \
-                world_entities/script_trigger.cc
+                world_entities/script_trigger.cc \
+                \
+                \
+                world_entities/particles/particle_emitter.cc \
+                world_entities/particles/dot_emitter.cc \
+                world_entities/particles/box_emitter.cc \
+                world_entities/particles/plane_emitter.cc \
+                \
+                world_entities/particles/particle_system.cc \
+                world_entities/particles/sprite_particles.cc \
+                world_entities/particles/spark_particles.cc \
+                world_entities/particles/model_particles.cc \
+                world_entities/particles/dot_particles.cc \
+                \
+                world_entities/particles/quick_animation.cc
+
+
+
 
 
@@ -144 +161 @@
                 effects/lightning_bolt.h \
                 \
-                script_trigger.h
+                script_trigger.h \
+                \
+                \
+                particles/particle_emitter.h \
+                particles/dot_emitter.h \
+                particles/box_emitter.h \
+                particles/plane_emitter.h \
+                \
+                particles/particle_system.h \
+                particles/sprite_particles.h \
+                particles/spark_particles.h \
+                particles/model_particles.h \
+                particles/dot_particles.h \
+                \
+                particles/quick_animation.h
+

branches/new_class_id/src/world_entities/effects/explosion.cc

@@ -22 +22 @@
 #include "state.h"
 
-#include "box_emitter.h"
-#include "sprite_particles.h"
+#include "particles/box_emitter.h"
+#include "particles/sprite_particles.h"
 
 

branches/new_class_id/src/world_entities/playable.cc

@@ -30 +30 @@
 #include "game_rules.h"
 
-#include "dot_emitter.h"
-#include "sprite_particles.h"
+#include "particles/dot_emitter.h"
+#include "particles/sprite_particles.h"
 
 #include "shared_network_data.h"

branches/new_class_id/src/world_entities/projectiles/bomb.cc

@@ -20 +20 @@
 #include "primitive_model.h"
 
-#include "dot_emitter.h"
-#include "particle_system.h"
+#include "particles/dot_emitter.h"
+#include "particles/particle_system.h"
 
 #include "debug.h"

branches/new_class_id/src/world_entities/projectiles/boomerang_projectile.cc

@@ -21 +21 @@
 #include "state.h"
 
-#include "dot_emitter.h"
-#include "sprite_particles.h"
+#include "particles/dot_emitter.h"
+#include "particles/sprite_particles.h"
 
 #include "debug.h"

branches/new_class_id/src/world_entities/projectiles/guided_missile.cc

@@ -20 +20 @@
 #include "state.h"
 
-#include "dot_emitter.h"
-#include "sprite_particles.h"
+#include "particles/dot_emitter.h"
+#include "particles/sprite_particles.h"
 
 #include "debug.h"

branches/new_class_id/src/world_entities/projectiles/hyperblast.cc

@@ -20 +20 @@
 #include "state.h"
 
-#include "box_emitter.h"
-#include "spark_particles.h"
+#include "particles/box_emitter.h"
+#include "particles/spark_particles.h"
 
 #include "debug.h"

branches/new_class_id/src/world_entities/projectiles/laser.cc

@@ -21 +21 @@
 #include "model.h"
 
-#include "dot_emitter.h"
-#include "sprite_particles.h"
+#include "particles/dot_emitter.h"
+#include "particles/sprite_particles.h"
 
 #include <cassert>

branches/new_class_id/src/world_entities/projectiles/rail_projectile.cc

@@ -21 +21 @@
 #include "model.h"
 
-#include "dot_emitter.h"
-#include "sprite_particles.h"
+#include "particles/dot_emitter.h"
+#include "particles/sprite_particles.h"
 
 #include <cassert>

branches/new_class_id/src/world_entities/projectiles/rocket.cc

@@ -20 +20 @@
 #include "state.h"
 
-#include "dot_emitter.h"
-#include "sprite_particles.h"
+#include "particles/dot_emitter.h"
+#include "particles/sprite_particles.h"
 
 #include "debug.h"

branches/new_class_id/src/world_entities/projectiles/test_bullet.cc

@@ -20 +20 @@
 #include "state.h"
 
-#include "dot_emitter.h"
-#include "sprite_particles.h"
+#include "particles/dot_emitter.h"
+#include "particles/sprite_particles.h"
 #include "debug.h"
 

branches/new_class_id/src/world_entities/space_ships/cruizer.cc

@@ -29 +29 @@
 
 #include "graphics_engine.h"
-#include "dot_emitter.h"
-#include "sprite_particles.h"
+#include "particles/dot_emitter.h"
+#include "particles/sprite_particles.h"
 
 #include "debug.h"

branches/new_class_id/src/world_entities/space_ships/space_ship.cc

@@ -26 +26 @@
 #include "weapons/cannon.h"
 
-#include "dot_emitter.h"
-#include "sprite_particles.h"
+#include "particles/dot_emitter.h"
+#include "particles/sprite_particles.h"
 
 #include "util/loading/factory.h"

branches/new_class_id/src/world_entities/space_ships/spacecraft_2d.cc

@@ -30 +30 @@
 
 #include "graphics_engine.h"
-#include "dot_emitter.h"
-#include "sprite_particles.h"
+#include "particles/dot_emitter.h"
+#include "particles/sprite_particles.h"
 
 #include "debug.h"

branches/new_class_id/src/world_entities/space_ships/turbine_hover.cc

@@ -29 +29 @@
 
 #include "graphics_engine.h"
-#include "dot_emitter.h"
-#include "sprite_particles.h"
+#include "particles/dot_emitter.h"
+#include "particles/sprite_particles.h"
 
 #include "debug.h"