Mercurial > hg > Members > kono > Cerium
changeset 238:e1d24c951408
warning clean
| author | admin@mcbk.cr.ie.u-ryukyu.ac.jp |
|---|---|
| date | Fri, 29 May 2009 13:43:52 +0900 |
| parents | f2527be3888e |
| children | ae6aa53faf70 |
| files | TaskManager/Test/test_render/SceneGraph.cpp TaskManager/Test/test_render/ball_bound.cpp TaskManager/Test/test_render/bullet_action.cpp TaskManager/Test/test_render/init_position.cpp TaskManager/Test/test_render/long_cube.cpp TaskManager/Test/test_render/polygon.cpp TaskManager/Test/test_render/task/CreatePolygonFromSceneGraph.cpp TaskManager/Test/test_render/task/DrawSpan.cpp TaskManager/Test/test_render/task/DrawSpanRenew.cpp TaskManager/Test/test_render/task/Load_Texture.cpp TaskManager/Test/test_render/task/update_sgp.cpp TaskManager/Test/test_render/vacuum.cpp |
| diffstat | 12 files changed, 16 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/TaskManager/Test/test_render/SceneGraph.cpp Sat May 16 20:49:36 2009 +0900 +++ b/TaskManager/Test/test_render/SceneGraph.cpp Fri May 29 13:43:52 2009 +0900 @@ -222,7 +222,7 @@ { xmlDocPtr doc; xmlNodePtr cur; - SceneGraphPtr root = NULL, tmp, parent; + SceneGraphPtr root = NULL, tmp = NULL, parent; /* パース DOM生成 */ doc = xmlParseFile(xmlfile);
--- a/TaskManager/Test/test_render/ball_bound.cpp Sat May 16 20:49:36 2009 +0900 +++ b/TaskManager/Test/test_render/ball_bound.cpp Fri May 29 13:43:52 2009 +0900 @@ -14,7 +14,7 @@ static float e = -0.8f; // 反発係数 static float g = 9.8f; // 重力加速度 -static float v0 = 0.0f; // 初速は 0 +//static float v0 = 0.0f; // 初速は 0 static float h0; // 初期高さ static float ball_radius = 100.0f;
--- a/TaskManager/Test/test_render/bullet_action.cpp Sat May 16 20:49:36 2009 +0900 +++ b/TaskManager/Test/test_render/bullet_action.cpp Fri May 29 13:43:52 2009 +0900 @@ -37,7 +37,7 @@ bullet_collision(SceneGraphPtr node, int screen_w, int screen_h, SceneGraphPtr tree) { SceneGraphIteratorPtr it = sgroot->getIterator(tree); - static int damage = 0; + //static int damage = 0; for (; it->hasNext(E_PLANE);) { it->next(E_PLANE);
--- a/TaskManager/Test/test_render/init_position.cpp Sat May 16 20:49:36 2009 +0900 +++ b/TaskManager/Test/test_render/init_position.cpp Fri May 29 13:43:52 2009 +0900 @@ -10,7 +10,7 @@ SceneGraphPtr back; SceneGraphPtr player; SceneGraphPtr enemy; - SceneGraphPtr bullet; + //SceneGraphPtr bullet; sgroot->createFromXMLfile("xml_file/player.xml"); back = sgroot->createSceneGraph(BACK);
--- a/TaskManager/Test/test_render/long_cube.cpp Sat May 16 20:49:36 2009 +0900 +++ b/TaskManager/Test/test_render/long_cube.cpp Fri May 29 13:43:52 2009 +0900 @@ -3,7 +3,7 @@ // prototype static void lcube_move(SceneGraphPtr node, int screen_w, int screen_h); -static void lcube_collision(SceneGraphPtr node, int screen_w, int screen_h); +//static void lcube_collision(SceneGraphPtr node, int screen_w, int screen_h); static void
--- a/TaskManager/Test/test_render/polygon.cpp Sat May 16 20:49:36 2009 +0900 +++ b/TaskManager/Test/test_render/polygon.cpp Fri May 29 13:43:52 2009 +0900 @@ -301,7 +301,7 @@ //printf("tx = %d ty = %d ", tx,ty); //printf("pixel color => R: %d, G: %d, B: %d\n", red, green, blue); - SDL_PixelFormat *pf; + SDL_PixelFormat *pf = NULL; //pf = viewer->screen->format; //cout << SDL_MapRGB(pf, red, green, blue) << endl;
--- a/TaskManager/Test/test_render/task/CreatePolygonFromSceneGraph.cpp Sat May 16 20:49:36 2009 +0900 +++ b/TaskManager/Test/test_render/task/CreatePolygonFromSceneGraph.cpp Fri May 29 13:43:52 2009 +0900 @@ -42,6 +42,7 @@ * @param[in] m1 input left matrix * @param[in] m2 input right matrix */ +/* static void MulMatrix(float *m0, float *m1, float *m2) //xyz[16] { @@ -53,7 +54,7 @@ } } } - +*/ int CreatePolygonFromSceneGraph::run(void *rbuf, void *wbuf) {
--- a/TaskManager/Test/test_render/task/DrawSpan.cpp Sat May 16 20:49:36 2009 +0900 +++ b/TaskManager/Test/test_render/task/DrawSpan.cpp Fri May 29 13:43:52 2009 +0900 @@ -147,7 +147,7 @@ tile->texture_addr = addr; - int index = hash->put(tile->texture_addr, tile); + hash->put(tile->texture_addr, tile); smanager->dma_load(tile->pixel, (uint32)addr, sizeof(uint32)*TEXTURE_BLOCK_SIZE, tag); }
--- a/TaskManager/Test/test_render/task/DrawSpanRenew.cpp Sat May 16 20:49:36 2009 +0900 +++ b/TaskManager/Test/test_render/task/DrawSpanRenew.cpp Fri May 29 13:43:52 2009 +0900 @@ -215,7 +215,7 @@ free(zRow); free(args); -FINISH: + //FINISH: /** * linebuf, zRow, args RenewTask Ѥ */
--- a/TaskManager/Test/test_render/task/Load_Texture.cpp Sat May 16 20:49:36 2009 +0900 +++ b/TaskManager/Test/test_render/task/Load_Texture.cpp Fri May 29 13:43:52 2009 +0900 @@ -20,11 +20,11 @@ */ void *hash_tmp = smanager->global_alloc(GLOBAL_TEXTURE_HASH, sizeof(TileHash)); - TileHashPtr hashtable = new(hash_tmp) TileHash; + new(hash_tmp) TileHash; void *tileList_tmp = smanager->global_alloc(GLOBAL_TILE_LIST, sizeof(TileList)); - TileListPtr tileList = new(tileList_tmp) TileList; + new(tileList_tmp) TileList; return 0; }
--- a/TaskManager/Test/test_render/task/update_sgp.cpp Sat May 16 20:49:36 2009 +0900 +++ b/TaskManager/Test/test_render/task/update_sgp.cpp Fri May 29 13:43:52 2009 +0900 @@ -14,8 +14,8 @@ SceneGraphNodePtr node; SceneGraphPack *sgp = (SceneGraphPack*)get_input(rbuf, 0); SceneGraphPack *_sgp = (SceneGraphPack*)get_output(wbuf, 0); - int screen_width = get_param(0); - int screen_height = get_param(1); + //int screen_width = get_param(0); + //int screen_height = get_param(1); // ϤǤʤ for (int i = 0; i < sgp->info.size && i < 3; i++) {
--- a/TaskManager/Test/test_render/vacuum.cpp Sat May 16 20:49:36 2009 +0900 +++ b/TaskManager/Test/test_render/vacuum.cpp Fri May 29 13:43:52 2009 +0900 @@ -10,7 +10,7 @@ static void cube_split(SceneGraphPtr root); static void vacuum_move(SceneGraphPtr node, int w, int h); -static void vacuum_coll(SceneGraphPtr node, int w, int h); +//static void vacuum_coll(SceneGraphPtr node, int w, int h); static float vacuum_speed = 3.0f; @@ -120,7 +120,7 @@ SceneGraphPtr tree) { SceneGraphIteratorPtr it = sgroot->getIterator(); - SceneGraphPtr bigm; + //xSceneGraphPtr bigm; Pad *pad = sgroot->getController(); float dx, dy, r; float q = 0;