Rename to mspvr

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

diff --git a/source/oculusriftcombiner.h b/source/oculusriftcombiner.h
index ede2fe91e481585de3e72bb165a8b4481a96b44f..a204c3eff766b25085095cdc4e6020f99423029b 100644 (file)
--- a/source/oculusriftcombiner.h
+++ b/source/oculusriftcombiner.h
@@ -1,13 +1,13 @@
-#ifndef MSP_GL_OCULUSRIFTCOMBINER_H_
-#define MSP_GL_OCULUSRIFTCOMBINER_H_
+#ifndef MSP_VR_OCULUSRIFTCOMBINER_H_
+#define MSP_VR_OCULUSRIFTCOMBINER_H_

 
 

-#include "mesh.h"
-#include "program.h"
-#include "programdata.h"
+#include <msp/gl/mesh.h>
+#include <msp/gl/program.h>
+#include <msp/gl/programdata.h>

 #include "stereocombiner.h"
 
 namespace Msp {
 #include "stereocombiner.h"
 
 namespace Msp {

-namespace GL {
+namespace VR {

 
 /**
 Presents a stereo view in a way suitable for an Oculus Rift HMD.  All distances
 
 /**
 Presents a stereo view in a way suitable for an Oculus Rift HMD.  All distances


@@ -16,10 +16,10 @@ are specified in multiples of the screen width.
 class OculusRiftCombiner: public StereoCombiner
 {
 private:
 class OculusRiftCombiner: public StereoCombiner
 {
 private:

-       Mesh mesh;
-       Program shprog;
-       ProgramData left_shdata;
-       ProgramData right_shdata;
+       GL::Mesh mesh;
+       GL::Program shprog;
+       GL::ProgramData left_shdata;
+       GL::ProgramData right_shdata;

        float view_distance;
        float lens_separation;
        float eye_separation;
        float view_distance;
        float lens_separation;
        float eye_separation;


@@ -41,10 +41,10 @@ private:
        float undistort(float) const;
 
 public:
        float undistort(float) const;
 
 public:

-       virtual void render(const Texture2D &, const Texture2D &) const;
+       virtual void render(const GL::Texture2D &, const GL::Texture2D &) const;

 };
 
 };
 

-} // namespace GL
+} // namespace VR

 } // namespace Msp
 
 #endif
 } // namespace Msp
 
 #endif