-#include "renderer.h"
+#include <msp/gl/renderer.h>
#include "stereocombiner.h"
#include "stereoview.h"
using namespace std;
namespace Msp {
-namespace GL {
+namespace VR {
-StereoView::StereoView(unsigned w, unsigned h, const Camera &c, const Renderable &r, const StereoCombiner &m):
+StereoView::StereoView(unsigned w, unsigned h, const GL::Camera &c, const GL::Renderable &r, const StereoCombiner &m):
width(w),
height(h),
base_camera(c),
{
combiner = &c;
- unsigned w = width/combiner->get_width_divisor();
- unsigned h = height/combiner->get_height_divisor();
+ unsigned w = width/combiner->get_width_divisor()*combiner->get_oversize();
+ unsigned h = height/combiner->get_height_divisor()*combiner->get_oversize();
left.create_target(w, h);
right.create_target(w, h);
}
EyeParams params;
params.fov = combiner->get_field_of_view();
- if(!params.fov)
+ if(params.fov==Geometry::Angle<float>::zero())
params.fov = base_camera.get_field_of_view();
params.aspect = base_camera.get_aspect();
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);
+ float frustum_skew = combiner->get_frustum_skew();
+
+ 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();
}
renderable.finish_frame();
}
-void StereoView::render(const Tag &tag) const
+void StereoView::render(const GL::Tag &tag) const
{
setup_frame();
left.render(renderable, tag);
finish_frame();
}
-void StereoView::render(Renderer &renderer, const Tag &tag) const
+void StereoView::render(GL::Renderer &renderer, const GL::Tag &tag) const
{
renderer.escape();
return render(tag);
StereoView::RenderTarget::RenderTarget(unsigned width, unsigned height)
{
- color.set_min_filter(LINEAR);
- color.set_wrap(CLAMP_TO_EDGE);
- color.storage(RGB, width, height);
- fbo.attach(COLOR_ATTACHMENT0, color);
+ color.set_min_filter(GL::LINEAR);
+ color.set_wrap(GL::CLAMP_TO_EDGE);
+ color.storage(GL::RGB, width, height);
+ fbo.attach(GL::COLOR_ATTACHMENT0, color);
- depth.storage(DEPTH_COMPONENT, width, height);
- fbo.attach(DEPTH_ATTACHMENT, depth);
+ depth.storage(GL::DEPTH_COMPONENT, width, height);
+ fbo.attach(GL::DEPTH_ATTACHMENT, depth);
}
target = new RenderTarget(w, h);
}
-void StereoView::Eye::setup_frame(const Camera &base_camera, const Vector3 &offset, const EyeParams ¶ms) const
+void StereoView::Eye::setup_frame(const GL::Camera &base_camera, const GL::Vector3 &offset, float frustum_skew, const EyeParams ¶ms) const
{
camera.set_position(base_camera.get_position()+offset);
camera.set_up_direction(base_camera.get_up_direction());
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 Renderable &renderable, const Tag &tag) const
+void StereoView::Eye::render(const GL::Renderable &renderable, const GL::Tag &tag) const
{
- Bind bind_fbo(target->fbo);
- Renderer renderer(&camera);
+ 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);
}
-} // namespace GL
+} // namespace VR
} // namespace Msp