From cf3edaf5ac32e13a8389e2108838b318cd055bae Mon Sep 17 00:00:00 2001
From: Pascal <engelerp@phys.ethz.ch>
Date: Mon, 24 Jun 2024 14:10:32 +0200
Subject: [PATCH] Switched shader loading to .ini loaded paths
---
gui/src/layer.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/gui/src/layer.cpp b/gui/src/layer.cpp
index c66dd9c..b4d46d4 100644
--- a/gui/src/layer.cpp
+++ b/gui/src/layer.cpp
@@ -6,6 +6,7 @@
#include <shader.hpp>
#include <metadata_manager.hpp>
#include <material.hpp>
+#include <INIReader.h>
Layer::Layer(std::string name, std::string filename, float zOffset, Material mat): _name(name), _zOffset(zOffset) {
//read data from file into vertex buffer, element buffer
@@ -106,8 +107,9 @@ Layer::Layer(std::string name, std::string filename, float zOffset, Material mat
glBindBuffer(GL_ARRAY_BUFFER, 0);
//setup shader
- std::string vertFile = std::string(SHADER_LOC) + std::string("objectShader.vert");
- std::string fragFile = std::string(SHADER_LOC) + std::string("objectShader.frag");
+ INIReader inireader("config.ini");
+ std::string vertFile = inireader.GetString("paths", "pathShaders", "NONE") + std::string("objectShader.vert");
+ std::string fragFile = inireader.GetString("paths", "pathShaders", "NONE") + std::string("objectShader.frag");
_shader = Shader(vertFile.c_str(), fragFile.c_str());
_shader.use();
_shader.setFloat("z_offset", _zOffset);
--
GitLab