Changeset 9761 in orxonox.OLD

Timestamp:

Sep 19, 2006, 3:47:07 PM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: moved the graphics_effect back to the lib as the GraphicsEngine is dependant on it

Location:

branches/new_class_id/src

Files:

• lib/graphics/Makefile.am (modified) (2 diffs)
• lib/graphics/graphics_effect.cc (moved) (moved from branches/new_class_id/src/world_entities/weather_effects/graphics_effect.cc)
• lib/graphics/graphics_effect.h (moved) (moved from branches/new_class_id/src/world_entities/weather_effects/graphics_effect.h)
• lib/graphics/graphics_engine.cc (modified) (1 diff)
• story_entities/game_world_data.cc (modified) (1 diff)
• world_entities/WorldEntities.am (modified) (2 diffs)

branches/new_class_id/src/lib/graphics/Makefile.am

@@ -6 +6 @@
 libORXgraphics_a_SOURCES = \
                 graphics_engine.cc \
+                graphics_effect.cc \
                 light.cc \
                 shader.cc \
@@ -22 +23 @@
 noinst_HEADERS =\
                 graphics_engine.h \
+                graphics_effect.h \
                 light.h \
                 shader.h \

branches/new_class_id/src/lib/graphics/graphics_engine.cc

@@ -35 +35 @@
 #include "texture.h"
 
-#include "weather_effects/graphics_effect.h"
+#include "graphics_effect.h"
 
 #include "shell_command.h"

branches/new_class_id/src/story_entities/game_world_data.cc

@@ -44 +44 @@
 
 #include "graphics_engine.h"
-#include "weather_effects/graphics_effect.h"
+#include "graphics_effect.h"
 #include "weather_effects/atmospheric_engine.h"
 #include "event_handler.h"

branches/new_class_id/src/world_entities/WorldEntities.am

@@ -89 +89 @@
                 \
                 \
-                world_entities/weather_effects/graphics_effect.cc \
                 world_entities/weather_effects/atmospheric_engine.cc \
                 world_entities/weather_effects/weather_effect.cc \
@@ -192 +191 @@
                 \
                 \
-                weather_effects/graphics_effect.h \
                 weather_effects/atmospheric_engine.h \
                 weather_effects/weather_effect.h \