Mercurial > hg > Game > Cerium
changeset 1332:fab593a9feb1 draft
minor changes.
author | e095732 <e095732@ie.u-ryukyu.ac.jp> |
---|---|
date | Wed, 21 Dec 2011 04:52:12 +0900 |
parents | 1dd2b2f5e2e9 |
children | 55de7223d9a0 |
files | Renderer/Engine/SceneGraphRoot.cc |
diffstat | 1 files changed, 3 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/Renderer/Engine/SceneGraphRoot.cc Wed Dec 21 04:22:17 2011 +0900 +++ b/Renderer/Engine/SceneGraphRoot.cc Wed Dec 21 04:52:12 2011 +0900 @@ -502,15 +502,11 @@ } } /*TEST*/ - for (int i=0; vertex_table==0; i++) { - printf("normal_table= %f\n", normal_table[i]); + for (int i=0; i<vcsum; i++) { + printf("vertexp = %d\n", vertexp[i]); // printf("vertex_table= %f\n", vertex_table[i]); } - for (int i=0;i<vcsum;i++){ - printf("vertexp = %d\n",vertexp[i]); - } - free(vertex_table); free(normal_table); free(texcoord_table); @@ -578,12 +574,8 @@ LIST list; init_list(&list); -<<<<<<< local + xml_walk(cur,&s, &list); - xml_walk(this, cur,&s, &list); -======= - xml_walk(cur,&s, &list); ->>>>>>> other } xmlFreeDoc(doc); }