diff --git a/src/model/controllers/ui/uiController.hpp b/src/model/controllers/ui/uiController.hpp index 783efc3..00e16c3 100644 --- a/src/model/controllers/ui/uiController.hpp +++ b/src/model/controllers/ui/uiController.hpp @@ -16,12 +16,6 @@ #include "../../patterns/observer/observable.hpp" -#define DEFAULT_UI_WINDOW_AMOUNT 1 // 2 windows, one for each eye -#define DEFAULT_UI_OFFSET_X 1080 // 1080 -#define DEFAULT_UI_OFFSET_Y 0 -#define DEFAULT_UI_SIZE_X 1920 // psvr is 960x1080 per eye -#define DEFAULT_UI_SIZE_Y 1080 - using namespace std; using namespace cv; using namespace cv::ogl; diff --git a/src/model/windows/window.hpp b/src/model/windows/window.hpp index fdd8ffe..f781a76 100644 --- a/src/model/windows/window.hpp +++ b/src/model/windows/window.hpp @@ -4,6 +4,7 @@ #include #include #include +#include "../../threadweaver/debugging.hpp" /// @brief this class represents a single window, there should only ever be one if the app is in opengl mode. class Window diff --git a/src/pipeline/members/displayOutputNode.cpp b/src/pipeline/members/displayOutputNode.cpp index 9d71f3c..4a76115 100644 --- a/src/pipeline/members/displayOutputNode.cpp +++ b/src/pipeline/members/displayOutputNode.cpp @@ -6,6 +6,7 @@ DisplayOutputNode::DisplayOutputNode(PipelineNode* predecessor, Window *managed) isLast = true; //output = NULL; cost = 2; + inited = false; } void DisplayOutputNode::processFrame() @@ -14,10 +15,12 @@ void DisplayOutputNode::processFrame() if (!inited) { #ifdef OGLWIN - namedWindow(_managed->myWindow, WINDOW_OPENGL); + DEBUG_LOG("DisplayOutputNode on thread " << localThread->get_id() << " is creating its opengl UI"); + cv::namedWindow(_managed->myWindow, cv::WINDOW_OPENGL); setWindowProperty(_managed->myWindow, cv::WND_PROP_FULLSCREEN, cv::WINDOW_FULLSCREEN); cv::setOpenGlContext(_managed->myWindow); - moveWindow(_managed->myWindow, DEFAULT_UI_OFFSET_X + 960, DEFAULT_UI_OFFSET_Y); + cv::moveWindow(_managed->myWindow, DEFAULT_UI_OFFSET_X + 960, DEFAULT_UI_OFFSET_Y); + DEBUG_LOG("DisplayOutputNode on thread " << localThread->get_id() << " is done creating its opengl UI"); #endif inited = true; } diff --git a/src/prog b/src/prog index 8c853fe..4b627b0 100755 Binary files a/src/prog and b/src/prog differ diff --git a/src/threadweaver/debugging.hpp b/src/threadweaver/debugging.hpp index 27804db..f5ebebd 100644 --- a/src/threadweaver/debugging.hpp +++ b/src/threadweaver/debugging.hpp @@ -4,7 +4,7 @@ //#define DBGMODE #define DBGCOMM -//#define OGLWIN +#define OGLWIN #define GFXCORE 0 #define DISPLAYCORE 1 #define CAMCORE 2 @@ -16,6 +16,12 @@ #define FPS_LIMIT_PSEYE 60 //increments of 15, valid values: 0-15-30-60 +#define DEFAULT_UI_WINDOW_AMOUNT 1 // 2 windows, one for each eye +#define DEFAULT_UI_OFFSET_X 1080 // 1080 +#define DEFAULT_UI_OFFSET_Y 0 +#define DEFAULT_UI_SIZE_X 1920 // psvr is 960x1080 per eye +#define DEFAULT_UI_SIZE_Y 1080 + #define QU(x) #x #define QUH(x) QU(x)