diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-04-21 21:46:37 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-04-21 21:46:37 (GMT) |
| commit | 96506610b276be1b4bc1cbc462d991237750fc62 (patch) | |
| tree | c05e6d55d2a0aa2ad178cfa30f00041a104d6fed /src/game/EllipseBrush.h | |
| parent | 75a9460c835f4ebea501a89d23e0c5f46da985cc (diff) | |
| download | powder-96506610b276be1b4bc1cbc462d991237750fc62.zip powder-96506610b276be1b4bc1cbc462d991237750fc62.tar.gz | |
Clean out graphics, add openGL graphics in seperate file, change brush to use unsigned char rather than boolean for bitmap/outline
Diffstat (limited to 'src/game/EllipseBrush.h')
| -rw-r--r-- | src/game/EllipseBrush.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/game/EllipseBrush.h b/src/game/EllipseBrush.h index 0953c01..26b3cf8 100644 --- a/src/game/EllipseBrush.h +++ b/src/game/EllipseBrush.h @@ -22,20 +22,20 @@ public: { if(bitmap) free(bitmap); - bitmap = (bool *)malloc(sizeof(bool)*(((size.X*2)+1)*((size.Y*2)+1))); - int rx = size.X; - int ry = size.Y; - for(int x = 0; x <= size.X*2; x++) + bitmap = (unsigned char*)calloc((size.X*size.Y), sizeof(unsigned char)); + int rx = radius.X; + int ry = radius.Y; + for(int x = 0; x <= radius.X*2; x++) { - for(int y = 0; y <= size.Y*2; y++) + for(int y = 0; y <= radius.Y*2; y++) { - if((pow(x-size.X,2)*pow(ry,2)+pow(y-size.Y,2)*pow(rx,2)<=pow(rx,2)*pow(ry,2))) + if((pow(x-radius.X,2)*pow(ry,2)+pow(y-radius.Y,2)*pow(rx,2)<=pow(rx,2)*pow(ry,2))) { - bitmap[y*(size.X*2)+x] = true; + bitmap[y*(size.X)+x] = 255; } else { - bitmap[y*(size.X*2)+x] = false; + bitmap[y*(size.X)+x] = 0; } } } |
