Changeset 9869 in orxonox.OLD for trunk/src/world_entities/WorldEntities.am

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/world_entities/WorldEntities.am (modified) (2 diffs)

trunk/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 \
+                \
+                \
+                world_entities/weather_effects/atmospheric_engine.cc \
+                world_entities/weather_effects/weather_effect.cc \
+                world_entities/weather_effects/cloud_effect.cc \
+                world_entities/weather_effects/sun_effect.cc \
+                world_entities/weather_effects/fog_effect.cc \
+                world_entities/weather_effects/volfog_effect.cc \
+                world_entities/weather_effects/rain_effect.cc \
+                world_entities/weather_effects/snow_effect.cc \
+                world_entities/weather_effects/lightning_effect.cc \
+                world_entities/weather_effects/lense_flare.cc
+
+
+
+
 
 
@@ -144 +174 @@
                 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 \
+                \
+                \
+                weather_effects/atmospheric_engine.h \
+                weather_effects/weather_effect.h \
+                weather_effects/sun_effect.h \
+                weather_effects/fog_effect.h \
+                weather_effects/volfog_effect.h \
+                weather_effects/rain_effect.h \
+                weather_effects/snow_effect.h \
+                weather_effects/cloud_effect.h \
+                weather_effects/lightning_effect.h \
+                weather_effects/lense_flare.h
+