stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-02-11 02:30:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Buildbot fixes

Browse source
This commit is contained in:
mazmazz 2018-12-27 00:54:27 -05:00
parent 62596bed38
commit 08579d9447
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/hardware/r_opengl/r_opengl.c
View file

@ -1416,6 +1416,10 @@ EXPORT void HWRAPI(DrawPolygon) (FSurfaceInfo *pSurf,
GLdouble px = 0.0f, py = 0.0f, pz = -1.0f; GLdouble px = 0.0f, py = 0.0f, pz = -1.0f;
GLfloat scalef = 0.0f; GLfloat scalef = 0.0f;
GLubyte c[4];
float alpha;
cx = (pOutVerts[0].x + pOutVerts[2].x) / 2.0f; // we should change the coronas' ... cx = (pOutVerts[0].x + pOutVerts[2].x) / 2.0f; // we should change the coronas' ...
cy = (pOutVerts[0].y + pOutVerts[2].y) / 2.0f; // ... code so its only done once. cy = (pOutVerts[0].y + pOutVerts[2].y) / 2.0f; // ... code so its only done once.
cz = pOutVerts[0].z; cz = pOutVerts[0].z;
@ -1451,12 +1455,12 @@ EXPORT void HWRAPI(DrawPolygon) (FSurfaceInfo *pSurf,
if (scalef < 0.05f) if (scalef < 0.05f)
return; return;
GLubyte c[4]; // GLubyte c[4];
c[0] = pSurf->FlatColor.s.red; c[0] = pSurf->FlatColor.s.red;
c[1] = pSurf->FlatColor.s.green; c[1] = pSurf->FlatColor.s.green;
c[2] = pSurf->FlatColor.s.blue; c[2] = pSurf->FlatColor.s.blue;
float alpha = byte2float[pSurf->FlatColor.s.alpha]; alpha = byte2float[pSurf->FlatColor.s.alpha];
alpha *= scalef; // change the alpha value (it seems better than changing the size of the corona) alpha *= scalef; // change the alpha value (it seems better than changing the size of the corona)
c[3] = (unsigned char)(alpha * 255); c[3] = (unsigned char)(alpha * 255);
pglColor4ubv(c); pglColor4ubv(c);
@ -1915,7 +1919,7 @@ static void DrawModelEx(model_t *model, INT32 frameIndex, INT32 duration, INT32
pglBindBuffer(GL_ARRAY_BUFFER, frame->vboID); pglBindBuffer(GL_ARRAY_BUFFER, frame->vboID);
pglVertexPointer(3, GL_SHORT, sizeof(vbotiny_t), BUFFER_OFFSET(0)); pglVertexPointer(3, GL_SHORT, sizeof(vbotiny_t), BUFFER_OFFSET(0));
pglNormalPointer(GL_BYTE, sizeof(vbotiny_t), BUFFER_OFFSET(sizeof(short)*3)); pglNormalPointer(GL_BYTE, sizeof(vbotiny_t), BUFFER_OFFSET(sizeof(short)*3));
pglTexCoordPointer(2, GL_FLOAT, sizeof(vbotiny_t), BUFFER_OFFSET(sizeof(short) * 3 + sizeof(byte) * 6)); pglTexCoordPointer(2, GL_FLOAT, sizeof(vbotiny_t), BUFFER_OFFSET(sizeof(short) * 3 + sizeof(char) * 6));
pglDrawElements(GL_TRIANGLES, mesh->numTriangles * 3, GL_UNSIGNED_SHORT, mesh->indices); pglDrawElements(GL_TRIANGLES, mesh->numTriangles * 3, GL_UNSIGNED_SHORT, mesh->indices);
pglBindBuffer(GL_ARRAY_BUFFER, 0); pglBindBuffer(GL_ARRAY_BUFFER, 0);

4
src/hardware/r_opengl/r_opengl.h
View file

@ -118,9 +118,11 @@ typedef void (APIENTRY * PFNglGetIntegerv) (GLenum pname, GLint *params);
extern PFNglGetIntegerv pglGetIntegerv; extern PFNglGetIntegerv pglGetIntegerv;
typedef const GLubyte* (APIENTRY * PFNglGetString) (GLenum name); typedef const GLubyte* (APIENTRY * PFNglGetString) (GLenum name);
extern PFNglGetString pglGetString; extern PFNglGetString pglGetString;
typedef void (APIENTRY * PFNglEnableClientState) (GLenum cap); #if 0
typedef void (APIENTRY * PFNglEnableClientState) (GLenum cap); // redefined in r_opengl.c
static PFNglEnableClientState pglEnableClientState; static PFNglEnableClientState pglEnableClientState;
#endif #endif
#endif
// ========================================================================== // ==========================================================================
// GLOBAL // GLOBAL