Merge pull request #5 from vsg-dev/VsgNativeWindow

Replaced vsgQt::ProxyWindow & vsgQt::ProxySurface with vsg::WindowAdapter and vsg::Surface.
vsg-dev · Sep 23, 2021 · 5157b5e · 5157b5e
2 parents 888545a + 751c05e
commit 5157b5e
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 251 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(QT_PACKAGE_NAME Qt5 CACHE STRING "Set Qt package name, i.e. Qt5 or Qt6.")
 set(QT_PACKAGE_VERSION 5.10 CACHE STRING "Set minimum Qt package version.")
 
-find_package(vsg 0.1.6 REQUIRED)
+find_package(vsg 0.1.7 REQUIRED)
 find_package(vsgXchange) # only used by exanples
 find_package(${QT_PACKAGE_NAME} ${QT_PACKAGE_VERSION} COMPONENTS Widgets REQUIRED)
 

diff --git a/examples/vsgqtviewer/main.cpp b/examples/vsgqtviewer/main.cpp
@@ -68,7 +68,7 @@ int main(int argc, char* argv[])
     // provide the calls to set up the vsg::Viewer that will be used to render to the QWindow subclass vsgQt::ViewerWindow
     viewerWindow->initializeCallback = [&](vsgQt::ViewerWindow& vw) {
 
-        auto& window = vw.proxyWindow;
+        auto& window = vw.windowAdapter;
         if (!window) return false;
 
         auto& viewer = vw.viewer;

diff --git a/include/vsgQt/ProxySurface.h b/include/vsgQt/ProxySurface.h
diff --git a/include/vsgQt/ProxyWindow.h b/include/vsgQt/ProxyWindow.h
diff --git a/include/vsgQt/ViewerWindow.h b/include/vsgQt/ViewerWindow.h
@@ -16,9 +16,10 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #include <QVulkanInstance>
 #include <QWindow>
 
+#include <vsg/viewer/WindowAdapter.h>
+#include <vsg/viewer/WindowAdapter.h>
+
 #include <vsgQt/KeyboardMap.h>
-#include <vsgQt/ProxySurface.h>
-#include <vsgQt/ProxyWindow.h>
 
 namespace vsgQt
 {
@@ -33,8 +34,7 @@ namespace vsgQt
         vsg::ref_ptr<vsg::Instance> instance;
         vsg::ref_ptr<vsg::Viewer> viewer;
 
-        vsg::ref_ptr<ProxySurface> proxySurface;
-        vsg::ref_ptr<ProxyWindow> proxyWindow;
+        vsg::ref_ptr<vsg::WindowAdapter> windowAdapter;
         vsg::ref_ptr<KeyboardMap> keyboardMap;
 
         using InitialCallback = std::function<void(ViewerWindow&)>;
@@ -50,6 +50,8 @@ namespace vsgQt
         bool event(QEvent* e) override;
 
         void exposeEvent(QExposeEvent*) override;
+        void hideEvent(QHideEvent *ev) override;
+
         void keyPressEvent(QKeyEvent*) override;
         void keyReleaseEvent(QKeyEvent*) override;
         void mouseMoveEvent(QMouseEvent*) override;

diff --git a/src/vsgQt/CMakeLists.txt b/src/vsgQt/CMakeLists.txt
@@ -34,15 +34,11 @@ endmacro()
 
 set(SOURCES
     KeyboardMap.cpp
-    ProxySurface.cpp
-    ProxyWindow.cpp
     ViewerWindow.cpp
 )
 
 set(HEADERS
     ../../include/vsgQt/KeyboardMap.h
-    ../../include/vsgQt/ProxySurface.h
-    ../../include/vsgQt/ProxyWindow.h
     ../../include/vsgQt/ViewerWindow.h
 )
 

diff --git a/src/vsgQt/ProxySurface.cpp b/src/vsgQt/ProxySurface.cpp
diff --git a/src/vsgQt/ProxyWindow.cpp b/src/vsgQt/ProxyWindow.cpp