Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7157 in orxonox.OLD for trunk/src/subprojects


Ignore:
Timestamp:
Feb 16, 2006, 3:34:01 PM (19 years ago)
Author:
bensch
Message:

sync

Location:
trunk/src/subprojects
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/subprojects/collision_detection/collision_detection.cc

    r7156 r7157  
    3131
    3232#include "graphics_engine.h"
     33
     34#include "state.h"
    3335
    3436Model* mod;
     
    5355  CDEngine::getInstance();
    5456
     57  State::setObjectManager(new ObjectManager);
    5558  /* Primitive Data Test */
    5659//   sVec3D* data = new sVec3D[6];
     
    9295//   entityList->add(b);
    9396
    94   CDEngine::getInstance()->setEntityList(entityList);
     97  //CDEngine::getInstance()->setEntityList(entityList);
    9598
    9699  LightManager* lightMan = LightManager::getInstance();
     
    229232{
    230233
    231   CDEngine::getInstance()->checkCollisions();
     234  //CDEngine::getInstance()->checkCollisions();
    232235
    233236
  • trunk/src/subprojects/collision_detection/collision_test_entity.cc

    r6512 r7157  
    8282
    8383
    84 /**
    85  *  draws the CollisionTestEntity
    86 */
    87 void CollisionTestEntity::draw ()
    88 {
    89   glMatrixMode(GL_MODELVIEW);
    90   glPushMatrix();
    91   float matrix[4][4];
    92 
    93   glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
    94   //rotate
    95   this->getAbsDir().matrix (matrix);
    96   glMultMatrixf((float*)matrix);
    97 
    98   this->model->draw();
    99 
    100   glPopMatrix();
    101 }
    102 
  • trunk/src/subprojects/collision_detection/collision_test_entity.h

    r6512 r7157  
    3030  virtual void tick (float time);
    3131
    32   virtual void draw ();
    33 
    3432};
    3533
  • trunk/src/subprojects/framework.cc

    r6074 r7157  
    9090{
    9191  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
    92   glLoadIdentity(); // Reset the view
     92  camera->apply();
     93  camera->project();
    9394
    9495  this->moduleDraw();
    9596
    96   camera->apply();
    9797
    9898  SDL_GL_SwapBuffers(); // Swap the buffers
  • trunk/src/subprojects/importer/importer.cc

    r6310 r7157  
    9595void Framework::moduleDraw(void) const
    9696{
     97  LightManager::getInstance()->draw();
    9798  obj->draw();
    9899
    99   LightManager::getInstance()->draw();
    100100}
    101101
Note: See TracChangeset for help on using the changeset viewer.