Context Navigation

← Previous Change
Next Change →

Changeset 9758 in orxonox.OLD for branches

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

Files:

: 26 edited
: 1 moved

configure.ac (modified) (1 diff)
src/Makefile.am (modified) (1 diff)
src/defs/include_paths.am (modified) (1 diff)
src/lib/BuildLibs.am (modified) (1 diff)
src/lib/Makefile.am (modified) (1 diff)
src/lib/graphics/effects/rain_effect.cc (modified) (1 diff)
src/lib/graphics/effects/rain_effect.h (modified) (1 diff)
src/lib/graphics/effects/snow_effect.cc (modified) (1 diff)
src/lib/graphics/effects/snow_effect.h (modified) (1 diff)
src/lib/physics/physics_connection.cc (modified) (1 diff)
src/lib/util/loading/resource.h (modified) (1 diff)
src/world_entities/WorldEntities.am (modified) (2 diffs)
src/world_entities/effects/explosion.cc (modified) (1 diff)
src/world_entities/particles (moved) (moved from branches/new_class_id/src/lib/particles)
src/world_entities/playable.cc (modified) (1 diff)
src/world_entities/projectiles/bomb.cc (modified) (1 diff)
src/world_entities/projectiles/boomerang_projectile.cc (modified) (1 diff)
src/world_entities/projectiles/guided_missile.cc (modified) (1 diff)
src/world_entities/projectiles/hyperblast.cc (modified) (1 diff)
src/world_entities/projectiles/laser.cc (modified) (1 diff)
src/world_entities/projectiles/rail_projectile.cc (modified) (1 diff)
src/world_entities/projectiles/rocket.cc (modified) (1 diff)
src/world_entities/projectiles/test_bullet.cc (modified) (1 diff)
src/world_entities/space_ships/cruizer.cc (modified) (1 diff)
src/world_entities/space_ships/space_ship.cc (modified) (1 diff)
src/world_entities/space_ships/spacecraft_2d.cc (modified) (1 diff)
src/world_entities/space_ships/turbine_hover.cc (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/new_class_id/configure.ac

r9668	r9758
624	624	src/lib/event/Makefile
625	625	src/lib/physics/Makefile
626		~~src/lib/particles/Makefile~~
627	626	src/lib/collision_detection/Makefile
628	627	src/lib/collision_reaction/Makefile

branches/new_class_id/src/Makefile.am

-                      r9716
+                      r9758
                 orxonox.cc \
+                \
-                lib/particles/model_particles.cc \
-                lib/particles/spark_particles.cc \
-                lib/particles/sprite_particles.cc \
-                lib/particles/plane_emitter.cc \
                 lib/graphics/effects/fog_effect.cc \
                 lib/graphics/effects/volfog_effect.cc \

branches/new_class_id/src/defs/include_paths.am

r8490	r9758
13	13	AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/spatial_separation
14	14	AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/render2D
15		~~AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/particles~~
16	15	AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gl
17	16	AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gl/glmenu

branches/new_class_id/src/lib/BuildLibs.am

r9709	r9758
6	6	$(LIB_PREFIX)/gui/libORXbasegui.a \
7	7	$(LIB_PREFIX)/graphics/libORXgraphics.a \
8		~~$(LIB_PREFIX)/particles/libORXparticles.a \~~
9	8	$(LIB_PREFIX)/collision_detection/libORXcd.a \
10	9	$(LIB_PREFIX)/collision_reaction/libORXcr.a \

branches/new_class_id/src/lib/Makefile.am

r9709	r9758
25	25	event \
26	26	physics \
27		~~particles \~~
28	27	collision_detection \
29	28	collision_reaction \

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

-                      r9757
+                      r9758
 #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

r9715	r9758
13	13	#include <string>
14	14
15		#include "particle_system.h"
	15	#include "particles/particle_system.h"
16	16
17	17	class SparkParticles;

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

-                      r9757
+                      r9758
 #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

r9715	r9758
7	7
8	8	#include "vector.h"
9		#include "particle_system.h"
	9	#include "particles/particle_system.h"
10	10	#include "material.h"
11	11	#include "vector2D.h"

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

r9727	r9758
22	22
23	23	#include "field.h"
24		#include "particle_system.h"
	24	#include "particles/particle_system.h"
25	25	#include "physics_interface.h"
26	26

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

r9718	r9758
49	49	};
50	50
	51
	52
51	53	public:
52	54	Resource(const std::string& fileName);

branches/new_class_id/src/world_entities/WorldEntities.am

-                      r9656
+                      r9758
                 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
 …
                 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

-                      r9716
+                      r9758
 #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

-                      r9757
+                      r9758
 #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

-                      r9716
+                      r9758
 #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

-                      r9716
+                      r9758
 #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

-                      r9716
+                      r9758
 #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

-                      r9716
+                      r9758
 #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

-                      r9716
+                      r9758
 #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

-                      r9716
+                      r9758
 #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

-                      r9716
+                      r9758
 #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

-                      r9716
+                      r9758
 #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

-                      r9716
+                      r9758
 #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

-                      r9757
+                      r9758
 #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

-                      r9757
+                      r9758
 #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

-                      r9716
+                      r9758
 #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"

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 9758 in orxonox.OLD for branches

Legend:

Download in other formats: