X-Git-Url: http://git.tdb.fi/?p=libs%2Fvr.git;a=blobdiff_plain;f=source%2Fstereoview.cpp;h=95eb847d1b27a862b6d8513f3f122edd0f227058;hp=9a4b0e0c49dad965c6100d2847605bd54663bd55;hb=932308a72ce197108007681dcc94dd8015a683f5;hpb=43579020c5709b589b2404414c489b0e6be3227d

diff --git a/source/stereoview.cpp b/source/stereoview.cpp
index 9a4b0e0..95eb847 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),
@@ -15,15 +15,16 @@ StereoView::StereoView(unsigned w, unsigned h, const Camera &c, const Renderable
 	combiner(0)
 {
 	set_combiner(m);
-	set_eye_spacing(0.07);
+	set_eye_spacing(0.064);
+	set_strabismus(Geometry::Angle<float>::zero());
 }
 
 void StereoView::set_combiner(const StereoCombiner &c)
 {
 	combiner = &c;
 
-	unsigned w = width/combiner->get_width_divisor();
-	unsigned h = height/combiner->get_height_divisor();
+	unsigned w = width*combiner->get_width_factor();
+	unsigned h = height*combiner->get_height_factor();
 	left.create_target(w, h);
 	right.create_target(w, h);
 }
@@ -33,24 +34,30 @@ void StereoView::set_eye_spacing(float s)
 	eye_spacing = s;
 }
 
+void StereoView::set_strabismus(const Geometry::Angle<float> &s)
+{
+	strabismus = s;
+}
+
 void StereoView::setup_frame() const
 {
 	offset_axis = normalize(cross(base_camera.get_look_direction(), base_camera.get_up_direction()))*0.5f;
 
 	EyeParams params;
 	params.fov = combiner->get_field_of_view();
-	if(!params.fov)
+	if(params.fov==Geometry::Angle<float>::zero())
 		params.fov = base_camera.get_field_of_view();
 
-	params.aspect = base_camera.get_aspect();
-	if(!combiner->is_aspect_kept())
-		params.aspect = params.aspect*combiner->get_height_divisor()/combiner->get_width_divisor();
-
+	params.aspect = base_camera.get_aspect()*combiner->get_aspect_factor();
 	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();
+	float halfw = tan(params.fov/2.0f)*params.aspect;
+	frustum_skew = tan(Geometry::atan<float>(frustum_skew*halfw)+strabismus)/halfw;
+
+	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 +67,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 +76,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 +85,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 +105,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 +114,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