X-Git-Url: http://git.tdb.fi/?p=libs%2Fvr.git;a=blobdiff_plain;f=source%2Fovr%2Foculusriftcombiner.cpp;h=e0c2c4d0ffc9146106d0d999191973b0daa7d05d;hp=2d40ea95c1ff0e00b2231c94d812874f675ba11e;hb=b6de7d24475dec8f5d6b8148a69cf8b561bc0761;hpb=c07c707c480f4e989caee17541187f08f136d216 diff --git a/source/ovr/oculusriftcombiner.cpp b/source/ovr/oculusriftcombiner.cpp index 2d40ea9..e0c2c4d 100644 --- a/source/ovr/oculusriftcombiner.cpp +++ b/source/ovr/oculusriftcombiner.cpp @@ -1,8 +1,8 @@ #include #include #include "oculusriftcombiner.h" -#include "oculusriftdevice.h" -#include "oculusriftdevice_private.h" +#include "oculusriftsystem.h" +#include "oculusriftsystem_private.h" using namespace std; @@ -81,7 +81,7 @@ struct OculusRiftCombiner::Frustum: StereoCombiner::Frustum }; -OculusRiftCombiner::OculusRiftCombiner(OculusRiftDevice &d, GL::View &v): +OculusRiftCombiner::OculusRiftCombiner(OculusRiftSystem &d, GL::View &v): device(d), view(v), left_mesh((GL::VERTEX2, GL::TEXCOORD2,0, GL::TEXCOORD2,1, GL::TEXCOORD2,2, GL::TEXCOORD2,3)),