renamed shader with .glsl extension

cledant · Mar 13, 2018 · b139540 · b139540
1 parent 286e73d
commit b139540
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/shaders/BasicColor/BasicColor.fs → shaders/BasicColor/BasicColor_fs.glsl b/shaders/BasicColor/BasicColor.fs → shaders/BasicColor/BasicColor_fs.glsl
diff --git a/shaders/BasicColor/BasicColor.vs → shaders/BasicColor/BasicColor_vs.glsl b/shaders/BasicColor/BasicColor.vs → shaders/BasicColor/BasicColor_vs.glsl
diff --git a/shaders/BasicProp/BasicProp.fs → shaders/BasicProp/BasicProp_fs.glsl b/shaders/BasicProp/BasicProp.fs → shaders/BasicProp/BasicProp_fs.glsl
diff --git a/shaders/BasicProp/BasicProp.vs → shaders/BasicProp/BasicProp_vs.glsl b/shaders/BasicProp/BasicProp.vs → shaders/BasicProp/BasicProp_vs.glsl
diff --git a/shaders/DiffuseColored/DiffuseColored.fs → ...ers/DiffuseColored/DiffuseColored_fs.glsl b/shaders/DiffuseColored/DiffuseColored.fs → ...ers/DiffuseColored/DiffuseColored_fs.glsl
diff --git a/shaders/DiffuseColored/DiffuseColored.vs → ...ers/DiffuseColored/DiffuseColored_vs.glsl b/shaders/DiffuseColored/DiffuseColored.vs → ...ers/DiffuseColored/DiffuseColored_vs.glsl
diff --git a/srcs/TestInstancing/InitTestInstancing.cpp b/srcs/TestInstancing/InitTestInstancing.cpp
@@ -17,8 +17,8 @@ static void init_ressources(RessourceManager &rm)
 {
 	rm.add_texture("default_texture", "./assets/default_texture/default_texture.tga",
 				   Texture::eTextureType::TEX_DIFFUSE_SPECULAR);
-	rm.add_shader("BasicProp", "./shaders/BasicProp/BasicProp.vs",
-				  "./shaders/BasicProp/BasicProp.fs");
+	rm.add_shader("BasicProp", "./shaders/BasicProp/BasicProp_vs.glsl",
+				  "./shaders/BasicProp/BasicProp_fs.glsl");
 	rm.add_model("Sakuya", "./assets/models/Sakuya/Sakuya_Izayoi.obj");
 	rm.add_model("Alice", "./assets/models/Alice/Alice.obj");
 }

diff --git a/srcs/TestLight/InitTestLight.cpp b/srcs/TestLight/InitTestLight.cpp
@@ -17,10 +17,10 @@ static void init_ressources(RessourceManager &rm)
 {
 	rm.add_texture("default_texture", "./assets/default_texture/default_texture.tga",
 				   Texture::eTextureType::TEX_DIFFUSE_SPECULAR);
-	rm.add_shader("BasicColor", "./shaders/BasicColor/BasicColor.vs",
-				  "./shaders/BasicColor/BasicColor.fs");
-	rm.add_shader("DiffuseColored", "./shaders/DiffuseColored/DiffuseColored.vs",
-				  "./shaders/DiffuseColored/DiffuseColored.fs");
+	rm.add_shader("BasicColor", "./shaders/BasicColor/BasicColor_vs.glsl",
+				  "./shaders/BasicColor/BasicColor_fs.glsl");
+	rm.add_shader("DiffuseColored", "./shaders/DiffuseColored/DiffuseColored_vs.glsl",
+				  "./shaders/DiffuseColored/DiffuseColored_fs.glsl");
 	rm.add_model("WhiteBox", "./assets/models/WhiteBox/WhiteBox.obj");
 	rm.add_model("BlueBox", "./assets/models/BlueBox/BlueBox.obj");
 	rm.add_model("RedBox", "./assets/models/RedBox/RedBox.obj");

diff --git a/srcs/TestLight/InitTestMultiLight.cpp b/srcs/TestLight/InitTestMultiLight.cpp
@@ -17,8 +17,8 @@ static void init_ressources(RessourceManager &rm)
 {
 	rm.add_texture("default_texture", "./assets/default_texture/default_texture.tga",
 				   Texture::eTextureType::TEX_DIFFUSE_SPECULAR);
-	rm.add_shader("DiffuseColored", "./shaders/DiffuseColored/DiffuseColored.vs",
-				  "./shaders/DiffuseColored/DiffuseColored.fs");
+	rm.add_shader("DiffuseColored", "./shaders/DiffuseColored/DiffuseColored_vs.glsl",
+				  "./shaders/DiffuseColored/DiffuseColored_fs.glsl");
 	rm.add_shader("MultiPointDirSpotLight", "./shaders/MultiPointDirSpotLight/MultiPointDirSpotLight_vs.glsl",
 				  "./shaders/MultiPointDirSpotLight/MultiPointDirSpotLight_fs.glsl");
 	rm.add_model("WhiteBox", "./assets/models/WhiteBox/WhiteBox.obj");
@@ -65,7 +65,7 @@ static void load_test_level(Glfw_manager &manager, RessourceManager &rm,
 	params_point.diffuse_color = glm::vec3(0.0f, 0.0f, 1.0f);
 	params_point.pos           = glm::vec3(0.0f, 0.0f, 5.0f);
 	(*world)->add_PointLight(params_point);
-	
+
 	//Creating Prop
 	Prop::Params prop_params;
 	prop_params.render_bin  = light;