Changeset 10379 in orxonox.OLD for trunk/src/world_entities/camera.h

Timestamp:

Jan 26, 2007, 10:58:31 AM (19 years ago)

Author:

patrick

Message:

merged branche camera to trunk. resolved many conflicts as in the other projects too

File:

• trunk/src/world_entities/camera.h (modified) (7 diffs)

trunk/src/world_entities/camera.h

@@ -11 +11 @@
 #include "plane.h"
 
+
 class World;
 class CameraTarget;
 class Event;
-
 
 //! Camera
@@ -22 +22 @@
 class Camera : public PNode, public EventListener
 {
+  friend class CameraTarget;
+  friend class CameraMan;
   ObjectListDeclaration(Camera);
 public:
@@ -34 +36 @@
     ViewTop
   };
-
+  public:
   Camera();
   Camera(const TiXmlElement* root);
@@ -42 +44 @@
   CameraTarget* getTarget() const { return this->target; };
   PNode* getTargetNode() const;
-
+  void setTargetNode(PNode* target);
   void setAspectRatio(float aspectRatio);
   inline float getAspectRatio() {return this->aspectRatio;};
@@ -70 +72 @@
   inline bool getEventHandling() {return this->eventHandling;}
 
+  void glLookAt(float eyex, float eyey, float eyez, float centerx, float centery, float centerz, float upx, float upy, float upz);
+  Vector* VectorProd(Vector* v1, Vector* v2);
+  void Rotate();
   void tick(float dt);
   void apply ();
@@ -75 +80 @@
 
   void process(const Event &event);
+  //CameraTarget*     target;          //!< The Target of the Camera (where this Camera Looks at)
 
-  //virtual void loadParams(const TiXmlElement* root);
+  virtual void loadParams(const TiXmlElement* root);
 
   void              setViewTopFovy(float fovy);
@@ -132 +138 @@
 class CameraTarget : public PNode
 {
-  friend class Camera;             //! The CameraTarget is a friend of Camera. noone else needs a CameraTarget, so noone else can create it.
+  friend class Camera;        //! The CameraTarget is a friend of Camera. noone else needs a CameraTarget, so noone else can create it.
   ObjectListDeclaration(CameraTarget);
 
 private:
   CameraTarget();
+  virtual ~CameraTarget() {}
+  float speed;
+  PNode* target;
+  PNode* freeTarget;
+  Camera* masta;
+  Vector translateTo;
+  Vector rotateBy;
+
 
 public:
+
+  void detach();
+  void atach(PNode* object);
+  Vector iterate(float dt, const Vector* target, const Vector* cam);
+  void translate(float dt);
+  void changeSpeed(float speed);
+  Vector* rotate(Vector* newPos, float speed);
+  void jump(float x, float y, float z);
+  void translateNow(Vector* vec);
+  PNode* createStick();
+  void trans(float x, float y, float z);
+  bool isDone();
 };
 
 
+
+
 #endif /* _CAMERA_H */
+