Changeset 267 for trunk/tests/gui_test/gui.frag

Timestamp:

06/19/14 19:03:25 (11 years ago)

Author:

epyon

Message:

• gui::element class now pure data
• gui::element related code in environment
• gui shaders use general library mechanism

File:

• trunk/tests/gui_test/gui.frag (modified) (1 diff)

trunk/tests/gui_test/gui.frag

@@ -2 +2 @@
 varying vec4 v_color;
 varying vec2 v_texcoord;
-uniform sampler2D tex;
+uniform sampler2D nv_t_diffuse;
  
 void main(void) {
-        vec4 texture = texture2D(tex,v_texcoord);
+        vec4 texture = texture2D(nv_t_diffuse,v_texcoord);
         gl_FragColor = v_color * texture;
 }