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 @@
Use
Level3
Disabled
- _DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ DEBUG;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
pch.h
false
@@ -169,6 +169,10 @@
+
+ NotUsing
+ NotUsing
+
NotUsing
NotUsing
@@ -300,6 +304,7 @@
+
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 @@
{ef44d179-f28b-458c-b3df-be2895553149}
+
+ {be0c0053-abd8-4e2d-a294-7c54511b05a6}
+
@@ -276,6 +279,9 @@
Source Files
+
+ libs\nanort
+
@@ -494,6 +500,9 @@
Header Files
+
+ libs\nanort
+
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::functiontex.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