From 664523a515b156ed6d1b192537d786a18be1e706 Mon Sep 17 00:00:00 2001 From: 4VRDriver <44267643+4VRDriver@users.noreply.github.com> Date: Tue, 8 Sep 2020 00:28:07 +0200 Subject: [PATCH] Rename shaders --- res/shaders/{basic.fs => basic.frag} | 0 res/shaders/{basic.vs => basic.vert} | 0 res/shaders/{light.fs => light.frag} | 0 res/shaders/{light.vs => light.vert} | 0 src/Controller.cpp | 5 ++--- 5 files changed, 2 insertions(+), 3 deletions(-) rename res/shaders/{basic.fs => basic.frag} (100%) rename res/shaders/{basic.vs => basic.vert} (100%) rename res/shaders/{light.fs => light.frag} (100%) rename res/shaders/{light.vs => light.vert} (100%) diff --git a/res/shaders/basic.fs b/res/shaders/basic.frag similarity index 100% rename from res/shaders/basic.fs rename to res/shaders/basic.frag diff --git a/res/shaders/basic.vs b/res/shaders/basic.vert similarity index 100% rename from res/shaders/basic.vs rename to res/shaders/basic.vert diff --git a/res/shaders/light.fs b/res/shaders/light.frag similarity index 100% rename from res/shaders/light.fs rename to res/shaders/light.frag diff --git a/res/shaders/light.vs b/res/shaders/light.vert similarity index 100% rename from res/shaders/light.vs rename to res/shaders/light.vert diff --git a/src/Controller.cpp b/src/Controller.cpp index 94fe7f8..b98022b 100644 --- a/src/Controller.cpp +++ b/src/Controller.cpp @@ -43,9 +43,8 @@ Controller::~Controller() { void Controller::run() { glClearColor(0.15f, 0.15f, 0.15f, 1.0f); - ShaderProgram shaderProgram("res/shaders/basic.vs", "res/shaders/basic.fs"); - - ShaderProgram lightProgram("res/shaders/light.vs", "res/shaders/light.fs"); + ShaderProgram shaderProgram("res/shaders/basic.vert", "res/shaders/basic.frag"); + ShaderProgram lightProgram("res/shaders/light.vert", "res/shaders/light.frag"); std::vector scene;