Added release build for optimized math (around 70 fps), there is a crucial...

Added release build for optimized math (around 70 fps), there is a crucial memory leak in this build, do not run the program for a long time!

CMakeLists.txt

@@ -70,8 +70,7 @@ target_link_libraries(
   spdlog
   stb
   tinyobjloader
-  OpenGL::GL
-  )
+  OpenGL::GL)
 
   
 # OPTIONS

CMakeSettings.json

+{
+  "configurations": [
+    {
+      "name": "x64-Debug",
+      "generator": "Ninja",
+      "configurationType": "Debug",
+      "inheritEnvironments": [ "msvc_x64_x64" ],
+      "buildRoot": "${projectDir}\\out\\build\\${name}",
+      "installRoot": "${projectDir}\\out\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "",
+      "ctestCommandArgs": ""
+    },
+    {
+      "name": "x64-Release",
+      "generator": "Ninja",
+      "configurationType": "RelWithDebInfo",
+      "buildRoot": "${projectDir}\\out\\build\\${name}",
+      "installRoot": "${projectDir}\\out\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "",
+      "ctestCommandArgs": "",
+      "inheritEnvironments": [ "msvc_x64_x64" ],
+      "variables": []
+    }
+  ]
+}
\ No newline at end of file

pacman/include/inanimate-objects/map.h

@@ -51,13 +51,13 @@ private:
 	engine::ObjectLibrary* s_ObjectLibrary;
 	engine::ShaderLibrary* s_ShaderLibrary;
 
-	Pacman* m_Player;
-	std::vector<Ghost*> m_Ghosts;	//Initialising an array of ghosts
+	engine::s_Ptr<Pacman> m_Player;
+	std::vector<engine::s_Ptr<Ghost>> m_Ghosts;	//Initialising an array of ghosts
 
-	std::vector<Wall*> m_Walls;
-	std::vector<Pellet*> m_Pellets;
+	std::vector<engine::s_Ptr<Wall>> m_Walls;
+	std::vector<engine::s_Ptr<Pellet>> m_Pellets;
 
