X-Git-Url: http://git.tdb.fi/?p=libs%2Fvr.git;a=blobdiff_plain;f=source%2Fstereoview.h;h=ff34706cc4b450d1daff8d7844b5147c282ffc5d;hp=4dce63b99870b96aa5c52cdb5296fcdba2311344;hb=735148a3ecf7e753f520f22668b771583185f72f;hpb=cf1b08401da851dd98cde45d9e4acf6e1d185224

diff --git a/source/stereoview.h b/source/stereoview.h
index 4dce63b..ff34706 100644
--- a/source/stereoview.h
+++ b/source/stereoview.h
@@ -1,26 +1,27 @@
-#ifndef MSP_GL_STEREOVIEW_H_
-#define MSP_GL_STEREOVIEW_H_
+#ifndef MSP_VR_STEREOVIEW_H_
+#define MSP_VR_STEREOVIEW_H_
 
 #include <msp/geometry/angle.h>
-#include "camera.h"
-#include "framebuffer.h"
-#include "renderable.h"
-#include "renderbuffer.h"
-#include "texture2d.h"
+#include <msp/gl/camera.h>
+#include <msp/gl/framebuffer.h>
+#include <msp/gl/renderable.h>
+#include <msp/gl/renderbuffer.h>
+#include <msp/gl/texture2d.h>
 
 namespace Msp {
-namespace GL {
+namespace VR {
 
+class HeadTrackingCamera;
 class StereoCombiner;
 
-class StereoView: public Renderable
+class StereoView
 {
 private:
 	struct RenderTarget
 	{
-		Framebuffer fbo;
-		Texture2D color;
-		Renderbuffer depth;
+		GL::Framebuffer fbo;
+		GL::Texture2D color;
+		GL::Renderbuffer depth;
 
 		RenderTarget(unsigned, unsigned);
 	};
@@ -35,40 +36,43 @@ private:
 
 	struct Eye
 	{
-		mutable Camera camera;
+		mutable GL::Camera camera;
 		RenderTarget *target;
 
 		Eye();
 
 		void create_target(unsigned, unsigned);
-		void setup_frame(const Camera &, const Vector3 &, const EyeParams &) const;
-		void render(const Renderable &, const Tag &) const;
+		void setup_frame(const GL::Camera &, const GL::Vector3 &, float, const EyeParams &) const;
+		void render(const GL::Renderable &) const;
 	};
 
-	unsigned width;
-	unsigned height;
-	const Camera &base_camera;
-	const Renderable &renderable;
-	const StereoCombiner *combiner;
+	const StereoCombiner &combiner;
+	const GL::Camera &base_camera;
+	HeadTrackingCamera *head_camera;
+	const GL::Renderable *content;
 	Eye left;
 	Eye right;
 	float eye_spacing;
-	mutable Vector3 offset_axis;
+	Geometry::Angle<float> strabismus;
 
 public:
-	StereoView(unsigned, unsigned, const Camera &, const Renderable &, const StereoCombiner &);
+	StereoView(const StereoCombiner &, const GL::Camera &);
+	StereoView(const StereoCombiner &, HeadTrackingCamera &);
+private:
+	void init();
 
-	void set_combiner(const StereoCombiner &);
+public:
+	void set_content(const GL::Renderable *);
 	void set_eye_spacing(float);
+	void set_strabismus(const Geometry::Angle<float> &);
 
-	virtual void setup_frame() const;
-	virtual void finish_frame() const;
-
-	virtual void render(const Tag & = Tag()) const;
-	virtual void render(Renderer &, const Tag & = Tag()) const;
+private:
+	void setup_frame() const;
+public:
+	void render() const;
 };
 
-} // namespace GL
+} // namespace VR
 } // namespace Msp
 
 #endif