X-Git-Url: http://git.tdb.fi/?p=libs%2Fvr.git;a=blobdiff_plain;f=source%2Fstereocombiner.h;h=5439aeba673da3a0d46de75a60e1445995e2dd7a;hp=10179309c6d0f3d81de53807997a30588a498353;hb=11d105c5183b401e5f52e9abb16cf659298cf035;hpb=43579020c5709b589b2404414c489b0e6be3227d

diff --git a/source/stereocombiner.h b/source/stereocombiner.h
index 1017930..5439aeb 100644
--- a/source/stereocombiner.h
+++ b/source/stereocombiner.h
@@ -1,32 +1,36 @@
-#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 prepare() const { }
+	virtual void render(const GL::Texture2D &, const GL::Texture2D &) const = 0;
 };
 
-} // namespace GL
+} // namespace VR
 } // namespace Msp
 
 #endif