github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-06-02 06:12:41 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

GLDraw: cosmetics

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@11958 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2018-05-20 14:09:34 +00:00
parent 9b81964e6a
commit 15a774ccfc
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
uppsrc/GLDraw/GLDraw.h
View file

@ -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

2
uppsrc/GLDraw/GLDrawS.cpp
View file

@ -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];
}