Fix text file reading

CMakeLists.txt

@@ -31,6 +31,7 @@ set(SRC_FILES
 	"src/resources/font.cpp"
 
 	"src/util/model_loader.cpp"
+	"src/util/files.cpp"
 
 	"src/resource_manager.cpp"
 
@@ -73,6 +74,7 @@ set(INCLUDE_FILES
 	"include/resources/font.hpp"
 
 	"include/util/model_loader.hpp"
+	"include/util/files.hpp"
 
 	"include/resource_manager.hpp"
 
@@ -202,15 +204,15 @@ target_link_libraries(${PROJECT_NAME} PUBLIC spdlog)
 target_include_directories(${PROJECT_NAME} PUBLIC dependencies/spdlog/include)
 
 # freetype
-set(FT_DISABLE_ZLIB TRUE CACHE INTERNAL "" FORCE)
+#set(FT_DISABLE_ZLIB TRUE CACHE INTERNAL "" FORCE)
-set(FT_DISABLE_BZIP2 TRUE CACHE INTERNAL "" FORCE)
+#set(FT_DISABLE_BZIP2 TRUE CACHE INTERNAL "" FORCE)
-set(FT_DISABLE_PNG TRUE CACHE INTERNAL "" FORCE)
+#set(FT_DISABLE_PNG TRUE CACHE INTERNAL "" FORCE)
-set(FT_DISABLE_HARFBUZZ TRUE CACHE INTERNAL "" FORCE)
+#set(FT_DISABLE_HARFBUZZ TRUE CACHE INTERNAL "" FORCE)
-set(FT_DISABLE_BROTLI TRUE CACHE INTERNAL "" FORCE)
+#set(FT_DISABLE_BROTLI TRUE CACHE INTERNAL "" FORCE)
-set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "" FORCE)
+#set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "" FORCE)
-add_subdirectory(dependencies/freetype)
+#add_subdirectory(dependencies/freetype)
-target_link_libraries(${PROJECT_NAME} PRIVATE freetype)
+#target_link_libraries(${PROJECT_NAME} PRIVATE freetype)
-target_include_directories(${PROJECT_NAME} PRIVATE dependencies/freetype/include)
+#target_include_directories(${PROJECT_NAME} PRIVATE dependencies/freetype/include)
 
 # stb
 target_include_directories(${PROJECT_NAME} PRIVATE dependencies/stb)
@@ -218,6 +220,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE dependencies/stb)
 # assimp
 set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "" FORCE)
 set(ASSIMP_BUILD_TESTS OFF CACHE INTERNAL "" FORCE)
+set(ASSIMP_BUILD_ZLIB ON CACHE INTERNAL "" FORCE)
 set(ASSIMP_NO_EXPORT OFF CACHE INTERNAL "" FORCE)
 set(ASSIMP_INSTALL OFF CACHE INTERNAL "" FORCE)
 add_subdirectory(dependencies/assimp)

include/util/files.hpp

@@ -0,0 +1,11 @@
+#pragma once
+
+#include <memory>
+#include <vector>
+#include <string>
+
+namespace engine::util {
+
+	std::unique_ptr<std::vector<char>> readTextFile(const std::string& path);
+
+}

src/gfx_device_vulkan.cpp

@@ -8,6 +8,7 @@
 #include "util.hpp"
 #include "config.h"
 #include "log.hpp"
+#include "util/files.hpp"
 
 #define VOLK_IMPLEMENTATION
 #include <volk.h>
@@ -224,20 +225,6 @@ namespace engine {
 
 	}
 
-	static std::vector<char> readTextFile(const std::string& filename)
-	{
-		std::ifstream file(filename, std::ios::ate);
-		if (file.is_open() == false) {
-			throw std::runtime_error("Unable to open file " + filename);
-		}
-		std::vector<char> buffer(file.tellg());
-		file.seekg(0);
-		file.read(buffer.data(), buffer.size());
-		file.close();
-
-		return buffer;
-	}
-
 	static std::vector<const char*> getRequiredVulkanExtensions(SDL_Window* window)
 	{
 		SDL_bool res;
@@ -1686,12 +1673,12 @@ namespace engine {
 
 		gfx::Pipeline* pipeline = new gfx::Pipeline;
 
-		auto vertShaderCode = readTextFile(vertShaderPath);
+		auto vertShaderCode = util::readTextFile(vertShaderPath);
-		auto fragShaderCode = readTextFile(fragShaderPath);
+		auto fragShaderCode = util::readTextFile(fragShaderPath);
 		INFO("Opened shader: {}", std::filesystem::path(vertShaderPath).filename().string());
 
-		VkShaderModule vertShaderModule = compileShader(pimpl->device, shaderc_vertex_shader, vertShaderCode.data(), vertShaderPath);
+		VkShaderModule vertShaderModule = compileShader(pimpl->device, shaderc_vertex_shader, vertShaderCode->data(), vertShaderPath);
-		VkShaderModule fragShaderModule = compileShader(pimpl->device, shaderc_fragment_shader, fragShaderCode.data(), fragShaderPath);
+		VkShaderModule fragShaderModule = compileShader(pimpl->device, shaderc_fragment_shader, fragShaderCode->data(), fragShaderPath);
 		
 		// create uniform buffers
 		pipeline->uniformBuffers.resize(FRAMES_IN_FLIGHT);

src/util/files.cpp

@@ -0,0 +1,33 @@
+#include "util/files.hpp"
+
+#include <fstream>
+
+namespace engine::util {
+
+	std::unique_ptr<std::vector<char>> readTextFile(const std::string& path)
+	{
+		auto buffer = std::make_unique<std::vector<char>>();
+
+		std::ifstream file(path, std::ios::ate);
+
+		if (file.is_open() == false) {
+			throw std::runtime_error("Unable to open file " + path);
+		}
+
+		// reserve enough space for the text file, but leave the size at 0
+		buffer->reserve(file.tellg()); 
+
+		file.seekg(0);
+
+		while (!file.eof()) {
+			char c{};
+			file.read(&c, 1);
+			buffer->push_back(c);
+		}
+
+		file.close();
+
+		return buffer;
+	}
+
+}

test/res/shader.vert

@@ -26,4 +26,3 @@ void main() {
 	vec3 lightPos = vec3(-5.0, 20.0, 5.0);
 	fragLightPos = vec3(constants.view * vec4(lightPos, 1.0));
 }
-