diff --git a/.gitmodules b/.gitmodules index 9158612..e6814d4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "dependencies/freetype"] path = dependencies/freetype url = https://github.com/freetype/freetype.git +[submodule "dependencies/stb"] + path = dependencies/stb + url = https://github.com/nothings/stb.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 638e36b..f9cf196 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,6 +67,7 @@ add_dependencies(kekengine kekengine_res) target_include_directories(kekengine PUBLIC "src/kekengine/include") target_include_directories(kekengine PUBLIC "dependencies/bullet3/src") target_include_directories(kekengine PUBLIC "dependencies/freetype/include") +target_include_directories(kekengine PUBLIC "dependencies/stb") target_link_libraries(kekengine PUBLIC microtar_static) target_link_libraries(kekengine PUBLIC Bullet3Collision BulletDynamics BulletCollision LinearMath Bullet3Collision Bullet3Common Bullet3Dynamics Bullet3Geometry BulletInverseDynamics) diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md index 3703f60..bb1ba4d 100644 --- a/DEPENDENCIES.md +++ b/DEPENDENCIES.md @@ -1,7 +1,10 @@ # Dependencies - OpenGL, GLEW, GLFW - stb_image, stb_image_write -- microtar (included) +- microtar - openvr (SteamVR), if compiling with KEKENGINE_VR - bullet 3 - freetype + +## Linux +- GTK 3 diff --git a/dependencies/stb b/dependencies/stb new file mode 160000 index 0000000..5736b15 --- /dev/null +++ b/dependencies/stb @@ -0,0 +1 @@ +Subproject commit 5736b15f7ea0ffb08dd38af21067c314d6a3aae9 diff --git a/src/kekengine/cpp/common/defaults.cpp b/src/kekengine/cpp/common/defaults.cpp index 12fc3e8..634d58c 100644 --- a/src/kekengine/cpp/common/defaults.cpp +++ b/src/kekengine/cpp/common/defaults.cpp @@ -77,6 +77,7 @@ static void defaultMouseCallback(GLFWwindow *window, double x, double y, void *d kekData.activeCamera->rotateYaw(xoff); kekData.activeCamera->rotatePitch(yoff); + break; } case GLFWCursorMode::FREE: case GLFWCursorMode::HIDDEN: @@ -85,6 +86,7 @@ static void defaultMouseCallback(GLFWwindow *window, double x, double y, void *d UIPoint childPos = element->getPosition(); if(element->hoverAll(UIPoint((int) x - childPos.x, (int) y - childPos.y), UIPoint((int) x, (int) y))) break; } + break; } } } diff --git a/src/kekengine/cpp/common/engine.cpp b/src/kekengine/cpp/common/engine.cpp index ef86f4e..c031270 100644 --- a/src/kekengine/cpp/common/engine.cpp +++ b/src/kekengine/cpp/common/engine.cpp @@ -10,8 +10,8 @@ #define STB_IMAGE_IMPLEMENTATION #define STB_IMAGE_WRITE_IMPLEMENTATION -#include -#include +#include +#include #include "errordialog.h" #include "objparser.h" diff --git a/src/kekengine/cpp/render/fonts.cpp b/src/kekengine/cpp/render/fonts.cpp index 2bb47fa..cde0e1c 100644 --- a/src/kekengine/cpp/render/fonts.cpp +++ b/src/kekengine/cpp/render/fonts.cpp @@ -1,6 +1,6 @@ #include "fonts.h" -#include +#include #include #include #include diff --git a/src/kekengine/cpp/render/texture.cpp b/src/kekengine/cpp/render/texture.cpp index 64f3a99..999ea96 100644 --- a/src/kekengine/cpp/render/texture.cpp +++ b/src/kekengine/cpp/render/texture.cpp @@ -1,7 +1,7 @@ #include "texture.h" -#include -#include +#include +#include #include "resource.h" #include "internal.h"