X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogrambuilder.cpp;h=db9809c4f986a29b2fca7bbd6a204fb31df2de57;hb=99ffd618b531395fe369b33fb029855d57547365;hp=4dcdaf5ef8969070ccd19001cab0f40e374bde47;hpb=41264797bc55f27411555b3c217a80c791154afc;p=libs%2Fgl.git

diff --git a/source/programbuilder.cpp b/source/programbuilder.cpp
index 4dcdaf5e..db9809c4 100644
--- a/source/programbuilder.cpp
+++ b/source/programbuilder.cpp
@@ -58,7 +58,8 @@ const ProgramBuilder::VariableDefinition ProgramBuilder::standard_variables[] =
 	{ FRAGMENT, "rgb_surface", "vec3", "rgb_lit_surface", "l" },
 	{ FRAGMENT, "rgb_unlit_surface", "vec3", "basic_color.rgb", "!s" },
 	{ FRAGMENT, "rgb_unlit_surface", "vec3", "basic_color.rgb*l_shadow", "s" },
-	{ FRAGMENT, "rgb_lit_surface", "vec3", "rgb_illumination_diffuse", "!m" },
+	{ FRAGMENT, "rgb_lit_surface", "vec3", "rgb_illumination_diffuse", "!m!t" },
+	{ FRAGMENT, "rgb_lit_surface", "vec3", "rgb_illumination_diffuse*tex_sample.rgb", "!mt" },
 	{ FRAGMENT, "rgb_lit_surface", "vec3", "rgb_surface_ambient+rgb_surface_diffuse", "m!p" },
 	{ FRAGMENT, "rgb_lit_surface", "vec3", "rgb_surface_ambient+rgb_surface_diffuse+rgb_surface_specular", "mp" },
 
@@ -134,13 +135,13 @@ const ProgramBuilder::VariableDefinition ProgramBuilder::standard_variables[] =
 	{ UNIFORM, "normalmap", "sampler2D", 0, 0 },
 	{ UNIFORM, "environment", "samplerCube", 0, 0 },
 	{ UNIFORM, "EnvMap::env_eye_matrix", "mat3", 0, 0 },
-	{ UNIFORM, "EnvMap::reflectivity", "float", 0, 0 },
+	{ UNIFORM, "Material::reflectivity", "float", 0, 0 },
 	{ UNIFORM, "eye_obj_matrix", "mat4", "gl_ModelViewMatrix", 0 },
 	{ UNIFORM, "eye_obj_normal_matrix", "mat3", "gl_NormalMatrix", 0 },
 	{ UNIFORM, "projection_matrix", "mat4", "gl_ProjectionMatrix", 0 },
 	{ UNIFORM, "ShadowMap::shd_eye_matrix", "mat4", 0, 0 },
 	{ UNIFORM, "Lighting::light_sources", "LightSourceParameters[MAX_LIGHTS]", "gl_LightSource[i]", 0 },
-	{ UNIFORM, "Lighting::ambient_color", "vec4", 0, 0 },
+	{ UNIFORM, "Lighting::ambient_color", "vec4", "gl_LightModel.ambient", 0 },
 	{ UNIFORM, "Lighting::sky_color", "vec4", 0, 0 },
 	{ UNIFORM, "Lighting::eye_sky_dir", "vec3", 0, 0 },
 	{ UNIFORM, "Lighting::horizon_limit", "float", 0, 0 },