Rename to mspvr

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

diff --git a/source/stereoview.cpp b/source/stereoview.cpp
index 53c6445f368b28266aba2ca372ab40a52fa3a4e6..02c60acce33a885ec0517c25d955a855b2ba4a80 100644 (file)
--- a/source/stereoview.cpp
+++ b/source/stereoview.cpp
@@ -1,13 +1,13 @@
-#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),
@@ -60,7 +60,7 @@ void StereoView::finish_frame() const
        renderable.finish_frame();
 }
 
-void StereoView::render(const Tag &tag) const
+void StereoView::render(const GL::Tag &tag) const
 {
        setup_frame();
        left.render(renderable, tag);
@@ -69,7 +69,7 @@ void StereoView::render(const Tag &tag) const
        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);
@@ -78,13 +78,13 @@ void StereoView::render(Renderer &renderer, const Tag &tag) const
 
 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);
 }
 
 
@@ -98,7 +98,7 @@ void StereoView::Eye::create_target(unsigned w, unsigned h)
        target = new RenderTarget(w, h);
 }
 
-void StereoView::Eye::setup_frame(const Camera &base_camera, const Vector3 &offset, const EyeParams &params) const
+void StereoView::Eye::setup_frame(const GL::Camera &base_camera, const GL::Vector3 &offset, const EyeParams &params) const
 {
        camera.set_position(base_camera.get_position()+offset);
        camera.set_up_direction(base_camera.get_up_direction());
@@ -109,12 +109,12 @@ void StereoView::Eye::setup_frame(const Camera &base_camera, const Vector3 &offs
        camera.set_depth_clip(params.near_clip, params.far_clip);
 }
 
-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);
+       GL::Renderer renderer(&camera);
        renderable.render(renderer, tag);
 }
 
-} // namespace GL
+} // namespace VR
 } // namespace Msp