MGislv
/
Quake3e
1
0
Fork 0
Code Releases Activity

Fixed typo in RB_AddQuadStamp2()

This commit is contained in:
Eugene 2022-01-30 00:00:53 +02:00
parent 735e20cd34
commit 44c4bd2285
4 changed files with 4 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
code/renderer/tr_backend.c
View File

@ -1092,52 +1092,7 @@ static const void *RB_StretchPic( const void *data ) {
//Check if it's time for BLOOM!
R_BloomScreen();
RB_CHECKOVERFLOW( 4, 6 );
numVerts = tess.numVertexes;
numIndexes = tess.numIndexes;
tess.numVertexes += 4;
tess.numIndexes += 6;
tess.indexes[ numIndexes ] = numVerts + 3;
tess.indexes[ numIndexes + 1 ] = numVerts + 0;
tess.indexes[ numIndexes + 2 ] = numVerts + 2;
tess.indexes[ numIndexes + 3 ] = numVerts + 2;
tess.indexes[ numIndexes + 4 ] = numVerts + 0;
tess.indexes[ numIndexes + 5 ] = numVerts + 1;
tess.vertexColors[ numVerts ].u32 =
tess.vertexColors[ numVerts + 1 ].u32 =
tess.vertexColors[ numVerts + 2 ].u32 =
tess.vertexColors[ numVerts + 3 ].u32 = backEnd.color2D.u32;
tess.xyz[ numVerts ][0] = cmd->x;
tess.xyz[ numVerts ][1] = cmd->y;
tess.xyz[ numVerts ][2] = 0;
tess.texCoords[0][ numVerts + 0][0] = cmd->s1;
tess.texCoords[0][ numVerts + 0][1] = cmd->t1;
tess.xyz[ numVerts + 1 ][0] = cmd->x + cmd->w;
tess.xyz[ numVerts + 1 ][1] = cmd->y;
tess.xyz[ numVerts + 1 ][2] = 0;
tess.texCoords[0][numVerts + 1][0] = cmd->s2;
tess.texCoords[0][numVerts + 1][1] = cmd->t1;
tess.xyz[ numVerts + 2 ][0] = cmd->x + cmd->w;
tess.xyz[ numVerts + 2 ][1] = cmd->y + cmd->h;
tess.xyz[ numVerts + 2 ][2] = 0;
tess.texCoords[0][numVerts + 2][0] = cmd->s2;
tess.texCoords[0][numVerts + 2][1] = cmd->t2;
tess.xyz[ numVerts + 3 ][0] = cmd->x;
tess.xyz[ numVerts + 3 ][1] = cmd->y + cmd->h;
tess.xyz[ numVerts + 3 ][2] = 0;
tess.texCoords[0][numVerts + 3][0] = cmd->s1;
tess.texCoords[0][numVerts + 3][1] = cmd->t2;
RB_AddQuadStamp2( cmd->x, cmd->y, cmd->w, cmd->h, cmd->s1, cmd->t1, cmd->s2, cmd->t2, backEnd.color2D );
return (const void *)(cmd + 1);
}

2
code/renderer/tr_surface.c
View File

@ -186,7 +186,7 @@ void RB_AddQuadStamp2( float x, float y, float w, float h, float s1, float t1, f
tess.texCoords[0][numVerts + 0][0] = s1;
tess.texCoords[0][numVerts + 0][1] = t1;
tess.texCoords[0][numVerts + 1][0] = s2;
tess.texCoords[0][numVerts + 1][1] = s1;
tess.texCoords[0][numVerts + 1][1] = t1;
tess.texCoords[0][numVerts + 2][0] = s2;
tess.texCoords[0][numVerts + 2][1] = t2;
tess.texCoords[0][numVerts + 3][0] = s1;

48
code/renderervk/tr_backend.c
View File

@ -1174,7 +1174,6 @@ RB_StretchPic
static const void *RB_StretchPic( const void *data ) {
const stretchPicCommand_t *cmd;
shader_t *shader;
int numVerts, numIndexes;
cmd = (const stretchPicCommand_t *)data;
@ -1201,52 +1200,7 @@ static const void *RB_StretchPic( const void *data ) {
}
#endif
RB_CHECKOVERFLOW( 4, 6 );
numVerts = tess.numVertexes;
numIndexes = tess.numIndexes;
tess.numVertexes += 4;
tess.numIndexes += 6;
tess.indexes[ numIndexes ] = numVerts + 3;
tess.indexes[ numIndexes + 1 ] = numVerts + 0;
tess.indexes[ numIndexes + 2 ] = numVerts + 2;
tess.indexes[ numIndexes + 3 ] = numVerts + 2;
tess.indexes[ numIndexes + 4 ] = numVerts + 0;
tess.indexes[ numIndexes + 5 ] = numVerts + 1;
tess.vertexColors[ numVerts ].u32 =
tess.vertexColors[ numVerts + 1 ].u32 =
tess.vertexColors[ numVerts + 2 ].u32 =
tess.vertexColors[ numVerts + 3 ].u32 = backEnd.color2D.u32;
tess.xyz[ numVerts ][0] = cmd->x;
tess.xyz[ numVerts ][1] = cmd->y;
tess.xyz[ numVerts ][2] = 0;
tess.texCoords[0][ numVerts + 0][0] = cmd->s1;
tess.texCoords[0][ numVerts + 0][1] = cmd->t1;
tess.xyz[ numVerts + 1 ][0] = cmd->x + cmd->w;
tess.xyz[ numVerts + 1 ][1] = cmd->y;
tess.xyz[ numVerts + 1 ][2] = 0;
tess.texCoords[0][numVerts + 1][0] = cmd->s2;
tess.texCoords[0][numVerts + 1][1] = cmd->t1;
tess.xyz[ numVerts + 2 ][0] = cmd->x + cmd->w;
tess.xyz[ numVerts + 2 ][1] = cmd->y + cmd->h;
tess.xyz[ numVerts + 2 ][2] = 0;
tess.texCoords[0][numVerts + 2][0] = cmd->s2;
tess.texCoords[0][numVerts + 2][1] = cmd->t2;
tess.xyz[ numVerts + 3 ][0] = cmd->x;
tess.xyz[ numVerts + 3 ][1] = cmd->y + cmd->h;
tess.xyz[ numVerts + 3 ][2] = 0;
tess.texCoords[0][numVerts + 3][0] = cmd->s1;
tess.texCoords[0][numVerts + 3][1] = cmd->t2;
RB_AddQuadStamp2( cmd->x, cmd->y, cmd->w, cmd->h, cmd->s1, cmd->t1, cmd->s2, cmd->t2, backEnd.color2D );
return (const void *)(cmd + 1);
}

2
code/renderervk/tr_surface.c
View File

@ -190,7 +190,7 @@ void RB_AddQuadStamp2( float x, float y, float w, float h, float s1, float t1, f
tess.texCoords[0][numVerts + 0][0] = s1;
tess.texCoords[0][numVerts + 0][1] = t1;
tess.texCoords[0][numVerts + 1][0] = s2;
tess.texCoords[0][numVerts + 1][1] = s1;
tess.texCoords[0][numVerts + 1][1] = t1;
tess.texCoords[0][numVerts + 2][0] = s2;
tess.texCoords[0][numVerts + 2][1] = t2;
tess.texCoords[0][numVerts + 3][0] = s1;