piwalker/2dGameProject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prebuild spdlog, and fix some link warnings.

Browse Source
This commit is contained in:
Samuel Walker
2025-01-21 22:03:15 -07:00
parent 7d51c5a2e7
commit 530734d159
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
2dGameProject/Log.h
View File

@ -1,5 +1,5 @@
#pragma once #pragma once
#include "spdlog/spdlog.h" #include "spdlog/logger.h"
#include <memory> #include <memory>
#define TRACE(...) Log::GetLogger()->trace(__VA_ARGS__) #define TRACE(...) Log::GetLogger()->trace(__VA_ARGS__)

4
2dGameProject/SpriteRenderer.cpp
View File

@ -48,7 +48,7 @@ SpriteRenderer::SpriteRenderer() {
glVertexAttribDivisor(4, 1); glVertexAttribDivisor(4, 1);
glVertexAttribDivisor(5, 1); glVertexAttribDivisor(5, 1);
glBindVertexArray(NULL); glBindVertexArray(0);
INFO("Sprite renderer initialized"); INFO("Sprite renderer initialized");
} }
@ -68,7 +68,7 @@ void SpriteRenderer::flush() {
glBufferData(GL_ARRAY_BUFFER, sizeof(glm::mat4) * matrices.size(), matrices.data(), GL_STREAM_DRAW); glBufferData(GL_ARRAY_BUFFER, sizeof(glm::mat4) * matrices.size(), matrices.data(), GL_STREAM_DRAW);
glBindVertexArray(VAO); glBindVertexArray(VAO);
glDrawElementsInstanced(GL_TRIANGLES, 6, GL_UNSIGNED_INT, 0, matrices.size()); glDrawElementsInstanced(GL_TRIANGLES, 6, GL_UNSIGNED_INT, 0, matrices.size());
glBindVertexArray(NULL); glBindVertexArray(0);
glFinish(); glFinish();
matrices.clear(); matrices.clear();
} }

3
CMakeLists.txt
View File

@ -8,6 +8,7 @@ set(OpenGL_GL_PREFERENCE GLVND)
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
add_subdirectory(deps/glfw) add_subdirectory(deps/glfw)
add_subdirectory(deps/glad) add_subdirectory(deps/glad)
add_subdirectory(deps/spdlog)
add_executable(2dGameProject ${2dGameProject_SRC}) add_executable(2dGameProject ${2dGameProject_SRC})
target_include_directories(2dGameProject PUBLIC target_include_directories(2dGameProject PUBLIC
"${PROJECT_SOURCE_DIR}/deps/glfw/include" "${PROJECT_SOURCE_DIR}/deps/glfw/include"
@ -16,4 +17,4 @@ target_include_directories(2dGameProject PUBLIC
"${PROJECT_SOURCE_DIR}/deps/spdlog/include" "${PROJECT_SOURCE_DIR}/deps/spdlog/include"
) )
target_link_libraries(2dGameProject PUBLIC glfw glad ${OPENGL_LIBRARIES}) target_link_libraries(2dGameProject PUBLIC glfw glad spdlog::spdlog ${OPENGL_LIBRARIES})