diff --git a/src/lib/djstdlib b/src/lib/djstdlib index cbedadd..9b772e2 160000 --- a/src/lib/djstdlib +++ b/src/lib/djstdlib @@ -1 +1 @@ -Subproject commit cbedadd36ed78454d57cd3d2ea6796befcc5f9b8 +Subproject commit 9b772e204672e03bf73388ae8aca21ea5559a764 diff --git a/src/main.c b/src/main.c index 5e12e5c..1ae5429 100644 --- a/src/main.c +++ b/src/main.c @@ -292,11 +292,11 @@ void framebufferSizeCallback(GLFWwindow *window, int width, int height) { GLFWwindow *initWindowAndGL(uint32 windowWidth, uint32 windowHeight) { #ifdef OS_LINUX - glfwInitHint(GLFW_PLATFORM, GLFW_PLATFORM_X11); + //glfwInitHint(GLFW_PLATFORM, GLFW_PLATFORM_X11); #endif glfwInit(); - glfwWindowHintString(GLFW_WAYLAND_APP_ID, "Somaesque"); + //glfwWindowHintString(GLFW_WAYLAND_APP_ID, "Somaesque"); glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4); glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 6); glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); @@ -331,10 +331,6 @@ GLFWwindow *initWindowAndGL(uint32 windowWidth, uint32 windowHeight) { glfwSetWindowSize(window, windowWidth, windowHeight); glEnable(GL_DEPTH_TEST); - glfwSetWindowAttrib(window, GLFW_DECORATED, GLFW_FALSE); - glfwSetWindowAttrib(window, GLFW_DECORATED, GLFW_TRUE); - glfwSetWindowAttrib(window, GLFW_DECORATED, GLFW_FALSE); - return window; } diff --git a/src/world/scene.c b/src/world/scene.c index d7d0044..376c62a 100644 --- a/src/world/scene.c +++ b/src/world/scene.c @@ -91,7 +91,8 @@ void removeEntity(Scene *s, uint32 entityHandle) { if (parentNode != NULL) { for (EachIn(parentNode->children, i)) { if (parentNode->children.data[i] == entity->graphNodeHandle) { - ListRemove(&parentNode->children, i); + memcpy(parentNode->children.data + i, parentNode->children.data + i + 1, parentNode->children.length - i - 1); + //ListRemove(&parentNode->children, i); graphNode->parentHandle = 0; break; }