From c7af7f8f2f38662bbd307b790924fb1bc467854c Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop@gmail.com>
Date: Sat, 15 Sep 2012 08:43:59 -0400
Subject: [PATCH] rename shaders

---
 assets/fs/shaders/{obj_f.glsl => obj.f.glsl}         | 0
 assets/fs/shaders/{obj_v.glsl => obj.v.glsl}         | 0
 assets/fs/shaders/{obj_tex_f.glsl => obj_tex.f.glsl} | 0
 assets/fs/shaders/{obj_tex_v.glsl => obj_tex.v.glsl} | 0
 src/client/Client-gl.cc                              | 4 ++--
 5 files changed, 2 insertions(+), 2 deletions(-)
 rename assets/fs/shaders/{obj_f.glsl => obj.f.glsl} (100%)
 rename assets/fs/shaders/{obj_v.glsl => obj.v.glsl} (100%)
 rename assets/fs/shaders/{obj_tex_f.glsl => obj_tex.f.glsl} (100%)
 rename assets/fs/shaders/{obj_tex_v.glsl => obj_tex.v.glsl} (100%)

diff --git a/assets/fs/shaders/obj_f.glsl b/assets/fs/shaders/obj.f.glsl
similarity index 100%
rename from assets/fs/shaders/obj_f.glsl
rename to assets/fs/shaders/obj.f.glsl
diff --git a/assets/fs/shaders/obj_v.glsl b/assets/fs/shaders/obj.v.glsl
similarity index 100%
rename from assets/fs/shaders/obj_v.glsl
rename to assets/fs/shaders/obj.v.glsl
diff --git a/assets/fs/shaders/obj_tex_f.glsl b/assets/fs/shaders/obj_tex.f.glsl
similarity index 100%
rename from assets/fs/shaders/obj_tex_f.glsl
rename to assets/fs/shaders/obj_tex.f.glsl
diff --git a/assets/fs/shaders/obj_tex_v.glsl b/assets/fs/shaders/obj_tex.v.glsl
similarity index 100%
rename from assets/fs/shaders/obj_tex_v.glsl
rename to assets/fs/shaders/obj_tex.v.glsl
diff --git a/src/client/Client-gl.cc b/src/client/Client-gl.cc
index c7274f2..d49452d 100644
--- a/src/client/Client-gl.cc
+++ b/src/client/Client-gl.cc
@@ -95,8 +95,8 @@ bool Client::initgl()
         {1, "normal"},
         {0, NULL}
     };
-    const char *v_source = (const char *) CFS.get_file("shaders/obj_v.glsl", NULL);
-    const char *f_source = (const char *) CFS.get_file("shaders/obj_f.glsl", NULL);
+    const char *v_source = (const char *) CFS.get_file("shaders/obj.v.glsl", NULL);
+    const char *f_source = (const char *) CFS.get_file("shaders/obj.f.glsl", NULL);
     if (v_source == NULL || f_source == NULL)
     {
         cerr << "Error loading shader sources" << endl;