Changeset 3120 in orxonox.OLD for orxonox/branches/images

Timestamp:

Dec 7, 2004, 12:34:57 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/images: efficiency fixes

Location:

orxonox/branches/images/importer

Files:

• framework.cc (modified) (1 diff)
• material.cc (modified) (1 diff)
• object.cc (modified) (10 diffs)

orxonox/branches/images/importer/framework.cc

@@ -1 +1 @@
 #include "framework.h"
 
-int verbose = 2;
+int verbose = 4;
 
 void DrawGLScene()

orxonox/branches/images/importer/material.cc

@@ -387 +387 @@
     {
       printf("IMG_Load: %s\n", IMG_GetError());
+      return false;
     }
   pImage->height = map->h;

orxonox/branches/images/importer/object.cc

@@ -219 +219 @@
   if (verbose >= 2)
     printf("Adding new Group\n");
-  group->name = "";
+  group->name = NULL;
   group->faceMode = -1;
   group->faceCount = 0;  
@@ -370 +370 @@
 {
   char* fileName = new char [strlen(objPath)+strlen(objFileName)+1];
-  fileName[0]='\0';
   if (objFileName != NULL && !strcmp(objFileName, ""))
     return false;
-  strcat(fileName, objPath);
+  strcpy(fileName, objPath);
   strcat(fileName, objFileName);
 
@@ -381 +380 @@
       if (verbose >=1)
         printf ("unable to open .OBJ file: %s\n Loading Box Object instead.\n", fileName);
-      exit(0);
       BoxObject();
+      delete []fileName;
       return false;
     }
@@ -440 +439 @@
     }
   OBJ_FILE->close();
+  delete []fileName;
   return true;
 
@@ -452 +452 @@
 bool Object::readGroup (char* groupString)
 {
+  if (verbose >=3)
+    printf ("Read Group: %s.\n", groupString);
   // setting the group name if not default.
   if (strcmp(currentGroup->name, "default"))
@@ -464 +466 @@
       initGroup(currentGroup);
     }
-
   ++groupCount;
 
@@ -593 +594 @@
   strcpy(mtlFileName, mtlFile);
   char* fileName = new char [strlen(objPath) + strlen(mtlFileName)+1];
-  fileName[0] = '\0';
-  strcat(fileName, objPath);
+  strcpy(fileName, objPath);
   strcat(fileName, mtlFileName);
   
@@ -606 +606 @@
       if (verbose >= 1)
         printf ("unable to open file: %s\n", fileName);
+      delete []fileName;
       return false;
     }
@@ -678 +679 @@
 
     }
+  delete []fileName;
   return true;
 }
@@ -687 +689 @@
 bool Object::readUseMtl (char* matString)
 {
-  if (!strcmp (mtlFileName, ""))
+  if (mtlFileName)
     {
       if (verbose >= 1)