diff --git a/.gitignore b/.gitignore
index 9491a2f..028f5ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -360,4 +360,6 @@ MigrationBackup/
.ionide/
# Fody - auto-generated XML schema
-FodyWeavers.xsd
\ No newline at end of file
+FodyWeavers.xsd
+
+log.txt
\ No newline at end of file
diff --git a/2dGameProject.sln b/2dGameProject.sln
index f082902..54b273e 100644
--- a/2dGameProject.sln
+++ b/2dGameProject.sln
@@ -9,6 +9,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glfw", "deps\glfw.vcxproj",
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glad", "deps\glad\glad.vcxproj", "{0CD78D8C-5F18-4236-8F46-B404EF625A88}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spdlog", "deps\spdlog.vcxproj", "{7AEADF62-BDF1-445D-84F1-9793CF769429}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
@@ -41,6 +43,14 @@ Global
{0CD78D8C-5F18-4236-8F46-B404EF625A88}.Release|x64.Build.0 = Release|x64
{0CD78D8C-5F18-4236-8F46-B404EF625A88}.Release|x86.ActiveCfg = Release|Win32
{0CD78D8C-5F18-4236-8F46-B404EF625A88}.Release|x86.Build.0 = Release|Win32
+ {7AEADF62-BDF1-445D-84F1-9793CF769429}.Debug|x64.ActiveCfg = Debug|x64
+ {7AEADF62-BDF1-445D-84F1-9793CF769429}.Debug|x64.Build.0 = Debug|x64
+ {7AEADF62-BDF1-445D-84F1-9793CF769429}.Debug|x86.ActiveCfg = Debug|Win32
+ {7AEADF62-BDF1-445D-84F1-9793CF769429}.Debug|x86.Build.0 = Debug|Win32
+ {7AEADF62-BDF1-445D-84F1-9793CF769429}.Release|x64.ActiveCfg = Release|x64
+ {7AEADF62-BDF1-445D-84F1-9793CF769429}.Release|x64.Build.0 = Release|x64
+ {7AEADF62-BDF1-445D-84F1-9793CF769429}.Release|x86.ActiveCfg = Release|Win32
+ {7AEADF62-BDF1-445D-84F1-9793CF769429}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/2dGameProject/2dGameProject.vcxproj b/2dGameProject/2dGameProject.vcxproj
index 039779d..35bf7ad 100644
--- a/2dGameProject/2dGameProject.vcxproj
+++ b/2dGameProject/2dGameProject.vcxproj
@@ -104,7 +104,8 @@
true
_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- $(SolutionDir)\deps\glad\include;$(SolutionDir)\deps\glfw\include;%(AdditionalIncludeDirectories)
+ $(SolutionDir)\deps\spdlog\include;$(SolutionDir)\deps\glm;$(SolutionDir)\deps\glad\include;$(SolutionDir)\deps\glfw\include;%(AdditionalIncludeDirectories)
+ /utf-8 %(AdditionalOptions)
Console
@@ -142,6 +143,9 @@
{1153a50d-40f1-4b5a-ba79-072cee778c0e}
+
+ {7aeadf62-bdf1-445d-84f1-9793cf769429}
+
diff --git a/2dGameProject/main.cpp b/2dGameProject/main.cpp
index cd68a6c..e2cb06d 100644
--- a/2dGameProject/main.cpp
+++ b/2dGameProject/main.cpp
@@ -4,18 +4,42 @@
#include
#include "Window.h"
#include
+#include
+#include
+#include
+#include
+#include
int OpenGLVersion;
+spdlog::logger logger("none");
+
+#define TRACE(...) logger.trace(__VA_ARGS__)
+#define DEBUG(...) logger.debug(__VA_ARGS__)
+#define INFO(...) logger.info(__VA_ARGS__)
+#define WARN(...) logger.warn(__VA_ARGS__)
+#define ERROR(...) logger.error(__VA_ARGS__)
+#define CRITICAL(...) logger.critical(__VA_ARGS__)
void init() {
- if (!glfwInit())
+ auto console = std::make_shared();
+ auto file = std::make_shared("log.txt", true);
+ logger = spdlog::logger("Logger", {console, file});
+ INFO("spdlog Initialized");
+
+ if (!glfwInit()) {
+ ERROR("Unable to Initialize GLFW");
throw ("Unable to init GLFW");
+ }
+ INFO("GLFW Initialized!");
}
void openGLContextInit() {
OpenGLVersion = gladLoadGL();
- if (OpenGLVersion == 0)
+ if (OpenGLVersion == 0) {
+ ERROR("Unable to load GLAD");
throw ("Failed to load GLAD");
+ }
+ INFO("GLAD Initialized");
}
void deinit() {
@@ -30,6 +54,7 @@ int main() {
window->beginRender();
openGLContextInit();
+ glm::vec2 vector(4, 3);
while (!window->isClosing()) {
glClear(GL_COLOR_BUFFER_BIT);
diff --git a/deps/spdlog.vcxproj b/deps/spdlog.vcxproj
new file mode 100644
index 0000000..794c8f1
--- /dev/null
+++ b/deps/spdlog.vcxproj
@@ -0,0 +1,243 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+
+ 17.0
+ {7AEADF62-BDF1-445D-84F1-9793CF769429}
+ Win32Proj
+ 10.0
+
+
+
+ Application
+ true
+ v143
+
+
+ Application
+ false
+ v143
+
+
+ StaticLibrary
+ true
+ v143
+
+
+ Application
+ false
+ v143
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+
+ WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ Level3
+
+
+ true
+ Windows
+
+
+
+
+ _DEBUG;_WINDOWS;SPDLOG_COMPILED_LIB;%(PreprocessorDefinitions)
+ Level3
+ $(SolutionDir)deps\spdlog\include;%(AdditionalIncludeDirectories)
+ /utf-8 %(AdditionalOptions)
+
+
+ true
+ Windows
+
+
+
+
+ WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ Level3
+
+
+ true
+ Windows
+ true
+ true
+
+
+
+
+ NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ Level3
+
+
+ true
+ Windows
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/deps/spdlog.vcxproj.filters b/deps/spdlog.vcxproj.filters
new file mode 100644
index 0000000..a27d317
--- /dev/null
+++ b/deps/spdlog.vcxproj.filters
@@ -0,0 +1,357 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hh;hpp;hxx;hm;inl;inc;xsd
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+
\ No newline at end of file