Changeset 10033 in orxonox.OLD for trunk/src/lib/graphics/importer

Timestamp:

Dec 7, 2006, 3:05:27 PM (18 years ago)

Author:

patrick

Message:

moved some of the importer sources, probably will need to rebuild the project

Location:

trunk/src/lib/graphics/importer

Files:

• Makefile.am (modified) (4 diffs)
• bsp (added)
• bsp/bsp_file.cc (moved) (moved from trunk/src/lib/graphics/importer/bsp_file.cc)
• bsp/bsp_file.h (moved) (moved from trunk/src/lib/graphics/importer/bsp_file.h)
• bsp/bsp_manager.cc (moved) (moved from trunk/src/lib/graphics/importer/bsp_manager.cc)
• bsp/bsp_manager.h (moved) (moved from trunk/src/lib/graphics/importer/bsp_manager.h)
• bsp/bsp_tree_leaf.cc (moved) (moved from trunk/src/lib/graphics/importer/bsp_tree_leaf.cc)
• bsp/bsp_tree_leaf.h (moved) (moved from trunk/src/lib/graphics/importer/bsp_tree_leaf.h)
• bsp/bsp_tree_node.cc (moved) (moved from trunk/src/lib/graphics/importer/bsp_tree_node.cc)
• bsp/bsp_tree_node.h (moved) (moved from trunk/src/lib/graphics/importer/bsp_tree_node.h)
• obj (added)
• obj/objModel.cc (moved) (moved from trunk/src/lib/graphics/importer/objModel.cc)
• obj/objModel.h (moved) (moved from trunk/src/lib/graphics/importer/objModel.h)
• resource_obj.h (modified) (1 diff)

trunk/src/lib/graphics/importer/Makefile.am

@@ -12 +12 @@
                 static_model.cc \
                 static_model_data.cc \
-                objModel.cc \
                 resource_obj.cc \
                 primitive_model.cc \
                 height_map.cc \
-                bsp_manager.cc \
-                bsp_file.cc \
-                bsp_tree_node.cc \
-                bsp_tree_leaf.cc \
                 \
                 material.cc \
@@ -29 +24 @@
                 movie_player.cc \
                 \
-                bsp_manager.cc \
-                bsp_file.cc \
-                bsp_tree_node.cc \
-                bsp_tree_leaf.cc \
+                obj/objModel.cc \
+                \
+                bsp/bsp_manager.cc \
+                bsp/bsp_file.cc \
+                bsp/bsp_tree_node.cc \
+                bsp/bsp_tree_leaf.cc \
                 \
                 md2/md2Model.cc \
@@ -60 +57 @@
                 static_model.h \
                 static_model_data.h \
-                objModel.h \
                 resource_obj.h \
                 primitive_model.h \
@@ -76 +72 @@
                 movie_player.h\
                 \
-                bsp_manager.h \
-                bsp_file.h \
-                bsp_tree_node.h \
-                bsp_tree_leaf.h \
+                bsp/bsp_manager.h \
+                bsp/bsp_file.h \
+                bsp/bsp_tree_node.h \
+                bsp/bsp_tree_leaf.h \
+                \
+                obj/objModel.h \
                 \
                 md2/md2Model.h \

trunk/src/lib/graphics/importer/resource_obj.h

@@ -9 +9 @@
 
 #include "util/loading/resource.h"
-#include "objModel.h"
+#include "obj/objModel.h"
 
 class ResourceOBJ : public StaticModel, public Resources::Resource