color is nowalways a pointer.

master
steffen 13 years ago
parent 5057228a2e
commit b1e2fca3f9

@ -77,7 +77,7 @@ LOCAL_SRC_FILES := \
mapsys/map_webload.c mapsys/map_searchhash.c\
mapsys/map.c mapsys/map_loadsave.c mapsys/map_way.c \
gui/gui.c gui/gui_button.c gui/gui_entry.c gui/gui_image.c gui/gui_label.c \
gui/gui_list.c gui/gui_window.c gui\gui_softkeyboard.c gui\gui_checkbox.c \
gui/gui_list.c gui/gui_window.c gui/gui_softkeyboard.c gui/gui_checkbox.c \
draw/draw.c draw/draw_favorites.c draw/draw_gps.c draw/draw_gui.c draw/draw_route.c \
main/favorites.c main/gui_buttons.c main/gui_mainmenu.c main/guiw_gpsfile.c \
main/main.c main/routing.c main/gps.c main/gui_favorites.c \

@ -239,7 +239,7 @@ void gfx_draw_line (struct image *dimg, int x1, int y1, int x2, int y2, struct l
/*
* draw polygon
*/
void gfx_draw_polygon (struct image *dimg, iPoint *p, int pcnt, struct line_style style, struct color c) {
void gfx_draw_polygon (struct image *dimg, iPoint *p, int pcnt, struct line_style style, struct color *c) {
static GLfloat *polygon = NULL;
static int polygon_cnt = 0;
int i;
@ -262,7 +262,7 @@ void gfx_draw_polygon (struct image *dimg, iPoint *p, int pcnt, struct line_styl
glUseProgram (engine.gles_prgobject);
glUniform1i (engine.gles_txenabled, 0);
glUniform4fv(engine.gles_color, 1, c.c.array);
glUniform4fv(engine.gles_color, 1, c->c.array);
glVertexAttribPointer (engine.gles_pos, 3, GL_FLOAT, GL_FALSE, 0, polygon);
glDrawArrays (GL_TRIANGLE_FAN, 0, pcnt);

Loading…
Cancel
Save