changeset 1355:157e0100d42f draft

minor changes
author e095732 <e095732@ie.u-ryukyu.ac.jp>
date Thu, 19 Jan 2012 17:14:32 +0900
parents 652fce805fde
children 58a02f491f51
files Renderer/Engine/SceneGraphRoot.cc
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Renderer/Engine/SceneGraphRoot.cc	Tue Jan 17 18:12:09 2012 +0900
+++ b/Renderer/Engine/SceneGraphRoot.cc	Thu Jan 19 17:14:32 2012 +0900
@@ -474,7 +474,6 @@
 
 void 
 get_points(xmlNodePtr cur, collada_state *s, TaskManager *manager){
-    printf("start decode points\n");
     char *pcont = (char*)xmlNodeGetContent(cur);
     for (int i = 0;i < s->polylist_count;i++){
        s->vcsum += s->vcount[i];
@@ -488,6 +487,7 @@
 }
 void
 decode_points(xmlNodePtr cur, collada_state *s, TaskManager *manager){
+    printf("start decode points\n");
     int vertexp[s->vcsum];
     for (int i=0;i<s->vcsum;i++){
        vertexp[i]=0;
@@ -600,7 +600,7 @@
         //printf("vertex_table= %f\n", s->vertex_table[i]);
     } 
     int tex_id = 0;
-    sgid_hash.sg_hash_regist("Ball", tex_id);
+    sgid_hash.sg_hash_regist(s->name, tex_id);
     //get_texpic(s->tex_picname, sg, cur , manager);
     //free(vertexp);
     //free(vertex_table);
@@ -668,7 +668,6 @@
         decode_float_array(cur,list);
     } else if (!xmlStrcmp(cur->name, (xmlChar*)"node" )) {
         s->name = (char*)xmlGetProp(cur, (xmlChar*)"id");
-	decode_points(cur,s,root->tmanager);
     }
     for (cur=cur->children; cur; cur=cur->next){
         xml_walk(cur,s,list,root);
@@ -704,6 +703,7 @@
         init_list(&list);
         xml_walk(cur,&s,&list,this);
     }
+    decode_points(cur,&s,this);
     //xmlFreeDoc(doc);
 }