Index: orxonox/trunk/src/lib/newmat/Makefile
===================================================================
--- orxonox/trunk/src/lib/newmat/Makefile	(revision 4636)
+++ orxonox/trunk/src/lib/newmat/Makefile	(revision 4637)
@@ -18,7 +18,7 @@
 SOURCES = $(libnewmat_a_SOURCES)
 
-srcdir = .
-top_srcdir = ../../..
-
+srcdir = /home/bensch/svn/orxonox/trunk/src/lib/newmat
+top_srcdir = /home/bensch/svn/orxonox/trunk
+VPATH = /home/bensch/svn/orxonox/trunk/src/lib/newmat
 pkgdatadir = $(datadir)/orxonox
 pkglibdir = $(libdir)/orxonox
@@ -126,5 +126,5 @@
 CXXFLAGS = -g -O2
 CYGPATH_W = echo
-DEBUG = 5
+DEBUG = 4
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
Index: orxonox/trunk/src/subprojects/importer/Makefile.am
===================================================================
--- orxonox/trunk/src/subprojects/importer/Makefile.am	(revision 4636)
+++ orxonox/trunk/src/subprojects/importer/Makefile.am	(revision 4637)
@@ -10,20 +10,19 @@
 importer_LDADD = $(MAINSRCDIR)/lib/event/libORXevent.a \
                  $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
-		 $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a
+                 $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a
 
 importer_SOURCES= ../framework.cc \
-		  importer.cc \
-		  $(MAINSRCDIR)/lib/graphics/light.cc \
-		  $(MAINSRCDIR)/util/state.cc \
-		  $(MAINSRCDIR)/world_entities/camera.cc \
-		  $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
-		  $(MAINSRCDIR)/lib/lang/base_object.cc \
-		  $(MAINSRCDIR)/lib/math/vector.cc \
-		  $(MAINSRCDIR)/util/resource_manager.cc \
-		  $(MAINSRCDIR)/lib/util/ini_parser.cc \
-		  $(MAINSRCDIR)/lib/graphics/text_engine.cc \
-		  $(MAINSRCDIR)/lib/coord/p_node.cc \
-		  $(MAINSRCDIR)/lib/coord/null_parent.cc \
-		  $(MAINSRCDIR)/util/loading/load_param.cc \
-		  $(MAINSRCDIR)/lib/util/substring.cc
-
+                  importer.cc \
+                  $(MAINSRCDIR)/lib/graphics/light.cc \
+                  $(MAINSRCDIR)/util/state.cc \
+                  $(MAINSRCDIR)/world_entities/camera.cc \
+                  $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
+                  $(MAINSRCDIR)/lib/lang/base_object.cc \
+                  $(MAINSRCDIR)/lib/math/vector.cc \
+                  $(MAINSRCDIR)/util/resource_manager.cc \
+                  $(MAINSRCDIR)/lib/util/ini_parser.cc \
+                  $(MAINSRCDIR)/lib/graphics/text_engine.cc \
+                  $(MAINSRCDIR)/lib/coord/p_node.cc \
+                  $(MAINSRCDIR)/lib/coord/null_parent.cc \
+                  $(MAINSRCDIR)/util/loading/load_param.cc \
+                  $(MAINSRCDIR)/lib/util/substring.cc
Index: orxonox/trunk/src/subprojects/particles/Makefile.am
===================================================================
--- orxonox/trunk/src/subprojects/particles/Makefile.am	(revision 4636)
+++ orxonox/trunk/src/subprojects/particles/Makefile.am	(revision 4637)
@@ -7,31 +7,28 @@
 particles_LDADD = $(MAINSRCDIR)/lib/physics/libORXphysics.a \
                   $(MAINSRCDIR)/lib/event/libORXevent.a \
+                  $(MAINSRCDIR)/lib/particles/libORXparticles.a \
+                  $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a \
+                  $(MAINSRCDIR)/lib/physics/libORXphysics.a \
                   $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
-                  $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) \
-		  -lpthread
+                  $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
 
-particles_CPPFLAGS =  -DGUI_MODULE \
-		      $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
+particles_CPPFLAGS =  -DGUI_MODULE  -DNO_AUDIO \
+                      $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
 
 particles_SOURCES= ../framework.cc \
