From ade7e422fe1b601c3fd7f60966af42bf7a932a46 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Wed, 24 Jul 2024 11:47:31 +0200 Subject: [PATCH 1/3] Fix some meta info --- src/ModelLoading.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ModelLoading.cpp b/src/ModelLoading.cpp index 60f36b4..9a9d0ed 100644 --- a/src/ModelLoading.cpp +++ b/src/ModelLoading.cpp @@ -38,7 +38,7 @@ using namespace ::OSRE::Common; using namespace ::OSRE::RenderBackend; /// @brief The log-tag -static constexpr c8 Tag[] = "ModelLoadingApp"; +static constexpr c8 Tag[] = "Assimp-Viewer"; //------------------------------------------------------------------------------------------------- /// @ingroup Editor @@ -185,7 +185,7 @@ class ModelLoadingApp : public App::AppBase { int main(int argc, char *argv[]) { ModelLoadingApp myApp(argc, argv); - if (!myApp.initWindow(10, 10, 1024, 768, "ModelLoader sample! Press o to import an Asset", false, false, App::RenderBackendType::OpenGLRenderBackend)) { + if (!myApp.initWindow(10, 10, 1024, 768, "Assimp-Vewer! Press o to import an Asset", false, false, App::RenderBackendType::OpenGLRenderBackend)) { return 1; } From 568a1d361523ec11169213123575db36d6eeda5e Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Wed, 24 Jul 2024 11:48:02 +0200 Subject: [PATCH 2/3] Add missing default config for vcpkg --- CMakePresets.json | 13 +++++++++++++ vcpkg.json | 6 ++++++ 2 files changed, 19 insertions(+) create mode 100644 CMakePresets.json create mode 100644 vcpkg.json diff --git a/CMakePresets.json b/CMakePresets.json new file mode 100644 index 0000000..3d4c40f --- /dev/null +++ b/CMakePresets.json @@ -0,0 +1,13 @@ +{ + "version": 3, + "configurePresets": [ + { + "name": "default", + "binaryDir": "${sourceDir}", + "cacheVariables": { + "CMAKE_TOOLCHAIN_FILE": "contrib/osre/contrib/vcpkg/scripts/buildsystems/vcpkg.cmake" + } + } + ] +} + diff --git a/vcpkg.json b/vcpkg.json new file mode 100644 index 0000000..268cfeb --- /dev/null +++ b/vcpkg.json @@ -0,0 +1,6 @@ +{ + "dependencies": [ + "glm", + "sdl2" + ] +} From fcee9a4b5b23e519e8b067d5cd2622c887c27671 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Sat, 3 Aug 2024 08:42:06 +0200 Subject: [PATCH 3/3] osre:latest greatest --- contrib/osre | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/osre b/contrib/osre index d9d7a07..9e6d208 160000 --- a/contrib/osre +++ b/contrib/osre @@ -1 +1 @@ -Subproject commit d9d7a07197d3e229e3dff82d871e36923ce22793 +Subproject commit 9e6d2087112f6e7d552e73038df8cbcf3da84683