Mercurial > hg > Game > Cerium
changeset 1109:d2cb74984336 draft
fix
author | tkaito |
---|---|
date | Wed, 12 Jan 2011 01:49:37 +0900 |
parents | cbfedf774354 |
children | 3c2c445be6ba |
files | Renderer/Engine/SceneGraphRoot.cc Renderer/Test/create_task.cc Renderer/Test/property_chain.cc Renderer/Test/property_universe.cc |
diffstat | 4 files changed, 13 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/Renderer/Engine/SceneGraphRoot.cc Tue Jan 11 07:06:24 2011 +0900 +++ b/Renderer/Engine/SceneGraphRoot.cc Wed Jan 12 01:49:37 2011 +0900 @@ -252,14 +252,14 @@ int SceneGraphRoot::getSgid(const char *name) { -/* + /* for(int i =0;i<= sg_src_id; i++) { if (sg_src[i] && strcmp(name,sg_src[i]->name) == 0) return i; } return -1; -*/ - return sgid_hash.get_sgid(name); + */ + return sgid_hash.get_sgid(name); }
--- a/Renderer/Test/create_task.cc Tue Jan 11 07:06:24 2011 +0900 +++ b/Renderer/Test/create_task.cc Wed Jan 12 01:49:37 2011 +0900 @@ -61,8 +61,8 @@ float scale[] = {1,1,1}; // get matrix - get_matrix(node->matrix, node->angle, node->xyz, scale, sgroot->camera->matrix); - get_matrix(node->real_matrix, node->angle, node->xyz, scale, sgroot->camera->real_matrix); + get_matrix(node->matrix, node->angle, node->xyz, sgroot->camera->matrix); + get_matrix(node->real_matrix, node->angle, node->xyz, sgroot->camera->real_matrix); sgroot->setSceneData(node);
--- a/Renderer/Test/property_chain.cc Tue Jan 11 07:06:24 2011 +0900 +++ b/Renderer/Test/property_chain.cc Wed Jan 12 01:49:37 2011 +0900 @@ -105,11 +105,11 @@ if (p->have_parent) { SceneGraphPtr parent = (SceneGraphPtr)update_property[p->parent_index].node; parent->addChild(p_node); - get_matrix(p_node->matrix, p_node->angle, p_node->xyz, scale, parent->matrix); - get_matrix(p_node->real_matrix, p_node->angle, p_node->xyz, scale, parent->real_matrix); + get_matrix(p_node->matrix, p_node->angle, p_node->xyz, parent->matrix); + get_matrix(p_node->real_matrix, p_node->angle, p_node->xyz, parent->real_matrix); } else { - get_matrix(p_node->matrix, p_node->angle, p_node->xyz, scale, camera->matrix); - get_matrix(p_node->real_matrix, p_node->angle, p_node->xyz, scale, camera->real_matrix); + get_matrix(p_node->matrix, p_node->angle, p_node->xyz, camera->matrix); + get_matrix(p_node->real_matrix, p_node->angle, p_node->xyz, camera->real_matrix); } }
--- a/Renderer/Test/property_universe.cc Tue Jan 11 07:06:24 2011 +0900 +++ b/Renderer/Test/property_universe.cc Wed Jan 12 01:49:37 2011 +0900 @@ -66,11 +66,11 @@ if (p->have_parent) { SceneGraphPtr parent = (SceneGraphPtr)update_property[p->parent_index].node; parent->addChild(p_node); - get_matrix(p_node->matrix, p_node->angle, p_node->xyz, scale, parent->matrix); - get_matrix(p_node->real_matrix, p_node->angle, p_node->xyz, scale, parent->real_matrix); + get_matrix(p_node->matrix, p_node->angle, p_node->xyz, parent->matrix); + get_matrix(p_node->real_matrix, p_node->angle, p_node->xyz, parent->real_matrix); } else { - get_matrix(p_node->matrix, p_node->angle, p_node->xyz, scale, camera->matrix); - get_matrix(p_node->real_matrix, p_node->angle, p_node->xyz, scale, camera->real_matrix); + get_matrix(p_node->matrix, p_node->angle, p_node->xyz, camera->matrix); + get_matrix(p_node->real_matrix, p_node->angle, p_node->xyz, camera->real_matrix); } }