Changeset 2848 in orxonox.OLD

Timestamp:

Nov 13, 2004, 12:49:28 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk/importer: delete [] array only if finalized. Typo.

Location:

orxonox/trunk/importer

Files:

• array.cc (modified) (1 diff)
• framework.cc (modified) (3 diffs)
• object.cc (modified) (1 diff)

orxonox/trunk/importer/array.cc

@@ -40 +40 @@
       delete last;
     }
-  delete [] array;
+  if (finalized)
+    delete [] array;
 }
 

orxonox/trunk/importer/framework.cc

@@ -5 +5 @@
 WindowHandler wHandler;  // Create an instance of the whandler basecode class
 Object* obj;
+Object* obj2;
+Object* obj3;
 float rotator = 0.0;
   GLfloat whiteLight[] = {1.0, 1.0, 0.0,1.0};
@@ -50 +52 @@
   else if (argc>=2)
     obj = new Object(argv[1]);
-  else obj = new Object();
+  else 
+    obj = new Object();
+
   GLfloat lmodelAmbient[] = {.1, .1, .1, 1.0};
   glLightfv(GL_LIGHT0, GL_DIFFUSE, whiteLight);
@@ -89 +93 @@
 
   // Kill the GL & SDL screens
+  delete obj;
   wHandler.KillGLWindow();
   // And quit

orxonox/trunk/importer/object.cc

@@ -194 +194 @@
       }
 
-      // case vt
+      // case VertexTextureCoordinate
       else if (!strncmp(Buffer, "vt ", 2))
       {
         readVertexTexture(Buffer+3);
       }
+      // case group
+      else if (!strncmp(Buffer, "g", 1))
+        {
+          printf("ERROR GROUPS NOT IMPLEMENTED YET\n");
+        }
     }
   OBJ_FILE->close();