diff --git a/.vscode/.browse.VC.db b/.vscode/.browse.VC.db new file mode 100644 index 0000000..71aa50b Binary files /dev/null and b/.vscode/.browse.VC.db differ diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json new file mode 100644 index 0000000..c710280 --- /dev/null +++ b/.vscode/c_cpp_properties.json @@ -0,0 +1,18 @@ +{ + "configurations": [ + { + "name": "Linux", + "includePath": [ + "${default}", + "${workspaceFolder}/include", + "${workspaceFolder}/include/imgui", + "${workspaceFolder}/include/logic" + ], + "compilerPath": "/usr/bin/gcc", + "cStandard": "gnu17", + "cppStandard": "gnu++17", + "intelliSenseMode": "${default}" + } + ], + "version": 4 +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index df5414c..862c1fd 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,7 @@ { "files.associations": { "variant": "cpp", - "new": "cpp" + "new": "cpp", + "iostream": "cpp" } } \ No newline at end of file diff --git a/bin/imgui.ini b/bin/imgui.ini index 4b5d4e9..008ba45 100644 --- a/bin/imgui.ini +++ b/bin/imgui.ini @@ -4,7 +4,7 @@ Size=400,400 Collapsed=0 [Window][babyboigame] -Pos=-1,1061 +Pos=30,53 Size=365,359 -Collapsed=1 +Collapsed=0 diff --git a/bin/main b/bin/main index bb1848b..e8226c4 100755 Binary files a/bin/main and b/bin/main differ diff --git a/include/game.h b/include/game.h index 1a5930b..0eaf527 100644 --- a/include/game.h +++ b/include/game.h @@ -19,10 +19,7 @@ #include "background.h" #include -#include -#include -#include #include #include diff --git a/include/imgui/imconfig.h b/include/imgui/imconfig.h index c6817de..cc9de95 100644 --- a/include/imgui/imconfig.h +++ b/include/imgui/imconfig.h @@ -12,7 +12,7 @@ //----------------------------------------------------------------------------- #pragma once - +#define IMGUI_IMPL_OPENGL_LOADER_GLAD //---- Define assertion handler. Defaults to calling assert(). // If your macro uses multiple statements, make sure is enclosed in a 'do { .. } while (0)' block so it can be used as a single statement. //#define IM_ASSERT(_EXPR) MyAssert(_EXPR) diff --git a/include/imgui/imgui_impl_opengl3.h b/include/imgui/imgui_impl_opengl3.h index d55935a..0b43446 100644 --- a/include/imgui/imgui_impl_opengl3.h +++ b/include/imgui/imgui_impl_opengl3.h @@ -52,7 +52,7 @@ IMGUI_IMPL_API void ImGui_ImplOpenGL3_DestroyDeviceObjects(); && !defined(IMGUI_IMPL_OPENGL_LOADER_CUSTOM) #if defined(__has_include) #if __has_include() - #define IMGUI_IMPL_OPENGL_LOADER_GLEW + // #define IMGUI_IMPL_OPENGL_LOADER_GLEW #elif __has_include() #define IMGUI_IMPL_OPENGL_LOADER_GLAD #elif __has_include() diff --git a/src/source.cpp b/src/source.cpp index 04a09b2..2a8607f 100644 --- a/src/source.cpp +++ b/src/source.cpp @@ -31,7 +31,7 @@ int main() glClear(GL_COLOR_BUFFER_BIT); game->render(deltaTime); - // game->renderImgui(); + game->renderImgui(); glfwSwapBuffers(game->getWindow()); glfwPollEvents();