NoiseTool new heightmap 2D mesh option

Auburn · Sep 5, 2021 · e6b3738 · e6b3738
1 parent 939adf4
commit e6b3738
Show file tree

Hide file tree

Showing 5 changed files with 255 additions and 66 deletions.
diff --git a/.gitignore b/.gitignore
@@ -33,6 +33,4 @@
 /.vs*
 /out
 /build
-
-# Allow SDL2 libs
-!/NoiseTool/ThirdParty/SDL2-2.0.12/**
+/enc_temp_folder
diff --git a/CMakeSettings.json b/CMakeSettings.json
@@ -11,6 +11,11 @@
             "ctestCommandArgs": "",
             "inheritEnvironments": [ "msvc_x64" ],
             "variables": [
+                {
+                    "name": "CPM_SOURCE_CACHE",
+                    "value": "${projectDir}\\out\\build\\cpm-cache",
+                    "type": "STRING"
+                },
                 {
                     "name": "FASTNOISE2_TESTS",
                     "value": "True",
@@ -29,6 +34,11 @@
             "ctestCommandArgs": "",
             "inheritEnvironments": [ "msvc_x64" ],
             "variables": [
+                {
+                    "name": "CPM_SOURCE_CACHE",
+                    "value": "${projectDir}\\out\\build\\cpm-cache",
+                    "type": "STRING"
+                },
                 {
                     "name": "FASTNOISE2_TESTS",
                     "value": "True",
@@ -47,6 +57,11 @@
             "ctestCommandArgs": "",
             "inheritEnvironments": [ "msvc_x86" ],
             "variables": [
+                {
+                    "name": "CPM_SOURCE_CACHE",
+                    "value": "${projectDir}\\out\\build\\cpm-cache",
+                    "type": "STRING"
+                },
                 {
                     "name": "FASTNOISE2_TESTS",
                     "value": "True",
@@ -65,6 +80,11 @@
             "ctestCommandArgs": "",
             "inheritEnvironments": [ "msvc_x86" ],
             "variables": [
+                {
+                    "name": "CPM_SOURCE_CACHE",
+                    "value": "${projectDir}\\out\\build\\cpm-cache",
+                    "type": "STRING"
+                },
                 {
                     "name": "FASTNOISE2_TESTS",
                     "value": "True",
@@ -83,6 +103,11 @@
             "ctestCommandArgs": "",
             "inheritEnvironments": [ "clang_cl_x64" ],
             "variables": [
+                {
+                    "name": "CPM_SOURCE_CACHE",
+                    "value": "${projectDir}\\out\\build\\cpm-cache",
+                    "type": "STRING"
+                },
                 {
                     "name": "FASTNOISE2_TESTS",
                     "value": "True",
@@ -101,6 +126,11 @@
             "ctestCommandArgs": "",
             "inheritEnvironments": [ "clang_cl_x64" ],
             "variables": [
+                {
+                    "name": "CPM_SOURCE_CACHE",
+                    "value": "${projectDir}\\out\\build\\cpm-cache",
+                    "type": "STRING"
+                },
                 {
                     "name": "FASTNOISE2_TESTS",
                     "value": "True",
@@ -119,6 +149,11 @@
             "ctestCommandArgs": "",
             "inheritEnvironments": [ "clang_cl_x86" ],
             "variables": [
+                {
+                    "name": "CPM_SOURCE_CACHE",
+                    "value": "${projectDir}\\out\\build\\cpm-cache",
+                    "type": "STRING"
+                },
                 {
                     "name": "FASTNOISE2_TESTS",
                     "value": "True",
@@ -137,14 +172,19 @@
             "ctestCommandArgs": "",
             "inheritEnvironments": [ "clang_cl_x86" ],
             "variables": [
+                {
+                    "name": "CPM_SOURCE_CACHE",
+                    "value": "${projectDir}\\out\\build\\cpm-cache",
+                    "type": "STRING"
+                },
                 {
                     "name": "FASTNOISE2_TESTS",
                     "value": "True",
                     "type": "BOOL"
                 }
             ]
         },
-        {
+        {            
             "name": "x64-WSL-GCC-Debug",
             "generator": "Ninja",
             "configurationType": "Debug",
@@ -158,6 +198,11 @@
             "wslPath": "${defaultWSLPath}",
             "addressSanitizerRuntimeFlags": "detect_leaks=0",
             "variables": [
+                {
+                    "name": "CPM_SOURCE_CACHE",
+                    "value": "${projectDir}\\out\\build\\cpm-cache",
+                    "type": "STRING"
+                },
                 {
                     "name": "FASTNOISE2_TESTS",
                     "value": "True",
@@ -179,6 +224,11 @@
             "wslPath": "${defaultWSLPath}",
             "addressSanitizerRuntimeFlags": "detect_leaks=0",
             "variables": [
+                {
+                    "name": "CPM_SOURCE_CACHE",
+                    "value": "${projectDir}\\out\\build\\cpm-cache",
+                    "type": "STRING"
+                },
                 {
                     "name": "FASTNOISE2_TESTS",
                     "value": "True",
@@ -200,6 +250,11 @@
             "wslPath": "${defaultWSLPath}",
             "addressSanitizerRuntimeFlags": "detect_leaks=0",
             "variables": [
+                {
+                    "name": "CPM_SOURCE_CACHE",
+                    "value": "${projectDir}\\out\\build\\cpm-cache",
+                    "type": "STRING"
+                },
                 {
                     "name": "CMAKE_CXX_FLAGS",
                     "value": "-m32",
@@ -226,6 +281,11 @@
             "wslPath": "${defaultWSLPath}",
             "addressSanitizerRuntimeFlags": "detect_leaks=0",
             "variables": [
+                {
+                    "name": "CPM_SOURCE_CACHE",
+                    "value": "${projectDir}\\out\\build\\cpm-cache",
+                    "type": "STRING"
+                },
                 {
                     "name": "CMAKE_CXX_FLAGS",
                     "value": "-m32",

diff --git a/NoiseTool/ImGuiExtra.h b/NoiseTool/ImGuiExtra.h
@@ -29,6 +29,8 @@ namespace ImGuiExtra
     {
         if( ImGui::IsItemHovered() )
         {
+            ImGui::SetItemUsingMouseWheel();
+
             if( ImGui::GetIO().MouseWheel < 0 && *comboIndex < comboCount - 1 )
             {
                 (*comboIndex)++;