BarinkEngine/BarinkEngine.cpp

@@ -19,15 +19,11 @@ int main(int argc, char* argv[]) {
 	GUIManager GUISystem = GUIManager(&MainWindow);
 
 
-	glEnable(GL_DEPTH_TEST);
-
-
 
 	// First call to setup game
 	Start();
 
 	
-	
 	// Runtime loop
 	while (!MainWindow.WindowShouldClose()) {
 

BarinkEngine/Include/Input/InputManager.h

@@ -12,13 +12,6 @@ namespace BarinkEngine {
 		void PollEvents();
 		void attach(BarinkWindow* window);
 
-
-		// GLFW Handlers
-		static void KeyCallback(GLFWwindow* window, int key, int scancode, int action, int mods);
-		static void CursorPositionCallback(GLFWwindow* window, double x, double y);
-		static void CursorEnterCallback(GLFWwindow* window, int entered);
-		static void MouseButtonCallback(GLFWwindow* window, int button, int action, int mods);
-		static void ScrollCallback(GLFWwindow* window, double xoffset, double yoffset);
 	private:
 		std::vector<BarinkWindow*> windows;
 	};

BarinkEngine/Input/InputManager.cpp

@@ -1,7 +1,5 @@
 #include "Input/InputManager.h"
-#include "GLFW/glfw3.h"
+
-#include "spdlog/spdlog.h"
-#include <iostream>
 void BarinkEngine::InputManager::PollEvents()
 {
 	for (std::vector<BarinkWindow*>::iterator it = windows.begin(); it != windows.end(); ++it) {
@@ -9,61 +7,9 @@ void BarinkEngine::InputManager::PollEvents()
 	}
 }
 
-void BarinkEngine::InputManager::KeyCallback(GLFWwindow* window, int key, int scancode, int action, int mods) 
-{
-	if (key == GLFW_KEY_A && action == GLFW_PRESS)
-	{
-		
-		std::cout << "'a' key was pressed" << std::endl;
-	}
-
-}
-
-void BarinkEngine::InputManager::CursorPositionCallback(GLFWwindow* window, double x, double y) 
-{
-	std::cout << "Cursor Position  x: " << x << ", y: " << y << std::endl;
-}
-
-void BarinkEngine::InputManager::CursorEnterCallback(GLFWwindow* window, int entered)
-{
-	if (entered) {
-		// Cursor entered the window's screen space
-		std::cout << "Cursor entered!" << std::endl;
-	}
-	else {
-		std::cout << "Cursor left!" << std::endl;
-	}
-}
-
-
-void BarinkEngine::InputManager::MouseButtonCallback(GLFWwindow* window, int button, int action, int mods)
-{
-	if (button == GLFW_MOUSE_BUTTON_RIGHT && action == GLFW_PRESS) {
-		std::cout << "Right mouse button was pressed!" << std::endl;
-	}
-
-}
-
-void BarinkEngine::InputManager::ScrollCallback(GLFWwindow* window, double xoffset, double yoffset)
-{
-	std::cout << "Scroll: x: " << xoffset << ", y: " << yoffset << std::endl;
-		
-
-}
-
-
 void BarinkEngine::InputManager::attach(BarinkWindow* window)
 {
-	
 	windows.push_back(window);
-
-	// Attach callbacks
-	glfwSetKeyCallback(window->windowptr(), KeyCallback);
-	glfwSetCursorPosCallback(window->windowptr(), CursorPositionCallback);
-	glfwSetCursorEnterCallback(window->windowptr(), CursorEnterCallback);
-	glfwSetMouseButtonCallback(window->windowptr(), MouseButtonCallback);
-	glfwSetScrollCallback(window->windowptr(), ScrollCallback);
-
 }
 
 BarinkEngine::InputManager::InputManager()

BarinkEngine/graphics/ModelImporter.cpp

@@ -54,7 +54,7 @@ std::vector<BarinkEngine::Mesh> ModelImporter::Test() {
     //spdlog::info("======= Assimp ======");
 
     Assimp::Importer importer;
-    const aiScene* scene = importer.ReadFile("build/SandboxApplication/Debug/Models/Cube.obj", aiProcess_Triangulate | aiProcess_FlipUVs);
+    const aiScene* scene = importer.ReadFile("build/SandboxApplication/Debug/Cube.obj", aiProcess_Triangulate | aiProcess_FlipUVs);
     
     aiNode* currentNode = scene->mRootNode;
 

BarinkEngine/graphics/Shader.cpp

@@ -1,5 +1,5 @@
 #include "Graphics/Shader.h"
-#include "spdlog/spdlog.h"
+
 Shader::Shader(const std::string vertexShaderPath, const std::string fragmentShaderPath)
 {
     char infoLog[512];
@@ -15,7 +15,7 @@ Shader::Shader(const std::string vertexShaderPath, const std::string fragmentSha
     glGetShaderiv(vertId, GL_COMPILE_STATUS, &succes);
     if(!succes){
         glGetShaderInfoLog(vertId, 512, NULL, infoLog);
-        spdlog::error( "Vertex shader has compile error {}", infoLog);
+        //spdlog::error( "Vertex shader has compile error {}", infoLog);
         return;
     }
 
@@ -33,7 +33,7 @@ Shader::Shader(const std::string vertexShaderPath, const std::string fragmentSha
     glGetShaderiv(fragId, GL_COMPILE_STATUS, &succes);
     if(!succes){
         glGetShaderInfoLog(fragId, 512, NULL, infoLog);
-        spdlog::error("Fragment shader has compile error {}", infoLog);
+        //spdlog::error("Fragment shader has compile error {}", infoLog);
         return;
     }
 
@@ -63,7 +63,7 @@ char* Shader::readFile (const char* filePath){
     file.open(filePath);
 
     if(file.is_open() == false){
-         spdlog::info("File not found.");
+        //spdlog::info("File not found.");
          return nullptr;
     }
 

BarinkEngine/graphics/shaders/fragment.shader

@@ -1,11 +1,14 @@
 #version 440 core
 
 out vec4 FragColor;
+
 uniform vec3 Color;
+
 in vec2 TexCoord;
+
 uniform sampler2D Texture;
 
 
 void main(){
-	FragColor = mix ( texture(Texture, TexCoord), vec4(Color, 1.0f), 0.5f);
+	FragColor = mix ( texture(Texture, TexCoord), vec4(Color, 1.0f));
 }

BarinkEngine/premake5.lua

@@ -13,43 +13,29 @@ project "BarinkEngine"
 
     "../libs/physx/physx/include",
     "../libs/steam-audio/include",
-    
     "../libs/assimp/include",
-    
-
     "../libs/glad/include",
-
     "../libs/glfw/include",
+   -- "../libs/tinygltf",
     "../libs/glew/include",
     "../libs/glm",
-    
     "../libs/ImGui",
-  }
-
-  links {
-    -- This needs to fall under the filter as the names can differ on different platforms 
-    "phonon",
-    "lua54",
-    "spdlog",
-    "assimp-vc143-mtd",
-    "glfw3",
-
-    "ImGUI_Opengl3",
-
-    
 
   }
 
-
   libdirs {
     "../libs/steam-audio/lib/windows-x64",
     "../libs/lua",
     "../libs/spdlog/build/Release",
     "../libs/assimp/lib/Debug",
     "../libs/glfw/build/src/Debug",
+    "../libs/ImGui"
   }
 
   files {
+    "../libs/ImGui/*.cpp",
+    "../libs/ImGui/backends/imgui_impl_glfw.cpp",
+    "../libs/ImGui/backends/imgui_impl_Opengl3.cpp",
     "../libs/glad/src/glad.c",
 
     "./*.cpp",
@@ -59,7 +45,6 @@ project "BarinkEngine"
   }
 
 
-
   filter { "system:windows"}
     prebuildcommands {
       -- Copy shaders 
@@ -69,7 +54,14 @@ project "BarinkEngine"
       "copy graphics\\shaders\\RenderSurfaceVert.shader   ..\\build\\SandboxApplication\\Debug\\RenderSurface.vs" 
     }
     
-   
+    links {
+      -- This needs to fall under the filter as the names can differ on different platforms 
+      "phonon",
+      "lua54",
+      "spdlog",
+      "assimp-vc143-mtd",
+      "glfw3"
+    }
 
   filter { "system:linux" }
     prebuildcommands {
@@ -79,5 +71,3 @@ project "BarinkEngine"
       "cp graphics/shaders/RenderSurfaceFrag.shader ../build/SandboxApplication/Debug/RenderSurface.fs",
       "cp graphics/shaders/RenderSurfaceVert.shader ../build/SandboxApplication/Debug/RenderSurface.vs" 
     }
-
-include('../ImGui')

ImGui/premake5.lua

@@ -1,18 +0,0 @@
-project "ImGUI_Opengl3"
-  kind "StaticLib"
-
-  includedirs {
-    "../libs/glfw/include",
-    "../libs/ImGui"
-  }
-
-  files {
-    "../libs/ImGui/*.cpp",
-    "../libs/ImGui/backends/imgui_impl_glfw.cpp",
-    "../libs/ImGui/backends/imgui_impl_Opengl3.cpp",
-  }
-
-  libdirs{
-    "../libs/ImGui",
-    "../libs/glad"
-  }

SandboxApplication/Sandbox.cpp

@@ -58,7 +58,7 @@ void Start() {
 
     shader = new Shader(vertexShaderSource, fragmentShaderSource);
 
-    textureCube = new Texture("build/SandboxApplication/Debug/Textures/wall.jpg");
+    textureCube = new Texture("build/SandboxApplication/Debug/die.jpg");
 
     matCube = new Material(*shader);
     matCube->Color = glm::vec3(1.0, 0.0, 0.0);