From 0fff9f2010c21aafa5224a55c9297e96a113500e Mon Sep 17 00:00:00 2001 From: omigamedev Date: Sun, 28 Oct 2018 00:29:09 +0200 Subject: [PATCH] add openvr support, switch to 8.1 sdk, prepare for vr ui --- .gitmodules | 3 + PanoPainter.vcxproj | 13 +- PanoPainter.vcxproj.filters | 9 + PanoPainterPackage/PanoPainterPackage.wapproj | 2 +- data/layout.xml | 4 +- libs/openvr | 1 + src/app.cpp | 13 +- src/app.h | 6 + src/app_events.cpp | 4 +- src/app_shaders.cpp | 2 +- src/app_vr.cpp | 105 ++++++++ src/hmd.cpp | 231 ++++++++++++++++++ src/hmd.h | 73 ++++++ src/main.cpp | 47 ++++ src/pch.cpp | 1 + src/pch.h | 1 + src/rtt.cpp | 1 + src/util.cpp | 7 - src/util.h | 6 + 19 files changed, 506 insertions(+), 23 deletions(-) create mode 160000 libs/openvr create mode 100644 src/app_vr.cpp create mode 100644 src/hmd.cpp create mode 100644 src/hmd.h diff --git a/.gitmodules b/.gitmodules index 4222149..bc66059 100644 --- a/.gitmodules +++ b/.gitmodules @@ -40,3 +40,6 @@ [submodule "libs/sqlite3"] path = libs/sqlite3 url = https://bitbucket.org/omigamedev/sqlite3.git +[submodule "libs/openvr"] + path = libs/openvr + url = https://github.com/ValveSoftware/openvr.git diff --git a/PanoPainter.vcxproj b/PanoPainter.vcxproj index 7dcc96b..74b5809 100644 --- a/PanoPainter.vcxproj +++ b/PanoPainter.vcxproj @@ -22,7 +22,7 @@ {6D5028CE-4D76-4B6A-A7C2-DE5A3268D433} Win32Proj PanoPainter - 10.0.17134.0 + 8.1 PanoPainter @@ -77,8 +77,8 @@ true - libs\glm;libs\glew-2.0.0\include;libs\stb;libs\tinyxml2;libs\yoga;libs\curl-win\include;libs\jpeg;libs\wacom;libs\bugtrap-client\include;libs\poly2tri\poly2tri;libs\base64;libs\sqlite3;$(IncludePath) - libs\curl-win\lib\dll-$(Configuration)-$(PlatformShortName);libs\glew-2.0.0\lib\Release\$(Platform);libs\bugtrap-client\lib;$(LibraryPath) + libs\glm;libs\glew-2.0.0\include;libs\stb;libs\tinyxml2;libs\yoga;libs\curl-win\include;libs\jpeg;libs\wacom;libs\bugtrap-client\include;libs\poly2tri\poly2tri;libs\base64;libs\sqlite3;libs\openvr\headers;$(IncludePath) + libs\curl-win\lib\dll-$(Configuration)-$(PlatformShortName);libs\glew-2.0.0\lib\Release\$(Platform);libs\bugtrap-client\lib;libs\openvr\lib\win64;$(LibraryPath) false @@ -87,8 +87,8 @@ false - libs\glm;libs\glew-2.0.0\include;libs\stb;libs\tinyxml2;libs\yoga;libs\curl-win\include;libs\jpeg;libs\wacom;libs\bugtrap-client\include;libs\poly2tri\poly2tri;libs\base64;libs\sqlite3;$(IncludePath) - libs\curl-win\lib\dll-$(Configuration)-$(PlatformShortName);libs\glew-2.0.0\lib\Release\$(Platform);libs\bugtrap-client\lib;$(LibraryPath) + libs\glm;libs\glew-2.0.0\include;libs\stb;libs\tinyxml2;libs\yoga;libs\curl-win\include;libs\jpeg;libs\wacom;libs\bugtrap-client\include;libs\poly2tri\poly2tri;libs\base64;libs\sqlite3;libs\openvr\headers;$(IncludePath) + libs\curl-win\lib\dll-$(Configuration)-$(PlatformShortName);libs\glew-2.0.0\lib\Release\$(Platform);libs\bugtrap-client\lib;libs\openvr\lib\win64;$(LibraryPath) @@ -179,6 +179,7 @@ + @@ -186,6 +187,7 @@ + @@ -307,6 +309,7 @@ + diff --git a/PanoPainter.vcxproj.filters b/PanoPainter.vcxproj.filters index 22a875b..20f10cb 100644 --- a/PanoPainter.vcxproj.filters +++ b/PanoPainter.vcxproj.filters @@ -270,6 +270,12 @@ libs\sqlite3 + + Source Files + + + Source Files + @@ -485,6 +491,9 @@ libs\sqlite3 + + Header Files + diff --git a/PanoPainterPackage/PanoPainterPackage.wapproj b/PanoPainterPackage/PanoPainterPackage.wapproj index f055075..192e1dd 100644 --- a/PanoPainterPackage/PanoPainterPackage.wapproj +++ b/PanoPainterPackage/PanoPainterPackage.wapproj @@ -125,9 +125,9 @@ - + PanoPainter\data\%(RecursiveDir)%(FileName)%(Extension) diff --git a/data/layout.xml b/data/layout.xml index 0506a8e..de4d0c5 100644 --- a/data/layout.xml +++ b/data/layout.xml @@ -969,11 +969,9 @@ Here's a list of what's available in this release. + - - -