Add vulkan support and remove support for opengl. The rendering engine is almost at par with the last commit, just needs to iron out some validation erros. Vulkan is newer, has better toolchains and alows for multithreading. So this rewrites the whole engine to support the above. Drop glfw to my own solution to win32 window creation (linux window creation planned in the future). Add my only library Taskus to ease multithreading in the engine.

Author: LuisDuarte1

.gitmodules

@@ -1,9 +1,12 @@
 [submodule "libs/glm"]
 	path = libs/glm
 	url = https://github.com/g-truc/glm.git
-[submodule "libs/glfw"]
-	path = libs/glfw
-	url = https://github.com/glfw/glfw.git
-[submodule "libs/glew"]
-	path = libs/glew
-	url = https://github.com/Perlmint/glew-cmake.git
+[submodule "libs/VulkanMemoryAllocator"]
+	path = libs/VulkanMemoryAllocator
+	url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git
+[submodule "libs/Taskus"]
+	path = libs/Taskus
+	url = https://github.com/LuisDuarte1/Taskus
+[submodule "libs/WindowsHModular"]
+	path = libs/WindowsHModular
+	url = https://github.com/Leandros/WindowsHModular

CMakeLists.txt

@@ -1,88 +1,80 @@
-cmake_minimum_required(VERSION 2.8)
-project(GraphicsEngine)
-set (CMAKE_CXX_STANDARD 17)
+cmake_minimum_required(VERSION 3.2)
+
 
 
 ###
 ### Options
 ###
 # Unsed previous parameters from cache for the sake of dynamism
-unset(GRAPHICSENGINE_SUPPORT_GLFW CACHE)
-unset(GRAPHICSENGINE_SUPPORT_GLAD CACHE)
-unset(GRAPHICSENGINE_SUPPORT_GLEW CACHE)
 unset(GRAPHICSENGINE_SUPPORT_GLM CACHE)
 unset(GRAPHICSENGINE_SUPPORT_OPENSSL CACHE)
+unset(GRAPHICSENGINE_SUPPORT_VULKAN CACHE)
+unset(GRAPHICSENGINE_SUPPORT_TASKUS CACHE)
+unset(GRAPHICSENGINE_USE_VCPKG CACHE)
+
 
 # Enable desired libs
-option(GRAPHICSENGINE_SUPPORT_GLFW "Set ON/OFF to enable/disable GLFW support." ON)
-option(GRAPHICSENGINE_SUPPORT_GLAD "Set ON/OFF to enable/disable GLAD support." ON)
-option(GRAPHICSENGINE_SUPPORT_GLEW "Set ON/OFF to enable/disable GLEW support." ON)
-option(GRAPHICSENGINE_SUPPORT_GLM "Set ON/OFF to enable/disable GLM support." ON)
-option(GRAPHICSENGINE_SUPPORT_OPENSSL "Set ON/OFF to enable/disable OpenSLL support." ON)
+option(GRAPHICSENGINE_SUPPORT_GLM "Set ON/OFF to enable/disable GLM support" ON)
+option(GRAPHICSENGINE_SUPPORT_OPENSSL "Set ON/OFF to enable/disable OpenSSL support." ON)
+option(GRAPHICSENGINE_SUPPORT_VULKAN "Set ON/OFF to enable/disable Vulkan support." ON)
+option(GRAPHICSENGINE_SUPPORT_TASKUS "Set ON/OFF to enable/disable Taskus support" ON)
+option(GRAPHICSENGINE_USE_VCPKG "Use VCPKG in Windows" ON)
 
+if(WIN32)
+    if(GRAPHICSENGINE_USE_VCPKG)
+        if(NOT DEFINED CMAKE_TOOLCHAIN_FILE)
+            #use my own path in cmake_toolchain_file
+            #you should replace this on your machine or specify it as a argument while configurng
+            set(CMAKE_TOOLCHAIN_FILE "C:/dev-bin/vcpkg/scripts/buildsystems/vcpkg.cmake")
+        endif()
+    endif()
+    
+endif()
+
+project(GraphicsEngine)
+set (CMAKE_CXX_STANDARD 20)
 
 ###
 ### Initialization
 ###
 # Project parameters
 set(PROJ_LINK_LIBS)
 set(PROJ_SRC)
-find_library( atomic-lib atomic )
-list(APPEND PROJ_LINK_LIBS atomic)
+set(PROJ_SHADERS)
+if(NOT WIN32)
+    find_library( atomic-lib atomic )
+    list(APPEND PROJ_LINK_LIBS atomic)
+endif()
 if(WIN32)
