Provide absolute render target dimensions from StereoCombiner

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

diff --git a/source/stereocombiner.h b/source/stereocombiner.h
index 10179309c6d0f3d81de53807997a30588a498353..8a351eaeb5d6f594b78733822c5731d04b14c059 100644 (file)
--- a/source/stereocombiner.h
+++ b/source/stereocombiner.h
@@ -1,32 +1,35 @@
-#ifndef MSP_GL_STEREOCOMBINER_H_
-#define MSP_GL_STEREOCOMBINER_H_
+#ifndef MSP_VR_STEREOCOMBINER_H_
+#define MSP_VR_STEREOCOMBINER_H_
 
-namespace Msp {
-namespace GL {
+#include <msp/geometry/angle.h>
+#include <msp/gl/texture2d.h>
 
-class Texture2D;
+namespace Msp {
+namespace VR {
 
 class StereoCombiner
 {
 protected:
-       unsigned width_div;
-       unsigned height_div;
-       bool keep_aspect;
-       float fov;
+       unsigned target_width;
+       unsigned target_height;
+       float render_aspect;
+       Geometry::Angle<float> fov;
+       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_field_of_view() const { return fov; }
+       float get_target_width() const { return target_width; }
+       float get_target_height() const { return target_height; }
+       float get_render_aspect() const { return render_aspect; }
+       const Geometry::Angle<float> &get_field_of_view() const { return fov; }
+       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