Changeset 3064 in orxonox.OLD for orxonox/trunk/importer

Timestamp:

Dec 3, 2004, 2:29:34 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk/importer: imports again. Materials are still missing

Location:

orxonox/trunk/importer

Files:

• array.cc (modified) (1 diff)
• object.cc (modified) (11 diffs)

orxonox/trunk/importer/array.cc

@@ -67 +67 @@
 {
   if (verbose >= 3)
-    printf ("Finalizing array.\n");  
+    printf ("Finalizing array. Length: %i\n", entryCount);  
   if ((array = (GLfloat*)malloc( entryCount* sizeof(GLfloat))) == NULL)
   //  if ((array = new GLfloat [entryCount]) == NULL)

orxonox/trunk/importer/object.cc

@@ -27 +27 @@
   BoxObject();
 
+  importToGL ();
+
   finalize();
 }
@@ -39 +41 @@
 
   importFile (fileName);
+
+  importToGL ();
 
   finalize();
@@ -54 +58 @@
 
   importFile (fileName);
+
+  importToGL ();
 
   finalize();
@@ -124 +130 @@
   finalizeGroup (currentGroup);
 
-  importToGL ();
-
   if (vertices != NULL)
     delete vertices;
@@ -135 +139 @@
   if (material != NULL)
     delete material;
-  return true;
+  return true; 
 }
 
@@ -247 +251 @@
 bool Object::finalizeGroup(Group* group) // think it is not needed anymore
 {
-  if (verbose >=2)
-    printf ("Finalize group %s.\n", group->name);
+  //  if (verbose >=2)
+  //    printf ("Finalize group %s.\n", group->name);
 
 }
@@ -362 +366 @@
       tmpElem->next = NULL;
 
-      char* tmpValue = new char [50];
+      char tmpValue [50];
       sscanf (faceString, "%s", tmpValue);
       tmpElem->value = new char [strlen(tmpValue)];
       strcpy (tmpElem->value, tmpValue);
 
-      delete tmpValue; ////// DANGEROUS could be wrong to do this (useless) /////
       faceString += strlen(tmpElem->value);
       if (strcmp (faceString, "\0"))
@@ -389 +392 @@
 {
   if (verbose >=3)
-    printf ("importing grafical Element to openGL\n");
+    printf ("importing grafical Element to openGL: %s\n", elementString);
   char* vertex = elementString;
 
@@ -457 +460 @@
   if (strcmp(currentGroup->name, "default"))
     {
-      currentGroup->name = (char*) malloc ( strlen(groupString) * sizeof (char));
+      currentGroup->name = new char [strlen(groupString)];
       strcpy(currentGroup->name, groupString);
     }
@@ -463 +466 @@
     {
       Group* newGroup = new Group;
-      finalizeGroup(currentGroup);
+      //      finalizeGroup(currentGroup);
       currentGroup->next = newGroup;
       initGroup(newGroup);
@@ -557 +560 @@
               delElem = tmpElem;
               tmpElem = tmpElem->next;
-              delete delElem;
+              //              delete delElem;
             }
           tmpFace = tmpFace->next;