Rename to mspvr

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

diff --git a/source/stereocombiner.h b/source/stereocombiner.h
index 5fb8dec7e5154fd716e2a93419ec641f2c204a6a..f078df773592531fe9b8ad79b3aa74d6321b5bc2 100644 (file)
--- a/source/stereocombiner.h
+++ b/source/stereocombiner.h
@@ -1,12 +1,11 @@
-#ifndef MSP_GL_STEREOCOMBINER_H_
-#define MSP_GL_STEREOCOMBINER_H_
+#ifndef MSP_VR_STEREOCOMBINER_H_
+#define MSP_VR_STEREOCOMBINER_H_

 
 #include <msp/geometry/angle.h>
 
 #include <msp/geometry/angle.h>

+#include <msp/gl/texture2d.h>

 
 namespace Msp {
 
 namespace Msp {

-namespace GL {
-
-class Texture2D;
+namespace VR {

 
 class StereoCombiner
 {
 
 class StereoCombiner
 {


@@ -27,10 +26,10 @@ public:
        const Geometry::Angle<float> &get_field_of_view() const { return fov; }
        float get_oversize() const { return oversize; }
 
        const Geometry::Angle<float> &get_field_of_view() const { return fov; }
        float get_oversize() const { return oversize; }
 

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

 };
 
 };
 

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

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