ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix meter missing in race gui for GLES 2

Browse Source
This commit is contained in:
Benau 2018-11-30 18:47:15 +08:00
parent 5c7133699e
commit 8b825bf7df
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/irrlicht/source/Irrlicht/COGLES2Driver.cpp
View File

@ -825,6 +825,16 @@ namespace video
drawVertexPrimitiveList2d3d(vertices, vertexCount, (const u16*)indexList, primitiveCount, vType, pType, iType); drawVertexPrimitiveList2d3d(vertices, vertexCount, (const u16*)indexList, primitiveCount, vType, pType, iType);
} }
void COGLES2Driver::draw2DVertexPrimitiveList(const void* vertices,
u32 vertexCount, const void* indexList, u32 primitiveCount,
E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType)
{
testGLError();
if (!checkPrimitiveCount(primitiveCount))
return;
setRenderStates2DMode(Material.MaterialType==EMT_TRANSPARENT_VERTEX_ALPHA, (Material.getTexture(0) != 0), Material.MaterialType==EMT_TRANSPARENT_ALPHA_CHANNEL);
drawVertexPrimitiveList2d3d(vertices, vertexCount, (const u16*)indexList, primitiveCount, vType, pType, iType, false);
}
void COGLES2Driver::drawVertexPrimitiveList2d3d(const void* vertices, u32 vertexCount, void COGLES2Driver::drawVertexPrimitiveList2d3d(const void* vertices, u32 vertexCount,
const void* indexList, u32 primitiveCount, const void* indexList, u32 primitiveCount,

4
lib/irrlicht/source/Irrlicht/COGLES2Driver.h
View File

@ -127,6 +127,10 @@ namespace video
const void* indexList, u32 primitiveCount, const void* indexList, u32 primitiveCount,
E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType); E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType);
virtual void draw2DVertexPrimitiveList(const void* vertices, u32 vertexCount,
const void* indexList, u32 primitiveCount,
E_VERTEX_TYPE vType=EVT_STANDARD, scene::E_PRIMITIVE_TYPE pType=scene::EPT_TRIANGLES, E_INDEX_TYPE iType=EIT_16BIT);
void drawVertexPrimitiveList2d3d(const void* vertices, u32 vertexCount, void drawVertexPrimitiveList2d3d(const void* vertices, u32 vertexCount,
const void* indexList, u32 primitiveCount, const void* indexList, u32 primitiveCount,
E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType,

2
src/states_screens/race_gui.cpp
View File

@ -996,6 +996,8 @@ void RaceGUI::drawMeterTexture(video::ITexture *meter_texture, video::S3DVertex
{ {
#ifndef SERVER_ONLY #ifndef SERVER_ONLY
//Should be greater or equal than the greatest vertices_count used by the meter functions //Should be greater or equal than the greatest vertices_count used by the meter functions
if (count < 2)
return;
short int index[12]; short int index[12];
for(unsigned int i=0; i<count; i++) for(unsigned int i=0; i<count; i++)
{ {