Mercurial > hg > Game > Cerium
changeset 894:d9d229ede3ff draft
merge
| author | Shinji KONO <kono@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Fri, 16 Jul 2010 00:13:45 +0900 |
| parents | 2faa1f62d925 (current diff) 77d821afdc2d (diff) |
| children | b662e9dd26b0 |
| files | |
| diffstat | 4 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Renderer/Engine/Makefile.def Fri Jul 16 00:13:04 2010 +0900 +++ b/Renderer/Engine/Makefile.def Fri Jul 16 00:13:45 2010 +0900 @@ -5,7 +5,7 @@ ABIBIT = 32 ABI = -m$(ABIBIT) CC = g++ -OPT = -g #-DSPE_CREATE_POLYGON #-O2 +OPT = -g -DSPE_CREATE_POLYGON #-O2 CFLAGS = -g -Wall $(ABI) $(OPT) # -DDEBUG INCLUDE = -I$(CERIUM)/include/TaskManager -I.
--- a/Renderer/Engine/SceneGraph.cc Fri Jul 16 00:13:04 2010 +0900 +++ b/Renderer/Engine/SceneGraph.cc Fri Jul 16 00:13:45 2010 +0900 @@ -164,8 +164,6 @@ TrianglePack を input に、polygon_pack の TriganlePack を output とする */ - init(); - int tri_pack_size = sizeof(TrianglePack)*(size/3); printf("tri_pack_size %d\n", tri_pack_size); tri_pack = (TrianglePackPtr)manager->allocate(tri_pack_size); @@ -295,13 +293,13 @@ //child->parent = this; //return child; } - + this->lastChild = child; - + if (this->children == NULL) { this->children = child; } - + child->parent = this; return child;
--- a/Renderer/Engine/viewer.cc Fri Jul 16 00:13:04 2010 +0900 +++ b/Renderer/Engine/viewer.cc Fri Jul 16 00:13:45 2010 +0900 @@ -470,6 +470,8 @@ HTaskPtr create_pp_wait = manager->create_task(Dummy); int pp_index = 0; + pp_cur->init(); + task_next->wait_for(create_pp_wait); while (sg) { @@ -491,7 +493,8 @@ pp_index, sg_index, tri_cur_num); PolygonPackPtr next = (PolygonPackPtr)manager->allocate(sizeof(PolygonPack)); - + next->init(); + pp_cur->next = next; pp_cur = next; pp_index = 0;
--- a/Renderer/Test/universe.cc Fri Jul 16 00:13:04 2010 +0900 +++ b/Renderer/Test/universe.cc Fri Jul 16 00:13:45 2010 +0900 @@ -65,6 +65,7 @@ moon->set_move_collision(moon_move, moon_collision); // SceneGraph 同士の親子関係を設定 (今回は 親 earth、子 moon) + earth->addChild(moon); // SceneGraphRoot に、使用する SceneGraph を設定する