GLSL 'include' support

2023-11-28 16:13:49 +03:00
parent e6ecd558a9
commit a60cc70246
20 changed files with 238 additions and 35 deletions
@@ -48,7 +48,7 @@ bool AssetsLoader::loadNext() {
 #include "../graphics/Font.h"

 bool _load_shader(Assets* assets, const path& filename, const std::string& name) {
-	Shader* shader = load_shader(filename.string() + ".glslv", filename.string() + ".glslf");
+	Shader* shader = Shader::loadShader(filename.string() + ".glslv", filename.string() + ".glslf");
 	if (shader == nullptr) {
 		std::cerr << "failed to load shader '" << name << "'" << std::endl;
 		return false;