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

diff --git a/source/stereoview.cpp b/source/stereoview.cpp
index 08949e6..95eb847 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,6 +34,11 @@ 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;
@@ -42,14 +48,13 @@ void StereoView::setup_frame() const
 	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();
 
 	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);