Mercurial > hg > Game > Cerium
changeset 1055:9ce0480cde63 draft
remove texture_image
| author | Shinji KONO <kono@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Tue, 14 Dec 2010 11:37:15 +0900 |
| parents | ab16fc9a6570 |
| children | 4955cedb17e5 |
| files | Renderer/Engine/Makefile.def Renderer/Engine/polygon.cc Renderer/Engine/polygon.h Renderer/Engine/task/create_sgp.cc Renderer/Test/Makefile.def TaskManager/Makefile.def |
| diffstat | 6 files changed, 9 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/Renderer/Engine/Makefile.def Sun Dec 12 05:57:37 2010 +0900 +++ b/Renderer/Engine/Makefile.def Tue Dec 14 11:37:15 2010 +0900 @@ -2,7 +2,7 @@ CERIUM = ../.. -ABIBIT = 32 +ABIBIT = 64 ABI = -m$(ABIBIT) CC = g++ OPT = -g # -O9 #-DSPE_CREATE_POLYGON_CHECK -DSPE_CREATE_POLYGON=1
--- a/Renderer/Engine/polygon.cc Sun Dec 12 05:57:37 2010 +0900 +++ b/Renderer/Engine/polygon.cc Tue Dec 14 11:37:15 2010 +0900 @@ -251,17 +251,17 @@ //Uint32 temp, pixel; Uint8 red, green, blue; - fmt = texture_image->format; + fmt = texture_info.texture_image->format; if (tx<0) tx = 0; - if (texture_image->w-1< tx) tx = texture_image->w-1 ; + if (texture_info.texture_image->w-1< tx) tx = texture_info.texture_image->w-1 ; if (ty<0) ty = 0; - if (texture_image->h-1< ty) ty = texture_image->h-1 ; + if (texture_info.texture_image->h-1< ty) ty = texture_info.texture_image->h-1 ; //SDL_LockSurface(texture_image); - char *p = get_pixel(tx,ty,texture_image); + char *p = get_pixel(tx,ty,texture_info.texture_image); blue = (Uint8) p[0]; green = (Uint8) p[1]; red = (Uint8) p[2];
--- a/Renderer/Engine/polygon.h Sun Dec 12 05:57:37 2010 +0900 +++ b/Renderer/Engine/polygon.h Tue Dec 14 11:37:15 2010 +0900 @@ -30,8 +30,6 @@ float *anim; float scale[3]; - SDL_Surface* texture_image; - Polygon(void); void parameter_change(char *name, float x, float y, float z, float ax, float ay, float az);
--- a/Renderer/Engine/task/create_sgp.cc Sun Dec 12 05:57:37 2010 +0900 +++ b/Renderer/Engine/task/create_sgp.cc Tue Dec 14 11:37:15 2010 +0900 @@ -98,8 +98,8 @@ p->pn = nnpn; //node->tex_addr = t->texture_image->pixels; - p->tex_width = t->texture_image->w; - p->tex_height = t->texture_image->h; + p->tex_width = t->texture_info.texture_image->w; + p->tex_height = t->texture_info.texture_image->h; p = p->next; } while (p);
--- a/Renderer/Test/Makefile.def Sun Dec 12 05:57:37 2010 +0900 +++ b/Renderer/Test/Makefile.def Tue Dec 14 11:37:15 2010 +0900 @@ -1,7 +1,7 @@ CERIUM = ../.. -ABIBIT = 32 +ABIBIT = 64 ABI = -m$(ABIBIT) CC = g++ CFLAGS = -g -Wall $(ABI) # -O9 # -O -DDEBUG
--- a/TaskManager/Makefile.def Sun Dec 12 05:57:37 2010 +0900 +++ b/TaskManager/Makefile.def Tue Dec 14 11:37:15 2010 +0900 @@ -27,7 +27,7 @@ IMPL_CELL_SRCS = $(IMPL_FIFO_SRCS) $(wildcard $(IMPL_CELL_DIR)/*.cc) IMPL_CELL_OBJS = $(IMPL_CELL_SRCS:.cc=.o) -ABIBIT = 32 +ABIBIT = 64 OPT = -g -O9 -DMAIL_QUEUE # -DEARLY_TOUCH