Merge branch 'main' into Shader-Manager

2024-04-11 09:14:29 +02:00
parent 1bba2047b1 56e58f88a6
commit 1104f7adbe
16 changed files with 686 additions and 386 deletions
--- a/enginecustom/applicationclass.h
+++ b/enginecustom/applicationclass.h
@@ -5,6 +5,8 @@
 ///////////////////////
 // MY CLASS INCLUDES //
 ///////////////////////
+#include "Logger.h"
+
 #include "d3dclass.h"
 #include "cameraclass.h"
 #include "object.h"
@@ -157,6 +159,12 @@ private :
 	FpsClass* m_Fps;
 	TextClass* m_FpsString;
 	int m_previousFps;
+
+	// ------------------------------------------------- //
+	// ------------------- LOGGER ---------------------- //
+	// ------------------------------------------------- //
+
+	Logger logger;
 };

 #endif