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

Timestamp:

Jan 14, 2007, 9:35:08 PM (18 years ago)

Author:

gfilip

Message:

another update

File:

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

branches/camera/src/world_entities/camera.cc

@@ -22 +22 @@
 #include "shell_command.h"
 #include "targets.h"
-#include <iostream.h>
+
 
 
@@ -324 +324 @@
 void CameraTarget::detach()
 {
-  glLoadIdentity();
-
-//Movemet
-  State::getCameraNode()->setParentSoft(PNode::getNullParent());
-
-//LookAt
- // State::getCameraTargetNode()->setParentSoft(PNode::getNullParent());
+  State::getCameraNode()->setParentSoft(target);
+  State::getCameraTargetNode()->setParentSoft(target);
 }
 
@@ -344 +339 @@
   State::getCameraTargetNode()->setParentSoft(object);
 }
+
+
 
 
@@ -366 +363 @@
     glLoadIdentity();
     target->shiftCoor(speed*tmpVec.x, speed*tmpVec.y, speed*tmpVec.z);
-    // cout << "%%" << tmpVec.x << "%%";
 
   }
@@ -403 +399 @@
 void CameraTarget::test()
 {
-  glLoadIdentity();
+glLoadIdentity();
 
 atach(target);
 
-//tar->setRelCoorSoft(1000,1000,1000);
-
-
-  //Vector* vec=new Vector(5000,5000,5000);
-  //translateNow(vec);
-  //glMatrixMode (GL_MODELVIEW);
-  //glLoadIdentity();
-  //glTranslatef(100, 100, 100);
- // State::getCamera()->getTargetNode()->setRelCoor(100,100,100);
 }
 
@@ -422 +409 @@
 {
   trans(-200, 0, 0);
-  //target->setAbsCoor(target->getAbsCoorX()-200, target->getAbsCoorY(), target->getAbsCoorZ());
-}
-
-
+}
+
+