Mercurial > hg > Members > kono > Cerium

changeset 581:58cdb81f7f96

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Sat, 24 Oct 2009 17:42:42 +0900
parents da82a47ece92
children ea03c178fc30
files Renderer/Engine/Makefile.def Renderer/Engine/spe/Load_Texture.cc Renderer/Engine/task/Load_Texture.cc Renderer/Test/Makefile.def Renderer/Test/dynamic_create.cc
diffstat 5 files changed, 8 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/Renderer/Engine/Makefile.def	Sat Oct 24 16:32:29 2009 +0900
+++ b/Renderer/Engine/Makefile.def	Sat Oct 24 17:42:42 2009 +0900
@@ -3,7 +3,7 @@
 CERIUM = ../..
 
 CC      = g++
-CFLAGS  = -O9 -g -Wall -DUSE_MEMLIST=1 -DUSE_MEMHASH=1 # -DDEBUG
+CFLAGS  = -g -Wall -DUSE_MEMLIST=1 -DUSE_MEMHASH=1 # -O9 -DDEBUG
 
 INCLUDE = -I$(CERIUM)/include/TaskManager -I.
 LIBS = -L$(CERIUM)/TaskManager
--- a/Renderer/Engine/spe/Load_Texture.cc	Sat Oct 24 16:32:29 2009 +0900
+++ b/Renderer/Engine/spe/Load_Texture.cc	Sat Oct 24 17:42:42 2009 +0900
@@ -5,9 +5,6 @@
 #include <string.h>
 #include "Load_Texture.h"
 #include "texture.h"
-#if !USE_MEMHASH
-#include "TileHash.h"
-#endif
 #include "Func.h"
 #include "global_alloc.h"
 
--- a/Renderer/Engine/task/Load_Texture.cc	Sat Oct 24 16:32:29 2009 +0900
+++ b/Renderer/Engine/task/Load_Texture.cc	Sat Oct 24 17:42:42 2009 +0900
@@ -2,9 +2,6 @@
 #include <string.h>
 #include "Load_Texture.h"
 #include "texture.h"
-#if !USE_MEMHASH
-#include "TileHash.h"
-#endif
 #include "Func.h"
 #include "global_alloc.h"
 #include "Tapestry.h"
--- a/Renderer/Test/Makefile.def	Sat Oct 24 16:32:29 2009 +0900
+++ b/Renderer/Test/Makefile.def	Sat Oct 24 17:42:42 2009 +0900
@@ -2,7 +2,7 @@
 CERIUM = ../..
 
 CC      = g++
-CFLAGS  = -g -Wall -DUSE_MEMLIST=1 -DUSE_MEMHASH=1 # -DDEBUG
+CFLAGS  = -g -Wall  # -O -DDEBUG
 
 INCLUDE = -I$(CERIUM)/include/TaskManager -I. -I$(CERIUM)/include/Cerium
 LIBS = -L$(CERIUM)/TaskManager -L$(CERIUM)/Renderer/Engine
--- a/Renderer/Test/dynamic_create.cc	Sat Oct 24 16:32:29 2009 +0900
+++ b/Renderer/Test/dynamic_create.cc	Sat Oct 24 17:42:42 2009 +0900
@@ -95,14 +95,14 @@
 }
 
 SceneGraphPtr
-create_sg(TaskManager *manager, SceneGraphPtr node, unsigned char *data, int len, int serial_id)
+create_sg(TaskManager *manager, SceneGraphPtr parent, unsigned char *data, int len, int serial_id)
 {
     SceneGraphPtr child = sgroot->createSceneGraph();
-    node->addChild(child);
-    child->set_move_collision(moon_move, moon_collision);
+    parent->addChild(child);
     // 読み込んだオブジェクトは、すべて、child の child になる。
     sgroot->createFromXMLmemory(sgroot->tmanager, child, (char *)data, len);
-    return node;
+    child->set_move_collision(moon_move, moon_collision);
+    return child;
 }
 
 
@@ -113,8 +113,9 @@
     unsigned char *xml_data = xml_tuple+LINDA_HEADER_SIZE;
     SceneGraphPtr sgp;
     // ここで create
-	fwrite(xml_data, 1, 10, stdout);
+    //	fwrite(xml_data, 1, 10, stdout);
     sgp = create_sg(carg->manager, carg->node, xml_data, xml_len, carg->sid);
+    printf("%s size %d loaded\n", sgp->children->name, xml_len);
     client_list_update(carg->manager, carg->clist, carg->sid, sgp);
     free(arg);
     free(xml_tuple);