X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogrambuilder.cpp;h=e1b34d0906aa3c7c02367e92982d353df2c908a3;hb=583e1d196458a33aea84e3fa6108beefb47f0972;hp=a2d49ac83c7ba6cb247f6a0a7df7808883b96da5;hpb=a005e42f923c3c9ea973b1d5ac283441104d8c17;p=libs%2Fgl.git

diff --git a/source/programbuilder.cpp b/source/programbuilder.cpp
index a2d49ac8..e1b34d09 100644
--- a/source/programbuilder.cpp
+++ b/source/programbuilder.cpp
@@ -44,10 +44,14 @@ Naming conventions:
 anything that might need them. */
 const ProgramBuilder::VariableDefinition ProgramBuilder::standard_variables[] =
 {
-	{ FRAGMENT, "gl_FragColor", "vec4", "frag_color", "g" },
-	{ FRAGMENT, "frag_color", "vec4", "basic_color", "!e!l" },
-	{ FRAGMENT, "frag_color", "vec4", "vec4(rgb_surface, surface_alpha)", "!el" },
-	{ FRAGMENT, "frag_color", "vec4", "vec4(rgb_surface+rgb_reflection, surface_alpha)", "e" },
+	{ FRAGMENT, "gl_FragColor", "vec4", "frag_color", 0 },
+	{ FRAGMENT, "frag_color", "vec4", "incoming_color", "!f" },
+	{ FRAGMENT, "frag_color", "vec4", "vec4(mix(fog_color.rgb, incoming_color.rgb, fog_value), incoming_color.a)", "f" },
+	{ FRAGMENT, "fog_value", "float", "exp(-fog_coord*fog_density)", 0 },
+
+	{ FRAGMENT, "incoming_color", "vec4", "basic_color", "!e!l" },
+	{ FRAGMENT, "incoming_color", "vec4", "vec4(rgb_surface, surface_alpha)", "!el" },
+	{ FRAGMENT, "incoming_color", "vec4", "vec4(rgb_surface+rgb_reflection, surface_alpha)", "e" },
 
 	{ FRAGMENT, "rgb_reflection", "vec3", "reflect_sample.rgb*reflectivity", 0 },
 	{ FRAGMENT, "reflect_sample", "vec4", "textureCube(environment, env_reflect_dir)", 0 },
@@ -106,6 +110,7 @@ const ProgramBuilder::VariableDefinition ProgramBuilder::standard_variables[] =
 	{ FRAGMENT, "diffuse_sample", "vec4", "texture2D(diffusemap, texture_coord)", 0 },
 
 	{ VERTEX, "gl_Position", "vec4", "projection_matrix*eye_vertex", 0 },
+	{ VERTEX, "fog_coord", "float", "-eye_vertex.z", 0 },
 	{ VERTEX, "shd_vertex", "vec3", "(shd_eye_matrix*eye_vertex).xyz", 0 },
 	{ VERTEX, "tbn_sky_dir", "vec3", "eye_sky_dir*eye_tbn_matrix", "n" },
 	{ VERTEX, "tbn_light_dir[i]", "vec3", "eye_light_dir[i]*eye_tbn_matrix", 0 },
@@ -143,6 +148,8 @@ const ProgramBuilder::VariableDefinition ProgramBuilder::standard_variables[] =
 	{ UNIFORM, "Lighting::sky_color", "vec4", 0, 0 },
 	{ UNIFORM, "Lighting::eye_sky_dir", "vec3", 0, 0 },
 	{ UNIFORM, "Lighting::horizon_limit", "float", 0, 0 },
+	{ UNIFORM, "Lighting::fog_color", "vec4", "gl_Fog.color", 0 },
+	{ UNIFORM, "Lighting::fog_density", "float", "gl_Fog.density", 0 },
 	{ UNIFORM, "Material::material", "MaterialParameters", "gl_FrontMaterial", 0 },
 
 	{ TYPE, "LightSourceParameters", "struct { vec4 position; vec4 diffuse; vec4 specular; }", "gl_LightSourceParameters", 0 },
@@ -236,9 +243,12 @@ ProgramBuilder::ProgramBuilder(const StandardFeatures &f):
 		}
 	}
 
-	if((get_gl_api()==OPENGL && !features.legacy) || (get_gl_api()==OPENGL_ES2 && get_glsl_version()>=Version(3, 0)))
+	if(!features.legacy)
 	{
+		aliases["texture1D"] = "texture";
 		aliases["texture2D"] = "texture";
+		aliases["texture3D"] = "texture";
+		aliases["textureCube"] = "texture";
 		aliases["shadow2D"] = "texture";
 	}
 	else
