Changeset 3746 in orxonox.OLD for orxonox/branches/levelloader/src/lib/graphics/importer

Timestamp:

Apr 7, 2005, 3:54:49 PM (20 years ago)

Author:

chris

Message:

orxonox/branches/levelloader: Merged trunk into branch… still not working though…

Location:

orxonox/branches/levelloader/src/lib/graphics/importer

Files:

• Makefile.am (modified) (3 diffs)
• Makefile.in (modified) (16 diffs)
• framework.cc (modified) (5 diffs)
• framework.h (modified) (2 diffs)
• material.cc (modified) (7 diffs)
• model.cc (modified) (4 diffs)
• model.h (modified) (3 diffs)
• objModel.cc (modified) (3 diffs)
• objModel.h (modified) (2 diffs)
• primitive_model.cc (copied) (copied from orxonox/trunk/src/lib/graphics/importer/primitive_model.cc)
• primitive_model.h (copied) (copied from orxonox/trunk/src/lib/graphics/importer/primitive_model.h)
• texture.cc (modified) (5 diffs)
• texture.h (modified) (3 diffs)

orxonox/branches/levelloader/src/lib/graphics/importer/Makefile.am

@@ -5 +5 @@
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/data
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gaphics
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/lang
@@ -27 +27 @@
                   model.cc \
                   objModel.cc \
+                  primitive_model.cc \
                   array.cc \
                   material.cc \
                   texture.cc \
-                  $(MAINSRCDIR)/lib/math/vector.cc
+                  $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
+                  $(MAINSRCDIR)/lib/lang/base_object.cc \
+                  $(MAINSRCDIR)/lib/math/vector.cc \
+                  $(MAINSRCDIR)/lib/util/resource_manager.cc
 
 noinst_HEADERS= framework.h \
@@ -36 +40 @@
                 model.h \
                 objModel.h \
+                primitive_model.h \
                 array.h \
                 material.h \

orxonox/branches/levelloader/src/lib/graphics/importer/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.2 from Makefile.am.
 # @configure_input@
 
@@ -42 +42 @@
 subdir = src/lib/graphics/importer
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in
+        $(srcdir)/Makefile.in TODO
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -50 +50 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
+am__installdirs = $(DESTDIR)$(bindir)
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_importer_OBJECTS = framework.$(OBJEXT) windowHandler.$(OBJEXT) \
-        model.$(OBJEXT) objModel.$(OBJEXT) array.$(OBJEXT) \
-        material.$(OBJEXT) texture.$(OBJEXT) vector.$(OBJEXT)
+        model.$(OBJEXT) objModel.$(OBJEXT) primitive_model.$(OBJEXT) \
+        array.$(OBJEXT) material.$(OBJEXT) texture.$(OBJEXT) \
+        graphics_engine.$(OBJEXT) base_object.$(OBJEXT) \
+        vector.$(OBJEXT) resource_manager.$(OBJEXT)
 importer_OBJECTS = $(am_importer_OBJECTS)
 importer_LDADD = $(LDADD)
@@ -61 +63 @@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/array.Po ./$(DEPDIR)/framework.Po \
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/array.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/base_object.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/framework.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/graphics_engine.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/model.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/objModel.Po ./$(DEPDIR)/texture.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/vector.Po ./$(DEPDIR)/windowHandler.Po
+@AMDEP_TRUE@    ./$(DEPDIR)/objModel.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/primitive_model.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/resource_manager.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/texture.Po ./$(DEPDIR)/vector.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/windowHandler.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -185 +193 @@
 target_vendor = @target_vendor@
 MAINSRCDIR = ../../..
-AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/gaphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai
+AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai
 AM_LDFLAGS = $(MWINDOWS)
 importer_SOURCES = framework.cc \
@@ -191 +199 @@
                   model.cc \
                   objModel.cc \
+                  primitive_model.cc \
                   array.cc \
                   material.cc \
                   texture.cc \
-                  $(MAINSRCDIR)/lib/math/vector.cc
+                  $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
+                  $(MAINSRCDIR)/lib/lang/base_object.cc \
+                  $(MAINSRCDIR)/lib/math/vector.cc \
+                  $(MAINSRCDIR)/lib/util/resource_manager.cc
 
 noinst_HEADERS = framework.h \
@@ -200 +212 @@
                 model.h \
                 objModel.h \
+                primitive_model.h \
                 array.h \
                 material.h \
@@ -217 +230 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile
+          $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -239 +252 @@
 install-binPROGRAMS: $(bin_PROGRAMS)
         @$(NORMAL_INSTALL)
-        test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+        $(mkdir_p) $(DESTDIR)$(bindir)
         @list='$(bin_PROGRAMS)'; for p in $$list; do \
           p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
@@ -245 +258 @@
           ; then \
             f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
+           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
           else :; fi; \
         done
@@ -254 +267 @@
         @list='$(bin_PROGRAMS)'; for p in $$list; do \
           f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-          echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-          rm -f "$(DESTDIR)$(bindir)/$$f"; \
+          echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+          rm -f $(DESTDIR)$(bindir)/$$f; \
         done
 
@@ -271 +284 @@
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base_object.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/framework.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graphics_engine.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/model.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/objModel.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/primitive_model.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resource_manager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector.Po@am__quote@
@@ -295 +312 @@
 @am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
