initial network stuff

[chaz/yoink] / src / Moof / Camera.hh

diff --git a/src/Moof/Camera.hh b/src/Moof/Camera.hh
index b5927f438e0d3e27f376f8e5a559da6e5d9190f5..bbb493d5d3c499190e03e904cd149221ccc2b053 100644 (file)
--- a/src/Moof/Camera.hh
+++ b/src/Moof/Camera.hh
@@ -1,87 +1,76 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
+/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+**]  All rights reserved.
+*
+* vi:ts=4 sw=4 tw=75
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+**************************************************************************/
 
 #ifndef _MOOF_CAMERA_HH_
 #define _MOOF_CAMERA_HH_
 
 #include <Moof/Event.hh>
 #include <Moof/Frustum.hh>
-#include <Moof/Interpolator.hh>
 #include <Moof/Math.hh>
+#include <Moof/RigidBody.hh>
 
 
 namespace Mf {
 
 
-class Camera
+class Camera : public RigidBody3
 {
-       void calculateSecondary();
-
 public:
-       Camera() :
-               position_(0.0, 0.0, 0.0)
+
+       Camera()
        {
-               cml::quaternion_rotation_world_y(rotation_, 0.0f);
-               calculateSecondary();
+               mState.init();
+               mPrevState.init();
+
+               cml::quaternion_rotation_world_y(mState.orientation, SCALAR(0.0));
        }
 
-       void setPosition(const Vector3& point);
+       void setPosition(const Vector3& position);
        void setRotation(const Quaternion& rotation);
 
+       void lookAt(const Vector3& point);
+
        void setProjection(const Matrix4& projection);
        void setProjection(Scalar fovy, Scalar aspect, Scalar near, Scalar far);
 
-       void uploadProjectionToGL() const;
-
-       void lookAt(const Vector3& point);
+       const Matrix4& getModelview() const
+       {
+               return mModelview;
+       }
 
-       const Matrix4& getModelviewMatrix() const
+       const Matrix4& getProjection() const
        {
-               return modelview_;
+               return mProjection;
        }
 
        const Frustum& getFrustum() const
        {
-               return frustum_;
+               return mFrustum;
        }
 
-       void handleEvent(const Event& event);
+
+       void uploadToGL(Scalar alpha = 0) const;
+
        void update(Scalar t, Scalar dt);
+       void draw(Scalar alpha = 0) const;
+       void handleEvent(const Event& event);
 
 private:
-       Vector3         position_;
-       Quaternion      rotation_;
-       Matrix4         projection_;
 
-       Matrix4         modelview_;
-       Frustum         frustum_;
+       void calculate(Scalar alpha) const;
+
+       mutable Matrix4         mModelview;
+       Matrix4                         mProjection;
 
-       Lerp3           pInterp_;
+       mutable Frustum         mFrustum;
 };
 
 
@@ -89,5 +78,3 @@ private:
 
 #endif // _MOOF_CAMERA_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-