REFACTOR vulkan:

- remove cppVulkanAPI submodule
- add vulkan.hpp and vulkan.cpp

.gitignore

@@ -39,3 +39,4 @@ latex
 html
 build
 glslc
+glm

CMakeLists.txt

@@ -32,6 +32,7 @@ target_sources(${PROJECT_NAME}
 		src/app/threads/AThreadWrapper.cpp
 		src/app/threads/render/RenderThread.cpp
 		src/app/threads/update/UpdateThread.cpp
+		src/app/vulkan/VulkanAPI.cpp
 		src/app/window/window.cpp
 		src/app/window/input.cpp
 )
@@ -47,12 +48,9 @@ target_include_directories(${PROJECT_NAME}
 		${CMAKE_CURRENT_SOURCE_DIR}/src/app/threads/render
 		${CMAKE_CURRENT_SOURCE_DIR}/src/app/threads/update
 		${CMAKE_CURRENT_SOURCE_DIR}/src/app/threads/block_update
+		${CMAKE_CURRENT_SOURCE_DIR}/src/app/vulkan
 		${CMAKE_CURRENT_SOURCE_DIR}/src/app/window
 )
 
-# link libraries
-add_subdirectory(external/cppVulkanAPI)
-target_link_libraries(${PROJECT_NAME}
-	PRIVATE
-		cppVulkanAPI
-)
+target_link_libraries(${PROJECT_NAME} glfw vulkan dl pthread X11 Xxf86vm Xrandr Xi)
+

build.sh

@@ -2,8 +2,8 @@
 
 # Sript to build the project
 
-# Download the necessary external libraries
-./scripts/download_cppVulkanAPI.sh
+# Download dependencies
+./scripts/download_glm.sh
 
 # Compile shaders
 ./scripts/compile_shaders.sh

scripts/download_glm.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [ ! -d external/glm ]
+then
+	echo "cloning 'https://github.com/g-truc/glm.git' in external/glm"
+
+	mkdir -p external/glm
+	git clone https://github.com/g-truc/glm.git external/glm
+fi

shaders/simple_shader.frag

@@ -1,19 +1,9 @@
 #version 450
 
-layout(set=1, binding = 0) uniform sampler2D texSampler;
-
-layout(location = 0) in vec3 fragNormal;
-layout(location = 1) in vec2 fragTexCoord;
+layout(location = 0) in vec3 fragColor;
 
 layout(location = 0) out vec4 outColor;
-layout(location = 1) out vec3 outNormal;
 
 void main() {
-	outColor = texture(texSampler, fragTexCoord);
-
-	vec3 abs_normal = abs(fragNormal);
-
-	float grey_shade = abs_normal.x * 0.299 + abs_normal.y * 0.587 + abs_normal.z * 0.114;
-
-	outNormal = vec3(grey_shade, grey_shade, grey_shade);
-}
+    outColor = vec4(fragColor, 1.0);
+}

shaders/simple_shader.vert

@@ -1,26 +1,20 @@
 #version 450
 
-layout(set=0, binding = 0) uniform UniformBufferObject {
-	mat4 view;
-	mat4 proj;
-} ubo;
+layout(location = 0) out vec3 fragColor;
 
-layout(push_constant) uniform PushConstantObject {
-	mat4 model;
-} pc;
+vec2 positions[3] = vec2[](
+    vec2(0.0, -0.5),
+    vec2(0.5, 0.5),
+    vec2(-0.5, 0.5)
+);
 
-layout(location = 0) in vec3 inPosition;
-layout(location = 1) in vec3 inNormal;
-layout(location = 2) in vec2 inTexCoord;
-
-layout(location = 0) out vec3 fragNormal;
-layout(location = 1) out vec2 fragTexCoord;
+vec3 colors[3] = vec3[](
+    vec3(1.0, 0.0, 0.0),
+    vec3(0.0, 1.0, 0.0),
+    vec3(0.0, 0.0, 1.0)
+);
 
 void main() {
-	gl_Position = ubo.proj * ubo.view * pc.model * vec4(inPosition, 1.0);
-
-	// convert normal to world space
-	fragNormal = normalize((pc.model * vec4(inNormal, 0.0)).xyz);
-
-	fragTexCoord = inTexCoord;
-}
+    gl_Position = vec4(positions[gl_VertexIndex], 0.0, 1.0);
+    fragColor = colors[gl_VertexIndex];
+}

src/app/application.cpp

@@ -8,8 +8,8 @@ Application::Application():
 	m_settings(),
 	m_world_scene(),
 	m_window("Vox", 800, 600),
-	m_renderAPI(m_window.getGLFWwindow()),
-	m_render_thread(m_settings, m_renderAPI, m_world_scene),
+	m_vulkan_api(m_window.getGLFWwindow()),
+	m_render_thread(m_settings, m_vulkan_api, m_world_scene),
 	m_update_thread(m_settings, m_window, m_world_scene, m_start_time)
 {
 	LOG_INFO("Application::Application()");

src/app/application.hpp

@@ -6,8 +6,7 @@
 #include "RenderThread.hpp"
 #include "WorldScene.hpp"
 #include "UpdateThread.hpp"
-
-#include <cppVulkanAPI.hpp>
+#include "VulkanAPI.hpp"
 
 #include <chrono>
 
@@ -28,7 +27,7 @@ class Application
 	Settings m_settings;
 	WorldScene m_world_scene;
 	Window m_window;
-	vk::RenderAPI m_renderAPI;
+	VulkanAPI m_vulkan_api;
 	RenderThread m_render_thread;
 	UpdateThread m_update_thread;
 };

src/app/scenes/WorldScene.hpp

@@ -3,7 +3,8 @@
 #include "define.hpp"
 #include "logger.hpp"
 
-#include <cppVulkanAPI.hpp>
+#include <glm/glm.hpp>
+#include <glm/gtc/matrix_transform.hpp>
 
 #include <vector>
 #include <mutex>