Changeset 3211 in orxonox.OLD for orxonox

Timestamp:

Dec 18, 2004, 12:56:24 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk/src/importer: reload-tester, unload on x reload on c.

File:

• orxonox/trunk/src/importer/framework.cc (modified) (3 diffs)

orxonox/trunk/src/importer/framework.cc

@@ -40 +40 @@
   //  glRotatef (180, dir.x, dir.y, dir.z);
   glMultMatrixf (*matQ);
-  obj->draw();
+  if (obj)
+    obj->draw();
 
   glPopMatrix();
@@ -203 +204 @@
             }
         break;
+
+
+      case SDL_KEYDOWN:
+        switch (event.key.keysym.sym)
+          {
+          case SDLK_x:
+            delete obj;
+            obj = NULL;
+            break;
+          case SDLK_c:
+            if (!obj)
+              obj = new Object(argv[1]);
+            break;
+          }
+        break;
             
         // If a quit event was recieved
@@ -224 +240 @@
 
   // Kill the GL & SDL screens
-  delete obj;
+  if (obj)
+    delete obj;
   wHandler.KillGLWindow();
   // And quit