diff --git a/uppsrc/GLDraw/GLDraw.h b/uppsrc/GLDraw/GLDraw.h index f05e07258..b13b929a3 100644 --- a/uppsrc/GLDraw/GLDraw.h +++ b/uppsrc/GLDraw/GLDraw.h @@ -25,6 +25,7 @@ enum { ATTRIB_VERTEX = 1, ATTRIB_COLOR, ATTRIB_TEXPOS, + ATTRIB_ALPHA, }; class GLProgram { @@ -89,6 +90,8 @@ public: ~GLDraw(); }; +void GLOrtho(float left, float right, float bottom, float top, float near_, float far_, GLuint u_projection); + }; #endif \ No newline at end of file diff --git a/uppsrc/GLDraw/GLDrawS.cpp b/uppsrc/GLDraw/GLDrawS.cpp index 6e9f5ba75..2ba3b29c5 100644 --- a/uppsrc/GLDraw/GLDrawS.cpp +++ b/uppsrc/GLDraw/GLDrawS.cpp @@ -74,7 +74,7 @@ void initializeGL() uniform sampler2D s_texture; void main() { - gl_FragColor = texture2D(s_texture, v_texCoord); +// gl_FragColor = texture2D(s_texture, v_texCoord); gl_FragColor = v_color; gl_FragColor[3] = texture2D(s_texture, v_texCoord)[3]; }