Update camera pose as part of the render call

[libs/vr.git] / source / stereoview.cpp

diff --git a/source/stereoview.cpp b/source/stereoview.cpp
index efc54dd5f3a38e9158f9e10ec4de640b32eea2e5..5945016da1ac8d1e20d01c0a4e25f0ceb0300954 100644 (file)
--- a/source/stereoview.cpp
+++ b/source/stereoview.cpp
@@ -1,4 +1,5 @@
 #include <msp/gl/renderer.h>
+#include "headtrackingcamera.h"
 #include "stereocombiner.h"
 #include "stereoview.h"
 
@@ -7,26 +8,38 @@ using namespace std;
 namespace Msp {
 namespace VR {
 
-StereoView::StereoView(unsigned w, unsigned h, const GL::Camera &c, const GL::Renderable &r, const StereoCombiner &m):
-       width(w),
-       height(h),
-       base_camera(c),
-       renderable(r),
-       combiner(0)
+StereoView::StereoView(const StereoCombiner &c, const GL::Camera &a):
+       combiner(c),
+       base_camera(a),
+       head_camera(0)
 {
-       set_combiner(m);
-       set_eye_spacing(0.064);
-       set_strabismus(Geometry::Angle<float>::zero());
+       init();
+}
+
+StereoView::StereoView(const StereoCombiner &c, HeadTrackingCamera &a):
+       combiner(c),
+       base_camera(a),
+       head_camera(&a)
+{
+       init();
 }
 
-void StereoView::set_combiner(const StereoCombiner &c)
+void StereoView::init()
 {
-       combiner = &c;
+       content = 0;
 
-       unsigned w = width*combiner->get_width_factor();
-       unsigned h = height*combiner->get_height_factor();
+       unsigned w = combiner.get_target_width();
+       unsigned h = combiner.get_target_height();
        left.create_target(w, h);
        right.create_target(w, h);
+
+       set_eye_spacing(0.064);
+       set_strabismus(Geometry::Angle<float>::zero());
+}
+
+void StereoView::set_content(const GL::Renderable *r)
+{
+       content = r;
 }
 
 void StereoView::set_eye_spacing(float s)
@@ -41,18 +54,21 @@ void StereoView::set_strabismus(const Geometry::Angle<float> &s)
 
 void StereoView::setup_frame() const
 {
+       if(head_camera)
+               head_camera->update();
+
        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();
+       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()*combiner->get_aspect_factor();
+       params.aspect = combiner.get_render_aspect();
        params.near_clip = base_camera.get_near_clip();
        params.far_clip = base_camera.get_far_clip();
 
-       float frustum_skew = combiner->get_frustum_skew();
+       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;
 
@@ -62,12 +78,16 @@ void StereoView::setup_frame() const
 
 void StereoView::render() const
 {
+       combiner.prepare();
        setup_frame();
-       renderable.setup_frame();
-       left.render(renderable);
-       right.render(renderable);
-       renderable.finish_frame();
-       combiner->render(left.target->color, right.target->color);
+       if(content)
+       {
+               content->setup_frame();
+               left.render(*content);
+               right.render(*content);
+               content->finish_frame();
+       }
+       combiner.render(left.target->color, right.target->color);
 }