@@ -345,8 +355,9 @@ void ProgramBuilder::add_shaders(Program &prog) const
 	for(list<ShaderVariable>::iterator i=variables.end(); i!=variables.begin(); )
 		(--i)->resolve_array(features);
 
+	bool legacy_variables = evaluate_flags("g");
 	for(list<ShaderVariable *>::const_iterator i=resolved_vars.begin(); i!=resolved_vars.end(); ++i)
-		(*i)->check_inline(features.legacy, !optimize);
+		(*i)->check_inline(legacy_variables, !optimize);
 
 	prog.attach_shader_owned(new VertexShader(create_source(resolved_vars, VERTEX)));
 	prog.attach_shader_owned(new FragmentShader(create_source(resolved_vars, FRAGMENT)));
@@ -376,7 +387,6 @@ string ProgramBuilder::create_source(const list<ShaderVariable *> &variables, Va
 {
 	string source;
 
-	bool legacy_qualifiers = features.legacy || (get_gl_api()==OPENGL_ES2 && !(get_glsl_version()>=Version(3, 0)));
 	bool use_blocks = !features.legacy && ARB_uniform_buffer_object;
 
 	if(!features.legacy)
@@ -385,7 +395,6 @@ string ProgramBuilder::create_source(const list<ShaderVariable *> &variables, Va
 		{
 			if(use_blocks)
 				source += "#version 300 es\n";
-			source += "precision mediump float;\n";
 		}
 		else
 		{
@@ -395,6 +404,9 @@ string ProgramBuilder::create_source(const list<ShaderVariable *> &variables, Va
 		}
 	}
 
+	if(get_gl_api()==OPENGL_ES2)
+		source += "precision mediump float;\n";
+
 	set<const VariableDefinition *> declared_types;
 	set<string> uniform_blocks;
 	for(list<ShaderVariable *>::const_iterator i=variables.begin(); i!=variables.end(); ++i)
@@ -431,13 +443,13 @@ string ProgramBuilder::create_source(const list<ShaderVariable *> &variables, Va
 
 		if(iface&INPUT)
 		{
-			const char *qualifier = (legacy_qualifiers ? scope==VERTEX ? "attribute" : "varying" : "in");
+			const char *qualifier = (features.legacy ? scope==VERTEX ? "attribute" : "varying" : "in");
 			source += format("%s %s;\n", qualifier, (*i)->create_declaration(interfaces[scope-1]));
 		}
 
 		if(iface&OUTPUT)
 		{
-			const char *qualifier = (legacy_qualifiers ? "varying" : "out");
+			const char *qualifier = (features.legacy ? "varying" : "out");
 			source += format("%s %s;\n", qualifier, (*i)->create_declaration(interfaces[scope]));
 		}
 	}
@@ -715,12 +727,17 @@ ProgramBuilder::StandardFeatures::StandardFeatures():
 	lighting(false),
 	max_lights(1),
 	skylight(false),
+	fog(false),
 	specular(false),
 	normalmap(false),
 	shadow(false),
-	reflection(false),
-	legacy(get_gl_api()==OPENGL && !(get_glsl_version()>=Version(1, 30)))
-{ }
+	reflection(false)
+{
+	if(get_gl_api()==OPENGL_ES2)
+		legacy = !(get_glsl_version()>=Version(3, 0));
+	else
+		legacy = !(get_glsl_version()>=Version(1, 30));
+}
 
 string ProgramBuilder::StandardFeatures::create_flags() const
 {
@@ -739,11 +756,13 @@ string ProgramBuilder::StandardFeatures::create_flags() const
 		if(normalmap)
 			flags += 'n';
 	}
+	if(fog)
+		flags += 'f';
 	if(shadow)
 		flags += 's';
 	if(reflection)
 		flags += 'e';
-	if(legacy)
+	if(legacy && get_gl_api()==OPENGL)
 		flags += 'g';
 
 	return flags;
@@ -1069,6 +1088,7 @@ ProgramBuilder::StandardFeatures::Loader::Loader(StandardFeatures &f):
 	DataFile::ObjectLoader<StandardFeatures>(f)
 {
 	add("custom",    &StandardFeatures::custom);
+	add("fog",       &StandardFeatures::fog);
 	add("lighting",  &StandardFeatures::lighting);
 	add("material",  &StandardFeatures::material);
 	add("max_lights", &StandardFeatures::max_lights);