Mercurial > hg > Game > Cerium
changeset 1140:3975c384ff93 draft
SceneGraph initalize... can worked on Mac OS X. not check Cell arch.
| author | Yutaka_Kinjyo |
|---|---|
| date | Thu, 17 Feb 2011 20:25:02 +0900 |
| parents | 67927f3a6655 |
| children | bc2dea061cb1 |
| files | Renderer/Engine/Camera.cc Renderer/Engine/SceneGraph.cc Renderer/Engine/viewer.cc |
| diffstat | 3 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/Renderer/Engine/Camera.cc Thu Feb 17 11:44:29 2011 +0900 +++ b/Renderer/Engine/Camera.cc Thu Feb 17 20:25:02 2011 +0900 @@ -152,7 +152,7 @@ if (i % 5 == 0) { real_matrix[i] = 1; } - } + } update(w,h); // to make matrix[]
--- a/Renderer/Engine/SceneGraph.cc Thu Feb 17 11:44:29 2011 +0900 +++ b/Renderer/Engine/SceneGraph.cc Thu Feb 17 20:25:02 2011 +0900 @@ -125,6 +125,8 @@ finalize = &SceneGraph::finalize_copy; this->name = "NULLPO"; + this->pp_num = 0; + } /** @@ -664,13 +666,15 @@ p->matrix = (float*)manager->allocate(sizeof(float)*16); p->real_matrix = (float*)manager->allocate(sizeof(float)*16); //これはいらない？ - //p->texture_info = (float*)sgroot->manager->allocate(sizeof(texrure_list)); + //p->texture_info = (texture_list*)manager->allocate(sizeof(texture_list)); for (int i = 0; i < 16; i++) { p->matrix[i] = this->matrix[i]; p->real_matrix[i] = this->real_matrix[i]; } + //memcpy(p->texture_info, this->texture_info, sizeof(texture_list)); + return p; }
--- a/Renderer/Engine/viewer.cc Thu Feb 17 11:44:29 2011 +0900 +++ b/Renderer/Engine/viewer.cc Thu Feb 17 20:25:02 2011 +0900 @@ -473,6 +473,7 @@ } PolygonPackPtr out_pp = r[ppi].ppack; + out_pp->init(); //多分このsg_remove_listであってる?。チェック対象かも for (SceneGraphPtr t = sgroot->sg_remove_list; t != NULL; t = t->next) {