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

Timestamp:

Mar 7, 2006, 5:05:50 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: new style for resources (prework/movement)

Location:

trunk/src/lib/graphics/importer

Files:

• height_map.cc (modified) (1 diff)
• material.cc (modified) (1 diff)
• md2Model.cc (modified) (1 diff)
• media_container.cc (modified) (1 diff)
• model.h (modified) (2 diffs)
• movie_player.cc (modified) (1 diff)

trunk/src/lib/graphics/importer/height_map.cc

@@ -20 +20 @@
 #include "p_node.h"
 #include "state.h"
-#include "resource_manager.h"
+#include "util/loading/resource_manager.h"
 #include "debug.h"
 

trunk/src/lib/graphics/importer/material.cc

@@ -21 +21 @@
 #include "texture.h"
 #include "debug.h"
-#include "resource_manager.h"
+#include "util/loading/resource_manager.h"
 #include <stdlib.h>
 #include <string.h>
 
 //! @todo check if we are in RESOURCE MANAGER-mode
-#include "resource_manager.h"
+#include "util/loading/resource_manager.h"
 
 using namespace std;

trunk/src/lib/graphics/importer/md2Model.cc

@@ -19 +19 @@
 
 #include "debug.h"
-#include "resource_manager.h"
+#include "util/loading/resource_manager.h"
 
 

trunk/src/lib/graphics/importer/media_container.cc

@@ -25 +25 @@
 #include "media_container.h"
 
-#include "resource_manager.h"
+#include "util/loading/resource_manager.h"
 
 /* header for debug output */

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

@@ -46 +46 @@
   unsigned int     numTexCoor;           //!< how many Texture Coordinates in the Model
 
-  const float*     pVertices;            //!< array of the Vertives
+  const float*     pVertices;            //!< array of the Vertices
   sTriangleExt*    pTriangles;           //!< array of all triangles
   const float*     pNormals;             //!< array of the Normals
@@ -55 +55 @@
 
 //! This class defines the basic components of a model
-class Model : public BaseObject {
+class Model : virtual public BaseObject {
 
   public:

trunk/src/lib/graphics/importer/movie_player.cc

@@ -25 +25 @@
 #include "movie_player.h"
 
-#include "resource_manager.h"
+#include "util/loading/resource_manager.h"
 
 // header for debug output