X-Git-Url: http://git.tdb.fi/?p=libs%2Fvr.git;a=blobdiff_plain;f=source%2Fsidebysidecombiner.h;h=77012b8b3a12edf1e1c6d717924cb62d6bff6a9d;hp=f6ec593a1ed471ba15caf40187c782d22d8488a6;hb=11d105c5183b401e5f52e9abb16cf659298cf035;hpb=43579020c5709b589b2404414c489b0e6be3227d

diff --git a/source/sidebysidecombiner.h b/source/sidebysidecombiner.h
index f6ec593..77012b8 100644
--- a/source/sidebysidecombiner.h
+++ b/source/sidebysidecombiner.h
@@ -1,32 +1,34 @@
-#ifndef MSP_GL_SIDEBYSIDECOMBINER_H_
-#define MSP_GL_SIDEBYSIDECOMBINER_H_
+#ifndef MSP_VR_SIDEBYSIDECOMBINER_H_
+#define MSP_VR_SIDEBYSIDECOMBINER_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 <msp/gl/view.h>
 #include "stereocombiner.h"
 
 namespace Msp {
-namespace GL {
+namespace VR {
 
 class SideBySideCombiner: public StereoCombiner
 {
 private:
-	Mesh mesh;
-	Program shprog;
-	ProgramData left_shdata;
-	ProgramData right_shdata;
+	GL::View &view;
+	GL::Mesh mesh;
+	GL::Program shprog;
+	GL::ProgramData left_shdata;
+	GL::ProgramData right_shdata;
 	bool cross_eyed;
 
 public:
-	SideBySideCombiner(bool = false);
+	SideBySideCombiner(GL::View &, bool = false);
 
 	void set_cross_eyed(bool);
 
-	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