Changeset 2796 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Camera.h

Timestamp:

06/22/08 09:23:45 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Camera.h (modified) (5 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Camera.h

@@ -20 +20 @@
         {
                 /// the 6 clip planes
-                //float mClipPlane[6][4];
                 Plane3 mClipPlanes[6];
 
@@ -30 +29 @@
         Camera(int width, int height, float fieldOfView = 90.f);
 
-        void Precompute();
-
-        void LookInBox(const AxisAlignedBox3 &box);
-
-        void LookAtBox(const AxisAlignedBox3 &box);
 
         void SetPosition(const Vector3 &pos);
 
-        void SetDirection(const Vector3 &dir);
-
         inline Vector3 GetPosition() const { return mPosition; }
-        inline Vector3 GetDirection() const { return mDirection; }
-        inline Vector3 GetUpVector() const { return mUp; }
-        inline Vector3 GetRightVector() const { return mRight; }
+        Vector3 GetDirection() const;
+        Vector3 GetUpVector() const;
+        Vector3 GetRightVector() const;
 
         inline float GetFov() const { return mFovy; }
@@ -49 +41 @@
         inline float GetAspect() const { return (float) mWidth / mHeight; }
 
+        /** Sets up viewing in gl
+        */
         void SetupCameraView();
         void GetProjectionMatrix(Matrix4x4 &mat);
@@ -60 +54 @@
         inline float GetNear() const { return mNear; }
         void SetNear(float nearDist);
+        
+        inline float GetFar() const { return mFar; }
+
+        void SetFar(float farDist) { mFar = farDist; }
+
+        void SetOrtho(bool ortho);
+
+        void Yaw(float angle);
+        void Pitch(float angle);
+        
 
 
 protected:
 
+        void Precompute(const Vector3 &direction);
+
+        void CalculateFromPitchAndYaw();
+
+
         ////////////////
-
-        Vector3 mPosition;
-        Vector3 mDirection;
-
-        /// up vector takes into account the FOV at a unit distance from the origin
-        Vector3 mUp;
-        /// right vector takes into account the FOV at a unit distance from the origin
-        Vector3 mRight;
+        //-- members
 
         float mFovy;
@@ -79 +81 @@
 
         float mNear;
+
+        float mFar;
+
+        bool mIsOrtho;
+
+        Matrix4x4 mBaseOrientation;
+        Matrix4x4 mViewOrientation;
+
+        float mPitch;
+        float mYaw;
+
+        Vector3 mPosition;
 };