Make the StereoCombiner information interface more flexible

[libs/vr.git] / source / stereocombiner.h

diff --git a/source/stereocombiner.h b/source/stereocombiner.h
index 5fb8dec7e5154fd716e2a93419ec641f2c204a6a..41c5a56945080b2edea0e0503b06128b62ee67b8 100644 (file)
--- a/source/stereocombiner.h
+++ b/source/stereocombiner.h
@@ -1,36 +1,35 @@
-#ifndef MSP_GL_STEREOCOMBINER_H_
-#define MSP_GL_STEREOCOMBINER_H_
+#ifndef MSP_VR_STEREOCOMBINER_H_
+#define MSP_VR_STEREOCOMBINER_H_
 
 #include <msp/geometry/angle.h>
+#include <msp/gl/texture2d.h>
 
 namespace Msp {
-namespace GL {
-
-class Texture2D;
+namespace VR {
 
 class StereoCombiner
 {
 protected:
-       unsigned width_div;
-       unsigned height_div;
-       bool keep_aspect;
+       float width_factor;
+       float height_factor;
+       float aspect_factor;
        Geometry::Angle<float> fov;
-       float oversize;
+       float frustum_skew;
 
        StereoCombiner();
 public:
        virtual ~StereoCombiner() { }
 
-       unsigned get_width_divisor() const { return width_div; }
-       unsigned get_height_divisor() const { return height_div; }
-       bool is_aspect_kept() const { return keep_aspect; }
+       float get_width_factor() const { return width_factor; }
+       float get_height_factor() const { return height_factor; }
+       float get_aspect_factor() const { return aspect_factor; }
        const Geometry::Angle<float> &get_field_of_view() const { return fov; }
-       float get_oversize() const { return oversize; }
+       float get_frustum_skew() const { return frustum_skew; }
 
-       virtual void render(const Texture2D &, const Texture2D &) const = 0;
+       virtual void render(const GL::Texture2D &, const GL::Texture2D &) const = 0;
 };
 
-} // namespace GL
+} // namespace VR
 } // namespace Msp
 
 #endif