Mercurial > hg > Game > Cerium

changeset 1308:78248082c56d draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reading COLLADA file minor change.
author Taiki TAIRA <e095767@ie.u-ryukyu.ac.jp>
date Thu, 15 Dec 2011 14:28:21 +0900
parents 5b1589ce972e
children ad17daa18d63 857d3feaeb75
files Renderer/Engine/SceneGraphRoot.cc
diffstat 1 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Renderer/Engine/SceneGraphRoot.cc	Wed Dec 14 19:39:43 2011 +0900
+++ b/Renderer/Engine/SceneGraphRoot.cc	Thu Dec 15 14:28:21 2011 +0900
@@ -365,8 +365,6 @@
             }
             */
 
-            get_point( , , );
-
     }
 
     if (!xmlStrcmp(cur->name, (xmlChar*)"float_array")) {
@@ -404,20 +402,23 @@
             float *pcount = malloc(sizeof(float)*sum); 
 
             if (!xmlStrcmp(cur->name, (xmlChar*)"vcount")) {
-                char *vcount_cont = (char*)xmlNodeGetContent(cur);
+                char *vcont = (char*)xmlNodeGetContent(cur);
                     for (int i=0; vcount!=NULL; i++) {
-                        vcount = pickup_float(vcount, p+i);
+                        vcont = pickup_float(vcont, vcount+i);
                     }
             }
 
             if (!xmlStrcmp(cur->name, (xmlChar*)"p")) {
                 char *pcont = (char*)xmlNodeGetContent(cur);
                 for (int i=0; pcont != NULL; i++) {
-                    pcount = pickup_float(pcont, p+i);
+                    pcont = pickup_float(pcont, pcount+i);
                 }
             }
         }
 
+        get_point(pid, , cur);
+
+
         for (SOURCE *iliner = list->first; list->end != iliner; iliner = iliner->next) {
             if (!strcmp_a(pid, iliner->id)) {
                 if (vcount == 4) {