Changeset 10259 in orxonox.OLD for branches/camera

Timestamp:

Jan 17, 2007, 3:46:05 PM (18 years ago)

Author:

gfilip

Message:

the skybox problem

Location:

branches/camera/src

Files:

• story_entities/game_world_data.cc (modified) (6 diffs)
• story_entities/game_world_data.h (modified) (1 diff)
• story_entities/menu/game_menu.cc (modified) (2 diffs)
• world_entities/cameraman.cc (modified) (3 diffs)
• world_entities/skybox.cc (modified) (2 diffs)
• world_entities/skybox.h (modified) (1 diff)
• world_entities/test_entity.cc (modified) (1 diff)

branches/camera/src/story_entities/game_world_data.cc

@@ -70 +70 @@
   this->glmis = NULL;
 
-  this->localCamera = NULL;
+
   this->localPlayer = NULL;
   this->sky = NULL;
@@ -98 +98 @@
 
   PNode::getNullParent();
-  this->localCamera = new Camera();
-  this->localCamera->setName ("GameWorld-Camera");
-  State::setCamera(this->localCamera, this->localCamera->getTarget());
+  Camera* localCamera = new Camera();
+  localCamera->setName ("GameWorld-Camera");
+  State::setCamera(localCamera, localCamera->getTarget());
 
   LightManager::getInstance();
@@ -232 +232 @@
   State::setPlayer(this->localPlayer);
 
-  Playable* playable;
   if (!Playable::objectList().empty())
   {
@@ -284 +283 @@
   State::setPlayer(NULL);
   this->localPlayer = NULL;
-  this->localCamera = NULL;
   State::setCamera(NULL, NULL);
   this->sky = NULL;
@@ -334 +332 @@
   LoadParamXML(root, "GameRule", this, GameWorldData, loadGameRule);
 
-  LoadParam(root, "clip-region", this->localCamera, Camera, setClipRegion);
+  LoadParam(root, "clip-region", State::getCamera(), Camera, setClipRegion);
 
 
@@ -340 +338 @@
   //LoadParamXML(root, "PhysicsEngine", PhysicsEngine::getInstance(), PhysicsEngine, loadParams);
 
-  if( this->sky != NULL)
-    this->localCamera->addChild(this->sky);
-  OrxSound::SoundEngine::getInstance()->setListener(this->localCamera);
+
+  OrxSound::SoundEngine::getInstance()->setListener(State::getCamera());
 
   return ErrorMessage();

branches/camera/src/story_entities/game_world_data.h

@@ -56 +56 @@
     GLMenuImageScreen*            glmis;          //!< The Level-Loader Display
 
-    Camera*                       localCamera;    //!< The current camera
+
     Player*                       localPlayer;    //!< The player, you fly through the level.
     WorldEntity*                  sky;            //!< The environmental sky of orxonox

branches/camera/src/story_entities/menu/game_menu.cc

@@ -110 +110 @@
   this->subscribeEvent(ES_MENU, SDLK_ESCAPE);
 
-  this->dataTank->localCamera->setRelCoor(this->cameraVector);
+  State::getCamera()->setRelCoor(this->cameraVector);
 
   GraphicsEngine::getInstance()->displayFPS(false);
@@ -390 +390 @@
   Quaternion q(/*0.00005*/ dt * .1, Vector(0.0, 1.0, 0.0));
   this->cameraVector = q.apply(this->cameraVector);
-  this->dataTank->localCamera->setRelCoor(this->cameraVector);
-  this->dataTank->localCamera->getTarget()->setRelCoorSoft(0,0,0);
+  State::getCamera()->setRelCoor(this->cameraVector);
+  State::getCamera()->getTarget()->setRelCoorSoft(0,0,0);
 }
 

branches/camera/src/world_entities/cameraman.cc

@@ -19 +19 @@
 #include "state.h"
 #include "iostream.h"
-
+#include "sound_engine.h"
 
 
@@ -36 +36 @@
   this->cameras.push_back(new Camera());
   cameras[cameras.size()-1]->target->detach();
+
+
+
   cout << cameras[1]->getAbsCoorX() << "," << cameras[1]->getAbsCoorY() << "," << cameras[1]->getAbsCoorZ() << endl << cameras[1]->target->getAbsCoorX() << endl;
 
@@ -46 +49 @@
   currentCam=cameras[cameraNo];
   State::setCamera(currentCam, currentCam->getTarget());
+  OrxSound::SoundEngine::getInstance()->setListener(currentCam);
+
   }
 

branches/camera/src/world_entities/skybox.cc

@@ -30 +30 @@
 
 #include "debug.h"
+
+#include "state.h"
+#include "playable.h"
+#include "player.h"
 
 #include "class_id_DEPRECATED.h"
@@ -220 +224 @@
 {
   this->size = size;
+}
+
+
+
+void SkyBox::tick(float dt)
+{
+  PRINTF(0)("tick\n");
+
+  Player* pl = State::getPlayer();
+  if( pl == NULL)
+    return;
+
+  Playable* playable = pl->getPlayable();
+  if( playable == NULL)
+    return;
+
+  if( this->getParent() != playable)
+    this->setParent( playable);
 }
 

branches/camera/src/world_entities/skybox.h

@@ -42 +42 @@
 
   virtual void draw();
+  virtual void tick(float dt);
 
   void setSize(float size);

branches/camera/src/world_entities/test_entity.cc

@@ -88 +88 @@
 void TestEntity::t2()
 {
-  CM->moveCurrCam(+600, 0, 0);
+  CM->moveCurrCam(0, -150, 0);
 
 }