Shaders assets fix

Zielon · Aug 13, 2021 · c7aad09 · c7aad09
1 parent 0c02572
commit c7aad09
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/Rasterizer/Rasterizer/src/Viewer/Shader.h b/Rasterizer/Rasterizer/src/Viewer/Shader.h
@@ -7,13 +7,17 @@
 #include <sstream>
 #include <iostream>
 
+#include "../path.h"
+
 namespace Viewer
 {
 	class Shader
 	{
 	public:
 		Shader(const std::string& vertexPath, const std::string& fragmentPath)
 		{
+			root = Path::Root({ "Rasterizer", "Assets", "Shaders" });
+
 			std::string vertexCode;
 			std::string fragmentCode;
 
@@ -25,8 +29,8 @@ namespace Viewer
 
 			try
 			{
-				vShaderFile.open("../Assets/Shaders/" + vertexPath);
-				fShaderFile.open("../Assets/Shaders/" + fragmentPath);
+				vShaderFile.open(root / vertexPath);
+				fShaderFile.open(root / fragmentPath);
 
 				std::stringstream vShaderStream, fShaderStream;
 
@@ -77,6 +81,7 @@ namespace Viewer
 
 	private:
 		unsigned int ID;
+		std::filesystem::path root;
 
 		static void CheckCompileErrors(GLuint shader, std::string type)
 		{

diff --git a/Rasterizer/Rasterizer/src/path.h b/Rasterizer/Rasterizer/src/path.h
@@ -8,15 +8,13 @@ class Path
 	static std::filesystem::path Root(std::vector<std::string> segments)
 	{
 		auto root = std::filesystem::current_path();
-		auto current = root.parent_path().filename();
+		auto current = root.filename();
 		while (current.string().find("CPURasterizer") == std::string::npos)
 		{
 			root = root.parent_path();
-			current = root.parent_path().filename();
+			current = root.filename();
 		}
 
-		root = root.parent_path();
-
 		for (const auto segment : segments)
 			root /= segment;