X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=shaderlib%2Fphong.glsl;h=482f895b44e3e80e50e92586a5c2144319b110c7;hb=7f03ee52e8af5f857e44702b6d1c2822a51c62ef;hp=90f0ac8ac51ef65f8ed05bc5b44dccdbf9cf28a6;hpb=146df2d02940a04aeafe854bdd981a1489cc80b3;p=libs%2Fgl.git

diff --git a/shaderlib/phong.glsl b/shaderlib/phong.glsl
index 90f0ac8a..482f895b 100644
--- a/shaderlib/phong.glsl
+++ b/shaderlib/phong.glsl
@@ -2,19 +2,39 @@ import msp_interface;
 import common;
 import shadow;
 
-const bool use_diffuse_map = false;
-const bool use_specular = false;
-const bool use_specular_map = false;
-const bool use_shininess_map = false;
-const bool use_emission = false;
-const bool use_emission_map = false;
-const bool use_reflectivity = false;
-const bool use_reflectivity_map = false;
-const bool use_sky = false;
-const bool use_fog = false;
+struct BasicMaterialParameters
+{
+	vec4 diffuse;
+	vec4 specular;
+	vec4 emission;
+	float shininess;
+	float reflectivity;
+};
+
+uniform BasicMaterial
+{
+	BasicMaterialParameters basic_material;
+};
+
+uniform sampler2D diffuse_map;
+uniform sampler2D specular_map;
+uniform sampler2D shininess_map;
+uniform sampler2D emission_map;
+uniform sampler2D reflectivity_map;
+
+layout(constant_id=auto) const bool use_diffuse_map = false;
+layout(constant_id=auto) const bool use_specular = false;
+layout(constant_id=auto) const bool use_specular_map = false;
+layout(constant_id=auto) const bool use_shininess_map = false;
+layout(constant_id=auto) const bool use_emission = false;
+layout(constant_id=auto) const bool use_emission_map = false;
+layout(constant_id=auto) const bool use_reflectivity = false;
+layout(constant_id=auto) const bool use_reflectivity_map = false;
+layout(constant_id=auto) const bool use_sky = false;
+layout(constant_id=auto) const bool use_fog = false;
 
 #pragma MSP stage(fragment)
-vec4 get_diffuse_color()
+virtual vec4 get_diffuse_color()
 {
 	if(use_diffuse_map)
 		return texture(diffuse_map, texcoord.xy);
@@ -22,7 +42,7 @@ vec4 get_diffuse_color()
 		return basic_material.diffuse;
 }
 
-vec3 get_specular_color()
+virtual vec3 get_specular_color()
 {
 	if(use_specular_map)
 		return texture(specular_map, texcoord.xy).rgb;
@@ -30,7 +50,7 @@ vec3 get_specular_color()
 		return basic_material.specular.rgb;
 }
 
-float get_shininess_value()
+virtual float get_shininess_value()
 {
 	if(use_shininess_map)
 		return texture(shininess_map, texcoord.xy).r*255.0;
@@ -38,7 +58,7 @@ float get_shininess_value()
 		return basic_material.shininess;
 }
 
-vec3 get_emission_color()
+virtual vec3 get_emission_color()
 {
 	if(use_emission_map)
 		return texture(emission_map, texcoord.xy).rgb;
@@ -46,7 +66,7 @@ vec3 get_emission_color()
 		return basic_material.emission.rgb;
 }
 
-float get_reflectivity_value()
+virtual float get_reflectivity_value()
 {
 	if(use_reflectivity_map)
 		return texture(reflectivity_map, texcoord.xy).r;