From da9417da7b8f6b1cb1bff87200141a20a1c6bd1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Wed, 24 Apr 2019 08:56:21 +0200 Subject: [PATCH 1/3] Remove .vscode folder from repository --- .gitignore | 4 +- .vscode/c_cpp_properties.json | 184 ---------------------------------- 2 files changed, 1 insertion(+), 187 deletions(-) delete mode 100644 .vscode/c_cpp_properties.json diff --git a/.gitignore b/.gitignore index ecacaa83..4f98207c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,9 +3,7 @@ /x64 # Automatically generated files by .vscode -/.vscode/.cmaketools.json -/.vscode/.ropeproject -/.vscode/settings.json +/.vscode # Development project files *.sublime-project diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json deleted file mode 100644 index c896afe1..00000000 --- a/.vscode/c_cpp_properties.json +++ /dev/null @@ -1,184 +0,0 @@ -{ - "configurations": [ - { - "name": "Mac", - "includePath": [ - "/Library/Developer/CommandLineTools/usr/lib/clang/9.0.0/include", - "/Library/Developer/CommandLineTools/usr/include/c++/v1/", - "/usr/local/include", - "/usr/include", - "/usr/include/machine", - "${workspaceRoot}", - "${workspaceRoot}/dependencies/filesystem", - "${workspaceRoot}/dependencies/openexr/OpenEXR/IlmImf", - "${workspaceRoot}/dependencies/openexr/IlmBase/Imath", - "${workspaceRoot}/dependencies/openexr/OpenEXR/IlmImfUtil", - "${workspaceRoot}/build/dependencies/nanogui", - "${workspaceRoot}/build/dependencies/openexr/IlmBase/Iex", - "${workspaceRoot}/dependencies/openexr/OpenEXR/exrmaketiled", - "${workspaceRoot}/dependencies/stb", - "${workspaceRoot}/dependencies/openexr/IlmBase/IlmThread", - "${workspaceRoot}/dependencies/tinyformat", - "${workspaceRoot}/dependencies/nanogui/ext/glfw/src", - "${workspaceRoot}/build/dependencies/openexr/IlmBase/IlmThread", - "${workspaceRoot}/dependencies/openexr/OpenEXR/IlmImfFuzzTest", - "${workspaceRoot}/build/dependencies/openexr/OpenEXR/IlmImf", - "${workspaceRoot}/dependencies/openexr/OpenEXR/exrmultiview", - "${workspaceRoot}/dependencies/utfcpp/source", - "${workspaceRoot}/include", - "${workspaceRoot}/dependencies/openexr/IlmBase/Half", - "${workspaceRoot}/dependencies/nanogui/ext/coro", - "${workspaceRoot}/build/dependencies/nanogui/ext_build/glfw/src", - "${workspaceRoot}/build/dependencies/openexr/IlmBase/Imath", - "${workspaceRoot}/dependencies/openexr/OpenEXR/exrmakepreview", - "${workspaceRoot}/dependencies/openexr/OpenEXR/exrenvmap", - "${workspaceRoot}/dependencies/nanogui/ext/nanovg/src", - "${workspaceRoot}/dependencies/args", - "${workspaceRoot}/dependencies/nanogui/ext/glfw/include", - "${workspaceRoot}/build/dependencies/openexr/OpenEXR/config", - "${workspaceRoot}/dependencies/nanogui/ext/eigen", - "${workspaceRoot}/dependencies/openexr/IlmBase/IexMath", - "${workspaceRoot}/build/dependencies/openexr/IlmBase/IexMath", - "${workspaceRoot}/dependencies/openexr/IlmBase/Iex", - "${workspaceRoot}/build/dependencies/openexr/IlmBase/Half", - "${workspaceRoot}/dependencies/nanogui/include", - "${workspaceRoot}/build/dependencies/openexr/IlmBase/config" - ], - "defines": [], - "intelliSenseMode": "clang-x64", - "browse": { - "path": [ - "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1", - "/usr/local/include", - "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.1.0/include", - "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include", - "/usr/include", - "/usr/include/machine", - "${workspaceRoot}" - ], - "limitSymbolsToIncludedHeaders": true, - "databaseFilename": "" - }, - "macFrameworkPath": [ - "/System/Library/Frameworks", - "/Library/Frameworks" - ], - "compilerPath": "/usr/bin/clang", - "cStandard": "c11", - "cppStandard": "c++11" - }, - { - "name": "Linux", - "includePath": [ - "/usr/include", - "/usr/local/include", - "${workspaceRoot}", - "${workspaceRoot}/dependencies/filesystem", - "${workspaceRoot}/dependencies/openexr/OpenEXR/IlmImf", - "${workspaceRoot}/dependencies/openexr/IlmBase/Imath", - "${workspaceRoot}/dependencies/openexr/OpenEXR/IlmImfUtil", - "${workspaceRoot}/build/dependencies/nanogui", - "${workspaceRoot}/build/dependencies/openexr/IlmBase/Iex", - "${workspaceRoot}/dependencies/openexr/OpenEXR/exrmaketiled", - "${workspaceRoot}/dependencies/stb", - "${workspaceRoot}/dependencies/openexr/IlmBase/IlmThread", - "${workspaceRoot}/dependencies/tinyformat", - "${workspaceRoot}/dependencies/nanogui/ext/glfw/src", - "${workspaceRoot}/build/dependencies/openexr/IlmBase/IlmThread", - "${workspaceRoot}/dependencies/openexr/OpenEXR/IlmImfFuzzTest", - "${workspaceRoot}/build/dependencies/openexr/OpenEXR/IlmImf", - "${workspaceRoot}/dependencies/openexr/OpenEXR/exrmultiview", - "${workspaceRoot}/dependencies/utfcpp/source", - "${workspaceRoot}/include", - "${workspaceRoot}/dependencies/openexr/IlmBase/Half", - "${workspaceRoot}/dependencies/nanogui/ext/coro", - "${workspaceRoot}/build/dependencies/nanogui/ext_build/glfw/src", - "${workspaceRoot}/build/dependencies/openexr/IlmBase/Imath", - "${workspaceRoot}/dependencies/openexr/OpenEXR/exrmakepreview", - "${workspaceRoot}/dependencies/openexr/OpenEXR/exrenvmap", - "${workspaceRoot}/dependencies/nanogui/ext/nanovg/src", - "${workspaceRoot}/dependencies/args", - "${workspaceRoot}/dependencies/nanogui/ext/glfw/include", - "${workspaceRoot}/build/dependencies/openexr/OpenEXR/config", - "${workspaceRoot}/dependencies/nanogui/ext/eigen", - "${workspaceRoot}/dependencies/openexr/IlmBase/IexMath", - "${workspaceRoot}/build/dependencies/openexr/IlmBase/IexMath", - "${workspaceRoot}/dependencies/openexr/IlmBase/Iex", - "${workspaceRoot}/build/dependencies/openexr/IlmBase/Half", - "${workspaceRoot}/dependencies/nanogui/include", - "${workspaceRoot}/build/dependencies/openexr/IlmBase/config" - ], - "defines": [], - "intelliSenseMode": "clang-x64", - "browse": { - "path": [ - "/usr/include", - "/usr/local/include", - "${workspaceRoot}" - ], - "limitSymbolsToIncludedHeaders": true, - "databaseFilename": "" - }, - "compilerPath": "/usr/bin/gcc", - "cStandard": "c11", - "cppStandard": "c++11" - }, - { - "name": "Win32", - "includePath": [ - "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/include", - "C:/Program Files (x86)/Windows Kits/10/Include/10.0.10240.0/ucrt", - "C:/Program Files (x86)/Microsoft SDKs/Windows/v7.1A/Include", - "${workspaceRoot}", - "${workspaceRoot}/dependencies/filesystem", - "${workspaceRoot}/dependencies/openexr/OpenEXR/IlmImf", - "${workspaceRoot}/dependencies/openexr/IlmBase/Imath", - "${workspaceRoot}/dependencies/openexr/OpenEXR/IlmImfUtil", - "${workspaceRoot}/build/dependencies/nanogui", - "${workspaceRoot}/build/dependencies/openexr/IlmBase/Iex", - "${workspaceRoot}/dependencies/openexr/OpenEXR/exrmaketiled", - "${workspaceRoot}/dependencies/stb", - "${workspaceRoot}/dependencies/openexr/IlmBase/IlmThread", - "${workspaceRoot}/dependencies/tinyformat", - "${workspaceRoot}/dependencies/nanogui/ext/glfw/src", - "${workspaceRoot}/build/dependencies/openexr/IlmBase/IlmThread", - "${workspaceRoot}/dependencies/openexr/OpenEXR/IlmImfFuzzTest", - "${workspaceRoot}/build/dependencies/openexr/OpenEXR/IlmImf", - "${workspaceRoot}/dependencies/openexr/OpenEXR/exrmultiview", - "${workspaceRoot}/dependencies/utfcpp/source", - "${workspaceRoot}/include", - "${workspaceRoot}/dependencies/openexr/IlmBase/Half", - "${workspaceRoot}/dependencies/nanogui/ext/coro", - "${workspaceRoot}/build/dependencies/nanogui/ext_build/glfw/src", - "${workspaceRoot}/build/dependencies/openexr/IlmBase/Imath", - "${workspaceRoot}/dependencies/openexr/OpenEXR/exrmakepreview", - "${workspaceRoot}/dependencies/openexr/OpenEXR/exrenvmap", - "${workspaceRoot}/dependencies/nanogui/ext/nanovg/src", - "${workspaceRoot}/dependencies/args", - "${workspaceRoot}/dependencies/nanogui/ext/glfw/include", - "${workspaceRoot}/build/dependencies/openexr/OpenEXR/config", - "${workspaceRoot}/dependencies/nanogui/ext/eigen", - "${workspaceRoot}/dependencies/openexr/IlmBase/IexMath", - "${workspaceRoot}/build/dependencies/openexr/IlmBase/IexMath", - "${workspaceRoot}/dependencies/openexr/IlmBase/Iex", - "${workspaceRoot}/build/dependencies/openexr/IlmBase/Half", - "${workspaceRoot}/dependencies/nanogui/include", - "${workspaceRoot}/build/dependencies/openexr/IlmBase/config" - ], - "defines": [ - "_DEBUG", - "UNICODE" - ], - "intelliSenseMode": "msvc-x64", - "browse": { - "path": [ - "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/include/*", - "${workspaceRoot}" - ], - "limitSymbolsToIncludedHeaders": true, - "databaseFilename": "" - } - } - ], - "version": 4 -} \ No newline at end of file From 8b6730766b741dcbd261c9fd61d21ef21c5ca5d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Wed, 24 Apr 2019 08:56:47 +0200 Subject: [PATCH 2/3] Fix implicit size_t to int conversion --- src/ImageViewer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ImageViewer.cpp b/src/ImageViewer.cpp index 9d6def68..fd317266 100644 --- a/src/ImageViewer.cpp +++ b/src/ImageViewer.cpp @@ -878,7 +878,7 @@ void ImageViewer::removeAllImages() { requestFocus(); for (size_t i = mImages.size(); i > 0; --i) { - mImageButtonContainer->removeChild(i - 1); + mImageButtonContainer->removeChild((int)(i - 1)); } mImages.clear(); From 6c360ec8a4f5aaf452774e3a9300bd5a3469b5be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Sat, 18 May 2019 09:33:59 +0200 Subject: [PATCH 3/3] Update custom nanogui with fixed focus path --- dependencies/nanogui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/nanogui b/dependencies/nanogui index acf43e51..5c0de3af 160000 --- a/dependencies/nanogui +++ b/dependencies/nanogui @@ -1 +1 @@ -Subproject commit acf43e519e5fdb1834b0257d577200fcc00abec8 +Subproject commit 5c0de3af43ee5f3176e313961414971041e881d6