From 0d6ccb76543508da575f0a67000384a36e76aa83 Mon Sep 17 00:00:00 2001 From: jriegel Date: Tue, 16 Sep 2014 18:14:42 +0200 Subject: [PATCH] FreeCAD-VR: Some fixes --- src/Gui/CoinRiftWidget.cpp | 6 ++++++ src/Gui/CoinRiftWidget.h | 3 ++- src/Gui/View3DInventorViewer.cpp | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/Gui/CoinRiftWidget.cpp b/src/Gui/CoinRiftWidget.cpp index ac3c1d8ef..0a9e894de 100644 --- a/src/Gui/CoinRiftWidget.cpp +++ b/src/Gui/CoinRiftWidget.cpp @@ -33,6 +33,8 @@ #include "PreCompiled.h" #include "CoinRiftWidget.h" +#include + #if BUILD_VR @@ -319,6 +321,10 @@ void CoinRiftWidget::paintGL() eyePose[eye].Position.y, eyePose[eye].Position.z); + //Base::Console().Log("Pos: (%d) %f, %f, %f \n",eye, eyePose[eye].Position.x, + // eyePose[eye].Position.y, + // eyePose[eye].Position.z); + //SbVec3f originalPosition(camera[eye]->position.getValue()); camera[eye]->position.setValue(basePosition - SbVec3f(eyeRenderDesc[eye].ViewAdjust.x, diff --git a/src/Gui/CoinRiftWidget.h b/src/Gui/CoinRiftWidget.h index a96e92802..bb348c40e 100644 --- a/src/Gui/CoinRiftWidget.h +++ b/src/Gui/CoinRiftWidget.h @@ -99,13 +99,14 @@ public: void setBase(const SbVec3f &pos){basePosition=pos;} void setBackgoundColor(const SbColor &Col){BackgroundColor = Col;} + SbVec3f basePosition; + protected: void handlingSafetyWarning(void); void initializeGL(); void paintGL(); void resizeGL(int width, int height); - SbVec3f basePosition; SbColor BackgroundColor; }; diff --git a/src/Gui/View3DInventorViewer.cpp b/src/Gui/View3DInventorViewer.cpp index 1a98287ed..82df6e8b3 100644 --- a/src/Gui/View3DInventorViewer.cpp +++ b/src/Gui/View3DInventorViewer.cpp @@ -1650,7 +1650,7 @@ void View3DInventorViewer::viewVR(void) if(oculusUp()) oculusStop(); else{ -#if 0 +#if 1 // start and load the simple test scene: oculusSetTestScene(oculusStart()); #else