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

Timestamp:

Jan 10, 2007, 1:18:46 PM (17 years ago)

Author:

gfilip

Message:

next update

File:

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

branches/camera/src/world_entities/camera.cc

@@ -75 +75 @@
 {
   return (PNode*)this->target;
+}
+
+void Camera::setTargetNode(PNode* target)
+{
+  this->target->setParent(target);
 }
 
@@ -157 +162 @@
 
   //iterate(float dt, translate, target)
-  target->translate( 1,dt);
+  target->translate(dt);
 }
 
@@ -353 +358 @@
 
 
-void CameraTarget::translate(float speed, float dt)
+void CameraTarget::translate(float dt)
 {
   if (fabs(translateTo.len()  - (target->getAbsCoor()).len()) >= 11 )
@@ -360 +365 @@
    Vector tmpVec= iterate(dt,  &translateTo,  &(State::getCameraNode()->getAbsCoor()));
     glLoadIdentity();
-    target->shiftCoor(tmpVec.x, tmpVec.y, tmpVec.z);
+    target->shiftCoor(speed*tmpVec.x, speed*tmpVec.y, speed*tmpVec.z);
     // cout << "%%" << tmpVec.x << "%%";
 
@@ -371 +376 @@
 }
 
-void CameraTarget::jump(Vector* newPos)
-{
-//target->setAbsCoor(newPos);
+void CameraTarget::jump(Vector newPos)
+{
+target->setAbsCoor(newPos);
 }