From 36e65cf07d140f519f2de616f9bff877987f1139 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Sun, 5 Jan 2014 13:50:54 +0200 Subject: [PATCH] Tweak some ProgramBuilder variables --- source/programbuilder.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/programbuilder.cpp b/source/programbuilder.cpp index 29df27ef..97f27a85 100644 --- a/source/programbuilder.cpp +++ b/source/programbuilder.cpp @@ -54,9 +54,9 @@ const ProgramBuilder::VariableDefinition ProgramBuilder::standard_variables[] = { FRAGMENT, "rgb_light_env", "vec3", "rgb_light_full+reflect_sample.rgb*reflectivity", "e" }, { FRAGMENT, "rgb_light_env", "vec3", "rgb_light_full", "!e" }, { FRAGMENT, "rgb_light_full", "vec3", "rgb_light_shadow+ambient_product_diffuse.rgb", "m" }, + { FRAGMENT, "rgb_light_full", "vec3", "rgb_light_shadow", "!m" }, { FRAGMENT, "ambient_product_diffuse", "vec4", "gl_FrontLightModelProduct.sceneColor", "g" }, { FRAGMENT, "ambient_product_diffuse", "vec4", "ambient_color*material.diffuse", "!g" }, - { FRAGMENT, "rgb_light_full", "vec3", "rgb_light_shadow", "!m" }, { FRAGMENT, "rgb_light_shadow", "vec3", "rgb_light*l_shadow", "s" }, { FRAGMENT, "rgb_light_shadow", "vec3", "rgb_light", "!s" }, { FRAGMENT, "rgb_light", "vec3", "vec3(l_diffuse)", "!m!p" }, @@ -115,13 +115,13 @@ const ProgramBuilder::VariableDefinition ProgramBuilder::standard_variables[] = { 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, "shd_eye_matrix", "mat4", 0, "!g" }, + { UNIFORM, "shd_eye_matrix", "mat4", 0, 0 }, { UNIFORM, "light_sources", "struct { vec4 position; vec4 diffuse; vec4 specular; } %s[2]", "gl_LightSource", 0 }, { UNIFORM, "ambient_color", "vec4", 0, 0 }, { UNIFORM, "material", "struct { vec4 ambient; vec4 diffuse; vec4 specular; float shininess; }", "gl_FrontMaterial", 0 }, // Terminator entry - { NO_SCOPE, 0, 0, 0, 0 } + { NO_SCOPE, 0, 0, 0, 0 } }; ProgramBuilder::ProgramBuilder(const StandardFeatures &f): -- 2.45.2