Changeset 3916 in orxonox.OLD for orxonox/trunk/src/lib/graphics/importer/objModel.cc

Timestamp:

Apr 21, 2005, 3:07:36 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: prepare for VertexArrays

File:

• orxonox/trunk/src/lib/graphics/importer/objModel.cc (modified) (4 diffs)

orxonox/trunk/src/lib/graphics/importer/objModel.cc

@@ -32 +32 @@
    \param scaling The factor that the model will be scaled with.
 */
-OBJModel::OBJModel(char* fileName, float scaling)
+OBJModel::OBJModel(const char* fileName, float scaling) : Model(fileName)
 {
   this->initializeOBJ();
@@ -72 +72 @@
    \param fileName The file to import
 */
-bool OBJModel::importFile (char* fileName)
+bool OBJModel::importFile (const char* fileName)
 {
   PRINTF(4)("preparing to read in file: %s\n", fileName);
@@ -84 +84 @@
   char pathSplitter='/';
 #endif /* __WIN32__ */
-  char* tmpName = fileName;
+  char* tmpName;
+  strcpy(tmpName, fileName);
   if (tmpName[0] == pathSplitter)
     tmpName++;
@@ -191 +192 @@
 
 */
-bool OBJModel::readMtlLib (char* mtlFile)
+bool OBJModel::readMtlLib (const char* mtlFile)
 {
   this->mtlFileName = new char [strlen(mtlFile)+1];