diff options
author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2012-11-02 15:36:19 +0000 |
---|---|---|
committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2012-11-02 15:36:19 +0000 |
commit | c823b2bf3165990a556d50990adf4da5cee95593 (patch) | |
tree | 733f3d3a6ed7a5e8f80d4b4553299902d89b58b8 /packages/noncvs/windows/extra/Gem/examples/10.glsl/multitexture.frag | |
parent | 2c0b722536a4ec2f723c289b695b983741c678f8 (diff) |
commit Gem 0.93.3 from http://gem.iem.at/releases/0.93.3/Gem-0.93.3-W32-i686.zip
svn path=/trunk/; revision=16521
Diffstat (limited to 'packages/noncvs/windows/extra/Gem/examples/10.glsl/multitexture.frag')
-rw-r--r-- | packages/noncvs/windows/extra/Gem/examples/10.glsl/multitexture.frag | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/packages/noncvs/windows/extra/Gem/examples/10.glsl/multitexture.frag b/packages/noncvs/windows/extra/Gem/examples/10.glsl/multitexture.frag index 9e8ed0ce..1118bedc 100644 --- a/packages/noncvs/windows/extra/Gem/examples/10.glsl/multitexture.frag +++ b/packages/noncvs/windows/extra/Gem/examples/10.glsl/multitexture.frag @@ -1,13 +1,13 @@ -uniform sampler2D MyTex; -uniform sampler2D MyTex1; - -varying vec2 texcoord1; -varying vec2 texcoord2; - -void main (void) -{ - vec4 color = texture2D(MyTex, texcoord1); - vec4 color2 = texture2D(MyTex1, texcoord2); - gl_FragColor = (color + color2) / 2.; -} - +uniform sampler2D MyTex;
+uniform sampler2D MyTex1;
+
+varying vec2 texcoord1;
+varying vec2 texcoord2;
+
+void main (void)
+{
+ vec4 color = texture2D(MyTex, texcoord1);
+ vec4 color2 = texture2D(MyTex1, texcoord2);
+ gl_FragColor = (color + color2) / 2.;
+}
+
|