- float dist = pow(fdist*0.0008,1.2);
- return mix( vfrag, vec3(0.55,0.76,1.0), min( 1.0, dist ) );
+ vec3 vtotal = g_ambient_colour.rgb;
+
+ for( int i=0; i<g_light_count; i++ )
+ {
+ vec3 vcolour = g_light_colours[i].rgb;
+ vec3 vdir = g_light_directions[i].xyz;
+
+ float flight = max(dot( vdir, wnormal )*0.75+0.25,0.0);
+ vtotal += vcolour*flight;
+ }
+
+ return vtotal;
+}
+
+vec3 newlight_compute_sun_spec( vec3 wnormal, vec3 halfview, float fintensity )
+{
+ vec3 vcolour = g_light_colours[0].rgb;
+ vec3 vdir = g_light_directions[0].xyz;
+
+ vec3 specdir = reflect( -vdir, wnormal );
+ float spec = pow(max(dot( halfview, specdir ), 0.0), 10.0);
+ return vcolour*spec*fintensity;
+}
+
+vec3 newlight_compute_quadratic( vec3 wnormal, vec3 halfview,
+ vec3 light_pos, vec3 light_colour )
+{
+ vec3 light_delta = (light_pos-aWorldCo) * 10.0;
+
+ float quadratic = dot(light_delta,light_delta);
+ float attenuation = 1.0f/( 1.0f + quadratic );
+ attenuation *= max( 0.0, dot( normalize(light_delta), wnormal ) );
+
+ return light_colour*attenuation;