Changeset 10116 in orxonox.OLD

Timestamp:

Dec 20, 2006, 12:24:39 AM (17 years ago)

Author:

gfilip

Message:

good night

Location:

branches/camera/src/world_entities

Files:

• camera.cc (modified) (5 diffs)
• camera.h (modified) (3 diffs)

branches/camera/src/world_entities/camera.cc

@@ -307 +307 @@
   rotateBy.y=0;
   rotateBy.z=0;
-
+  //target=State::getCamera()->getTargetNode();
 
 }
@@ -315 +315 @@
 {
   glLoadIdentity();
+
+//Movemet
   State::getCameraNode()->setParentSoft(PNode::getNullParent());
-  //State::getCameraTargetNode()->setParentSoft(this);
+
+//LookAt
+ // State::getCameraTargetNode()->setParentSoft(PNode::getNullParent());
 }
 
@@ -322 +326 @@
 {
   State::getCameraNode()->setParentSoft(object);
+  State::getCameraTargetNode()->setParentSoft(object);
 }
 
@@ -345 +350 @@
     Vector tmpVec= iterate(dt,  &translateTo,  &(State::getCameraNode()->getAbsCoor()));
     glLoadIdentity();
-    glTranslatef(tmpVec.x, tmpVec.y, tmpVec.z);
+    //glTranslatef(
+    State::getCamera()->getTargetNode()->setAbsCoor(tmpVec.x, tmpVec.y, tmpVec.z);
   }
 }
@@ -374 +380 @@
 void CameraTarget::test()
 {
-//Vector* vec=new Vector(100,100,100);
-  //translateNow(vec);
-  glMatrixMode (GL_PROJECTION);
-  glLoadIdentity();
-  glTranslatef(100, 100, 100);
-}
+Vector* vec=new Vector(5000,5000,5000);
+  translateNow(vec);
+  //glMatrixMode (GL_MODELVIEW);
+  //glLoadIdentity();
+  //glTranslatef(100, 100, 100);
+ // State::getCamera()->getTargetNode()->setRelCoor(100,100,100);
+}
+
+
+
+
+

branches/camera/src/world_entities/camera.h

@@ -10 +10 @@
 #include "event_listener.h"
 #include "plane.h"
+//#include "targets.h"
 
 class World;
 class CameraTarget;
 class Event;
-
 
 //! Camera
@@ -94 +94 @@
   virtual ~CameraTarget() {}
   float speed;
+  PNode* target;
 
 public:
@@ -110 +111 @@
 
 
+
+
 #endif /* _CAMERA_H */
+