Changeset 10238 in orxonox.OLD for branches/camera/src/world_entities/camera.cc

Timestamp:

Jan 16, 2007, 7:55:24 PM (18 years ago)

Author:

gfilip

Message:

black camera

File:

• branches/camera/src/world_entities/camera.cc (modified) (7 diffs)

branches/camera/src/world_entities/camera.cc

@@ -19 +19 @@
 #include "glincl.h"
 #include "vector.h"
-#include "state.h"
 #include "shell_command.h"
 #include "targets.h"
@@ -37 +36 @@
   this->setName("camera");
   this->target = new CameraTarget();
-
+  this->target->masta=this;
   this->subscribeEvent(ES_GAME, KeyMapper::PEV_VIEW0);
   this->subscribeEvent(ES_GAME, KeyMapper::PEV_VIEW1);
@@ -318 +317 @@
   rotateBy.z=0;
   target=createStick();
-
 }
 
@@ -324 +322 @@
 void CameraTarget::detach()
 {
-  State::getCameraNode()->setParentSoft(target);
-  State::getCameraTargetNode()->setParentSoft(target);
+  masta->setParentSoft(target);
+  masta->getTargetNode()->setParentSoft(target);
 }
 
@@ -336 +334 @@
 void CameraTarget::atach(PNode* object)
 {
-  State::getCameraNode()->setParentSoft(object);
-  State::getCameraTargetNode()->setParentSoft(object);
-}
-
-
-
-
-Vector CameraTarget::iterate(float dt, const Vector* target, const Vector* cam)
+  masta->setParentSoft(object);
+  masta->getTargetNode()->setParentSoft(object);
+}
+
+
+
+
+Vector CameraTarget::iterate(float dt, const Vector* Target, const Vector* cam)
 {
 
 
   Vector tmpVec;
-  tmpVec= (*target - *cam);
+  tmpVec= (*Target - *cam);
   tmpVec.normalize();
   return  tmpVec;
@@ -360 +358 @@
  {
 
-   Vector tmpVec= iterate(dt,  &translateTo,  &(State::getCameraNode()->getAbsCoor()));
+   Vector tmpVec= iterate(dt,  &translateTo,  &(masta->getAbsCoor()));
     glLoadIdentity();
     target->shiftCoor(speed*tmpVec.x, speed*tmpVec.y, speed*tmpVec.z);
@@ -399 +397 @@
 void CameraTarget::test()
 {
-glLoadIdentity();
-
-atach(target);
-
+  atach(target);
 }