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

Merge branch 'master' of github.com:FacialTurd/PowderToypp

Browse Source
This commit is contained in:
Simon Robertshaw 2012-08-15 12:50:06 +01:00
commit 2378363055
6 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
site_scons/site_tools/gch/__init__.pyc
View File

Binary file not shown.

BIN
site_scons/site_tools/mfprogram/__init__.pyc
View File

Binary file not shown.

2
src/graphics/Graphics.h
View File

@ -160,7 +160,7 @@ public:
void xor_bitmap(unsigned char * bitmap, int x, int y, int w, int h);
void draw_line(int x, int y, int x2, int y2, int r, int g, int b, int a);
void drawrect(int x, int y, int width, int height, int r, int g, int b, int a);
void drawrect(int x, int y, int width, int height, int r, int g, int b, int a,bool hollow=true);
void fillrect(int x, int y, int width, int height, int r, int g, int b, int a);
void clearrect(int x, int y, int width, int height);
void gradientrect(int x, int y, int width, int height, int r, int g, int b, int a, int r2, int g2, int b2, int a2);

8
src/graphics/OpenGLDrawMethods.inl
View File

@ -1,6 +1,7 @@
#include "../data/font.h"
int PIXELMETHODS_CLASS::drawtext(int x, int y, const char *s, int r, int g, int b, int a)
{
bool invert = false;
if(!strlen(s))
return 0;
int oR = r, oG = g, oB = b;
@ -282,7 +283,7 @@ void PIXELMETHODS_CLASS::draw_line(int x, int y, int x2, int y2, int r, int g, i
glEnd();
}
void PIXELMETHODS_CLASS::drawrect(int x, int y, int width, int height, int r, int g, int b, int a)
void PIXELMETHODS_CLASS::drawrect(int x, int y, int width, int height, int r, int g, int b, int a,bool hollow)
{
float fx = float(x)+0.5f;
float fy = float(y)+0.5f;
@ -293,7 +294,10 @@ void PIXELMETHODS_CLASS::drawrect(int x, int y, int width, int height, int r, in
//height-=2;
//width-=2;
glColor4ub(r, g, b, a);
glBegin(GL_LINE_STRIP);
if(hollow)
glBegin(GL_LINE_STRIP);
else
glBegin(GL_QUADS);
glVertex2f(fx, fy);
glVertex2f(fx+fwidth, fy);
glVertex2f(fx+fwidth, fy+fheight);

12
src/graphics/Renderer.cpp
View File

@ -576,7 +576,6 @@ VideoBuffer * Renderer::WallIcon(int wallID, int width, int height)
void Renderer::DrawWalls()
{
#ifndef OGLR
int x, y, i, j, cr, cg, cb;
unsigned char wt;
pixel pc;
@ -593,6 +592,13 @@ void Renderer::DrawWalls()
continue;
pc = wtypes[wt].colour;
gc = wtypes[wt].eglow;
#ifdef OGLR
int r = (pc&0x00FF0000)>>8;
int g = (pc&0x0000FF00)>>4;
int b = (pc&0x000000FF)>>0;
int a = 255;
#endif
#ifndef OGLR
// standard wall patterns
if (wtypes[wt].drawstyle==1)
@ -708,8 +714,10 @@ void Renderer::DrawWalls()
fire_b[y][x] = cb;
}
}
#else
this->drawrect(x*CELL,y*CELL,CELL,CELL,r,g,b,a,false);
#endif
}
}
void Renderer::DrawSigns()

2
src/graphics/Renderer.h
View File

@ -105,7 +105,7 @@ public:
void xor_bitmap(unsigned char * bitmap, int x, int y, int w, int h);
void draw_line(int x, int y, int x2, int y2, int r, int g, int b, int a);
void drawrect(int x, int y, int width, int height, int r, int g, int b, int a);
void drawrect(int x, int y, int width, int height, int r, int g, int b, int a,bool hollow = true);
void fillrect(int x, int y, int width, int height, int r, int g, int b, int a);
void clearrect(int x, int y, int width, int height);
void gradientrect(int x, int y, int width, int height, int r, int g, int b, int a, int r2, int g2, int b2, int a2);