X-Git-Url: http://git.tdb.fi/?p=libs%2Fvr.git;a=blobdiff_plain;f=source%2Fsidebysidecombiner.cpp;h=c5aef041ecf3f123501d9fc062d5c497f1abe1de;hp=b9d1d89c243023faf1def099df849dc7b05b8d56;hb=b17410965e84e378c4cc85ffb732365552edc584;hpb=43579020c5709b589b2404414c489b0e6be3227d

diff --git a/source/sidebysidecombiner.cpp b/source/sidebysidecombiner.cpp
index b9d1d89..c5aef04 100644
--- a/source/sidebysidecombiner.cpp
+++ b/source/sidebysidecombiner.cpp
@@ -1,6 +1,6 @@
-#include "meshbuilder.h"
+#include <msp/gl/meshbuilder.h>
+#include <msp/gl/texture2d.h>
 #include "sidebysidecombiner.h"
-#include "texture2d.h"
 
 namespace {
 
@@ -24,21 +24,22 @@ const char fs_source[] =
 }
 
 namespace Msp {
-namespace GL {
+namespace VR {
 
 SideBySideCombiner::SideBySideCombiner(bool c):
-	mesh(VERTEX2),
+	mesh(GL::VERTEX2),
 	shprog(vs_source, fs_source)
 {
-	width_div = 2;
+	width_factor = 0.5f;
+	aspect_factor = 0.5f;
 
 	left_shdata.uniform("texture", 0);
 	right_shdata.uniform("texture", 0);
 
 	set_cross_eyed(c);
 
-	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);
@@ -54,11 +55,11 @@ void SideBySideCombiner::set_cross_eyed(bool c)
 	right_shdata.uniform("offset", m);
 }
 
-void SideBySideCombiner::render(const Texture2D &left, const Texture2D &right) const
+void SideBySideCombiner::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();
 
@@ -67,5 +68,5 @@ void SideBySideCombiner::render(const Texture2D &left, const Texture2D &right) c
 	mesh.draw();
 }
 
-} // namespace GL
+} // namespace VR
 } // namespace Msp