From 15a774ccfcf54cd3abf20bf6ddbbdaa1e83fcb63 Mon Sep 17 00:00:00 2001 From: cxl Date: Sun, 20 May 2018 14:09:34 +0000 Subject: [PATCH] GLDraw: cosmetics git-svn-id: svn://ultimatepp.org/upp/trunk@11958 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/GLDraw/GLDraw.h | 3 +++ uppsrc/GLDraw/GLDrawS.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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]; }