Changeset 7157 in orxonox.OLD

Timestamp:

Feb 16, 2006, 3:34:01 PM (18 years ago)

Author:

bensch

Message:

sync

Location:

trunk/src/subprojects

Files:

• collision_detection/collision_detection.cc (modified) (4 diffs)
• collision_detection/collision_test_entity.cc (modified) (1 diff)
• collision_detection/collision_test_entity.h (modified) (1 diff)
• framework.cc (modified) (1 diff)
• importer/importer.cc (modified) (1 diff)

trunk/src/subprojects/collision_detection/collision_detection.cc

@@ -31 +31 @@
 
 #include "graphics_engine.h"
+
+#include "state.h"
 
 Model* mod;
@@ -53 +55 @@
   CDEngine::getInstance();
 
+  State::setObjectManager(new ObjectManager);
   /* Primitive Data Test */
 //   sVec3D* data = new sVec3D[6];
@@ -92 +95 @@
 //   entityList->add(b);
 
-  CDEngine::getInstance()->setEntityList(entityList);
+  //CDEngine::getInstance()->setEntityList(entityList);
 
   LightManager* lightMan = LightManager::getInstance();
@@ -229 +232 @@
 {
 
-  CDEngine::getInstance()->checkCollisions();
+  //CDEngine::getInstance()->checkCollisions();
 
 

trunk/src/subprojects/collision_detection/collision_test_entity.cc

@@ -82 +82 @@
 
 
-/**
- *  draws the CollisionTestEntity
-*/
-void CollisionTestEntity::draw ()
-{
-  glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
-  float matrix[4][4];
-
-  glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
-  //rotate
-  this->getAbsDir().matrix (matrix);
-  glMultMatrixf((float*)matrix);
-
-  this->model->draw();
-
-  glPopMatrix();
-}
-

trunk/src/subprojects/collision_detection/collision_test_entity.h

@@ -30 +30 @@
   virtual void tick (float time);
 
-  virtual void draw ();
-
 };
 

trunk/src/subprojects/framework.cc

@@ -90 +90 @@
 {
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
-  glLoadIdentity(); // Reset the view
+  camera->apply();
+  camera->project();
 
   this->moduleDraw();
 
-  camera->apply();
 
   SDL_GL_SwapBuffers(); // Swap the buffers

trunk/src/subprojects/importer/importer.cc

@@ -95 +95 @@
 void Framework::moduleDraw(void) const
 {
+  LightManager::getInstance()->draw();
   obj->draw();
 
-  LightManager::getInstance()->draw();
 }