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

Decorations are per particle TODO: remove references to the decorations buffer

Browse Source
This commit is contained in:
Simon Robertshaw 2011-05-27 14:44:56 +01:00
parent a6fe1a4832
commit 5919cefa85
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
includes/powder.h
View File

@ -329,6 +329,7 @@ struct particle
int flags; int flags;
int tmp; int tmp;
int tmp2; int tmp2;
int dcolour;
}; };
typedef struct particle particle; typedef struct particle particle;

26
src/graphics.c
View File

@ -2946,6 +2946,7 @@ void draw_parts(pixel *vid)
blendpixel(vid, nx+1, ny+1, cr, cg, cb, 112); blendpixel(vid, nx+1, ny+1, cr, cg, cb, 112);
blendpixel(vid, nx-1, ny+1, cr, cg, cb, 112); blendpixel(vid, nx-1, ny+1, cr, cg, cb, 112);
} }
blendpixel(vid, nx, ny, (parts[i].dcolour>>16)&0xFF, (parts[i].dcolour>>8)&0xFF, (parts[i].dcolour)&0xFF, (parts[i].dcolour>>24)&0xFF);
} }
#endif #endif
} }
@ -3126,29 +3127,36 @@ void draw_walls(pixel *vid)
void draw_decorations(pixel *vid_buf,pixel *decorations) void draw_decorations(pixel *vid_buf,pixel *decorations)
{ {
int i,r,g,b; /*int i,r,g,b;
for (i=0; i<(XRES+BARSIZE)*YRES; i++) for (i=0; i<(XRES+BARSIZE)*YRES; i++)
{ {
r = PIXR(decorations[i]); r = (decorations[i]&0xFF0000)>>16;
g = PIXG(decorations[i]); g = (decorations[i]&0x00FF00)>>8;
b = PIXB(decorations[i]); b = decorations[i]&0x0000FF;
if (r>0 || g>0 || b>0) if (r>0 || g>0 || b>0)
vid_buf[i] = PIXRGB(r,g,b); vid_buf[i] = PIXRGB(r,g,b);
} }*/
} }
void create_decorations(pixel *decorations,int x, int y, int rx, int ry, int r, int g, int b) void create_decorations(pixel *decorations,int x, int y, int rx, int ry, int r, int g, int b)
{ {
int i,j; int i,j,rp;
if (rx==0 && ry==0) if (rx==0 && ry==0)
{ {
decorations[(y)*(XRES+BARSIZE)+(x)] = PIXRGB(r, g, b); rp = pmap[y][x];
if ((rp>>8)>=NPART || !rp)
return;
parts[rp>>8].dcolour = ((255<<24)|(r<<16)|(g<<8)|b);//decorations[(y)*(XRES+BARSIZE)+(x)] = PIXRGB(r, g, b);
return; return;
} }
for (j=-ry; j<=ry; j++) for (j=-ry; j<=ry; j++)
for (i=-rx; i<=rx; i++) for (i=-rx; i<=rx; i++)
if(y+j>=0 && x+i>=0 && x+i<XRES && y+j<YRES) if(y+j>=0 && x+i>=0 && x+i<XRES && y+j<YRES)
if ((CURRENT_BRUSH==CIRCLE_BRUSH && (pow(i,2))/(pow(rx,2))+(pow(j,2))/(pow(ry,2))<=1)||(CURRENT_BRUSH==SQUARE_BRUSH&&i*j<=ry*rx)) if ((CURRENT_BRUSH==CIRCLE_BRUSH && (pow(i,2))/(pow(rx,2))+(pow(j,2))/(pow(ry,2))<=1)||(CURRENT_BRUSH==SQUARE_BRUSH&&i*j<=ry*rx)){
decorations[(y+j)*(XRES+BARSIZE)+(x+i)] = PIXRGB(r, g, b); rp = pmap[y+j][x+i];
if ((rp>>8)>=NPART || !rp)
continue;
parts[rp>>8].dcolour = ((255<<24)|(r<<16)|(g<<8)|b);
}
} }
void line_decorations(pixel *decorations,int x1, int y1, int x2, int y2, int rx, int ry, int r, int g, int b) void line_decorations(pixel *decorations,int x1, int y1, int x2, int y2, int rx, int ry, int r, int g, int b)
{ {

2
src/interface.c
View File

@ -4326,7 +4326,7 @@ unsigned int decorations_ui(pixel *vid_buf,pixel *decorations,int *bsx,int *bsy,
my /= sdl_scale; my /= sdl_scale;
memcpy(vid_buf,old_buf,(XRES+BARSIZE)*(YRES+MENUSIZE)*PIXELSIZE); memcpy(vid_buf,old_buf,(XRES+BARSIZE)*(YRES+MENUSIZE)*PIXELSIZE);
draw_decorations(vid_buf,decorations); draw_parts(vid_buf);//draw_decorations(vid_buf,decorations);
//ui_edit_process(mx, my, b, &box_R); //ui_edit_process(mx, my, b, &box_R);
//ui_edit_process(mx, my, b, &box_G); //ui_edit_process(mx, my, b, &box_G);
//ui_edit_process(mx, my, b, &box_B); //ui_edit_process(mx, my, b, &box_B);