Merge branch 'master' of git://gitorious.org/fg/fgdata
This commit is contained in:
commit
ae71559092
2 changed files with 10293 additions and 9756 deletions
20045
Docs/getstart.pdf
20045
Docs/getstart.pdf
File diff suppressed because it is too large
Load diff
|
@ -1,7 +1,7 @@
|
|||
// -*- mode: C; -*-
|
||||
// Licence: GPL v2
|
||||
// Author: Frederic Bouvier
|
||||
|
||||
#version 120
|
||||
//varying float fogCoord;
|
||||
|
||||
varying vec3 VNormal;
|
||||
|
@ -48,6 +48,6 @@ void main (void)
|
|||
// fogFactor = clamp(fogFactor, 0.0, 1.0);
|
||||
// gl_FragColor = mix(gl_Fog.color, color, fogFactor);
|
||||
|
||||
color.rgb = fog_Func(fragColor.rgb, fogType);
|
||||
color.rgb = fog_Func(color.rgb, fogType);
|
||||
gl_FragColor = color;
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue