From 56fce78098c48d54b8cfced95e5b418959ca7892 Mon Sep 17 00:00:00 2001 From: kienan Date: Sun, 3 May 2020 16:57:48 -0400 Subject: [PATCH] Make shader list and program file names more consistent In particular, the client was loading list.txt, not shader_list.txt and it seems weird to be incoherent between the source and built resources in this way. --- src/client/client_imgui.cpp | 2 +- src/shaders/{shader_list.txt => list.txt} | 0 src/shaders/{shader_programs.txt => programs.txt} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename src/shaders/{shader_list.txt => list.txt} (100%) rename src/shaders/{shader_programs.txt => programs.txt} (100%) diff --git a/src/client/client_imgui.cpp b/src/client/client_imgui.cpp index a8b4be0..5c46f6b 100644 --- a/src/client/client_imgui.cpp +++ b/src/client/client_imgui.cpp @@ -107,7 +107,7 @@ int main(int argc, char** argv) // @BUG This is a temporary hack. When shader_program_registry is grown, the existing // entries lose data. shader_program_registry.reserve(10); - loadShaderProgramsFromFile("shaders/shader_programs.txt", &shader_registry, &shader_program_registry); + loadShaderProgramsFromFile("shaders/programs.txt", &shader_registry, &shader_program_registry); messager.registerCallback(&debug_messagebus_callback); int window_height, window_width; glm::mat4 projection; diff --git a/src/shaders/shader_list.txt b/src/shaders/list.txt similarity index 100% rename from src/shaders/shader_list.txt rename to src/shaders/list.txt diff --git a/src/shaders/shader_programs.txt b/src/shaders/programs.txt similarity index 100% rename from src/shaders/shader_programs.txt rename to src/shaders/programs.txt