Changeset 10473 in orxonox.OLD for trunk

Timestamp:

Jan 29, 2007, 12:55:48 AM (18 years ago)

Author:

patrick

Message:

more cameara bugs fixed

Location:

trunk/src

Files:

• story_entities/game_world.cc (modified) (2 diffs)
• world_entities/cameraman.cc (modified) (1 diff)
• world_entities/cameraman.h (modified) (1 diff)
• world_entities/effects/billboard.cc (modified) (2 diffs)
• world_entities/planet.cc (modified) (1 diff)
• world_entities/planet.h (modified) (1 diff)

trunk/src/story_entities/game_world.cc

@@ -452 +452 @@
 
     // tick camera first
-    State::getCamera()->tick(this->dtS);
+    CameraMan* man = State::getCameraman();
+    (man->getCurrentCam())->tick(this->dtS);
     // TICK everything
     for (i = 0; i < this->dataTank->tickLists.size(); ++i)
@@ -587 +588 @@
 void GameWorld::applyCameraSettings()
 {
-
-  State::getCamera()->apply ();
-  State::getCamera()->project ();
+  CameraMan* man = State::getCameraman();
+  man->getCurrentCam()->apply ();
+  man->getCurrentCam()->project ();
   GraphicsEngine::storeMatrices();
 }

trunk/src/world_entities/cameraman.cc

@@ -1 @@
-/*
+  /*
    orxonox - the future of 3D-vertical-scrollers
 

trunk/src/world_entities/cameraman.h

@@ -53 +53 @@
     float getCurrCameraCoorY();
     float getCurrCameraCoorZ();
-    const Camera* getCurrentCam() { return this->currentCam; }
+    const Camera* getCurrentCam() const { return this->currentCam; }
+    Camera* getCurrentCam() { return this->currentCam; }
     bool cameraIsInVector(Camera* camera);
 

trunk/src/world_entities/effects/billboard.cc

@@ -22 +22 @@
 #include "glincl.h"
 #include "state.h"
-
+#include "cameraman.h"
+#include "camera.h"
 
 #include "debug.h"
@@ -133 +134 @@
   this->material->select();
 
-  const PNode* camera = State::getCameraNode();  //!< @todo MUST be different
+  const CameraMan* man = State::getCameraman();
+  const Camera* camera = man->getCurrentCam(); //!< @todo MUST be different
   Vector cameraPos = camera->getAbsCoor();
-  Vector cameraTargetPos = State::getCameraTargetNode()->getAbsCoor();
+  Vector cameraTargetPos = camera->getAbsCoor();
   Vector view = cameraTargetPos - cameraPos;
   Vector up = Vector(0, 1, 0);

trunk/src/world_entities/planet.cc

@@ -58 +58 @@
   PrimitiveModel* model = new PrimitiveModel(PRIM_SPHERE, this->size, 50);
   this->setModel(model);
-
-  this->cloudModel = new PrimitiveModel(PRIM_SPHERE, this->size + 1, 50);
 }
 

trunk/src/world_entities/planet.h

@@ -44 +44 @@
 
   Model*          cloudModel;      //!< the model for the cloud
-  Billboard*      halo;            //!< halo around the planet
 
   bool            bClouds;         //!< true if there are clouds defined