Mercurial > hg > Members > kono > Cerium
changeset 149:6aead32217b7
SceneGraph.cpp での texture_list fix
| author | gongo@charles.cr.ie.u-ryukyu.ac.jp |
|---|---|
| date | Tue, 02 Dec 2008 18:58:08 +0900 |
| parents | 9642aeef298d |
| children | bbf774c57544 |
| files | TaskManager/Test/test_render/Makefile.def TaskManager/Test/test_render/SceneGraph.cpp TaskManager/Test/test_render/spe/Makefile |
| diffstat | 3 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/TaskManager/Test/test_render/Makefile.def Tue Dec 02 18:49:04 2008 +0900 +++ b/TaskManager/Test/test_render/Makefile.def Tue Dec 02 18:58:08 2008 +0900 @@ -11,7 +11,7 @@ #CERIUM = ../../.. CC = g++ -CFLAGS = -O0 -g -Wall# -DDEBUG +CFLAGS = -O9 -g -Wall# -DDEBUG INCLUDE = -I$(CERIUM)/include/TaskManager -I. LIBS = -L$(CERIUM)/TaskManager
--- a/TaskManager/Test/test_render/SceneGraph.cpp Tue Dec 02 18:49:04 2008 +0900 +++ b/TaskManager/Test/test_render/SceneGraph.cpp Tue Dec 02 18:58:08 2008 +0900 @@ -323,10 +323,6 @@ texture_image = converted; } - list[id_count-1].t_w = texture_image->w; - list[id_count-1].t_h = texture_image->h; - list[id_count-1].pixels = (Uint32*)texture_image->pixels; - uint32 *tex_dest = (uint32*)manager->malloc(texture_image->w*texture_image->h*4); { @@ -346,12 +342,17 @@ } } + list[id_count-1].t_w = texture_image->w; + list[id_count-1].t_h = texture_image->h; + list[id_count-1].pixels_orig = (Uint32*)texture_image->pixels; + list[id_count-1].pixels = tex_dest; + texture_id = id_count-1; texture_info.t_w = texture_image->w; texture_info.t_h = texture_image->h; texture_info.pixels_orig = (Uint32*)texture_image->pixels; texture_info.pixels = tex_dest; - printf("%p\n", tex_dest); + printf("%d %d\n", texture_image->w, texture_image->h); //load_texture(image_name); if(unlink(image_name)) {
--- a/TaskManager/Test/test_render/spe/Makefile Tue Dec 02 18:49:04 2008 +0900 +++ b/TaskManager/Test/test_render/spe/Makefile Tue Dec 02 18:58:08 2008 +0900 @@ -8,7 +8,7 @@ OBJS = $(SRCS:.cpp=.o) CC = spu-g++ -CFLAGS = -O0 -g -fno-exceptions -fno-rtti #-DDEBUG +CFLAGS = -O9 -g -fno-exceptions -fno-rtti #-DDEBUG INCLUDE = -I$(CERIUM)/include/TaskManager -I. -I.. LIBS = -L$(CERIUM)/TaskManager -lspemanager