add null shape for void blocks

[blank.git] / src / camera.hpp

diff --git a/src/camera.hpp b/src/camera.hpp
index 7cdd5e527b1ca5ecc2e0c795dd5679907dd0d209..805109c313af3a8f0fd692448e02c7bab7190b0c 100644 (file)
--- a/src/camera.hpp
+++ b/src/camera.hpp
@@ -4,6 +4,7 @@
 #include <glm/glm.hpp>
 
 #include "controller.hpp"
+#include "geometry.hpp"
 
 
 namespace blank {
@@ -13,13 +14,10 @@ class Camera
 
 public:
        Camera();
-       ~Camera();
 
        Camera(const Camera &) = delete;
        Camera &operator =(const Camera &) = delete;
 
-       glm::mat4 MakeMVP(const glm::mat4 &m) const { return vp * m; }
-
        void Viewport(int width, int height);
        void Viewport(int x, int y, int width, int height);
 
@@ -28,6 +26,8 @@ public:
        void Aspect(float w, float h);
        void Clip(float near, float far);
 
+       Ray Aim() const;
+
        const glm::mat4 &Projection() { return projection; }
        const glm::mat4 &View() { return view; }
 
@@ -44,7 +44,6 @@ private:
 
        glm::mat4 projection;
        glm::mat4 view;
-       glm::mat4 vp;
 
 };