Manjaro working
This commit is contained in:
BIN
.vscode/.browse.VC.db
vendored
Normal file
BIN
.vscode/.browse.VC.db
vendored
Normal file
Binary file not shown.
18
.vscode/c_cpp_properties.json
vendored
Normal file
18
.vscode/c_cpp_properties.json
vendored
Normal file
@@ -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
|
||||
}
|
||||
3
.vscode/settings.json
vendored
3
.vscode/settings.json
vendored
@@ -1,6 +1,7 @@
|
||||
{
|
||||
"files.associations": {
|
||||
"variant": "cpp",
|
||||
"new": "cpp"
|
||||
"new": "cpp",
|
||||
"iostream": "cpp"
|
||||
}
|
||||
}
|
||||
@@ -4,7 +4,7 @@ Size=400,400
|
||||
Collapsed=0
|
||||
|
||||
[Window][babyboigame]
|
||||
Pos=-1,1061
|
||||
Pos=30,53
|
||||
Size=365,359
|
||||
Collapsed=1
|
||||
Collapsed=0
|
||||
|
||||
|
||||
@@ -19,10 +19,7 @@
|
||||
#include "background.h"
|
||||
|
||||
#include <cute_headers-master/cute_c2.h>
|
||||
#include <cute_headers-master/cute_gl.h>
|
||||
|
||||
#include <glad/glad.h>
|
||||
#include <glad/glad.h>
|
||||
|
||||
#include <glm/glm.hpp>
|
||||
#include <glm/gtc/matrix_transform.hpp>
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -52,7 +52,7 @@ IMGUI_IMPL_API void ImGui_ImplOpenGL3_DestroyDeviceObjects();
|
||||
&& !defined(IMGUI_IMPL_OPENGL_LOADER_CUSTOM)
|
||||
#if defined(__has_include)
|
||||
#if __has_include(<GL/glew.h>)
|
||||
#define IMGUI_IMPL_OPENGL_LOADER_GLEW
|
||||
// #define IMGUI_IMPL_OPENGL_LOADER_GLEW
|
||||
#elif __has_include(<glad/glad.h>)
|
||||
#define IMGUI_IMPL_OPENGL_LOADER_GLAD
|
||||
#elif __has_include(<GL/gl3w.h>)
|
||||
|
||||
@@ -31,7 +31,7 @@ int main()
|
||||
glClear(GL_COLOR_BUFFER_BIT);
|
||||
|
||||
game->render(deltaTime);
|
||||
// game->renderImgui();
|
||||
game->renderImgui();
|
||||
|
||||
glfwSwapBuffers(game->getWindow());
|
||||
glfwPollEvents();
|
||||
|
||||
Reference in New Issue
Block a user