From 81f51e2be6f5f1d953795a138d5c7047ccc6a819 Mon Sep 17 00:00:00 2001
From: omigamedev <omarator@gmail.com>
Date: Tue, 8 Jan 2019 16:54:05 +0100
Subject: [PATCH] add nanort lib and update external git modules

---
 .gitmodules                 | 3 +++
 PanoPainter.vcxproj         | 7 ++++++-
 PanoPainter.vcxproj.filters | 9 +++++++++
 libs/glm                    | 2 +-
 libs/nanort                 | 1 +
 libs/openvr                 | 2 +-
 libs/stb/stb                | 2 +-
 libs/tinyxml2               | 2 +-
 src/canvas.cpp              | 3 +++
 src/node_panel_grid.cpp     | 4 ++--
 10 files changed, 28 insertions(+), 7 deletions(-)
 create mode 160000 libs/nanort

diff --git a/.gitmodules b/.gitmodules
index bc66059..fef1cb0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -43,3 +43,6 @@
 [submodule "libs/openvr"]
 	path = libs/openvr
 	url = https://github.com/ValveSoftware/openvr.git
+[submodule "libs/nanort"]
+	path = libs/nanort
+	url = https://github.com/lighttransport/nanort.git
diff --git a/PanoPainter.vcxproj b/PanoPainter.vcxproj
index 832e9bd..d2abd1f 100644
--- a/PanoPainter.vcxproj
+++ b/PanoPainter.vcxproj
@@ -112,7 +112,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>DEBUG;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <ExceptionHandling>false</ExceptionHandling>
     </ClCompile>
@@ -169,6 +169,10 @@
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="libs\nanort\nanort.cc">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
     <ClCompile Include="libs\sqlite3\sqlite3.c">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
@@ -300,6 +304,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="libs\nanort\nanort.h" />
     <ClInclude Include="libs\sqlite3\sqlite3.h" />
     <ClInclude Include="libs\sqlite3\sqlite3ext.h" />
     <ClInclude Include="src\action.h" />
diff --git a/PanoPainter.vcxproj.filters b/PanoPainter.vcxproj.filters
index 20f10cb..65ffe49 100644
--- a/PanoPainter.vcxproj.filters
+++ b/PanoPainter.vcxproj.filters
@@ -43,6 +43,9 @@
     <Filter Include="libs\sqlite3">
       <UniqueIdentifier>{ef44d179-f28b-458c-b3df-be2895553149}</UniqueIdentifier>
     </Filter>
+    <Filter Include="libs\nanort">
+      <UniqueIdentifier>{be0c0053-abd8-4e2d-a294-7c54511b05a6}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\app.cpp">
@@ -276,6 +279,9 @@
     <ClCompile Include="src\app_vr.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="libs\nanort\nanort.cc">
+      <Filter>libs\nanort</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\app.h">
@@ -494,6 +500,9 @@
     <ClInclude Include="src\hmd.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="libs\nanort\nanort.h">
+      <Filter>libs\nanort</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="PanoPainter.rc">
diff --git a/libs/glm b/libs/glm
index 1190ae0..47031aa 160000
--- a/libs/glm
+++ b/libs/glm
@@ -1 +1 @@
-Subproject commit 1190ae0b0e6ab38dc4a650ce7ad79be66a7a4de1
+Subproject commit 47031aa4b7b079716e4cac496819e7f464b6a713
diff --git a/libs/nanort b/libs/nanort
new file mode 160000
index 0000000..4f0df84
--- /dev/null
+++ b/libs/nanort
@@ -0,0 +1 @@
+Subproject commit 4f0df84625c5f8a03751157a17c624bbce80cd24
diff --git a/libs/openvr b/libs/openvr
index 1fb1030..64fc059 160000
--- a/libs/openvr
+++ b/libs/openvr
@@ -1 +1 @@
-Subproject commit 1fb1030f2ac238456dca7615a4408fb2bb42afb6
+Subproject commit 64fc05966a109543a1e191a45e1ab3a25a651211
diff --git a/libs/stb/stb b/libs/stb/stb
index 9d9f75e..e6afb9c 160000
--- a/libs/stb/stb
+++ b/libs/stb/stb
@@ -1 +1 @@
-Subproject commit 9d9f75eb682dd98b34de08bb5c489c6c561c9fa6
+Subproject commit e6afb9cbae4064da8c3e69af3ff5c4629579c1d2
diff --git a/libs/tinyxml2 b/libs/tinyxml2
index e1b5043..8f4a9a8 160000
--- a/libs/tinyxml2
+++ b/libs/tinyxml2
@@ -1 +1 @@
-Subproject commit e1b50439c94181d3c271cbc5a9b3445640f8f4e9
+Subproject commit 8f4a9a8cc2a93709b97d0cf51d33ddd1ec33277d
diff --git a/src/canvas.cpp b/src/canvas.cpp
index 01322f1..008c7ef 100644
--- a/src/canvas.cpp
+++ b/src/canvas.cpp
@@ -2207,6 +2207,9 @@ void Canvas::draw_objects(std::function<void(const glm::mat4& camera, const glm:
 
         glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, 0);
         layer.m_rtt[i].unbindFramebuffer();
+
+        layer.m_dirty_face[i] = true;
+        layer.m_dirty_box[i] = { 0, 0, layer.w, layer.h };
     }
 
     glDeleteRenderbuffers(1, &rboID);
diff --git a/src/node_panel_grid.cpp b/src/node_panel_grid.cpp
index bc452b5..a4881bb 100644
--- a/src/node_panel_grid.cpp
+++ b/src/node_panel_grid.cpp
@@ -104,7 +104,7 @@ void NodePanelGrid::init_controls()
             auto sz = m_hm_preview->tex.size();
             m_hm_preview->SetAspectRatio(sz.x / sz.y);
             m_hm_plane.create(1, 1, m_hm_image, 
-                m_groud_resolution->get_value() * 5.f, m_hm_height->get_value());
+                m_groud_resolution->get_value() * 5.f, get_height());
             m_hm_preview->SetHeight(100);
         }
     };
@@ -122,7 +122,7 @@ void NodePanelGrid::init_controls()
 
 float NodePanelGrid::get_height() const
 {
-    return glm::pow(m_hm_height->get_value() - 0.5f, 3.f) * 10.f;
+    return -glm::pow(m_hm_height->get_value() - 0.5f, 3.f) * 10.f;
 }
 
 float NodePanelGrid::get_offset() const