Derive ProgramCompiler::DeclarationCombiner from BlockModifier

[libs/gl.git] / source / camera.h

diff --git a/source/camera.h b/source/camera.h
index f814e9d7cac17898fe8a4c1716910079632bfe2d..d96ada81e45c4c26840e79c4b813f6034c1a8d82 100644 (file)
--- a/source/camera.h
+++ b/source/camera.h
@@ -1,13 +1,12 @@
 #ifndef MSP_GL_CAMERA_H_
 #define MSP_GL_CAMERA_H_
 
-#include "matrix.h"
-#include "vector.h"
+#include "placeable.h"
 
 namespace Msp {
 namespace GL {
 
-class Camera
+class Camera: public Placeable
 {
 private:
        Geometry::Angle<float> fov;
@@ -23,7 +22,6 @@ private:
        Vector3 look_dir;
        Vector3 up_dir;
        Matrix view_matrix;
-       Matrix object_matrix;
        Matrix proj_matrix;
 
 public:
@@ -36,6 +34,9 @@ public:
        void set_frustum_axis(float, float);
        void set_frustum_rotation(const Geometry::Angle<float> &);
        const Geometry::Angle<float> &get_field_of_view() const { return fov; }
+       bool is_orthographic() const { return fov==Geometry::Angle<float>::zero(); }
+       float get_orthographic_width() const { return height*aspect; }
+       float get_orthographic_height() const { return height; }
        float get_aspect() const { return aspect; }
        float get_near_clip() const { return clip_near; }
        float get_far_clip() const { return clip_far; }
@@ -49,8 +50,10 @@ public:
        const Vector3 &get_look_direction() const { return look_dir; }
        const Vector3 &get_up_direction() const { return up_dir; }
 
-       /** Deprecated alias for get_view_matrix. */
-       const Matrix &get_matrix() const { return get_view_matrix(); }
+       virtual void set_matrix(const Matrix &m) { set_object_matrix(m); }
+
+       /** Sets the position and orientation of the camera from an object matrix. */
+       void set_object_matrix(const Matrix &);
 
        /** Returns the view matrix, used to transform coordinates from world space
        to eye space. */
@@ -58,7 +61,7 @@ public:
 
        /** Returns the object matrix, used to transform coordinates from eye space
        to world space. */
-       const Matrix &get_object_matrix() const { return object_matrix; }
+       const Matrix &get_object_matrix() const { return matrix; }
 
        /** Returns the projection matrix. */
        const Matrix &get_projection_matrix() const { return proj_matrix; }
@@ -66,6 +69,7 @@ public:
        Vector3 project(const Vector4 &) const;
        Vector3 project(const Vector3 &) const;
        Vector4 unproject(const Vector4 &) const;
+       Vector3 unproject(const Vector3 &) const;
 
        void apply() const;