Changeset 3542 in orxonox.OLD for orxonox/branches/levelloader/src/lib

Timestamp:

Mar 14, 2005, 9:58:58 AM (20 years ago)

Author:

chris

Message:

orxonox/branches/levelloader: First incarnation of a debugworld loaded from a XML-File in place, compilability in place, all necessary basic loading constuctors in place. Unfortunately the code still generates interferences with the old hardcoded debugworld resulting in SegFault crash.

Location:

orxonox/branches/levelloader/src/lib/graphics/importer

Files:

• objModel.cc (modified) (5 diffs)
• objModel.h (modified) (2 diffs)

orxonox/branches/levelloader/src/lib/graphics/importer/objModel.cc

@@ -24 +24 @@
    \param fileName file to parse and load (must be a .obj file)
 */
-OBJModel::OBJModel(char* fileName)
+OBJModel::OBJModel(const char* fileName)
 {
   this->initializeOBJ();
@@ -40 +40 @@
    \param scaling The factor that the model will be scaled with.
 */
-OBJModel::OBJModel(char* fileName, float scaling)
+OBJModel::OBJModel(const char* fileName, float scaling)
 {
   this->initializeOBJ();
@@ -84 +84 @@
    \param fileName The file to import
 */
-bool OBJModel::importFile (char* fileName)
+bool OBJModel::importFile (const char* fileName)
 {
   PRINTF(3)("preparing to read in file: %s\n", fileName);
@@ -96 +96 @@
   char pathSplitter='/';
 #endif /* __WIN32__ */
-  char* tmpName = fileName;
+  const char* tmpName = fileName;
   if (tmpName[0] == pathSplitter)
     tmpName++;
-  char* name = tmpName;
+  const char* name = tmpName;
   while (( tmpName = strchr (tmpName+1, pathSplitter)))
     {
@@ -212 +212 @@
 
 */
-bool OBJModel::readMtlLib (char* mtlFile)
+bool OBJModel::readMtlLib (const char* mtlFile)
 {
   this->mtlFileName = new char [strlen(mtlFile)+1];

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

@@ -13 +13 @@
 {
  public:
-  OBJModel(char* fileName);
-  OBJModel(char* fileName, float scaling);
+  OBJModel(const char* fileName);
+  OBJModel(const char* fileName, float scaling);
   virtual ~OBJModel();
   void initializeOBJ(void);
@@ -25 +25 @@
 
   ///// readin /////
-  bool importFile (char* fileName);
+  bool importFile (const char* fileName);
   bool readFromObjFile (void);
-  bool readMtlLib (char* matFile);
+  bool readMtlLib (const char* matFile);
 
 };