Changeset 10272 in orxonox.OLD for branches

Timestamp:

Jan 17, 2007, 6:16:08 PM (18 years ago)

Author:

gfilip

Message:

evrything finally solved

Location:

branches/camera/src

Files:

• story_entities/game_world.cc (modified) (1 diff)
• story_entities/game_world_data.cc (modified) (3 diffs)
• util/state.cc (modified) (3 diffs)
• util/state.h (modified) (3 diffs)
• world_entities/cameraman.cc (modified) (3 diffs)
• world_entities/cameraman.h (modified) (2 diffs)
• world_entities/test_entity.cc (modified) (3 diffs)

branches/camera/src/story_entities/game_world.cc

@@ -551 +551 @@
   State::getCamera()->apply ();
   State::getCamera()->project ();
-  //this->dataTank->localCamera->apply ();
-  //this->dataTank->localCamera->project ();
   GraphicsEngine::storeMatrices();
 }

branches/camera/src/story_entities/game_world_data.cc

@@ -30 +30 @@
 #include "player.h"
 #include "camera.h"
+#include "cameraman.h"
 #include "terrain.h"
 #include "skybox.h"
@@ -99 +100 @@
   PNode::getNullParent();
   Camera* localCamera = new Camera();
-  localCamera->setName ("GameWorld-Camera");
+    localCamera->setName ("GameWorld-Camera");
   State::setCamera(localCamera, localCamera->getTarget());
-
+  cameraman* camMan = new cameraman();
+  State::setCameraman(camMan);
   LightManager::getInstance();
 
@@ -332 +334 @@
   LoadParamXML(root, "GameRule", this, GameWorldData, loadGameRule);
 
-  LoadParam(root, "clip-region", State::getCamera(), Camera, setClipRegion);
+  LoadParam(root, "clip-region", State::getCameraman(), cameraman, setClipRegion);
 
 

branches/camera/src/util/state.cc

@@ -20 +20 @@
 
 #include "camera.h"
+#include "cameraman.h"
 
 #ifndef NULL
@@ -31 +32 @@
 Camera* State::camera = NULL;
 CameraTarget* State::cameraTarget = NULL;
+
+cameraman* State::CameraMan = NULL;
 
 PNode* State::cameraNode = NULL;
@@ -63 +66 @@
   State::cameraTargetNode = cameraTarget;
 }
+
+
+void State::setCameraman(cameraman* cm)
+
+{
+  State::CameraMan=cm;
+}

branches/camera/src/util/state.h

@@ -18 +18 @@
 class ObjectManager;
 class GameRules;
-
+class cameraman;
 class ScriptManager;
 
@@ -42 +42 @@
   /** @returns a Pointer to the CameraTarget */
   static inline PNode* getCameraTargetNode() { return State::cameraTargetNode; };
+
+
+
+  /////////////////////
+  /// CAMERAMANAGER ///
+  /////////////////////
+  /** @param cameraman the PNode to the CameraManager,*/
+  static void setCameraman(cameraman*);
+  static inline cameraman* getCameraman() { return State::CameraMan; };
+
 
   ////////////////
@@ -116 +126 @@
   static Camera*                camera;             //!< The current Camera.
   static CameraTarget*          cameraTarget;       //!< The Camera Target.
+  static cameraman*             CameraMan;
   static PNode*                 cameraNode;         //!< A reference to the camera
   static PNode*                 cameraTargetNode;   //!< A reference to the cameraTarget

branches/camera/src/world_entities/cameraman.cc

@@ -21 +21 @@
 #include "sound_engine.h"
 
+ObjectListDefinition(cameraman);
+
 
 cameraman::cameraman()
 {
+  this->registerObject(this, cameraman::_objectList);
+
+  this->nearClip = 1.0;
+  this->farClip = 1000.0;
+
   currentCam=State::getCamera();
   this->cameras.push_back(currentCam);
-  currentCam->target->detach();
   State::setCamera(currentCam, currentCam->getTarget());
+//   currentCam->setClipRegion(nearClip, farClip);
 }
 
@@ -36 +43 @@
   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;
+  cameras[cameras.size()-1]->setClipRegion(nearClip, farClip);
 
 }
@@ -97 +101 @@
 
 
+
+void cameraman::setClipRegion(float nearCli, float farCli)
+{
+  this->nearClip=nearCli;
+  this->farClip=farCli;
+
+  for(int i = 0; i < this->cameras.size(); i++)
+    cameras[i]->setClipRegion(nearCli, farCli);
+}
+
+
 void cameraman::jumpCurrCam(int x, int y, int z)
 {

branches/camera/src/world_entities/cameraman.h

@@ -5 +5 @@
 #include "camera.h"
 #include <vector>
+#include "base_object.h"
 
-class cameraman {
+class cameraman : public BaseObject {
+  ObjectListDeclaration(cameraman);
 
   private:
     Camera* currentCam;
-   // int camNo;
-
+    float nearClip;
+    float farClip;
 
 
@@ -28 +30 @@
     void changeSpeed(float speed);
     void testCam();
-
+    void setClipRegion(float nearClip, float farClip);
 
 

branches/camera/src/world_entities/test_entity.cc

@@ -23 +23 @@
 #include "test_entity.h"
 #include "debug.h"
-#include <iostream.h>
 #include "state.h"
 #include "shell_command.h"
@@ -80 +79 @@
 void TestEntity::test()
 {
-  CM= new cameraman();
+  CM= State::getCameraman();
   CM->createCam();
-  //CM->moveCurrCam(-300, 0, 0);
   CM->moveCam(-300, 0, 0, 0);
 }
@@ -100 +98 @@
 void TestEntity::t4()
 {
-  cout << CM->cameras[1]->getAbsCoorX() << endl <<CM->cameras[1]->getAbsCoorY() << endl <<CM->cameras[1]->getAbsCoorZ() << endl << CM->cameras[1]->target->getAbsCoorX() << endl;
-  CM->testCam();
-  cout << CM->cameras[1]->getAbsCoorX() << endl <<CM->cameras[1]->getAbsCoorY() << endl <<CM->cameras[1]->getAbsCoorZ() << endl << CM->cameras[1]->target->getAbsCoorX() << endl;
+
 }