X-Git-Url: http://git.tdb.fi/?p=libs%2Fvr.git;a=blobdiff_plain;f=source%2Fstereoview.cpp;h=5b8dbbbbb5bab8b8a8b5f62e5c9eaf1bc15518fa;hp=95eb847d1b27a862b6d8513f3f122edd0f227058;hb=fa43a20e8274638b84c26e052dd8f7cc8993edd9;hpb=12044b218363bdd93f9fc1b3c71167d700144e45 diff --git a/source/stereoview.cpp b/source/stereoview.cpp index 95eb847..5b8dbbb 100644 --- a/source/stereoview.cpp +++ b/source/stereoview.cpp @@ -58,28 +58,16 @@ void StereoView::setup_frame() const 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(); -} - -void StereoView::finish_frame() const -{ - renderable.finish_frame(); } -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); } @@ -117,12 +105,12 @@ void StereoView::Eye::setup_frame(const GL::Camera &base_camera, const GL::Vecto 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