Changeset 4178 in orxonox.OLD for orxonox/branches/physics/src/lib/graphics/importer/objModel.h

Timestamp:

May 13, 2005, 11:16:33 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged the Trunk into the physics Branche again:
merged with command:
svn merge ../trunk physics -r 3953:HEAD
no important conflicts

Location:

orxonox/branches/physics

Files:

• . (modified) (1 prop)
• src/lib/graphics/importer/objModel.h (modified) (1 diff)

orxonox/branches/physics

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+

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

@@ -15 +15 @@
   OBJModel(const char* fileName, float scaling = 1.0);
   virtual ~OBJModel();
-  void initializeOBJ(void);
 
  private:
   // Variables
   char* objPath;        //!< The Path where the obj and mtl-file are located.
-  char* objFileName;    //!< The Name of the obj-file.
-  char* mtlFileName;    //!< The Name of the mtl-file (parsed out of the obj-file)
 
   ///// readin /////
   bool importFile (const char* fileName);
-  bool readFromObjFile (void);
+  bool readFromObjFile (const char* fileName);
   bool readMtlLib (const char* matFile);
 };

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+