X-Git-Url: http://git.tdb.fi/?p=libs%2Fvr.git;a=blobdiff_plain;f=source%2Fstereoview.cpp;h=4586f29d97ee7966ab1fa9104c6c5ed762637ede;hp=08949e653599509021f24eb29b2f9b37f41a6826;hb=d8b7f621f37d8bcad572b06f7288084b5ad6eb8c;hpb=268da92f49360feaf9445ed2b8264d9310d3cebe diff --git a/source/stereoview.cpp b/source/stereoview.cpp index 08949e6..4586f29 100644 --- a/source/stereoview.cpp +++ b/source/stereoview.cpp @@ -15,15 +15,15 @@ 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); } 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); } @@ -42,10 +42,7 @@ void StereoView::setup_frame() const if(params.fov==Geometry::Angle::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();