Mercurial > hg > Members > kono > Cerium

changeset 849:1221a142640d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author tkaito
date Sun, 06 Jun 2010 03:33:00 +0900
parents df80613f1e1a (diff) 8c78d15ea999 (current diff)
children 0e5dcda89c8e
files
diffstat 3 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Renderer/Engine/SceneGraph.cc	Sat Jun 05 21:23:25 2010 +0900
+++ b/Renderer/Engine/SceneGraph.cc	Sun Jun 06 03:33:00 2010 +0900
@@ -227,6 +227,8 @@
     if (this->lastChild != NULL) {
         SceneGraphPtr last = this->lastChild;
         last->brother = child;
+	child->parent = this;
+	return child;
     }
 
     this->lastChild = child;
--- a/Renderer/Engine/SceneGraphRoot.cc	Sat Jun 05 21:23:25 2010 +0900
+++ b/Renderer/Engine/SceneGraphRoot.cc	Sun Jun 06 03:33:00 2010 +0900
@@ -110,6 +110,7 @@
     sg_src[sg->sgid] = sg;
 }
 
+
 void
 SceneGraphRoot::addNext(SceneGraphPtr sg)
 {
--- a/Renderer/Engine/SceneGraphRoot.h	Sat Jun 05 21:23:25 2010 +0900
+++ b/Renderer/Engine/SceneGraphRoot.h	Sun Jun 06 03:33:00 2010 +0900
@@ -64,8 +64,6 @@
     // 4 * lightnum (4) = 16;
     float light_vector[16];
 
-
-
     // SceneGraphIterator
     SceneGraphIteratorPtr iterator;