summaryrefslogtreecommitdiff
path: root/src/Graphics.h
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-01-27 09:38:56 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-01-27 09:38:56 (GMT)
commitebd80c73de6b02e1fcf731aa0f377b6085128e57 (patch)
tree24c380dbfbde4c3dc34dc1f995f0ad2b177b6e7a /src/Graphics.h
parente84f0fc6e5301265708a99b13ab898ce45422611 (diff)
downloadpowder-ebd80c73de6b02e1fcf731aa0f377b6085128e57.zip
powder-ebd80c73de6b02e1fcf731aa0f377b6085128e57.tar.gz
Some inlines and Checkbox ui component
Diffstat (limited to 'src/Graphics.h')
-rw-r--r--src/Graphics.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/Graphics.h b/src/Graphics.h
index 82117a7..25cb5d6 100644
--- a/src/Graphics.h
+++ b/src/Graphics.h
@@ -91,8 +91,8 @@ public:
SDL_Surface * sdl_scrn;
pixel *vid;
pixel *render_packed_rgb(void *image, int width, int height, int cmp_size);
- static char * generate_gradient(pixel * colours, float * points, int pointcount, int size);
- void draw_other();
+ static char * GenerateGradient(pixel * colours, float * points, int pointcount, int size);
+ //void draw_other();
void draw_rgba_image(unsigned char *data, int x, int y, float a);
static void *ptif_pack(pixel *src, int w, int h, int *result_size);
static pixel *ptif_unpack(void *datain, int size, int *w, int *h);
@@ -103,13 +103,13 @@ public:
//void sdl_blit_1(int x, int y, int w, int h, pixel *src, int pitch);
//void sdl_blit_2(int x, int y, int w, int h, pixel *src, int pitch);
//void sdl_blit(int x, int y, int w, int h, pixel *src, int pitch);
- void drawblob(int x, int y, unsigned char cr, unsigned char cg, unsigned char cb);
+ inline void drawblob(int x, int y, unsigned char cr, unsigned char cg, unsigned char cb);
void draw_tool(int b, int sl, int sr, unsigned pc, unsigned iswall);
//int draw_tool_xy(pixel *vid_buf, int x, int y, int b, unsigned pc);
//void draw_menu(pixel *vid_buf, int i, int hover);
void drawpixel(int x, int y, int r, int g, int b, int a);
- int addchar(int x, int y, int c, int r, int g, int b, int a);
- int drawchar(int x, int y, int c, int r, int g, int b, int a);
+ inline int addchar(int x, int y, int c, int r, int g, int b, int a);
+ inline int drawchar(int x, int y, int c, int r, int g, int b, int a);
int drawtext(int x, int y, std::string &s, int r, int g, int b, int a);
int drawtext(int x, int y, const char *s, int r, int g, int b, int a);
int drawtext_outline(int x, int y, const char *s, int r, int g, int b, int a, int olr, int olg, int olb, int ola);
@@ -125,17 +125,17 @@ public:
static int textwidthx(char *s, int w);
static int textposxy(char *s, int width, int w, int h);
static int textwrapheight(char *s, int width);
- void blendpixel(int x, int y, int r, int g, int b, int a);
+ inline void blendpixel(int x, int y, int r, int g, int b, int a);
void draw_icon(int x, int y, char ch, int flag);
//void draw_air();
//void draw_grav_zones(pixel *vid);
//void draw_grav(pixel *vid);
void draw_line(int x1, int y1, int x2, int y2, int r, int g, int b, int a);
- void addpixel(int x, int y, int r, int g, int b, int a);
+ inline void addpixel(int x, int y, int r, int g, int b, int a);
void xor_pixel(int x, int y);
void xor_line(int x1, int y1, int x2, int y2);
void xor_rect(int x, int y, int w, int h);
- void blend_line(int x1, int y1, int x2, int y2, int r, int g, int b, int a);
+ inline void blend_line(int x1, int y1, int x2, int y2, int r, int g, int b, int a);
//void render_parts(pixel *vid);
// #ifdef OGLR
// void draw_parts_fbo();
@@ -147,11 +147,11 @@ public:
// void line_decorations(int x1, int y1, int x2, int y2, int rx, int ry, int r, int g, int b, int click, int tool);
// void box_decorations(int x1, int y1, int x2, int y2, int r, int g, int b, int click, int tool);
// void draw_color_menu(pixel *vid_buf, int i, int hover);
- void draw_wavelengths(int x, int y, int h, int wl);
- void render_signs();
+ inline void draw_wavelengths(int x, int y, int h, int wl);
+ //void render_signs();
// void render_fire(pixel *dst);
// void prepare_alpha(int size, float intensity);
- void draw_image(pixel *img, int x, int y, int w, int h, int a);
+ inline void draw_image(pixel *img, int x, int y, int w, int h, int a);
static void dim_copy(pixel *dst, pixel *src);
static void dim_copy_pers(pixel *dst, pixel *src);
//void render_zoom(pixel *img);