Add stb dependency

This commit is contained in:
MrLetsplay 2023-09-11 14:03:49 +02:00
parent 3d9dd14fd0
commit be86af632f
Signed by: mr
SSH Key Fingerprint: SHA256:92jBH80vpXyaZHjaIl47pjRq+Yt7XGTArqQg1V7hSqg
8 changed files with 16 additions and 6 deletions

3
.gitmodules vendored
View File

@ -10,3 +10,6 @@
[submodule "dependencies/freetype"] [submodule "dependencies/freetype"]
path = dependencies/freetype path = dependencies/freetype
url = https://github.com/freetype/freetype.git url = https://github.com/freetype/freetype.git
[submodule "dependencies/stb"]
path = dependencies/stb
url = https://github.com/nothings/stb.git

View File

@ -67,6 +67,7 @@ add_dependencies(kekengine kekengine_res)
target_include_directories(kekengine PUBLIC "src/kekengine/include") target_include_directories(kekengine PUBLIC "src/kekengine/include")
target_include_directories(kekengine PUBLIC "dependencies/bullet3/src") target_include_directories(kekengine PUBLIC "dependencies/bullet3/src")
target_include_directories(kekengine PUBLIC "dependencies/freetype/include") 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 microtar_static)
target_link_libraries(kekengine PUBLIC Bullet3Collision BulletDynamics BulletCollision LinearMath Bullet3Collision Bullet3Common Bullet3Dynamics Bullet3Geometry BulletInverseDynamics) target_link_libraries(kekengine PUBLIC Bullet3Collision BulletDynamics BulletCollision LinearMath Bullet3Collision Bullet3Common Bullet3Dynamics Bullet3Geometry BulletInverseDynamics)

View File

@ -1,7 +1,10 @@
# Dependencies # Dependencies
- OpenGL, GLEW, GLFW - OpenGL, GLEW, GLFW
- stb_image, stb_image_write - stb_image, stb_image_write
- microtar (included) - microtar
- openvr (SteamVR), if compiling with KEKENGINE_VR - openvr (SteamVR), if compiling with KEKENGINE_VR
- bullet 3 - bullet 3
- freetype - freetype
## Linux
- GTK 3

1
dependencies/stb vendored Submodule

@ -0,0 +1 @@
Subproject commit 5736b15f7ea0ffb08dd38af21067c314d6a3aae9

View File

@ -77,6 +77,7 @@ static void defaultMouseCallback(GLFWwindow *window, double x, double y, void *d
kekData.activeCamera->rotateYaw(xoff); kekData.activeCamera->rotateYaw(xoff);
kekData.activeCamera->rotatePitch(yoff); kekData.activeCamera->rotatePitch(yoff);
break;
} }
case GLFWCursorMode::FREE: case GLFWCursorMode::FREE:
case GLFWCursorMode::HIDDEN: case GLFWCursorMode::HIDDEN:
@ -85,6 +86,7 @@ static void defaultMouseCallback(GLFWwindow *window, double x, double y, void *d
UIPoint childPos = element->getPosition(); UIPoint childPos = element->getPosition();
if(element->hoverAll(UIPoint((int) x - childPos.x, (int) y - childPos.y), UIPoint((int) x, (int) y))) break; if(element->hoverAll(UIPoint((int) x - childPos.x, (int) y - childPos.y), UIPoint((int) x, (int) y))) break;
} }
break;
} }
} }
} }

View File

@ -10,8 +10,8 @@
#define STB_IMAGE_IMPLEMENTATION #define STB_IMAGE_IMPLEMENTATION
#define STB_IMAGE_WRITE_IMPLEMENTATION #define STB_IMAGE_WRITE_IMPLEMENTATION
#include <stb/stb_image.h> #include <stb_image.h>
#include <stb/stb_image_write.h> #include <stb_image_write.h>
#include "errordialog.h" #include "errordialog.h"
#include "objparser.h" #include "objparser.h"

View File

@ -1,6 +1,6 @@
#include "fonts.h" #include "fonts.h"
#include <stb/stb_image_write.h> #include <stb_image_write.h>
#include <GL/glew.h> #include <GL/glew.h>
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
#include <iostream> #include <iostream>

View File

@ -1,7 +1,7 @@
#include "texture.h" #include "texture.h"
#include <stb/stb_image.h> #include <stb_image.h>
#include <stb/stb_image_write.h> #include <stb_image_write.h>
#include "resource.h" #include "resource.h"
#include "internal.h" #include "internal.h"