Changeset 7158 in orxonox.OLD

Timestamp:

Feb 18, 2006, 1:46:47 AM (18 years ago)

Author:

bensch

Message:

importer works again

Location:

trunk/src/subprojects

Files:

• framework.cc (modified) (3 diffs)
• importer/importer.cc (modified) (1 diff)

trunk/src/subprojects/framework.cc

@@ -31 +31 @@
 {
   // create parser
-
   char* configFileName = ResourceManager::homeDirCheck(DEFAULT_CONFIG_FILE);
 
@@ -90 +89 @@
 {
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+
   camera->apply();
   camera->project();
+
 
   this->moduleDraw();
@@ -105 +106 @@
   float dt = (float)(currFrame - lastFrame) / 1000.0;
   lastFrame = currFrame;
+  this->camera->tick(dt);
 
   this->moduleTick(dt);

trunk/src/subprojects/importer/importer.cc

@@ -62 +62 @@
     }
   }
-  else
+ // else
     obj = new PrimitiveModel(PRIM_CYLINDER);
 
-  obj = new VertexArrayModel(*obj);
 
   ResourceManager::getInstance()->debug();