Mercurial > hg > Members > kono > Cerium
changeset 87:265fb700dd4c
*** empty log message ***
| author | gongo |
|---|---|
| date | Wed, 27 Feb 2008 11:14:20 +0900 |
| parents | 61bacd3b4405 |
| children | 504899860e66 |
| files | TaskManager/Test/simple_render/Makefile TaskManager/Test/simple_render/spe/CreatePolygonPack.cpp TaskManager/Test/simple_render/viewer.cpp |
| diffstat | 3 files changed, 25 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/TaskManager/Test/simple_render/Makefile Wed Feb 27 10:56:09 2008 +0900 +++ b/TaskManager/Test/simple_render/Makefile Wed Feb 27 11:14:20 2008 +0900 @@ -13,13 +13,13 @@ EXTRA_CFLAGS = `sdl-config --cflags` `xml2-config --cflags`\ -#EXTRA_LIBS = -lCellManager -lspe2 -lpthread -EXTRA_LIBS = -lFifoManager +EXTRA_LIBS = -lCellManager -lspe2 -lpthread +#EXTRA_LIBS = -lFifoManager -#LIBS = `sdl-config --libs` -lSDL_image -lGL \ +LIBS = `sdl-config --libs` -lSDL_image -lGL \ + `xml2-config --libs` -L../.. $(EXTRA_LIBS) +#LIBS = `sdl-config --libs` -lSDL_image -Wl,-framework,OpenGL \ # `xml2-config --libs` -L../.. $(EXTRA_LIBS) -LIBS = `sdl-config --libs` -lSDL_image -Wl,-framework,OpenGL \ - `xml2-config --libs` -L../.. $(EXTRA_LIBS) .SUFFIXES: .cpp .o
--- a/TaskManager/Test/simple_render/spe/CreatePolygonPack.cpp Wed Feb 27 10:56:09 2008 +0900 +++ b/TaskManager/Test/simple_render/spe/CreatePolygonPack.cpp Wed Feb 27 11:14:20 2008 +0900 @@ -54,26 +54,29 @@ rotate(xyz2, node->translation); rotate(xyz3, node->translation); - pp->tri[pt].x1 = xyz1[0]; - pp->tri[pt].y1 = xyz1[1]; - pp->tri[pt].z1 = xyz1[2]; - pp->tri[pt].tex_x1 = node->texture[nt]; - pp->tri[pt].tex_y1 = node->texture[nt+1]; + pp->tri[pt].ver1.x = xyz1[0]; + pp->tri[pt].ver1.y = xyz1[1]; + pp->tri[pt].ver1.z = xyz1[2]; + pp->tri[pt].ver1.tex_x = node->texture[nt]; + pp->tri[pt].ver1.tex_y = node->texture[nt+1]; - pp->tri[pt].x2 = xyz2[0]; - pp->tri[pt].y2 = xyz2[1]; - pp->tri[pt].z2 = xyz2[2]; - pp->tri[pt].tex_x2 = node->texture[nt+2]; - pp->tri[pt].tex_y2 = node->texture[nt+2+1]; + pp->tri[pt].ver2.x = xyz2[0]; + pp->tri[pt].ver2.y = xyz2[1]; + pp->tri[pt].ver2.z = xyz2[2]; + pp->tri[pt].ver2.tex_x = node->texture[nt+2]; + pp->tri[pt].ver2.tex_y = node->texture[nt+2+1]; - pp->tri[pt].x3 = xyz3[0]; - pp->tri[pt].y3 = xyz3[1]; - pp->tri[pt].z3 = xyz3[2]; - pp->tri[pt].tex_x3 = node->texture[nt+4]; - pp->tri[pt].tex_y3 = node->texture[nt+4+1]; + pp->tri[pt].ver3.x = xyz3[0]; + pp->tri[pt].ver3.y = xyz3[1]; + pp->tri[pt].ver3.z = xyz3[2]; + pp->tri[pt].ver3.tex_x = node->texture[nt+4]; + pp->tri[pt].ver3.tex_y = node->texture[nt+4+1]; + pp->tri[pt].tex_width = node->tex_width; + pp->tri[pt].tex_height = node->tex_height; } pp->info.size = pt; + pp->ssl = sgp->ssl; } return sizeof(PolygonPack); @@ -83,7 +86,7 @@ void CreatePolygonPack::rotate(float *xyz, float *matrix) { -#if 0 +#if 1 float abc[4]; abc[0] = xyz[0];
--- a/TaskManager/Test/simple_render/viewer.cpp Wed Feb 27 10:56:09 2008 +0900 +++ b/TaskManager/Test/simple_render/viewer.cpp Wed Feb 27 11:14:20 2008 +0900 @@ -30,7 +30,7 @@ exit( 1 ); } -#ifndef _DEBUG +#ifdef _DEBUG screen = SDL_SetVideoMode( width, height, bpp, SDL_HWSURFACE); if (screen == NULL) { fprintf(stderr, "Couldn't set GL mode: %s\n", SDL_GetError());