-	Collision* m_Collision = new Collision();
+	engine::s_Ptr <Collision> m_Collision = engine::m_SPtr<Collision>();
 };
 
 Map::Map() {
@@ -103,12 +103,12 @@ Map::Map() {
 			switch (value) {
 			case 1:		// Wall
 			{
-				m_Walls.push_back(new Wall(i + offsetX + cam.x, j + offsetY + cam.y, 0.f + cam.z, 0.f, 3.f, 3.f));
+				m_Walls.push_back(engine::m_SPtr<Wall>(i + offsetX + cam.x, j + offsetY + cam.y, 0.f + cam.z, 0.f, 3.f, 3.f));
 				break;
 			}
 			case 2:		// Player/Pacman
 			{
-				m_Player = new Pacman();
+				m_Player = engine::m_SPtr<Pacman>();
 				m_Player->setPosition({ i + offsetX + cam.x, j + offsetY + cam.y, 0.f + cam.z });
 				m_Player->setNextPosition({ i + offsetX + cam.x, j + offsetY + cam.y, 0.f + cam.z });
 				m_Player->setSize({ 1.5f, 1.5f, 1.5f });
@@ -116,14 +116,14 @@ Map::Map() {
 				break;
 			}
 			case 0:	// Pellets and Ghosts
-				m_Pellets.push_back(new Pellet(i + offsetX + cam.x, j + offsetY + cam.y, 0.f + cam.z, 0.5f, 0.5f, 0.5f));
+				m_Pellets.push_back(engine::m_SPtr<Pellet>(i + offsetX + cam.x, j + offsetY + cam.y, 0.f + cam.z, 0.5f, 0.5f, 0.5f));
 	
 				// Ghost random position generation
 				randomNumber = numDistribution(rando);
 	
 				// Generate new random number for random ghost placement
 				if (randomNumber == 3 && m_Ghosts.size() < 4) {
-					m_Ghosts.push_back(new Ghost());
+					m_Ghosts.push_back(engine::m_SPtr<Ghost>());
 					m_Ghosts.back()->setPosition({ i + offsetX + cam.x, j + offsetY + cam.y, 0.f + cam.z });
 					m_Ghosts.back()->setNextPosition({ i + offsetX + cam.x, j + offsetY + cam.y, 0.f + cam.z });
 					m_Ghosts.back()->setSize({ 1.5f, 1.5f, 1.5f });

pacman/pacman.cpp

@@ -8,15 +8,15 @@
 class PacmanGame : public engine::AppFrame {
 public:
 	PacmanGame() : AppFrame() {
-		//pushLayer(new ExampleLayer());
-		pushLayer(new GameLayer);
+		//pushLayer(NEW ExampleLayer());
+		pushLayer(NEW GameLayer);
 	}
 
 
 	PacmanGame(engine::WindowSpecs specs) : AppFrame(specs) {
 		setAppIcon("assets/textures/pacman3.png");	// Window icon
 
-		pushLayer(new GameLayer);
+		pushLayer(NEW GameLayer);
 	}
 
 

sandbox/sandbox.cpp

@@ -119,14 +119,14 @@ private:
 class Sandbox : public engine::AppFrame {
 public:
 	Sandbox() : engine::AppFrame() {
-		//pushLayer(new ExampleLayer());
-		pushLayer(new SandboxLayer);
+		//pushLayer(NEW ExampleLayer());
+		pushLayer(NEW SandboxLayer);
 	}
 
 
 	Sandbox(engine::WindowSpecs specs) : engine::AppFrame(specs) {
 		//pushLayer(new ExampleLayer());
-		pushLayer(new SandboxLayer);
+		pushLayer(NEW SandboxLayer);
 	}
 
 

vendor/engine/CMakeLists.txt

@@ -94,7 +94,11 @@ target_compile_definitions(Engine PUBLIC GLFW_INCLUDE_NONE ENABLE_ASSERTS)	# Uni
 if (WIN32 OR CYGWIN)
     # WINDOWS AND CYGWIN COMPILER
 	target_compile_definitions(Engine PUBLIC PLATFORM_WINDOWS)
+	if(CMAKE_BUILD_TYPE STREQUAL "Debug")	# Check build type for multithreading application
 		target_compile_options(Engine PRIVATE /EHsc /MDd /c /MP)	# Multithreading for libraries
+	else()
+		target_compile_options(Engine PRIVATE /EHsc /MD /c /MP)	# Multithreading for libraries
+	endif()
 endif (WIN32 OR CYGWIN)
 if (UNIX)
     # UNIX (including MAC OS X)

vendor/engine/engine.h

 #pragma once
 
+#ifdef _DEBUG
+	#define NEW new ( _NORMAL_BLOCK , __FILE__ , __LINE__ )
+#else
+	#define NEW new
+#endif
+
 /*
 *	engine.h is the static lib header file to access engine and STL tools
 */

vendor/engine/include/entrypoint.h

@@ -3,19 +3,31 @@
 *	the application uses the lib as a dependency
 */
 #pragma once
+#define _CRTDBG_MAP_ALLOC
+#include <cstdlib>
+#include <crtdbg.h>
 #include <iostream>
 #include "logger.h"
 #include "app-frame.h"
 
+#ifdef _DEBUG
+	#define NEW new ( _NORMAL_BLOCK , __FILE__ , __LINE__ )
+// Replace _NORMAL_BLOCK with _CLIENT_BLOCK if you want the
+// allocations to be of _CLIENT_BLOCK type
+#else
+	#define NEW new
+#endif
+
 // Declare that the createApp function should be defined in the client application
 extern engine::u_Ptr<engine::AppFrame> engine::createApp();
 
 int main(int argc, char** argv) {
+	_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
 	//Intro
 	std::cout << "Engine is running ...\n";
 
 	// Logger
-	auto logger = new engine::Logger();		// Define logger
+	auto logger = NEW engine::Logger();		// Define logger
 	ENGINE_INFO("Logger is running ...");	// Test logger
 
 	// Define a base application for the client to run on

vendor/engine/precompiled.h

@@ -5,6 +5,12 @@
 */
 #pragma once
 
+#ifdef _DEBUG
+	#define NEW new ( _NORMAL_BLOCK , __FILE__ , __LINE__ )
+#else
+	#define NEW new
+#endif
+
 #include <iostream>
 #include <fstream>
 #include <memory>

vendor/engine/src/renderer.cpp

@@ -55,8 +55,8 @@ namespace engine {
 		Static members
 	*/
 	s_Ptr<RenderAPI> Renderer::s_RenderAPI = m_SPtr<RenderAPI>();
-	engine::ObjectLibrary* Renderer::s_ObjectLibrary = new engine::ObjectLibrary();
-	engine::ShaderLibrary* Renderer::s_ShaderLibrary = new engine::ShaderLibrary();
+	engine::ObjectLibrary* Renderer::s_ObjectLibrary = NEW engine::ObjectLibrary();
+	engine::ShaderLibrary* Renderer::s_ShaderLibrary = NEW engine::ShaderLibrary();
 	static RendererStorage s_Data;
 	static RendererStorage3D s_3DData;
 
@@ -73,7 +73,7 @@ namespace engine {
 			DATA DEFINITION FOR QUAD DRAWING
 		*/
 		s_Data.quadVertexArray = m_SPtr<VertexArray>();
-		s_Data.quadVertexBufferStore = new QuadVertex[s_Data.MAXVERTICES];
+		s_Data.quadVertexBufferStore = NEW QuadVertex[s_Data.MAXVERTICES];
 
 		// Vertex default positioning
 		s_Data.quadVertexPositions[0] = { -0.5f, -0.5f, 0.0f, 1.0f };
@@ -93,7 +93,7 @@ namespace engine {
 		s_Data.quadVertexArray->setVertexBuffer(s_Data.quadVertexBuffer);
 
 		// Index
-		uint32_t* quadIndices = new uint32_t[s_Data.MAXINDICES];
+		uint32_t* quadIndices = NEW uint32_t[s_Data.MAXINDICES];
 		// Set indices to ptr
 		uint32_t offset = 0;
 		for (uint32_t i = 0; i < s_Data.MAXINDICES; i += 6) {

vendor/engine/src/window.cpp

@@ -59,7 +59,7 @@ namespace engine {
 
 		// Context options
 		glfwSetWindowUserPointer(m_Window, &m_Specs);	// Window context details
-		setVSync(true);									// Vsync on by default
+		setVSync(false);									// Vsync off by default
 
 		/*
 		The following callback functions utilize the GLFW library to abstract window events