matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix another blending issue and search_ui display clearing

Browse Source
This commit is contained in:
Simon Robertshaw 2011-10-25 16:00:52 +01:00
parent 565a3e10e4
commit b9ec7d8654
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/graphics.c
View File

@ -1621,10 +1621,13 @@ void render_parts(pixel *vid)
int cglowV = 0, cglowC = 0, cglow = 0; int cglowV = 0, cglowC = 0, cglow = 0;
int cflatV = 0, cflatC = 0, cflat = 0; int cflatV = 0, cflatC = 0, cflat = 0;
int clineV = 0, clineC = 0, cline = 0; int clineV = 0, clineC = 0, cline = 0;
GLuint origBlendSrc, origBlendDst;
//Set coord offset //Set coord offset
glScalef(1,-1,1); glScalef(1,-1,1);
glTranslatef(0, -YRES/*-(YRES+MENUSIZE)*/, 0); glTranslatef(0, -YRES/*-(YRES+MENUSIZE)*/, 0);
glGetIntegerv(GL_BLEND_SRC, &origBlendSrc);
glGetIntegerv(GL_BLEND_DST, &origBlendDst);
//Render to the particle FBO //Render to the particle FBO
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, partsFbo); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, partsFbo);
#endif #endif
@ -2264,6 +2267,22 @@ void render_parts(pixel *vid)
// -- END FLAT -- // // -- END FLAT -- //
} }
if(cblob)
{
// -- BEGIN BLOB -- //
glEnable( GL_POINT_SMOOTH ); //Blobs!
glPointSize(2.5f);
glColorPointer(4, GL_FLOAT, 0, &blobC[0]);
glVertexPointer(2, GL_INT, 0, &blobV[0]);
glDrawArrays(GL_POINTS, 0, cblob);
//Clear some stuff we set
glDisable( GL_POINT_SMOOTH );
// -- END BLOB -- //
}
if(cglow || cblur) if(cglow || cblur)
{ {
// -- BEGIN GLOW -- // // -- BEGIN GLOW -- //
@ -2317,22 +2336,6 @@ void render_parts(pixel *vid)
// -- END GLOW -- // // -- END GLOW -- //
} }
if(cblob)
{
// -- BEGIN BLOB -- //
glEnable( GL_POINT_SMOOTH ); //Blobs!
glPointSize(2.5f);
glColorPointer(4, GL_FLOAT, 0, &blobC[0]);
glVertexPointer(2, GL_INT, 0, &blobV[0]);
glDrawArrays(GL_POINTS, 0, cblob);
//Clear some stuff we set
glDisable( GL_POINT_SMOOTH );
// -- END BLOB -- //
}
if(cline) if(cline)
{ {
// -- BEGIN LINES -- // // -- BEGIN LINES -- //
@ -2452,7 +2455,8 @@ void render_parts(pixel *vid)
//Reset coords/offset //Reset coords/offset
glTranslatef(0, YRES+MENUSIZE, 0); glTranslatef(0, YRES+MENUSIZE, 0);
glScalef(1,-1,1); glScalef(1,-1,1);
glBlendFunc(origBlendSrc, origBlendDst);
#endif #endif
} }

1
src/interface.c
View File

@ -3199,6 +3199,7 @@ int search_ui(pixel *vid_buf)
drawtext(vid_buf, gx+(w-textwidth(search_owners[mp]))/2, gy+YRES/GRID_Z+16, search_owners[mp], 128, 128, 128, 255); drawtext(vid_buf, gx+(w-textwidth(search_owners[mp]))/2, gy+YRES/GRID_Z+16, search_owners[mp], 128, 128, 128, 255);
} }
clearScreen(1.0f);
sdl_blit(0, 0, (XRES+BARSIZE), YRES+MENUSIZE, vid_buf, (XRES+BARSIZE)); sdl_blit(0, 0, (XRES+BARSIZE), YRES+MENUSIZE, vid_buf, (XRES+BARSIZE));
ui_edit_process(mx, my, b, &ed); ui_edit_process(mx, my, b, &ed);