X-Git-Url: http://git.tdb.fi/?p=libs%2Fvr.git;a=blobdiff_plain;f=source%2Fstereoview.cpp;h=08949e653599509021f24eb29b2f9b37f41a6826;hp=53c6445f368b28266aba2ca372ab40a52fa3a4e6;hb=268da92f49360feaf9445ed2b8264d9310d3cebe;hpb=3d83f3acedfdd428807313986eefaf5bcd64b7e8

diff --git a/source/stereoview.cpp b/source/stereoview.cpp
index 53c6445..08949e6 100644
--- a/source/stereoview.cpp
+++ b/source/stereoview.cpp
@@ -1,13 +1,13 @@
-#include "renderer.h"
+#include <msp/gl/renderer.h>
 #include "stereocombiner.h"
 #include "stereoview.h"
 
 using namespace std;
 
 namespace Msp {
-namespace GL {
+namespace VR {
 
-StereoView::StereoView(unsigned w, unsigned h, const Camera &c, const Renderable &r, const StereoCombiner &m):
+StereoView::StereoView(unsigned w, unsigned h, const GL::Camera &c, const GL::Renderable &r, const StereoCombiner &m):
 	width(w),
 	height(h),
 	base_camera(c),
@@ -49,8 +49,10 @@ void StereoView::setup_frame() const
 	params.near_clip = base_camera.get_near_clip();
 	params.far_clip = base_camera.get_far_clip();
 
-	left.setup_frame(base_camera, offset_axis*-eye_spacing, params);
-	right.setup_frame(base_camera, offset_axis*eye_spacing, params);
+	float frustum_skew = combiner->get_frustum_skew();
+
+	left.setup_frame(base_camera, offset_axis*-eye_spacing, frustum_skew, params);
+	right.setup_frame(base_camera, offset_axis*eye_spacing, -frustum_skew, params);
 
 	renderable.setup_frame();
 }
@@ -60,7 +62,7 @@ void StereoView::finish_frame() const
 	renderable.finish_frame();
 }
 
-void StereoView::render(const Tag &tag) const
+void StereoView::render(const GL::Tag &tag) const
 {
 	setup_frame();
 	left.render(renderable, tag);
@@ -69,7 +71,7 @@ void StereoView::render(const Tag &tag) const
 	finish_frame();
 }
 
-void StereoView::render(Renderer &renderer, const Tag &tag) const
+void StereoView::render(GL::Renderer &renderer, const GL::Tag &tag) const
 {
 	renderer.escape();
 	return render(tag);
@@ -78,13 +80,13 @@ void StereoView::render(Renderer &renderer, const Tag &tag) const
 
 StereoView::RenderTarget::RenderTarget(unsigned width, unsigned height)
 {
-	color.set_min_filter(LINEAR);
-	color.set_wrap(CLAMP_TO_EDGE);
-	color.storage(RGB, width, height);
-	fbo.attach(COLOR_ATTACHMENT0, color);
+	color.set_min_filter(GL::LINEAR);
+	color.set_wrap(GL::CLAMP_TO_EDGE);
+	color.storage(GL::RGB, width, height);
+	fbo.attach(GL::COLOR_ATTACHMENT0, color);
 
-	depth.storage(DEPTH_COMPONENT, width, height);
-	fbo.attach(DEPTH_ATTACHMENT, depth);
+	depth.storage(GL::DEPTH_COMPONENT, width, height);
+	fbo.attach(GL::DEPTH_ATTACHMENT, depth);
 }
 
 
@@ -98,7 +100,7 @@ void StereoView::Eye::create_target(unsigned w, unsigned h)
 	target = new RenderTarget(w, h);
 }
 
-void StereoView::Eye::setup_frame(const Camera &base_camera, const Vector3 &offset, const EyeParams &params) const
+void StereoView::Eye::setup_frame(const GL::Camera &base_camera, const GL::Vector3 &offset, float frustum_skew, const EyeParams &params) const
 {
 	camera.set_position(base_camera.get_position()+offset);
 	camera.set_up_direction(base_camera.get_up_direction());
@@ -107,14 +109,16 @@ void StereoView::Eye::setup_frame(const Camera &base_camera, const Vector3 &offs
 	camera.set_field_of_view(params.fov);
 	camera.set_aspect(params.aspect);
 	camera.set_depth_clip(params.near_clip, params.far_clip);
+	camera.set_frustum_axis(frustum_skew, 0);
 }
 
-void StereoView::Eye::render(const Renderable &renderable, const Tag &tag) const
+void StereoView::Eye::render(const GL::Renderable &renderable, const GL::Tag &tag) const
 {
-	Bind bind_fbo(target->fbo);
-	Renderer renderer(&camera);
+	GL::Bind bind_fbo(target->fbo);
+	target->fbo.clear(GL::COLOR_BUFFER_BIT|GL::DEPTH_BUFFER_BIT);
+	GL::Renderer renderer(&camera);
 	renderable.render(renderer, tag);
 }
 
-} // namespace GL
+} // namespace VR
 } // namespace Msp