X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Fbasicmaterial.cpp;h=33dced53d7fb65c68fce1251893f14b202c144c3;hb=842c817bb679a5a0abc05e8149e2e6e0ae1a0412;hp=362fc9db14e6a8636960bec3a746cd8e62715ed8;hpb=0912a8d73043961ab7a4d66cd2fbb13187483ffd;p=libs%2Fgl.git

diff --git a/source/materials/basicmaterial.cpp b/source/materials/basicmaterial.cpp
index 362fc9db..33dced53 100644
--- a/source/materials/basicmaterial.cpp
+++ b/source/materials/basicmaterial.cpp
@@ -15,36 +15,21 @@ BasicMaterial::BasicMaterial():
 	set_reflectivity(0.0f);
 }
 
-string BasicMaterial::create_program_source() const
-{
-	string source = "import phong;\n";
-	if(diffuse.texture)
-		source += "const bool use_diffuse_map = true;\n";
-	if(specular.texture || specular.value.r || specular.value.g || specular.value.b)
-	{
-		source += "const bool use_specular = true;\n";
-		if(specular.texture)
-			source += "const bool use_specular_map = true;\n";
-		if(shininess.texture)
-			source += "const bool use_shininess_map = true;\n";
-	}
-	if(normal.texture)
-		source += "const bool use_normal_map = true;\n";
-	if(emission.texture || emission.value.r || emission.value.g || emission.value.b)
-	{
-		source += "const bool use_emission = true;\n";
-		if(emission.texture)
-			source += "const bool use_emission_map = true;\n";
-	}
-	if(reflectivity.value || reflectivity.texture)
-	{
-		source += "const bool use_reflectivity = true;\n";
-		if (reflectivity.texture)
-			source += "const bool use_reflectivity_map = true;\n";
-	}
-	if(receive_shadows)
-		source += "const bool use_shadow_map = true;\n";
-	return source;
+void BasicMaterial::fill_program_info(string &module_name, map<string, int> &spec_values) const
+{
+	module_name = "phong.glsl";
+	spec_values["use_diffuse_map"] = (diffuse.texture!=0);
+	bool use_specular = (specular.texture || specular.value.r || specular.value.g || specular.value.b);
+	spec_values["use_specular"] = use_specular;
+	spec_values["use_specular_map"] = (specular.texture!=0);
+	spec_values["use_shininess_map"] = (use_specular && shininess.texture!=0);
+	spec_values["use_normal_map"] = (normal.texture!=0);
+	bool use_emission = (emission.texture || emission.value.r || emission.value.g || emission.value.b);
+	spec_values["use_emission"] = use_emission;
+	spec_values["use_emission_map"] = (emission.texture!=0);
+	spec_values["use_reflectivity"] = (reflectivity.value!=0 || reflectivity.texture!=0);
+	spec_values["use_reflectivity_map"] = (reflectivity.texture!=0);
+	spec_values["use_shadow_map"] = receive_shadows;
 }
 
 void BasicMaterial::attach_textures_to(Texturing &texturing, ProgramData &tex_shdata) const