-    set(CMAKE_RC_COMPILER "windres") #Windows only, for some reason mys2 mingw 64 gets the rc compiler wrong
+    #set(CMAKE_RC_COMPILER "windres") #Windows only, for some reason mys2 mingw 64 gets the rc compiler wrong
     find_package(OpenGL REQUIRED)
 
     list(APPEND PROJ_LINK_LIBS opengl32)
 endif(WIN32)
 
 # Add all files/folders under src folder automatically to the project
-file(GLOB_RECURSE PROJ_SRC src/*.h src/*.cpp)
-
+file(GLOB_RECURSE PROJ_SRC_CPP src/*.cpp)
+file(GLOB_RECURSE PROJ_SRC_H src/*.h)
+file(GLOB PROJ_SHADERS src/shaders/*.vert src/shaders/*.frag)
 
 ###
 ### Compiler settings
 ###
 
 
-
 ###
-### GLFW
+### Taskus
 ###
-if(GRAPHICSENGINE_SUPPORT_GLFW)
-    # Disable internal builds
-    unset(GLFW_BUILD_EXAMPLES CACHE)
-    unset(GLFW_BUILD_TESTS CACHE)
-    unset(GLFW_BUILD_DOCS CACHE)
-    option(GLFW_BUILD_EXAMPLES "Build the GLFW example programs" OFF)
-    option(GLFW_BUILD_TESTS "Build the GLFW test programs" OFF)
-    option(GLFW_BUILD_DOCS "Build the GLFW documentation" OFF)
-
-    add_subdirectory(libs/glfw)
-    list(APPEND PROJ_LINK_LIBS glfw)
-endif(GRAPHICSENGINE_SUPPORT_GLFW)
 
+#MINGW IS NOT SUPPORTED BECAUSE OF TASKUS
+if(GRAPHICSENGINE_SUPPORT_TASKUS)
+    add_subdirectory(libs/Taskus)
+    list(APPEND PROJ_LINK_LIBS Taskus)
+endif()
 
-###
-### GLAD
-###
-if(GRAPHICSENGINE_SUPPORT_GLAD)
-    include_directories(libs/glfw/deps)
-endif(GRAPHICSENGINE_SUPPORT_GLAD)
 
 
-###
-### GLEW
-###
-if(GRAPHICSENGINE_SUPPORT_GLEW)
-    # Disable internal builds
-    unset(BUILD_UTILS CACHE)
-    option(BUILD_UTILS "utilities" OFF)
 
-    add_subdirectory(libs/glew/build/cmake)
-    include_directories(libs/glew/include)
-    list(APPEND PROJ_LINK_LIBS glew)
-endif(GRAPHICSENGINE_SUPPORT_GLEW)
 
 ###
 ### GLM
@@ -96,19 +88,50 @@ endif(GRAPHICSENGINE_SUPPORT_GLM)
 ### OpenSSL
 ###
 if(GRAPHICSENGINE_SUPPORT_OPENSSL)
-    find_package(OpenSSL)
+    find_package(OpenSSL REQUIRED)
     list(APPEND PROJ_LINK_LIBS OpenSSL::SSL)
     list(APPEND PROJ_LINK_LIBS OpenSSL::Crypto)
 endif(GRAPHICSENGINE_SUPPORT_OPENSSL)
 
+###
+### Vulkan
+###
+
+if(GRAPHICSENGINE_SUPPORT_VULKAN)
+    if(WIN32)
+        set(ENV{VULKAN_SDK} "C:\\VulkanSDK\\1.2.198.1") #default installation for vulkansdk in windows
+    endif(WIN32)
+    
+    find_package(Vulkan REQUIRED)
+    list(APPEND PROJ_LINK_LIBS ${Vulkan_LIBRARIES})
+    include_directories(${Vulkan_INCLUDE_DIRS})
+endif(GRAPHICSENGINE_SUPPORT_VULKAN)
+
+
+
+
+### Compile the shaders after building the source
+
+foreach(shader ${PROJ_SHADERS})
+    set(SHADER_FILENAME)
+    
+    cmake_path(GET shader FILENAME SHADER_FILENAME)
+    message(STATUS "Adding shader to compile: "${SHADER_FILENAME})
+    set(COMMAND_TO_EXECUTE ${Vulkan_GLSLC_EXECUTABLE} ${shader} -o ${SHADER_FILENAME}.spv)
+    add_custom_target(${SHADER_FILENAME} ALL 
+        COMMAND ${COMMAND_TO_EXECUTE})
+
+endforeach()
 
 ###
 ### Generating the project files
 ###
-add_executable(${PROJECT_NAME} ${PROJ_SRC})
+add_executable(${PROJECT_NAME} ${PROJ_SRC_CPP}  ${PROJ_SRC_H})
 
 
 ###
 ### Linking to the project
 ###
 target_link_libraries(${PROJECT_NAME} ${PROJ_LINK_LIBS})
+
+

libs/Taskus

@@ -3,10 +3,11 @@
 
 #include <iostream>
 #include <atomic>
+#define GLM_FORCE_DEPTH_ZERO_TO_ONE 
+#define GLM_FORCE_LEFT_HANDED 
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 
-using namespace glm;
 
 class Camera{
     public:
@@ -17,6 +18,8 @@ class Camera{
         inline void ChangeWorldPosition(glm::vec3 newposition){world_position.store(newposition); };
         inline glm::vec3 GetWorldPosistion(){return world_position.load();};
         bool initialized = false;
+        //it is controllable when it can be changed because of player input
+        //this should be disabled for instance for cutscnes
         std::atomic<bool> controllable;
     private:
         std::atomic<glm::vec3> world_position;

libs/VulkanMemoryAllocator

@@ -1,9 +1,9 @@
-#include <iostream>
+/*#include <iostream>
 #include "gamelogic.h"
 
 GameLogic::GameLogic(OpenGLRenderer* renderer){
     /* We already assume that the renderer is already initialized and ready to render
-    */
+    
     main_camera = new Camera(glm::vec3(4,3,3), vec3(0,0,0));
     input = new InputSystem();
     current_renderer = renderer; //this doesnt need to be atomic by default because it's only suppose to write once
@@ -95,4 +95,5 @@ void GameLogic::GameLoop(){ //GameLoop tries to run at a fixed rate (120 tps, ca
         break;
     }
     return;
-}
+}
+*/

