X-Git-Url: http://git.tdb.fi/?p=libs%2Fvr.git;a=blobdiff_plain;f=source%2Fstereoview.cpp;h=efc54dd5f3a38e9158f9e10ec4de640b32eea2e5;hp=02c60acce33a885ec0517c25d955a855b2ba4a80;hb=0f239b07bc06bf26d0ee0f9c1ee1e3b636f6d1f6;hpb=5244110fa8d347b8539f4fcff1bea729eecc2027

diff --git a/source/stereoview.cpp b/source/stereoview.cpp
index 02c60ac..efc54dd 100644
--- a/source/stereoview.cpp
+++ b/source/stereoview.cpp
@@ -15,15 +15,16 @@ StereoView::StereoView(unsigned w, unsigned h, const GL::Camera &c, const GL::Re
 	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()*combiner->get_oversize();
-	unsigned h = height/combiner->get_height_divisor()*combiner->get_oversize();
+	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,46 +34,40 @@ 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;
+	GL::Vector3 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==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);
-
-	renderable.setup_frame();
-}
+	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;
 
-void StereoView::finish_frame() const
-{
-	renderable.finish_frame();
+	left.setup_frame(base_camera, offset_axis*-eye_spacing, frustum_skew, params);
+	right.setup_frame(base_camera, offset_axis*eye_spacing, -frustum_skew, params);
 }
 
-void StereoView::render(const GL::Tag &tag) const
+void StereoView::render() const
 {
 	setup_frame();
-	left.render(renderable, tag);
-	right.render(renderable, tag);
+	renderable.setup_frame();
+	left.render(renderable);
+	right.render(renderable);
+	renderable.finish_frame();
 	combiner->render(left.target->color, right.target->color);
-	finish_frame();
-}
-
-void StereoView::render(GL::Renderer &renderer, const GL::Tag &tag) const
-{
-	renderer.escape();
-	return render(tag);
 }
 
 
@@ -98,7 +93,7 @@ void StereoView::Eye::create_target(unsigned w, unsigned h)
 	target = new RenderTarget(w, h);
 }
 
-void StereoView::Eye::setup_frame(const GL::Camera &base_camera, const GL::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,13 +102,15 @@ void StereoView::Eye::setup_frame(const GL::Camera &base_camera, const GL::Vecto
 	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 GL::Renderable &renderable, const GL::Tag &tag) const
+void StereoView::Eye::render(const GL::Renderable &renderable) const
 {
 	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);
+	renderable.render(renderer);
 }
 
 } // namespace VR