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

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/lib

Files:

• BuildLibs.am (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• graphics/effects/rain_effect.cc (modified) (1 diff)
• graphics/effects/rain_effect.h (modified) (1 diff)
• graphics/effects/snow_effect.cc (modified) (1 diff)
• graphics/effects/snow_effect.h (modified) (1 diff)
• physics/physics_connection.cc (modified) (1 diff)
• util/loading/resource.h (modified) (1 diff)

branches/new_class_id/src/lib/BuildLibs.am

@@ -6 +6 @@
                 $(LIB_PREFIX)/gui/libORXbasegui.a \
                 $(LIB_PREFIX)/graphics/libORXgraphics.a \
-                $(LIB_PREFIX)/particles/libORXparticles.a \
                 $(LIB_PREFIX)/collision_detection/libORXcd.a \
                 $(LIB_PREFIX)/collision_reaction/libORXcr.a \

branches/new_class_id/src/lib/Makefile.am

@@ -25 +25 @@
         event \
         physics \
-        particles \
         collision_detection \
         collision_reaction \

branches/new_class_id/src/lib/graphics/effects/rain_effect.cc

@@ -24 +24 @@
 #include "p_node.h"
 #include "state.h"
-#include "spark_particles.h"
-#include "plane_emitter.h"
+#include "particles/spark_particles.h"
+#include "particles/plane_emitter.h"
 #include "shell_command.h"
 #include "light.h"

branches/new_class_id/src/lib/graphics/effects/rain_effect.h

@@ -13 +13 @@
 #include <string>
 
-#include "particle_system.h"
+#include "particles/particle_system.h"
 
 class SparkParticles;

branches/new_class_id/src/lib/graphics/effects/snow_effect.cc

@@ -24 +24 @@
 #include "p_node.h"
 #include "state.h"
-#include "sprite_particles.h"
-#include "plane_emitter.h"
+#include "particles/sprite_particles.h"
+#include "particles/plane_emitter.h"
 #include "shell_command.h"
 #include "script_class.h"

branches/new_class_id/src/lib/graphics/effects/snow_effect.h

@@ -7 +7 @@
 
 #include "vector.h"
-#include "particle_system.h"
+#include "particles/particle_system.h"
 #include "material.h"
 #include "vector2D.h"

branches/new_class_id/src/lib/physics/physics_connection.cc

@@ -22 +22 @@
 
 #include "field.h"
-#include "particle_system.h"
+#include "particles/particle_system.h"
 #include "physics_interface.h"
 

branches/new_class_id/src/lib/util/loading/resource.h

@@ -49 +49 @@
   };
 
+
+
 public:
   Resource(const std::string& fileName);