Changeset 7158 in orxonox.OLD for trunk/src/subprojects
- Timestamp:
- Feb 18, 2006, 1:46:47 AM (19 years ago)
- Location:
- trunk/src/subprojects
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/subprojects/framework.cc
r7157 r7158 31 31 { 32 32 // create parser 33 34 33 char* configFileName = ResourceManager::homeDirCheck(DEFAULT_CONFIG_FILE); 35 34 … … 90 89 { 91 90 glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); 91 92 92 camera->apply(); 93 93 camera->project(); 94 94 95 95 96 this->moduleDraw(); … … 105 106 float dt = (float)(currFrame - lastFrame) / 1000.0; 106 107 lastFrame = currFrame; 108 this->camera->tick(dt); 107 109 108 110 this->moduleTick(dt); -
trunk/src/subprojects/importer/importer.cc
r7157 r7158 62 62 } 63 63 } 64 else64 // else 65 65 obj = new PrimitiveModel(PRIM_CYLINDER); 66 66 67 obj = new VertexArrayModel(*obj);68 67 69 68 ResourceManager::getInstance()->debug();
Note: See TracChangeset
for help on using the changeset viewer.