+graphics_engine.o: $(MAINSRCDIR)/lib/graphics/graphics_engine.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT graphics_engine.o -MD -MP -MF "$(DEPDIR)/graphics_engine.Tpo" -c -o graphics_engine.o `test -f '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/graphics_engine.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/graphics_engine.Tpo" "$(DEPDIR)/graphics_engine.Po"; else rm -f "$(DEPDIR)/graphics_engine.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/graphics_engine.cc' object='graphics_engine.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/graphics_engine.Po' tmpdepfile='$(DEPDIR)/graphics_engine.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o graphics_engine.o `test -f '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/graphics_engine.cc
+
+graphics_engine.obj: $(MAINSRCDIR)/lib/graphics/graphics_engine.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT graphics_engine.obj -MD -MP -MF "$(DEPDIR)/graphics_engine.Tpo" -c -o graphics_engine.obj `if test -f '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/graphics_engine.Tpo" "$(DEPDIR)/graphics_engine.Po"; else rm -f "$(DEPDIR)/graphics_engine.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/graphics_engine.cc' object='graphics_engine.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/graphics_engine.Po' tmpdepfile='$(DEPDIR)/graphics_engine.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o graphics_engine.obj `if test -f '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; fi`
+
+base_object.o: $(MAINSRCDIR)/lib/lang/base_object.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT base_object.o -MD -MP -MF "$(DEPDIR)/base_object.Tpo" -c -o base_object.o `test -f '$(MAINSRCDIR)/lib/lang/base_object.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/lang/base_object.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/base_object.Tpo" "$(DEPDIR)/base_object.Po"; else rm -f "$(DEPDIR)/base_object.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/lang/base_object.cc' object='base_object.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/base_object.Po' tmpdepfile='$(DEPDIR)/base_object.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o base_object.o `test -f '$(MAINSRCDIR)/lib/lang/base_object.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/lang/base_object.cc
+
+base_object.obj: $(MAINSRCDIR)/lib/lang/base_object.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT base_object.obj -MD -MP -MF "$(DEPDIR)/base_object.Tpo" -c -o base_object.obj `if test -f '$(MAINSRCDIR)/lib/lang/base_object.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/lang/base_object.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/lang/base_object.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/base_object.Tpo" "$(DEPDIR)/base_object.Po"; else rm -f "$(DEPDIR)/base_object.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/lang/base_object.cc' object='base_object.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/base_object.Po' tmpdepfile='$(DEPDIR)/base_object.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o base_object.obj `if test -f '$(MAINSRCDIR)/lib/lang/base_object.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/lang/base_object.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/lang/base_object.cc'; fi`
+
 vector.o: $(MAINSRCDIR)/lib/math/vector.cc
 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT vector.o -MD -MP -MF "$(DEPDIR)/vector.Tpo" -c -o vector.o `test -f '$(MAINSRCDIR)/lib/math/vector.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/math/vector.cc; \
@@ -310 +359 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o vector.obj `if test -f '$(MAINSRCDIR)/lib/math/vector.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/math/vector.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/math/vector.cc'; fi`
+
+resource_manager.o: $(MAINSRCDIR)/lib/util/resource_manager.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT resource_manager.o -MD -MP -MF "$(DEPDIR)/resource_manager.Tpo" -c -o resource_manager.o `test -f '$(MAINSRCDIR)/lib/util/resource_manager.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/resource_manager.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/resource_manager.Tpo" "$(DEPDIR)/resource_manager.Po"; else rm -f "$(DEPDIR)/resource_manager.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/util/resource_manager.cc' object='resource_manager.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/resource_manager.Po' tmpdepfile='$(DEPDIR)/resource_manager.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resource_manager.o `test -f '$(MAINSRCDIR)/lib/util/resource_manager.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/resource_manager.cc
+
+resource_manager.obj: $(MAINSRCDIR)/lib/util/resource_manager.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT resource_manager.obj -MD -MP -MF "$(DEPDIR)/resource_manager.Tpo" -c -o resource_manager.obj `if test -f '$(MAINSRCDIR)/lib/util/resource_manager.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/resource_manager.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/resource_manager.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/resource_manager.Tpo" "$(DEPDIR)/resource_manager.Po"; else rm -f "$(DEPDIR)/resource_manager.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/util/resource_manager.cc' object='resource_manager.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/resource_manager.Po' tmpdepfile='$(DEPDIR)/resource_manager.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resource_manager.obj `if test -f '$(MAINSRCDIR)/lib/util/resource_manager.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/resource_manager.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/resource_manager.cc'; fi`
 uninstall-info-am:
 
@@ -332 +397 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-            $$tags $$unique; \
-        fi
+        test -z "$(ETAGS_ARGS)$$tags$$unique" \
+          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             $$tags $$unique
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
@@ -391 +454 @@
 all-am: Makefile $(PROGRAMS) $(HEADERS)
 installdirs:
-        for dir in "$(DESTDIR)$(bindir)"; do \
-          test -z "$$dir" || $(mkdir_p) "$$dir"; \
-        done
+        $(mkdir_p) $(DESTDIR)$(bindir)
 install: install-am
 install-exec: install-exec-am

orxonox/branches/levelloader/src/lib/graphics/importer/framework.cc

@@ -17 +17 @@
 
 #include "vector.h"
+
+#include "primitive_model.h"
+
 
 int verbose;
@@ -76 +79 @@
     obj = new OBJModel(argv[1]);
   else 
-    {
-      // This is an example, of how it is possible, to create a new Model, and adding some vertex-information.
-      // This also packs everything into a DisplayList, and can be handled exactly as any other model.
-      // This is an example of a cube with Texture-Coordinates, but without explicite Vertex-Normals. (they are soft-created).
-      /*
-      obj = (OBJModel*) new Model();
-      obj->setName("CUBE");
-      obj->addVertex (-0.5, -0.5, 0.5);
-      obj->addVertex (0.5, -0.5, 0.5);
-      obj->addVertex (-0.5, 0.5, 0.5);
-      obj->addVertex (0.5, 0.5, 0.5);
-      obj->addVertex (-0.5, 0.5, -0.5);
-      obj->addVertex (0.5, 0.5, -0.5);
-      obj->addVertex (-0.5, -0.5, -0.5);
-      obj->addVertex (0.5, -0.5, -0.5);
-      
-      obj->addVertexTexture (0.0, 0.0);
-      obj->addVertexTexture (1.0, 0.0);
-      obj->addVertexTexture (0.0, 1.0);
-      obj->addVertexTexture (1.0, 1.0);
-      obj->addVertexTexture (0.0, 2.0);
-      obj->addVertexTexture (1.0, 2.0);
-      obj->addVertexTexture (0.0, 3.0);
-      obj->addVertexTexture (1.0, 3.0);
-      obj->addVertexTexture (0.0, 4.0);
-      obj->addVertexTexture (1.0, 4.0);
-      obj->addVertexTexture (2.0, 0.0);
-      obj->addVertexTexture (2.0, 1.0);
-      obj->addVertexTexture (-1.0, 0.0);
-      obj->addVertexTexture (-1.0, 1.0);
-
-      obj->addFace ("1 2 4 3");
-      obj->addFace ("3 4 6 5");
-      obj->addFace ("5 6 8 7");
-      obj->addFace ("7 8 2 1");
-      obj->addFace ("2 8 6 4");
-      obj->addFace ("7 1 3 5");
-      obj->finalize();
-      */
-      obj = (OBJModel*) new Model(CYLINDER);
-    }
+    obj = new PrimitiveModel(SPHERE);
+
   M = Vector(wHandler.screen->w/2, wHandler.screen->h/2, 0); 
   rotAxis = Vector (0.0,1.0,0.0);
@@ -166 +130 @@
       switch (event.type) {
       case SDL_MOUSEMOTION:
-        PRINTF(3)("Mouse motion about %d,%d Pixels to (%d,%d).\n", 
+        PRINTF(4)("Mouse motion about %d,%d Pixels to (%d,%d).\n", 
                   event.motion.xrel, event.motion.yrel,
                   event.motion.x, event.motion.y);
@@ -205 +169 @@
         if (event.button.button == 4)
           {
-            PRINTF(0)("MouseWheel up\n");
+            PRINTF(4)("MouseWheel up\n");
             zoomTo *= .5;
           }
         else if (event.button.button == 5)
           {
-            PRINTF(2)("MouseWheel down\n");
+            PRINTF(4)("MouseWheel down\n");
             zoomTo *= 2.0;
           }
@@ -240 +204 @@
         else 
             {
-              PRINTF(2)("MouseButton %d released at (%d,%d).\n",
+              PRINTF(4)("MouseButton %d released at (%d,%d).\n",
                         event.button.button, event.button.x, event.button.y);
             }

orxonox/branches/levelloader/src/lib/graphics/importer/framework.h

@@ -4 +4 @@
 #include "windowHandler.h" // Include the Whandler Basecode
 #include "objModel.h"
+#include "vector.h"
 
 class Vector;
@@ -34 +35 @@
 
 WindowHandler wHandler;  // Create an instance of the whandler basecode class
-OBJModel* obj;
+Model* obj;
 
 

orxonox/branches/levelloader/src/lib/graphics/importer/material.cc

@@ -21 +21 @@
 #include "texture.h"
 #include "debug.h"
+#include "resource_manager.h"
 #include <stdlib.h>
 #include <string.h>
+
+//! \todo check if we are in RESOURCE MANAGER-mode
+#include "resource_manager.h"
 
 using namespace std;
@@ -58 +62 @@
     delete []this->name;
   if (this->diffuseTexture)
-    this->diffuseTexture;
+    ResourceManager::getInstance()->unload(this->diffuseTexture);
   if (this->nextMat)
     delete this->nextMat;
@@ -89 +93 @@
   this->nextMat = NULL;
   this->name ="";
-  this->setIllum(1);
+  this->setIllum(3);
   this->setDiffuse(0,0,0);
   this->setAmbient(0,0,0);
@@ -104 +108 @@
   this->ambientTextureSet = false;
   this->specularTextureSet = false;
-
-  
 }
 
@@ -167 +169 @@
 }
 
-
 /**
    \brief Set the Name of the Material. (Important for searching)
@@ -321 +322 @@
 void Material::addTexturePath(char* pathName)
 {
-  PathList::getInstance()->addPath(pathName);
+  ResourceManager::getInstance()->addImageDir(pathName);
 }
 
@@ -333 +334 @@
 {
   PRINTF(4)("setting Diffuse Map %s\n", dMap);
-  diffuseTexture = new Texture();
-  this->diffuseTextureSet = diffuseTexture->loadImage(dMap);
-
+  //    diffuseTexture = new Texture();
+  //    this->diffuseTextureSet = diffuseTexture->loadImage(dMap);
+
+  //! \todo check if RESOURCE MANAGER is availiable
+  //! \todo Textures from .mtl-file need special care.
+  this->diffuseTextureSet = this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE);
 }
 

orxonox/branches/levelloader/src/lib/graphics/importer/model.cc

@@ -34 +34 @@
 {
   this->initialize();
-}
-
-/**
-   \brief Creates a 3D-Model of Primitive-Type type
-
-   if you want to just display a Cube/Sphere/Cylinder/... without any material.
-   
-   \todo implement Cube/Sphere/Cylinder/...
-*/
-Model::Model(PRIMITIVE type)
-{
-  this->initialize();
-
-  switch (type)
-    {
-    default:
-    case CUBE:
-      this->cubeModel();
-      break;
-    case SPHERE:
-      this->sphereModel();
-      break;
-    case CYLINDER:
-      this->cylinderModel();
-      break;
-
-    }
-  this->importToGL ();
-
-  this->cleanup();
 }
 
@@ -492 +462 @@
 
       tmpElem->vertexNumber = va_arg (itemlist, int) -1;
-      if (type >= 2)
+      if (type & TEXCOORD)
         tmpElem->texCoordNumber = va_arg (itemlist, int) -1;
-      if (type == 1 || type ==3)
+      if (type & NORMAL)
         tmpElem->normalNumber = va_arg(itemlist, int) -1;
       this->currentGroup->currentFace->vertexCount++;
@@ -797 +767 @@
 void Model::cubeModel(void)
 {
-  this->addVertex ("-0.5 -0.5 0.5");
-  this->addVertex ("0.5 -0.5 0.5");
-  this->addVertex ("-0.5 0.5 0.5");
-  this->addVertex ("0.5 0.5 0.5");
-  this->addVertex ("-0.5 0.5 -0.5");
-  this->addVertex ("0.5 0.5 -0.5");
-  this->addVertex ("-0.5 -0.5 -0.5");
-  this->addVertex ("0.5 -0.5 -0.5");
-
-  this->addVertexTexture ("0.0 0.0");
-  this->addVertexTexture ("1.0 0.0");
-  this->addVertexTexture ("0.0 1.0");
-  this->addVertexTexture ("1.0 1.0");
-  this->addVertexTexture ("0.0 2.0");
-  this->addVertexTexture ("1.0 2.0");
-  this->addVertexTexture ("0.0 3.0");
-  this->addVertexTexture ("1.0 3.0");
-  this->addVertexTexture ("0.0 4.0");
-  this->addVertexTexture ("1.0 4.0");
-  this->addVertexTexture ("2.0 0.0");
-  this->addVertexTexture ("2.0 1.0");
-  this->addVertexTexture ("-1.0 0.0");
-  this->addVertexTexture ("-1.0 1.0");
-
-  this->addVertexNormal ("0.0 0.0 1.0");
-  this->addVertexNormal ("0.0 0.0 1.0");
-  this->addVertexNormal ("0.0 0.0 1.0");
-  this->addVertexNormal ("0.0 0.0 1.0");
-  this->addVertexNormal ("0.0 1.0 0.0");
-  this->addVertexNormal ("0.0 1.0 0.0");
-  this->addVertexNormal ("0.0 1.0 0.0");
-  this->addVertexNormal ("0.0 1.0 0.0");
-  this->addVertexNormal ("0.0 0.0 -1.0");
-  this->addVertexNormal ("0.0 0.0 -1.0");
-  this->addVertexNormal ("0.0 0.0 -1.0");
-  this->addVertexNormal ("0.0 0.0 -1.0");
-  this->addVertexNormal ("0.0 -1.0 0.0");
-  this->addVertexNormal ("0.0 -1.0 0.0");
-  this->addVertexNormal ("0.0 -1.0 0.0");
-  this->addVertexNormal ("0.0 -1.0 0.0");
-  this->addVertexNormal ("1.0 0.0 0.0");
-  this->addVertexNormal ("1.0 0.0 0.0");
-  this->addVertexNormal ("1.0 0.0 0.0");
-  this->addVertexNormal ("1.0 0.0 0.0");
-  this->addVertexNormal ("-1.0 0.0 0.0");
-  this->addVertexNormal ("-1.0 0.0 0.0");
-  this->addVertexNormal ("-1.0 0.0 0.0");
-  this->addVertexNormal ("-1.0 0.0 0.0");
+  this->addVertex (-0.5, -0.5, 0.5);
+  this->addVertex (0.5, -0.5, 0.5);
+  this->addVertex (-0.5, 0.5, 0.5);
+  this->addVertex (0.5, 0.5, 0.5);
+  this->addVertex (-0.5, 0.5, -0.5);
+  this->addVertex (0.5, 0.5, -0.5);
+  this->addVertex (-0.5, -0.5, -0.5);
+  this->addVertex (0.5, -0.5, -0.5);
+
+  this->addVertexTexture (0.0, 0.0);
+  this->addVertexTexture (1.0, 0.0);
+  this->addVertexTexture (0.0, 1.0);
+  this->addVertexTexture (1.0, 1.0);
+  this->addVertexTexture (0.0, 2.0);
+  this->addVertexTexture (1.0, 2.0);
+  this->addVertexTexture (0.0, 3.0);
+  this->addVertexTexture (1.0, 3.0);
+  this->addVertexTexture (0.0, 4.0);
+  this->addVertexTexture (1.0, 4.0);
+  this->addVertexTexture (2.0, 0.0);
+  this->addVertexTexture (2.0, 1.0);
+  this->addVertexTexture (-1.0, 0.0);
+  this->addVertexTexture (-1.0, 1.0);
+
+  this->addVertexNormal (0.0, 0.0, 1.0);
+  this->addVertexNormal (0.0, 0.0, 1.0);
+  this->addVertexNormal (0.0, 0.0, 1.0);
+  this->addVertexNormal (0.0, 0.0, 1.0);
+  this->addVertexNormal (0.0, 1.0, 0.0);
+  this->addVertexNormal (0.0, 1.0, 0.0);
+  this->addVertexNormal (0.0, 1.0, 0.0);
+  this->addVertexNormal (0.0, 1.0, 0.0);
+  this->addVertexNormal (0.0, 0.0, -1.0);
+  this->addVertexNormal (0.0, 0.0, -1.0);
+  this->addVertexNormal (0.0, 0.0, -1.0);
+  this->addVertexNormal (0.0, 0.0, -1.0);
+  this->addVertexNormal (0.0, -1.0, 0.0);
+  this->addVertexNormal (0.0, -1.0, 0.0);
+  this->addVertexNormal (0.0, -1.0, 0.0);
+  this->addVertexNormal (0.0, -1.0, 0.0);
+  this->addVertexNormal (1.0, 0.0, 0.0);
+  this->addVertexNormal (1.0, 0.0, 0.0);
+  this->addVertexNormal (1.0, 0.0, 0.0);
+  this->addVertexNormal (1.0, 0.0, 0.0);
+  this->addVertexNormal (-1.0, 0.0, 0.0);
+  this->addVertexNormal (-1.0, 0.0, 0.0);
+  this->addVertexNormal (-1.0, 0.0, 0.0);
+  this->addVertexNormal (-1.0, 0.0, 0.0);
 
   /* normaleLess-testingMode
@@ -855 +825 @@
   */
 
-  this->addFace ("1/1/1 2/2/2 4/4/3 3/3/4");
-  this->addFace ("3/3/5 4/4/6 6/6/7 5/5/8");
-  this->addFace ("5/5/9 6/6/10 8/8/11 7/7/12");
-  this->addFace ("7/7/13 8/8/14 2/10/15 1/9/16");
-  this->addFace ("2/2/17 8/11/18 6/12/19 4/4/20");
-  this->addFace ("7/13/21 1/1/22 3/3/23 5/14/24");
-
-}
-
-/**
-   \brief Builds a Sphere into the Model
-*/
-void Model::sphereModel()
-{
-  int detail = 30;
-  if (detail <= 0) detail = 1;
-  float df = (float)detail;
-  for (float i = 0.0; i < df/2; i+=1.0)
-    {
-      for (float j = 0.0; j < df; j+=1.0)
-      {
-        float vz = i/df *2.0*PI - PI/2.0;
-        this->addVertex(cos(j/df*2.0*PI) * cos(vz) ,
-                        sin(j/df*2.0*PI) * cos(vz),
-                        sin(vz));
-        //if (j==0.0)
-        //printf ("%f %f\n", vz, sin (vz));
-        if (i==0.0)
-          PRINTF(0)("%f, %f\n", j/df*2.0*PI, cos(j/df*PI));
-      }
-    }
-  vertices->debug();
-  for (int i = 0; i < detail/2; i++)
-    for (int j = 1; j < detail; j++)
-      {
-        unsigned int v1,v2,v3,v4;
-        v1 = i*detail +j;
-
-        /*      if (j+1 == detail)
-          {
-            v2 = i*detail +1;
-            v3 = i*detail+detail + 1;
-          }
-          else*/
-          {
-            v2 = i*detail +j+1;
-            v3 = i*detail+detail + j+1;
-          }
-        v4 = i*detail+detail + j;
-        //printf("%i %i %i %i\n", v1, v2, v3, v4);
-        this->addFace(4, 0, v1, v2, v3, v4);
-      }
-}
-
-/**
-   \brief Creates a Cylinder.
-*/
-void Model::cylinderModel(void)
-{
-  unsigned int detail = 20;
-  float size = 1.0;
-
-  // check if devision by zero
-  if (detail <= 3)
-    detail = 3;
-  int count = 0;
-  // defining Points of the Cylinder.
-  for (float phi = 0.0; phi < 2.0*PI; phi += 2.0*PI/(float)detail)
-    {
-      this->addVertex(size*cos(phi), size*sin(phi), -size);
-      this->addVertex(size*cos(phi), size*sin(phi), size);
-      count ++;
-    }
-  this->addVertex(0, 0, -size);
-  this->addVertex(0, 0, size);
-
-  
-  if (count != detail)
-    PRINTF(1)("calculation error, count should be %d but is %d.\n", detail, count);
-  vertices->debug();
-
-  // adding Faces
-  for (int i = 0; i < detail-1; i++)
-    {
-      int p1, p2, p3, p4;
-      p1 = 2*i+1;
-      p2 = 2*i+2;
-      if (i <= detail);
-      p3 = 2*i+4;
-      p4 = 2*i+3;
-      // something is wrong here
-      this->addFace(4, 0, p1, p2, p3, p4);
-      this->addFace(3, 0, p4, p1, 2*detail+1);
-      this->addFace(3, 0, p2, p3, 2*detail+2);
-    }
-  addFace(4,0, 2*detail-1, 2*detail, 2, 1);
-  this->addFace(3, 0, 1, 2*detail-1, 2*detail+1);
-  this->addFace(3, 0, 2*detail, 2, 2*detail+2);
-
-}
+  this->addFace (4, 3, 1,1,1, 2,2,2, 4,4,3, 3,3,4);
+  this->addFace (4, 3, 3,3,5, 4,4,6, 6,6,7, 5,5,8);
+  this->addFace (4, 3, 5,5,9, 6,6,10, 8,8,11, 7,7,12);
+  this->addFace (4, 3, 7,7,13, 8,8,14, 2,10,15, 1,9,16);
+  this->addFace (4, 3, 2,2,17, 8,11,18, 6,12,19, 4,4,20);
+  this->addFace (4, 3, 7,13,21, 1,1,22, 3,3,23, 5,14,24);
+
+}

orxonox/branches/levelloader/src/lib/graphics/importer/model.h

@@ -15 +15 @@
 using namespace std;
 
-//! Specification of different primitives the Model knows
-enum PRIMITIVE {PLANE, CUBE, SPHERE, CYLINDER};
+// definition of different modes for setting up Faces
+#define VERTEX 0       //!< If Faces are created WITH Vertex-Coordinate
+#define NORMAL 1       //!< If Faces are created WITH Normals (otherwise autocalculate)
+#define TEXCOORD 2     //!< If Faces are created WITH TextureCoordinate
 
 //! Class that handles 3D-Models. it can also read them in and display them.
@@ -23 +25 @@
  public:
   Model(void);
-  Model(PRIMITIVE type);
   Model(char* modelName);
   virtual ~Model(void);
@@ -114 +115 @@
 
   void cubeModel(void);
-  void sphereModel(void);
-  void cylinderModel(void);
 };
 

orxonox/branches/levelloader/src/lib/graphics/importer/objModel.cc

@@ -21 +21 @@
 
 #include "debug.h"
-
-/**
-   \brief Crates a 3D-Model and loads in a File.
-   \param fileName file to parse and load (must be a .obj file)
-*/
-OBJModel::OBJModel(const char* fileName)
-{
-  this->initializeOBJ();
-
-  this->importFile (fileName);
-
-  this->importToGL ();
-
-  this->cleanup();
-}
 
 /**
@@ -193 +178 @@
       else if (!strncmp(Buffer, "s ", 2)) //! \todo smoothing groups have to be implemented
         {
-          PRINTF(3)("smoothing groups not supportet yet. line: %s\n", Buffer);
+          PRINTF(2)("smoothing groups not supportet yet. line: %s\n", Buffer);
         }
     }
@@ -200 +185 @@
   delete []fileName;
   return true;
-
 }
 

orxonox/branches/levelloader/src/lib/graphics/importer/objModel.h

@@ -13 +13 @@
 {
  public:
-  OBJModel(const char* fileName);
-  OBJModel(const char* fileName, float scaling);
+  OBJModel(const char* fileName, float scaling = 1.0);
   virtual ~OBJModel();
   void initializeOBJ(void);
@@ -28 +27 @@
   bool readFromObjFile (void);
   bool readMtlLib (const char* matFile);
-
 };
 

orxonox/branches/levelloader/src/lib/graphics/importer/texture.cc

@@ -22 +22 @@
 #include "texture.h"
 
-// headers only for PathList
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdlib.h>
-#include <fstream>
-
-/**
-   \brief creates a ned PathList.
-   
-   It is a good idea to use this as an initial List,
-   because if you give on a name the Path will not be checked for its existence.
-*/
-PathList::PathList()
-{
-  this->pathName = NULL;
-  this->next = NULL;
-}
-
-/**
-   \brief Creates a new PathList with a Name.
-   \param pName the Name of The Path.
-
-   This function just adds the Path without checking if it exists.
-*/
-PathList::PathList(char* pName)
-{
-  this->pathName = new char [strlen(pName)+1];
-  strcpy (this->pathName, pName);
-  this->next = NULL;
-}
-
-/**
-   \brief destroys a PathList
-
-   It does this by deleting the Name and then delete its preceding PathList.
-*/
-PathList::~PathList()
-{
-  if (this->pathName)
-    delete []this->pathName;
-  if (this->next)
-    delete this->next;
-}
-
-PathList* PathList::firstPath = NULL;
-
-/**
-   \returns A Pointer to the first Path of the Pathlist
-*/
-PathList* PathList::getInstance(void)
-{
-  if (firstPath)
-    return firstPath;
-  firstPath = new PathList();
-}
-/**
-   \brief Adds a new Pathlist Element.
-   \param pName
-   
-   Adding a Path automatically checks if the Path exists,
-   and if it does not it will not add it to the List.
-*/
-void PathList::addPath (char* pName)
-{
-  if (pName[0] == '\0')
-    {
-      PRINTF(2)("not Adding empty Path to the List.\n");
-      return;
-    }
-  char* tmpPName = new char[strlen(pName)];
-  strncpy(tmpPName, pName, strlen(pName)-1);
-  tmpPName[strlen(pName)-1] = '\0';
-  if (access (tmpPName, F_OK) == 0)
-    {
-      struct stat status;
-      stat(tmpPName, &status);
-      if (status.st_mode & S_IFDIR)
-        {
-          PRINTF(4)("Adding Path %s to the PathList.\n", pName);
-          PathList* tmpPathList = this;
-          while (tmpPathList->next)
-            tmpPathList = tmpPathList->next;
-          tmpPathList->next = new PathList(pName);
-        }
-      else
-        PRINTF(2)("You tried to add non-folder %s to a PathList.\n", tmpPName);
-    }
-  else
-      PRINTF(2)("You tried to add non-existing folder %s to a PathList.\n", tmpPName);
-  delete []tmpPName;
-}
-
-
+#include "graphics_engine.h"
 
 /**
@@ -127 +34 @@
   this->texture = 0;
 }
+
+/**
+   \brief Constructor for a Texture
+*/
+Texture::Texture(const char* imageName)
+{
+  this->pImage = new Image;
+  this->pImage->data = NULL;
+  this->map = NULL;
+  this->texture = 0;
+  this->loadImage(imageName);
+}  
 
 /**
@@ -143 +62 @@
 
 /**
-   \brief Searches for a Texture inside one of the defined Paths
-   \param texName The name of the texture o search for.
-   \returns pathName+texName if texName was found in the pathList. NULL if the Texture is not found.
-*/
-char* Texture::searchTextureInPaths(char* texName) const
-{
-  char* tmpName = NULL;
-  PathList* pList = PathList::getInstance();
-  while (pList)
-    {
-      if (pList->pathName)
-        {
-          tmpName = new char [strlen(pList->pathName)+strlen(texName)+1];
-          strcpy(tmpName, pList->pathName);
-        }
-      else
-        {
-          tmpName = new char [strlen(texName)+1];
-          tmpName[0]='\0';
-        }
-      strcat(tmpName, texName);
-      if (access (tmpName, F_OK) == 0)
-        return tmpName;
-      
-      if (tmpName)
-        delete []tmpName;
-      tmpName = NULL;
-      pList = pList->next;
-    }
-  return NULL;
-}
-
-/**
    \brief a Simple function that switches two char values
    \param a The first value
@@ -195 +81 @@
 bool Texture::loadTexToGL (Image* pImage)
 {
-  PRINTF(4)("Loading texture to OpenGL-Environment.\n");
-  glGenTextures(1, &this->texture);
-  glBindTexture(GL_TEXTURE_2D, this->texture);
-  /* not Working, and not needed. 
-  glTexImage2D( GL_TEXTURE_2D, 0, 3, width,
-                height, 0, GL_BGR,
-                GL_UNSIGNED_BYTE, map->pixels );
-  */ 
-  gluBuild2DMipmaps(GL_TEXTURE_2D, 3, pImage->width, pImage->height, pImage->format, GL_UNSIGNED_BYTE, pImage->data);
-  
-  glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_NEAREST);
-  glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR_MIPMAP_LINEAR); 
-}
-
+  if (GraphicsEngine::texturesEnabled)
+    {
+      PRINTF(4)("Loading texture to OpenGL-Environment.\n");
+      glGenTextures(1, &this->texture);
+      glBindTexture(GL_TEXTURE_2D, this->texture);
+      /* not Working, and not needed. 
+         glTexImage2D( GL_TEXTURE_2D, 0, 3, width,
+         height, 0, GL_BGR,
+         GL_UNSIGNED_BYTE, map->pixels );
+      */ 
+      gluBuild2DMipmaps(GL_TEXTURE_2D, 3, pImage->width, pImage->height, pImage->format, GL_UNSIGNED_BYTE, pImage->data);
+      
+      glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_NEAREST);
+      glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR_MIPMAP_LINEAR);     
+    }
+}
 
 #ifdef HAVE_SDL_SDL_IMAGE_H
-bool Texture::loadImage(char* imageName)
-{
-  char* imgNameWithPath = searchTextureInPaths(imageName);
-  if (imgNameWithPath)
-    {
-      this->map=IMG_Load(imgNameWithPath);
-      if(!map)
-        {
-          PRINTF(1)("IMG_Load: %s\n", IMG_GetError());
+bool Texture::loadImage(const char* imageName)
+{
+  if (GraphicsEngine::texturesEnabled)
+    {
+      if (imageName)
+        {
+          this->map=IMG_Load(imageName);
+          if(!map)
+            {
+              PRINTF(1)("IMG_Load: %s\n", IMG_GetError());
+              return false;
+            }
+          pImage->height = map->h;
+          pImage->width  = map->w;
+          pImage->data   = (GLubyte*)map->pixels;
+          pImage->bpp    = map->format->BytesPerPixel;
+          if (pImage->bpp == 3)
+            pImage->format = GL_RGB;
+          else if (pImage->bpp == 4)
+            pImage->format = GL_RGBA;
+          
+          if( !IMG_isPNG(SDL_RWFromFile(imageName, "rb")) && !IMG_isJPG(SDL_RWFromFile(imageName, "rb")))
+            for (int i=0;i<map->h * map->w *3;i+=3)
+              { 
+                GLuint temp = pImage->data[i];
+                pImage->data[i] = pImage->data[i+2];
+                pImage->data[i+2] = temp;
+              }
+          /* this is the real swapping algorithm */
+          for( int i = 0 ; i < (pImage->height / 2) ; ++i )
+            for( int j = 0 ; j < pImage->width * pImage->bpp; j += pImage->bpp )
+              for(int k = 0; k < pImage->bpp; ++k)
+                swap( pImage->data[ (i * pImage->width * pImage->bpp) + j + k], pImage->data[ ( (pImage->height - i - 1) * pImage->width * pImage->bpp ) + j + k]);
+          
+          this->loadTexToGL (this->pImage);
+          SDL_FreeSurface(map);
+          this->pImage->data = NULL;
+        }
+      else
+        {
+          PRINTF(2)("Image not Found: %s\n", imageName);
           return false;
         }
-      pImage->height = map->h;
-      pImage->width  = map->w;
-      pImage->data   = (GLubyte*)map->pixels;
-      pImage->bpp    = map->format->BytesPerPixel;
-      if (pImage->bpp == 3)
-        pImage->format = GL_RGB;
-      else if (pImage->bpp == 4)
-        pImage->format = GL_RGBA;
-          
-      if( !IMG_isPNG(SDL_RWFromFile(imgNameWithPath, "rb")) && !IMG_isJPG(SDL_RWFromFile(imgNameWithPath, "rb")))
-        for (int i=0;i<map->h * map->w *3;i+=3)
-          { 
-            GLuint temp = pImage->data[i];
-            pImage->data[i] = pImage->data[i+2];
-            pImage->data[i+2] = temp;
-          }
-      /* this is the real swapping algorithm */
-      for( int i = 0 ; i < (pImage->height / 2) ; ++i )
-        for( int j = 0 ; j < pImage->width * pImage->bpp; j += pImage->bpp )
-          for(int k = 0; k < pImage->bpp; ++k)
-            swap( pImage->data[ (i * pImage->width * pImage->bpp) + j + k], pImage->data[ ( (pImage->height - i - 1) * pImage->width * pImage->bpp ) + j + k]);
- 
-      this->loadTexToGL (this->pImage);
-      SDL_FreeSurface(map);
-      this->pImage->data = NULL;
-    }
-  else
-    {
-      PRINTF(2)("Image not Found: %s\n", imgNameWithPath);
-      return false;
     }
 }
@@ -262 +152 @@
    \todo Checks where to find the Image
 */
-bool Texture::loadImage(char* imageName)
-{
-  char* imgNameWithPath = searchTextureInPaths(imageName);
-  if (imgNameWithPath)
-    {
-      if (!strncmp(imgNameWithPath+strlen(imgNameWithPath)-4, ".bmp", 4))
-        {
-          PRINTF(4)("Requested bmp-image. Trying to Import.\n");
-          return this->loadBMP(imgNameWithPath);
-        }
-      
-      else if (!strncmp(imgNameWithPath+strlen(imgNameWithPath)-4, ".jpg", 4) || !strncmp(imgNameWithPath+strlen(imgNameWithPath)-5, ".jpg", 5))
-        {
-          PRINTF(4)("Requested jpeg-image. Trying to Import\n");
-          return this->loadJPG(imgNameWithPath);
-        }
-      else if (!strncmp(imgNameWithPath+strlen(imgNameWithPath)-4, ".tga", 4))
-        {
-          PRINTF(4)("Requested tga-image. Trying to Import\n");
-          return this->loadTGA(imgNameWithPath);
-        }
-      else if (!strncmp(imgNameWithPath+strlen(imgNameWithPath)-4, ".png", 4))
-        {
-          PRINTF(4)("Requested png-image. Trying to Import\n");
-          return this->loadPNG(imgNameWithPath);
+bool Texture::loadImage(const char* imageName)
+{
+  if (GraphicsEngine::texturesEnabled)
+    {
+      if (imageName)
+        {
+          if (!strncmp(imageName+strlen(imageName)-4, ".bmp", 4))
+            {
+              PRINTF(4)("Requested bmp-image. Trying to Import.\n");
+              return this->loadBMP(imageName);
+            }
+          
+          else if (!strncmp(imageName+strlen(imageName)-4, ".jpg", 4) || !strncmp(imageName+strlen(imageName)-5, ".jpg", 5))
+            {
+              PRINTF(4)("Requested jpeg-image. Trying to Import\n");
+              return this->loadJPG(imageName);
+            }
+          else if (!strncmp(imageName+strlen(imageName)-4, ".tga", 4))
+            {
+              PRINTF(4)("Requested tga-image. Trying to Import\n");
+              return this->loadTGA(imageName);
+            }
+          else if (!strncmp(imageName+strlen(imageName)-4, ".png", 4))
+            {
+              PRINTF(4)("Requested png-image. Trying to Import\n");
+              return this->loadPNG(imageName);
+            }
+          else
+            {
+              PRINTF(2)("Requested Image was not recognized in its type. (Maybe a type-Cast-error.)\n FileName: %s", imageName);
+              return false;
+            }
         }
       else
         {
-          PRINTF(2)("Requested Image was not recognized in its type. (Maybe a type-Cast-error.)\n FileName: %s", imgNameWithPath);
+          PRINTF(2)("Image not Found: %s\n", imageName);
           return false;
         }
     }
-  else
-    {
-      PRINTF(2)("Image not Found: %s\n", imgNameWithPath);
-      return false;
-    }
-}
-
+}
 /**
    \brief reads in a Windows BMP-file, and imports it to openGL.

orxonox/branches/levelloader/src/lib/graphics/importer/texture.h

@@ -28 +28 @@
 #endif /* HAVE_SDL_SDL_IMAGE_H */
 
-
-
-//! Class to handle lists of paths.
-/**
-   \todo Ability to return Paths by itself.
-
-   It is simple to use, and good, for all PathList you want.
-   just create a new Pathlist, and add Paths.
-*/
-class PathList
-{
- private:
-  PathList();
-  static PathList* firstPath; //!< A static Pointer to the first PathList in the List.
- public:
-  PathList(char* pName);
-  ~PathList();
-  static PathList* getInstance(void);
-  
-  void addPath (char* pName);
-  char* pathName;              //!< The Name of the current Path.
-  PathList* next;              //!< Pointer to the next Pathlist.
-};
-
 //! A Class, that reads in Textures from different fileformats.
 class Texture
@@ -70 +46 @@
   GLuint texture;   //!< The Texture-ID of opengl from this Texture.
   SDL_Surface* map; //!< The map SDL initializes for this element.
-  char* searchTextureInPaths(char* texName) const;
+  char* searchTextureInPaths(const char* texName) const;
   inline void swap(unsigned char &a, unsigned char &b);
  public:
   Texture(void);
+  Texture(const char* imageName);
   ~Texture(void);
   /** \returns The textureID of this texture.  */
@@ -79 +56 @@
   bool loadTexToGL (Image* pImage);
 
-  bool loadImage(char* imageName);
+  bool loadImage(const char* imageName);
 #ifndef HAVE_SDL_SDL_IMAGE_H