Rename to mspvr

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

diff --git a/source/oculusriftcombiner.cpp b/source/oculusriftcombiner.cpp
index 9d985d9268e679584419bb2c75bb4947ce22aeef..771f3b82a3cd7df48f48854b10e7b786c931bc72 100644 (file)
--- a/source/oculusriftcombiner.cpp
+++ b/source/oculusriftcombiner.cpp
@@ -1,7 +1,7 @@
 #include <cmath>
-#include "meshbuilder.h"
+#include <msp/gl/meshbuilder.h>
+#include <msp/gl/texture2d.h>
 #include "oculusriftcombiner.h"
-#include "texture2d.h"
 
 using namespace std;
 
@@ -41,10 +41,10 @@ const char fs_source[] =
 }
 
 namespace Msp {
-namespace GL {
+namespace VR {
 
 OculusRiftCombiner::OculusRiftCombiner():
-       mesh(VERTEX2),
+       mesh(GL::VERTEX2),
        shprog(vs_source, fs_source),
        // Default values copied from the SDK
        view_distance(0.438f),
@@ -62,8 +62,8 @@ OculusRiftCombiner::OculusRiftCombiner():
        // This will also call update_parameters
        set_distortion(1.0f, 0.22f, 0.24f);
 
-       MeshBuilder bld(mesh);
-       bld.begin(TRIANGLE_STRIP);
+       GL::MeshBuilder bld(mesh);
+       bld.begin(GL::TRIANGLE_STRIP);
        bld.vertex(-1, 1);
        bld.vertex(-1, -1);
        bld.vertex(1, 1);
@@ -153,11 +153,11 @@ float OculusRiftCombiner::undistort(float r) const
        }
 }
 
-void OculusRiftCombiner::render(const Texture2D &left, const Texture2D &right) const
+void OculusRiftCombiner::render(const GL::Texture2D &left, const GL::Texture2D &right) const
 {
-       Bind bind_shprog(shprog);
+       GL::Bind bind_shprog(shprog);
 
-       Bind bind_tex(left);
+       GL::Bind bind_tex(left);
        left_shdata.apply();
        mesh.draw();
 
@@ -166,5 +166,5 @@ void OculusRiftCombiner::render(const Texture2D &left, const Texture2D &right) c
        mesh.draw();
 }
 
-} // namespace GL
+} // namespace VR
 } // namespace Msp