libs/glew

@@ -1,8 +1,8 @@
-#ifndef GAMELOGIC_H
+/*#ifndef GAMELOGIC_H
 #define GAMELOGIC_H
 #include <iostream>
 #include <vector>
-#include <time.h>       /* time */
+#include <time.h>       
 #include <random>
 #include <thread>         
 #include <chrono>
@@ -32,4 +32,5 @@ class GameLogic{
         
 };
 
-#endif
+#endif
+*/

libs/glfw

@@ -1,22 +1,14 @@
 #include "input.h"
 
 InputSystem::InputSystem(){
-    for(int i = 0; i < NUM_OF_SCANCODES; i++){
-        is_pressed[i] = false;
-    }
 }
 
 void InputSystem::ProcessInputMessage(InputMessage m){
-    assert(m.scancode < NUM_OF_SCANCODES);
-    if(m.action == 0){
-        is_pressed[m.scancode] = false;
-    }
-    if(m.action == 1){
-        is_pressed[m.scancode] = true;
-    }
+    keyboardMap.insert_or_assign(m.keycode,m.keyDown);
 }
 
-bool InputSystem::GetIfKeyIsPressed(int scancode){
-    assert(scancode < NUM_OF_SCANCODES);
-    return is_pressed[scancode];
+bool InputSystem::GetIfKeyIsPressed(char inputchar){
+    auto r = keyboardMap.find(inputchar);
+    if(r == keyboardMap.end()) assert(false); //crash if not found
+    return (*r).second;
 }

src/camera/camera.h

@@ -3,19 +3,25 @@
 
 #include <iostream>
 #include <cassert>
-#include "../thread_communication/threadcommunication.h"
+#include <map>
+
 
 #define NUM_OF_SCANCODES 240
 
 
+struct InputMessage{
+    char keycode;
+    bool keyDown; //useful for representing if key is down or up 
+    //TODO: mouse input 
+};
 
 class InputSystem{
     public:
         InputSystem();
         void ProcessInputMessage(InputMessage m);
-        bool GetIfKeyIsPressed(int scancode);
+        bool GetIfKeyIsPressed(char wchar);
     private:
-        bool is_pressed[NUM_OF_SCANCODES];
+        std::map<char, bool> keyboardMap;
 
 };
 

src/gamelogic/gamelogic.cpp

@@ -1,4 +1,4 @@
-#ifndef LIGHT_H
+/*#ifndef LIGHT_H
 #define LIGHT_H
 
 #include <iostream>
@@ -48,4 +48,5 @@ class Light: public WorldObject{
 
 };
 
-#endif
+#endif
+*/