Changeset 10128 in orxonox.OLD

Timestamp:

Dec 20, 2006, 4:34:00 PM (17 years ago)

Author:

gfilip

Message:

finally

Location:

branches/camera/src/world_entities

Files:

• camera.cc (modified) (8 diffs)
• camera.h (modified) (1 diff)

branches/camera/src/world_entities/camera.cc

@@ -22 +22 @@
 #include "shell_command.h"
 #include "targets.h"
+#include <iostream.h>
+
 
 ObjectListDefinition(Camera);
@@ -291 +293 @@
 SHELL_COMMAND(det, CameraTarget, detach);
 SHELL_COMMAND(tes, CameraTarget, test);
-
+SHELL_COMMAND(tr, CameraTarget,trans);
+SHELL_COMMAND(t2, CameraTarget,test2);
 
 
@@ -308 +311 @@
   rotateBy.y=0;
   rotateBy.z=0;
-  //target=State::getCamera()->getTargetNode();
+  target=createStick();
 
 }
@@ -323 +326 @@
  // State::getCameraTargetNode()->setParentSoft(PNode::getNullParent());
 }
+
+PNode* CameraTarget::createStick()
+{
+  return new Targets();
+}
+
 
 void CameraTarget::atach(PNode* object)
@@ -345 +354 @@
 void CameraTarget::translate(float speed, float dt)
 {
-  if (translateTo.x >= 0.01+State::getCameraNode()->getAbsCoorX() || translateTo.y
-      >= 0.01+State::getCameraNode()->getAbsCoorX() || translateTo.z
-      >= 0.01+State::getCameraNode()->getAbsCoorX())
+  if (translateTo.x >= 0.01+target->getAbsCoorX() || translateTo.y >= 0.01+target->getAbsCoorY() || translateTo.z
+      >= 0.01+target->getAbsCoorZ() || translateTo.x <= target->getAbsCoorX()-0.01 || translateTo.y <= target->getAbsCoorY()-0.01 || translateTo.z
+      <= target->getAbsCoorZ()-0.01)
   {
     Vector tmpVec= iterate(dt,  &translateTo,  &(State::getCameraNode()->getAbsCoor()));
     glLoadIdentity();
     //glTranslatef(
-    State::getCamera()->getTargetNode()->setAbsCoor(tmpVec.x, tmpVec.y, tmpVec.z);
+    cout << tmpVec.x;
+    target->setAbsCoor(target->getAbsCoorX()+tmpVec.x, target->getAbsCoorY()+tmpVec.y, target->getAbsCoorZ()+tmpVec.z);
   }
 }
@@ -364 +374 @@
 {
 
+}
+
+
+void CameraTarget::trans(float x, float y, float z)
+{
+  Vector tmpVec=Vector(x,y,z);
+  translateNow(&tmpVec);
 }
 
@@ -381 +398 @@
 void CameraTarget::test()
 {
-Targets* tar=new Targets();
-atach(tar);
+  glLoadIdentity();
+
+atach(target);
+
+//tar->setRelCoorSoft(1000,1000,1000);
 
 
@@ -394 +414 @@
 
 
-
-
-
+void CameraTarget::test2()
+{
+  trans(-200, 0, 0);
+  //target->setAbsCoor(target->getAbsCoorX()-200, target->getAbsCoorY(), target->getAbsCoorZ());
+}
+
+

branches/camera/src/world_entities/camera.h

@@ -108 +108 @@
   void test();
   void translateNow(Vector* vec);
+  PNode* createStick();
+  void trans(float x, float y, float z);
+  void test2();
 };