-		   particle_fun.cc \
-		   $(MAINSRCDIR)/lib/particles/particle_engine.cc \
-		   $(MAINSRCDIR)/lib/particles/particle_system.cc \
-		   $(MAINSRCDIR)/lib/particles/particle_emitter.cc \
-		   $(MAINSRCDIR)/lib/graphics/light.cc \
-		   $(MAINSRCDIR)/util/state.cc \
-		   $(MAINSRCDIR)/world_entities/camera.cc \
-	  	   $(MAINSRCDIR)/lib/graphics/importer/model.cc \
-		   $(MAINSRCDIR)/lib/graphics/importer/objModel.cc \
-		   $(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc \
-	  	   $(MAINSRCDIR)/lib/graphics/importer/array.cc \
-	  	   $(MAINSRCDIR)/lib/graphics/importer/material.cc \
-		   $(MAINSRCDIR)/lib/graphics/importer/texture.cc \
-		   $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
-		   $(MAINSRCDIR)/lib/lang/base_object.cc \
-		   $(MAINSRCDIR)/lib/math/vector.cc \
-		   $(MAINSRCDIR)/util/resource_manager.cc \
-		   $(MAINSRCDIR)/lib/graphics/text_engine.cc \
-		   $(MAINSRCDIR)/lib/coord/p_node.cc \
-		   $(MAINSRCDIR)/lib/coord/null_parent.cc \
-		   $(MAINSRCDIR)/lib/gui/gui_gtk.cc
+                   particle_fun.cc \
+                   $(MAINSRCDIR)/lib/graphics/light.cc \
+                   $(MAINSRCDIR)/util/state.cc \
+                   $(MAINSRCDIR)/world_entities/camera.cc \
+                   $(MAINSRCDIR)/world_entities/world_entity.cc \
+                   $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
+                   $(MAINSRCDIR)/lib/lang/base_object.cc \
+                   $(MAINSRCDIR)/lib/math/vector.cc \
+                   $(MAINSRCDIR)/util/resource_manager.cc \
+                   $(MAINSRCDIR)/lib/graphics/text_engine.cc \
+                   $(MAINSRCDIR)/lib/coord/p_node.cc \
+                   $(MAINSRCDIR)/lib/coord/null_parent.cc \
+                   $(MAINSRCDIR)/lib/gui/gui_gtk.cc \
+                   $(MAINSRCDIR)/lib/util/substring.cc \
+                   $(MAINSRCDIR)/util/loading/load_param.cc \
+                   $(MAINSRCDIR)/lib/util/ini_parser.cc
Index: orxonox/trunk/src/subprojects/particles/Makefile.in
===================================================================
--- orxonox/trunk/src/subprojects/particles/Makefile.in	(revision 4636)
+++ orxonox/trunk/src/subprojects/particles/Makefile.in	(revision 4637)
@@ -52,21 +52,21 @@
 PROGRAMS = $(bin_PROGRAMS)
 am_particles_OBJECTS = particles-framework.$(OBJEXT) \
-	particles-particle_fun.$(OBJEXT) \
-	particles-particle_engine.$(OBJEXT) \
-	particles-particle_system.$(OBJEXT) \
-	particles-particle_emitter.$(OBJEXT) particles-light.$(OBJEXT) \
+	particles-particle_fun.$(OBJEXT) particles-light.$(OBJEXT) \
 	particles-state.$(OBJEXT) particles-camera.$(OBJEXT) \
-	particles-model.$(OBJEXT) particles-objModel.$(OBJEXT) \
-	particles-primitive_model.$(OBJEXT) particles-array.$(OBJEXT) \
-	particles-material.$(OBJEXT) particles-texture.$(OBJEXT) \
+	particles-world_entity.$(OBJEXT) \
 	particles-graphics_engine.$(OBJEXT) \
 	particles-base_object.$(OBJEXT) particles-vector.$(OBJEXT) \
 	particles-resource_manager.$(OBJEXT) \
 	particles-text_engine.$(OBJEXT) particles-p_node.$(OBJEXT) \
-	particles-null_parent.$(OBJEXT) particles-gui_gtk.$(OBJEXT)
+	particles-null_parent.$(OBJEXT) particles-gui_gtk.$(OBJEXT) \
+	particles-substring.$(OBJEXT) particles-load_param.$(OBJEXT) \
+	particles-ini_parser.$(OBJEXT)
 particles_OBJECTS = $(am_particles_OBJECTS)
 am__DEPENDENCIES_1 =
 particles_DEPENDENCIES = $(MAINSRCDIR)/lib/physics/libORXphysics.a \
 	$(MAINSRCDIR)/lib/event/libORXevent.a \
+	$(MAINSRCDIR)/lib/particles/libORXparticles.a \
+	$(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a \
+	$(MAINSRCDIR)/lib/physics/libORXphysics.a \
 	$(MAINSRCDIR)/lib/tinyxml/libtinyxml.a $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
@@ -74,26 +74,21 @@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/particles-array.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/particles-base_object.Po \
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/particles-base_object.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/particles-camera.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/particles-framework.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/particles-graphics_engine.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/particles-gui_gtk.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/particles-ini_parser.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/particles-light.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/particles-material.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/particles-model.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/particles-load_param.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/particles-null_parent.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/particles-objModel.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/particles-p_node.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/particles-particle_emitter.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/particles-particle_engine.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/particles-particle_fun.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/particles-particle_system.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/particles-primitive_model.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/particles-resource_manager.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/particles-state.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/particles-substring.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/particles-text_engine.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/particles-texture.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/particles-vector.Po
+@AMDEP_TRUE@	./$(DEPDIR)/particles-vector.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/particles-world_entity.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -217,33 +212,30 @@
 particles_LDADD = $(MAINSRCDIR)/lib/physics/libORXphysics.a \
                   $(MAINSRCDIR)/lib/event/libORXevent.a \
+                  $(MAINSRCDIR)/lib/particles/libORXparticles.a \
+                  $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a \
+                  $(MAINSRCDIR)/lib/physics/libORXphysics.a \
                   $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
-                  $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) \
-		  -lpthread
-
-particles_CPPFLAGS = -DGUI_MODULE \
-		      $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
+                  $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
+
+particles_CPPFLAGS = -DGUI_MODULE  -DNO_AUDIO \
+                      $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
 
 particles_SOURCES = ../framework.cc \
-		   particle_fun.cc \
-		   $(MAINSRCDIR)/lib/particles/particle_engine.cc \
-		   $(MAINSRCDIR)/lib/particles/particle_system.cc \
-		   $(MAINSRCDIR)/lib/particles/particle_emitter.cc \
-		   $(MAINSRCDIR)/lib/graphics/light.cc \
-		   $(MAINSRCDIR)/util/state.cc \
-		   $(MAINSRCDIR)/world_entities/camera.cc \
-	  	   $(MAINSRCDIR)/lib/graphics/importer/model.cc \
-		   $(MAINSRCDIR)/lib/graphics/importer/objModel.cc \
-		   $(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc \
-	  	   $(MAINSRCDIR)/lib/graphics/importer/array.cc \
-	  	   $(MAINSRCDIR)/lib/graphics/importer/material.cc \
-		   $(MAINSRCDIR)/lib/graphics/importer/texture.cc \
-		   $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
-		   $(MAINSRCDIR)/lib/lang/base_object.cc \
-		   $(MAINSRCDIR)/lib/math/vector.cc \
-		   $(MAINSRCDIR)/util/resource_manager.cc \
-		   $(MAINSRCDIR)/lib/graphics/text_engine.cc \
-		   $(MAINSRCDIR)/lib/coord/p_node.cc \
-		   $(MAINSRCDIR)/lib/coord/null_parent.cc \
-		   $(MAINSRCDIR)/lib/gui/gui_gtk.cc
+                   particle_fun.cc \
+                   $(MAINSRCDIR)/lib/graphics/light.cc \
+                   $(MAINSRCDIR)/util/state.cc \
+                   $(MAINSRCDIR)/world_entities/camera.cc \
+                   $(MAINSRCDIR)/world_entities/world_entity.cc \
+                   $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
+                   $(MAINSRCDIR)/lib/lang/base_object.cc \
+                   $(MAINSRCDIR)/lib/math/vector.cc \
+                   $(MAINSRCDIR)/util/resource_manager.cc \
+                   $(MAINSRCDIR)/lib/graphics/text_engine.cc \
+                   $(MAINSRCDIR)/lib/coord/p_node.cc \
+                   $(MAINSRCDIR)/lib/coord/null_parent.cc \
+                   $(MAINSRCDIR)/lib/gui/gui_gtk.cc \
+                   $(MAINSRCDIR)/lib/util/substring.cc \
+                   $(MAINSRCDIR)/util/loading/load_param.cc \
+                   $(MAINSRCDIR)/lib/util/ini_parser.cc
 
 all: all-am
@@ -313,5 +305,4 @@
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-array.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-base_object.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-camera.Po@am__quote@
@@ -319,20 +310,16 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-graphics_engine.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-gui_gtk.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-ini_parser.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-light.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-material.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-model.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-load_param.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-null_parent.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-objModel.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-p_node.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-particle_emitter.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-particle_engine.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-particle_fun.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-particle_system.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-primitive_model.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-resource_manager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-state.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-substring.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-text_engine.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-texture.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-vector.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-world_entity.Po@am__quote@
 
 .cc.o:
@@ -384,52 +371,4 @@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-particle_fun.obj `if test -f 'particle_fun.cc'; then $(CYGPATH_W) 'particle_fun.cc'; else $(CYGPATH_W) '$(srcdir)/particle_fun.cc'; fi`
 
-particles-particle_engine.o: $(MAINSRCDIR)/lib/particles/particle_engine.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-particle_engine.o -MD -MP -MF "$(DEPDIR)/particles-particle_engine.Tpo" -c -o particles-particle_engine.o `test -f '$(MAINSRCDIR)/lib/particles/particle_engine.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/particles/particle_engine.cc; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-particle_engine.Tpo" "$(DEPDIR)/particles-particle_engine.Po"; else rm -f "$(DEPDIR)/particles-particle_engine.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/particles/particle_engine.cc' object='particles-particle_engine.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-particle_engine.Po' tmpdepfile='$(DEPDIR)/particles-particle_engine.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-particle_engine.o `test -f '$(MAINSRCDIR)/lib/particles/particle_engine.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/particles/particle_engine.cc
-
-particles-particle_engine.obj: $(MAINSRCDIR)/lib/particles/particle_engine.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-particle_engine.obj -MD -MP -MF "$(DEPDIR)/particles-particle_engine.Tpo" -c -o particles-particle_engine.obj `if test -f '$(MAINSRCDIR)/lib/particles/particle_engine.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/particles/particle_engine.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/particles/particle_engine.cc'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-particle_engine.Tpo" "$(DEPDIR)/particles-particle_engine.Po"; else rm -f "$(DEPDIR)/particles-particle_engine.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/particles/particle_engine.cc' object='particles-particle_engine.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-particle_engine.Po' tmpdepfile='$(DEPDIR)/particles-particle_engine.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-particle_engine.obj `if test -f '$(MAINSRCDIR)/lib/particles/particle_engine.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/particles/particle_engine.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/particles/particle_engine.cc'; fi`
-
-particles-particle_system.o: $(MAINSRCDIR)/lib/particles/particle_system.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-particle_system.o -MD -MP -MF "$(DEPDIR)/particles-particle_system.Tpo" -c -o particles-particle_system.o `test -f '$(MAINSRCDIR)/lib/particles/particle_system.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/particles/particle_system.cc; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-particle_system.Tpo" "$(DEPDIR)/particles-particle_system.Po"; else rm -f "$(DEPDIR)/particles-particle_system.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/particles/particle_system.cc' object='particles-particle_system.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-particle_system.Po' tmpdepfile='$(DEPDIR)/particles-particle_system.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-particle_system.o `test -f '$(MAINSRCDIR)/lib/particles/particle_system.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/particles/particle_system.cc
-
-particles-particle_system.obj: $(MAINSRCDIR)/lib/particles/particle_system.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-particle_system.obj -MD -MP -MF "$(DEPDIR)/particles-particle_system.Tpo" -c -o particles-particle_system.obj `if test -f '$(MAINSRCDIR)/lib/particles/particle_system.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/particles/particle_system.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/particles/particle_system.cc'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-particle_system.Tpo" "$(DEPDIR)/particles-particle_system.Po"; else rm -f "$(DEPDIR)/particles-particle_system.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/particles/particle_system.cc' object='particles-particle_system.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-particle_system.Po' tmpdepfile='$(DEPDIR)/particles-particle_system.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-particle_system.obj `if test -f '$(MAINSRCDIR)/lib/particles/particle_system.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/particles/particle_system.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/particles/particle_system.cc'; fi`
-
-particles-particle_emitter.o: $(MAINSRCDIR)/lib/particles/particle_emitter.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-particle_emitter.o -MD -MP -MF "$(DEPDIR)/particles-particle_emitter.Tpo" -c -o particles-particle_emitter.o `test -f '$(MAINSRCDIR)/lib/particles/particle_emitter.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/particles/particle_emitter.cc; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-particle_emitter.Tpo" "$(DEPDIR)/particles-particle_emitter.Po"; else rm -f "$(DEPDIR)/particles-particle_emitter.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/particles/particle_emitter.cc' object='particles-particle_emitter.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-particle_emitter.Po' tmpdepfile='$(DEPDIR)/particles-particle_emitter.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-particle_emitter.o `test -f '$(MAINSRCDIR)/lib/particles/particle_emitter.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/particles/particle_emitter.cc
-
-particles-particle_emitter.obj: $(MAINSRCDIR)/lib/particles/particle_emitter.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-particle_emitter.obj -MD -MP -MF "$(DEPDIR)/particles-particle_emitter.Tpo" -c -o particles-particle_emitter.obj `if test -f '$(MAINSRCDIR)/lib/particles/particle_emitter.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/particles/particle_emitter.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/particles/particle_emitter.cc'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-particle_emitter.Tpo" "$(DEPDIR)/particles-particle_emitter.Po"; else rm -f "$(DEPDIR)/particles-particle_emitter.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/particles/particle_emitter.cc' object='particles-particle_emitter.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-particle_emitter.Po' tmpdepfile='$(DEPDIR)/particles-particle_emitter.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-particle_emitter.obj `if test -f '$(MAINSRCDIR)/lib/particles/particle_emitter.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/particles/particle_emitter.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/particles/particle_emitter.cc'; fi`
-
 particles-light.o: $(MAINSRCDIR)/lib/graphics/light.cc
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-light.o -MD -MP -MF "$(DEPDIR)/particles-light.Tpo" -c -o particles-light.o `test -f '$(MAINSRCDIR)/lib/graphics/light.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/light.cc; \
@@ -480,99 +419,19 @@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-camera.obj `if test -f '$(MAINSRCDIR)/world_entities/camera.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/world_entities/camera.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/world_entities/camera.cc'; fi`
 
-particles-model.o: $(MAINSRCDIR)/lib/graphics/importer/model.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-model.o -MD -MP -MF "$(DEPDIR)/particles-model.Tpo" -c -o particles-model.o `test -f '$(MAINSRCDIR)/lib/graphics/importer/model.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/importer/model.cc; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-model.Tpo" "$(DEPDIR)/particles-model.Po"; else rm -f "$(DEPDIR)/particles-model.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/importer/model.cc' object='particles-model.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-model.Po' tmpdepfile='$(DEPDIR)/particles-model.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-model.o `test -f '$(MAINSRCDIR)/lib/graphics/importer/model.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/importer/model.cc
-
-particles-model.obj: $(MAINSRCDIR)/lib/graphics/importer/model.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-model.obj -MD -MP -MF "$(DEPDIR)/particles-model.Tpo" -c -o particles-model.obj `if test -f '$(MAINSRCDIR)/lib/graphics/importer/model.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/importer/model.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/importer/model.cc'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-model.Tpo" "$(DEPDIR)/particles-model.Po"; else rm -f "$(DEPDIR)/particles-model.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/importer/model.cc' object='particles-model.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-model.Po' tmpdepfile='$(DEPDIR)/particles-model.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-model.obj `if test -f '$(MAINSRCDIR)/lib/graphics/importer/model.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/importer/model.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/importer/model.cc'; fi`
-
-particles-objModel.o: $(MAINSRCDIR)/lib/graphics/importer/objModel.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-objModel.o -MD -MP -MF "$(DEPDIR)/particles-objModel.Tpo" -c -o particles-objModel.o `test -f '$(MAINSRCDIR)/lib/graphics/importer/objModel.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/importer/objModel.cc; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-objModel.Tpo" "$(DEPDIR)/particles-objModel.Po"; else rm -f "$(DEPDIR)/particles-objModel.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/importer/objModel.cc' object='particles-objModel.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-objModel.Po' tmpdepfile='$(DEPDIR)/particles-objModel.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-objModel.o `test -f '$(MAINSRCDIR)/lib/graphics/importer/objModel.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/importer/objModel.cc
-
-particles-objModel.obj: $(MAINSRCDIR)/lib/graphics/importer/objModel.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-objModel.obj -MD -MP -MF "$(DEPDIR)/particles-objModel.Tpo" -c -o particles-objModel.obj `if test -f '$(MAINSRCDIR)/lib/graphics/importer/objModel.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/importer/objModel.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/importer/objModel.cc'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-objModel.Tpo" "$(DEPDIR)/particles-objModel.Po"; else rm -f "$(DEPDIR)/particles-objModel.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/importer/objModel.cc' object='particles-objModel.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-objModel.Po' tmpdepfile='$(DEPDIR)/particles-objModel.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-objModel.obj `if test -f '$(MAINSRCDIR)/lib/graphics/importer/objModel.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/importer/objModel.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/importer/objModel.cc'; fi`
-
-particles-primitive_model.o: $(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-primitive_model.o -MD -MP -MF "$(DEPDIR)/particles-primitive_model.Tpo" -c -o particles-primitive_model.o `test -f '$(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-primitive_model.Tpo" "$(DEPDIR)/particles-primitive_model.Po"; else rm -f "$(DEPDIR)/particles-primitive_model.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc' object='particles-primitive_model.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-primitive_model.Po' tmpdepfile='$(DEPDIR)/particles-primitive_model.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-primitive_model.o `test -f '$(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc
-
-particles-primitive_model.obj: $(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-primitive_model.obj -MD -MP -MF "$(DEPDIR)/particles-primitive_model.Tpo" -c -o particles-primitive_model.obj `if test -f '$(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-primitive_model.Tpo" "$(DEPDIR)/particles-primitive_model.Po"; else rm -f "$(DEPDIR)/particles-primitive_model.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc' object='particles-primitive_model.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-primitive_model.Po' tmpdepfile='$(DEPDIR)/particles-primitive_model.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-primitive_model.obj `if test -f '$(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc'; fi`
-
-particles-array.o: $(MAINSRCDIR)/lib/graphics/importer/array.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-array.o -MD -MP -MF "$(DEPDIR)/particles-array.Tpo" -c -o particles-array.o `test -f '$(MAINSRCDIR)/lib/graphics/importer/array.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/importer/array.cc; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-array.Tpo" "$(DEPDIR)/particles-array.Po"; else rm -f "$(DEPDIR)/particles-array.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/importer/array.cc' object='particles-array.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-array.Po' tmpdepfile='$(DEPDIR)/particles-array.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-array.o `test -f '$(MAINSRCDIR)/lib/graphics/importer/array.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/importer/array.cc
-
-particles-array.obj: $(MAINSRCDIR)/lib/graphics/importer/array.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-array.obj -MD -MP -MF "$(DEPDIR)/particles-array.Tpo" -c -o particles-array.obj `if test -f '$(MAINSRCDIR)/lib/graphics/importer/array.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/importer/array.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/importer/array.cc'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-array.Tpo" "$(DEPDIR)/particles-array.Po"; else rm -f "$(DEPDIR)/particles-array.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/importer/array.cc' object='particles-array.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-array.Po' tmpdepfile='$(DEPDIR)/particles-array.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-array.obj `if test -f '$(MAINSRCDIR)/lib/graphics/importer/array.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/importer/array.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/importer/array.cc'; fi`
-
-particles-material.o: $(MAINSRCDIR)/lib/graphics/importer/material.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-material.o -MD -MP -MF "$(DEPDIR)/particles-material.Tpo" -c -o particles-material.o `test -f '$(MAINSRCDIR)/lib/graphics/importer/material.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/importer/material.cc; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-material.Tpo" "$(DEPDIR)/particles-material.Po"; else rm -f "$(DEPDIR)/particles-material.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/importer/material.cc' object='particles-material.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-material.Po' tmpdepfile='$(DEPDIR)/particles-material.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-material.o `test -f '$(MAINSRCDIR)/lib/graphics/importer/material.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/importer/material.cc
-
-particles-material.obj: $(MAINSRCDIR)/lib/graphics/importer/material.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-material.obj -MD -MP -MF "$(DEPDIR)/particles-material.Tpo" -c -o particles-material.obj `if test -f '$(MAINSRCDIR)/lib/graphics/importer/material.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/importer/material.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/importer/material.cc'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-material.Tpo" "$(DEPDIR)/particles-material.Po"; else rm -f "$(DEPDIR)/particles-material.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/importer/material.cc' object='particles-material.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-material.Po' tmpdepfile='$(DEPDIR)/particles-material.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-material.obj `if test -f '$(MAINSRCDIR)/lib/graphics/importer/material.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/importer/material.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/importer/material.cc'; fi`
-
-particles-texture.o: $(MAINSRCDIR)/lib/graphics/importer/texture.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-texture.o -MD -MP -MF "$(DEPDIR)/particles-texture.Tpo" -c -o particles-texture.o `test -f '$(MAINSRCDIR)/lib/graphics/importer/texture.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/importer/texture.cc; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-texture.Tpo" "$(DEPDIR)/particles-texture.Po"; else rm -f "$(DEPDIR)/particles-texture.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/importer/texture.cc' object='particles-texture.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-texture.Po' tmpdepfile='$(DEPDIR)/particles-texture.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-texture.o `test -f '$(MAINSRCDIR)/lib/graphics/importer/texture.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/importer/texture.cc
-
-particles-texture.obj: $(MAINSRCDIR)/lib/graphics/importer/texture.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-texture.obj -MD -MP -MF "$(DEPDIR)/particles-texture.Tpo" -c -o particles-texture.obj `if test -f '$(MAINSRCDIR)/lib/graphics/importer/texture.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/importer/texture.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/importer/texture.cc'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-texture.Tpo" "$(DEPDIR)/particles-texture.Po"; else rm -f "$(DEPDIR)/particles-texture.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/importer/texture.cc' object='particles-texture.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-texture.Po' tmpdepfile='$(DEPDIR)/particles-texture.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-texture.obj `if test -f '$(MAINSRCDIR)/lib/graphics/importer/texture.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/importer/texture.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/importer/texture.cc'; fi`
+particles-world_entity.o: $(MAINSRCDIR)/world_entities/world_entity.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-world_entity.o -MD -MP -MF "$(DEPDIR)/particles-world_entity.Tpo" -c -o particles-world_entity.o `test -f '$(MAINSRCDIR)/world_entities/world_entity.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/world_entities/world_entity.cc; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-world_entity.Tpo" "$(DEPDIR)/particles-world_entity.Po"; else rm -f "$(DEPDIR)/particles-world_entity.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/world_entities/world_entity.cc' object='particles-world_entity.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-world_entity.Po' tmpdepfile='$(DEPDIR)/particles-world_entity.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-world_entity.o `test -f '$(MAINSRCDIR)/world_entities/world_entity.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/world_entities/world_entity.cc
+
+particles-world_entity.obj: $(MAINSRCDIR)/world_entities/world_entity.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-world_entity.obj -MD -MP -MF "$(DEPDIR)/particles-world_entity.Tpo" -c -o particles-world_entity.obj `if test -f '$(MAINSRCDIR)/world_entities/world_entity.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/world_entities/world_entity.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/world_entities/world_entity.cc'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-world_entity.Tpo" "$(DEPDIR)/particles-world_entity.Po"; else rm -f "$(DEPDIR)/particles-world_entity.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/world_entities/world_entity.cc' object='particles-world_entity.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-world_entity.Po' tmpdepfile='$(DEPDIR)/particles-world_entity.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-world_entity.obj `if test -f '$(MAINSRCDIR)/world_entities/world_entity.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/world_entities/world_entity.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/world_entities/world_entity.cc'; fi`
 
 particles-graphics_engine.o: $(MAINSRCDIR)/lib/graphics/graphics_engine.cc
@@ -703,4 +562,52 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-gui_gtk.obj `if test -f '$(MAINSRCDIR)/lib/gui/gui_gtk.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/gui/gui_gtk.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/gui/gui_gtk.cc'; fi`
+
+particles-substring.o: $(MAINSRCDIR)/lib/util/substring.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-substring.o -MD -MP -MF "$(DEPDIR)/particles-substring.Tpo" -c -o particles-substring.o `test -f '$(MAINSRCDIR)/lib/util/substring.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/substring.cc; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-substring.Tpo" "$(DEPDIR)/particles-substring.Po"; else rm -f "$(DEPDIR)/particles-substring.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/util/substring.cc' object='particles-substring.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-substring.Po' tmpdepfile='$(DEPDIR)/particles-substring.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-substring.o `test -f '$(MAINSRCDIR)/lib/util/substring.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/substring.cc
+
+particles-substring.obj: $(MAINSRCDIR)/lib/util/substring.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-substring.obj -MD -MP -MF "$(DEPDIR)/particles-substring.Tpo" -c -o particles-substring.obj `if test -f '$(MAINSRCDIR)/lib/util/substring.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/substring.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/substring.cc'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-substring.Tpo" "$(DEPDIR)/particles-substring.Po"; else rm -f "$(DEPDIR)/particles-substring.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/util/substring.cc' object='particles-substring.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-substring.Po' tmpdepfile='$(DEPDIR)/particles-substring.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-substring.obj `if test -f '$(MAINSRCDIR)/lib/util/substring.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/substring.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/substring.cc'; fi`
+
+particles-load_param.o: $(MAINSRCDIR)/util/loading/load_param.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-load_param.o -MD -MP -MF "$(DEPDIR)/particles-load_param.Tpo" -c -o particles-load_param.o `test -f '$(MAINSRCDIR)/util/loading/load_param.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/util/loading/load_param.cc; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-load_param.Tpo" "$(DEPDIR)/particles-load_param.Po"; else rm -f "$(DEPDIR)/particles-load_param.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/util/loading/load_param.cc' object='particles-load_param.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-load_param.Po' tmpdepfile='$(DEPDIR)/particles-load_param.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-load_param.o `test -f '$(MAINSRCDIR)/util/loading/load_param.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/util/loading/load_param.cc
+
+particles-load_param.obj: $(MAINSRCDIR)/util/loading/load_param.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-load_param.obj -MD -MP -MF "$(DEPDIR)/particles-load_param.Tpo" -c -o particles-load_param.obj `if test -f '$(MAINSRCDIR)/util/loading/load_param.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/util/loading/load_param.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/util/loading/load_param.cc'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-load_param.Tpo" "$(DEPDIR)/particles-load_param.Po"; else rm -f "$(DEPDIR)/particles-load_param.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/util/loading/load_param.cc' object='particles-load_param.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-load_param.Po' tmpdepfile='$(DEPDIR)/particles-load_param.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-load_param.obj `if test -f '$(MAINSRCDIR)/util/loading/load_param.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/util/loading/load_param.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/util/loading/load_param.cc'; fi`
+
+particles-ini_parser.o: $(MAINSRCDIR)/lib/util/ini_parser.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-ini_parser.o -MD -MP -MF "$(DEPDIR)/particles-ini_parser.Tpo" -c -o particles-ini_parser.o `test -f '$(MAINSRCDIR)/lib/util/ini_parser.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/ini_parser.cc; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-ini_parser.Tpo" "$(DEPDIR)/particles-ini_parser.Po"; else rm -f "$(DEPDIR)/particles-ini_parser.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/util/ini_parser.cc' object='particles-ini_parser.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-ini_parser.Po' tmpdepfile='$(DEPDIR)/particles-ini_parser.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-ini_parser.o `test -f '$(MAINSRCDIR)/lib/util/ini_parser.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/ini_parser.cc
+
+particles-ini_parser.obj: $(MAINSRCDIR)/lib/util/ini_parser.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-ini_parser.obj -MD -MP -MF "$(DEPDIR)/particles-ini_parser.Tpo" -c -o particles-ini_parser.obj `if test -f '$(MAINSRCDIR)/lib/util/ini_parser.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/ini_parser.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/ini_parser.cc'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-ini_parser.Tpo" "$(DEPDIR)/particles-ini_parser.Po"; else rm -f "$(DEPDIR)/particles-ini_parser.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/util/ini_parser.cc' object='particles-ini_parser.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-ini_parser.Po' tmpdepfile='$(DEPDIR)/particles-ini_parser.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-ini_parser.obj `if test -f '$(MAINSRCDIR)/lib/util/ini_parser.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/ini_parser.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/ini_parser.cc'; fi`
 uninstall-info-am:
 
Index: orxonox/trunk/src/subprojects/particles/particle_fun.cc
===================================================================
--- orxonox/trunk/src/subprojects/particles/particle_fun.cc	(revision 4636)
+++ orxonox/trunk/src/subprojects/particles/particle_fun.cc	(revision 4637)
@@ -50,5 +50,6 @@
   // Creating a Test Particle System
   ParticleSystem* system = new ParticleSystem(100000, PINIT_PARTICLE_TYPE);
-  system->setRadius(PINIT_START_RADIUS, PINIT_END_RADIUS ,0 ,0);
+  system->setRadius(0, PINIT_START_RADIUS, 0 );
+  system->setRadius(1, PINIT_END_RADIUS, 0 );
   system->setLifeSpan(PINIT_LIFESPAN);
 
@@ -153,4 +154,9 @@
           PRINT(4)("EmitterSize set to %f\n", atof(value));
         }
+        else if (!strcmp(name, "InheritSpeed"))
+        {
+          tmpEmit->setInheritSpeed(atof(value));
+          PRINT(4)("ParticleInheritSpeed set to %f\n", atof(value));
+        }
     }
   delete value;
@@ -169,10 +175,10 @@
       if (!strcmp(name, "StartRadius"))
         {
-          tmpSys->setRadius(atof(value), tmpSys->getEndRadius());
+          tmpSys->setRadius(0, atof(value));
           PRINT(4)("ParticleStartRadius set to %f\n", atof(value));
         }
       else if (!strcmp(name, "EndRadius"))
         {
-          tmpSys->setRadius( tmpSys->getStartRadius(), atof(value));
+          tmpSys->setRadius( 1, atof(value));
           PRINT(4)("ParticleEndRadius set to %f\n", atof(value));
         }
@@ -186,5 +192,5 @@
       else if (!strcmp(name, "Mass"))
         {
-          tmpSys->setMass(atof(value));
+          tmpSys->setMass(0, atof(value));
           PRINT(4)("ParticleMass set to %f\n", atof(value));
         }
@@ -208,14 +214,9 @@
         }
 
-      else if (!strcmp(name, "InheritSpeed"))
-        {
-          tmpSys->setInheritSpeed(atof(value));
-          PRINT(4)("ParticleInheritSpeed set to %f\n", atof(value));
-        }
       else if (!strcmp(name, "RandomColor"))
         {
-          tmpSys->setColor((float)rand()/RAND_MAX, (float)rand()/RAND_MAX, (float)rand()/RAND_MAX, 1,
-                           (float)rand()/RAND_MAX, (float)rand()/RAND_MAX, (float)rand()/RAND_MAX, .5,
-                           (float)rand()/RAND_MAX, (float)rand()/RAND_MAX, (float)rand()/RAND_MAX, 0);
+          tmpSys->setColor(0, (float)rand()/RAND_MAX, (float)rand()/RAND_MAX, (float)rand()/RAND_MAX, 1);
+          tmpSys->setColor(.5, (float)rand()/RAND_MAX, (float)rand()/RAND_MAX, (float)rand()/RAND_MAX, .5);
+          tmpSys->setColor(.5, (float)rand()/RAND_MAX, (float)rand()/RAND_MAX, (float)rand()/RAND_MAX, 0);
         }
     }
@@ -300,4 +301,10 @@
           EmitterSize->redraw();
           emitterBox->fill(EmitterSize);
+
+          emitterBox->fill(new Label("InheritSpeed"));
+          Slider* InheritSpeed = new Slider("InheritSpeed", 0, 1);
+          InheritSpeed->setExactness(3);
+          InheritSpeed->connectSignal("value_changed", (void*)InheritSpeed, emitterChange );
+          emitterBox->fill(InheritSpeed);
         }
         emitterFrame->fill(emitterBox);
@@ -359,10 +366,4 @@
           systemBox->fill(ParticleType);
 
-          systemBox->fill(new Label("InheritSpeed"));
-          Slider* InheritSpeed = new Slider("InheritSpeed", 0, 1);
-          InheritSpeed->setExactness(3);
-          InheritSpeed->connectSignal("value_changed", (void*)InheritSpeed, systemChange );
-          systemBox->fill(InheritSpeed);
-
           Button* RandomColor = new Button("RandomColor");
           RandomColor->connectSignal("released", (void*)RandomColor, systemChange);
Index: orxonox/trunk/src/util/loading/load_param.cc
===================================================================
--- orxonox/trunk/src/util/loading/load_param.cc	(revision 4636)
+++ orxonox/trunk/src/util/loading/load_param.cc	(revision 4637)
@@ -33,4 +33,5 @@
 {
   this->setClassID(CL_LOAD_PARAM, "LoadParam");
+
   this->loadString = NULL;
   this->pointerToParam = pointerToParam;
@@ -216,5 +217,5 @@
   if (this->paramCount > 0)
   {
-      PRINT(3)(" (Default: ");
+    PRINT(3)(" (Default: ");
     for (int i = 0; i < this->paramCount; i++)
     {
Index: orxonox/trunk/src/util/resource_manager.cc
===================================================================
--- orxonox/trunk/src/util/resource_manager.cc	(revision 4636)
+++ orxonox/trunk/src/util/resource_manager.cc	(revision 4637)
@@ -181,4 +181,5 @@
   ResourceType tmpType;
 #ifndef NO_MODEL
+#define __IF_OK
   if (!strncmp(fileName+(strlen(fileName)-4), ".obj", 4))
     tmpType = OBJ;
@@ -193,5 +194,9 @@
 #endif /* NO_MODEL */
 #ifndef NO_AUDIO
-  else if (!strncmp(fileName+(strlen(fileName)-4), ".wav", 4))
+#ifdef __IF_OK
+  else
+#endif
+#define __IF_OK
+  if (!strncmp(fileName+(strlen(fileName)-4), ".wav", 4))
     tmpType = WAV;
   else if (!strncmp(fileName+(strlen(fileName)-4), ".mp3", 4))
@@ -201,10 +206,18 @@
 #endif /* NO_AUDIO */
 #ifndef NO_TEXT
-  else if (!strncmp(fileName+(strlen(fileName)-4), ".ttf", 4))
+#ifdef __IF_OK
+  else
+#endif
+#define __IF_OK
+ if (!strncmp(fileName+(strlen(fileName)-4), ".ttf", 4))
     tmpType = TTF;
 #endif /* NO_TEXT */
 #ifndef NO_TEXTURES
-  else
-    tmpType = IMAGE;
+#ifdef __IF_OK
+  else
+#else
+  if
+#endif
+   tmpType = IMAGE;
 #endif /* NO_TEXTURES */
 
@@ -793,5 +806,6 @@
       switch (enumRes->type)
         {
-        case OBJ:
+#ifndef NO_MODEL
+          case OBJ:
           PRINT(0)("ObjectModel\n");
           break;
@@ -799,7 +813,10 @@
           PRINT(0)("PrimitiveModel\n");
           break;
+#endif
+#ifndef NO_TEXTURES
         case IMAGE:
           PRINT(0)("ImageFile (Texture)\n");
           break;
+#endif
         default:
           PRINT(0)("SoundFile\n");
Index: orxonox/trunk/src/util/resource_manager.h
===================================================================
--- orxonox/trunk/src/util/resource_manager.h	(revision 4636)
+++ orxonox/trunk/src/util/resource_manager.h	(revision 4637)
@@ -73,6 +73,6 @@
 
   // more specific
+  float             modelSize;         //!< the size of the model (OBJ/PRIM)
 #ifndef NO_MODEL
-  float             modelSize;         //!< the size of the model (OBJ/PRIM)
   char*             skinFileName;      //!< skinFileName (MD2)
 #endif /* NO_MODEL */
