Changeset 6310 in orxonox.OLD for trunk/src/subprojects

Timestamp:

Dec 27, 2005, 12:24:27 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the VertexArrayModel from heightmap and added some simple importer facility.

Location:

trunk/src/subprojects/importer

Files:

• Makefile.am (modified) (2 diffs)
• importer.cc (modified) (2 diffs)

trunk/src/subprojects/importer/Makefile.am

@@ -10 +10 @@
 
 importer_LDADD = $(MAINSRCDIR)/lib/event/libORXevent.a \
-                 $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
+                 $(MAINSRCDIR)/lib/parser/tinyxml/libtinyxml.a \
                  $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \
                  $(MAINSRCDIR)/lib/shell/libORXshell.a \
-                 $(MAINSRCDIR)/lib/sound/libORXsound.a \
-                 $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a
+                $(MAINSRCDIR)/lib/sound/libORXsound.a \
+                $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a
 
 importer_SOURCES= ../framework.cc \
                   importer.cc \
+                  tc.cc \
                   $(MAINSRCDIR)/util/state.cc \
                   $(MAINSRCDIR)/world_entities/camera.cc \
@@ -36 +37 @@
 
 
+
 multitex_LDADD = $(MAINSRCDIR)/lib/event/libORXevent.a \
-                 $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
+                 $(MAINSRCDIR)/lib/parser/tinyxml/libtinyxml.a \
                  $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \
                  $(MAINSRCDIR)/lib/shell/libORXshell.a \

trunk/src/subprojects/importer/importer.cc

@@ -24 +24 @@
 #include "primitive_model.h"
 #include <stdlib.h>
+
+#include "vertex_array_model.h"
 
 #include "resource_manager.h"
@@ -63 +65 @@
     obj = new PrimitiveModel(PRIM_CYLINDER);
 
+  obj = new VertexArrayModel(*obj);
+
   ResourceManager::getInstance()->debug();