Mercurial > hg > Members > kono > Cerium

changeset 732:74aa6649dcb6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author aaa
date Tue, 22 Dec 2009 18:17:41 +0900
parents 6222ef073236 (current diff) 8bf398bf2a8a (diff)
children 71a58131b2c0
files
diffstat 4 files changed, 19 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/Renderer/Test/Makefile.macosx	Tue Dec 22 18:16:21 2009 +0900
+++ b/Renderer/Test/Makefile.macosx	Tue Dec 22 18:17:41 2009 +0900
@@ -10,7 +10,9 @@
 .cc.o:
 	$(CC) $(CFLAGS)  -c $< -o $@
 
-ALL =  ball_bound boss1_action direction gaplant ieshoot node panel universe untitled vacuum send_linda dynamic writer chain_old SgRootChange 
+ALL =  ball_bound boss1_action direction gaplant ieshoot node panel universe untitled vacuum property_test send_linda dynamic writer chain_old SgRootChange 
+oFLAGS=-g -O2
+CFLAGt=-g -O2
 all: $(ALL)
 
 BALL_BOUND_OBJ = ball_bound.o
@@ -53,6 +55,10 @@
 vacuum : $(VACUUM_OBJ) 
 	$(CC) -o $@ $?    $(LIBS)
 
+PROPERTY_OBJ = property_test.o
+property_test : $(PROPERTY_OBJ)
+	$(CC) -o $@ $?    $(LIBS)
+
 DYNAMIC_OBJ = dynamic_create.o 
 dynamic : $(DYNAMIC_OBJ) 
 	$(CC) -o $@ $?    $(LIBS)
--- a/Renderer/Test/property_test.cc	Tue Dec 22 18:16:21 2009 +0900
+++ b/Renderer/Test/property_test.cc	Tue Dec 22 18:17:41 2009 +0900
@@ -10,7 +10,7 @@
 ChainProperty cv[CHAIN_LEN];
 
 
-void createSceneGraphFromProperty(SceneGraphPtr root, ChainPropertyPtr cv);
+void createSceneGraphFromProperty(SceneGraphPtr root, ChainPropertyPtr cv, Viewer *sgroot);
 
 void
 init_chainold_vars(ChainPropertyPtr cv) {
@@ -28,8 +28,9 @@
 
 
 static void
-chain_old_move_ope(SceneGraphPtr node, int screen_w, int screen_h)
+chain_old_move_ope(SceneGraphPtr node, void *sgroot_, int screen_w, int screen_h)
 {
+    SceneGraphRoot *sgroot = (SceneGraphRoot *)sgroot_;
     Pad *pad = sgroot->getController();
 
     if (pad->cross.isHold()) {
@@ -49,12 +50,9 @@
         cv[CHAIN_LEN-1].can_move = TRUE;
     }
 }
+
 void
-chain_old_move(ChainProperty cv, int w, int h)
-{
-}
-void
-chain_old_move(SceneGraphPtr sg, int w, int h)
+chain_old_move(SceneGraphPtr sg, void *sgroot_, int w, int h)
 {
     int id = sg->id;
     if(id == 0) {
@@ -118,7 +116,7 @@
 */
 
 void
-spe_move_collision(ChainProperty cv, spe_move_func new_move, spe_move_func new_collision)
+spe_move_collision(ChainProperty cv, void *sgroot_,spe_move_func new_move, spe_move_func new_collision)
 {
 
     cv.move = new_move;
@@ -128,7 +126,7 @@
 
 
 void
-chain_old_collision(void *cv, int w, int h, ChainPropertyPtr ocv)
+chain_old_collision(SceneGraphPtr node, void *sgroot_, int w, int h, SceneGraphPtr ocv)
 {
     //createSceneGraphFromProperty(cv, cv);
 }
@@ -142,7 +140,7 @@
 
 
 void
-createSceneGraphFromProperty(SceneGraphPtr root, ChainPropertyPtr cv)
+createSceneGraphFromProperty(SceneGraphPtr root, ChainPropertyPtr cv, Viewer *sgroot)
 {
     SceneGraphPtr node;
 
@@ -210,7 +208,7 @@
 
     }
 
-    createSceneGraphFromProperty(root, cv);
+    createSceneGraphFromProperty(root, cv, sgroot);
     cv[0].can_move = FALSE;
     //sgroot->setSceneData(root);
 
--- a/Renderer/Test/property_test.h	Tue Dec 22 18:16:21 2009 +0900
+++ b/Renderer/Test/property_test.h	Tue Dec 22 18:17:41 2009 +0900
@@ -38,7 +38,7 @@
     void chain_move(TaskManager *manager, SceneGraphPtr sg, int w, int h);
     //void chain_collision(SceneGraphPtr sg, int w, int h, SceneGraphPtr osg);
     void chain_collision(ChainPropertyPtr cv, int w, int h);
-    void createSceneGraphFromProperty(SceneGraphPtr root, ChainPropertyPtr cv);
+    //void createSceneGraphFromProperty(SceneGraphPtr root, ChainPropertyPtr cv, Viewer *sgroot);
     //void property_swich();
     //void set_properties(ChainPropertyPtr cv);
     MainLoopPtr init(Viewer *viewer, int screen_w, int screen_h);
--- a/Renderer/Test/vacuum.cc	Tue Dec 22 18:16:21 2009 +0900
+++ b/Renderer/Test/vacuum.cc	Tue Dec 22 18:17:41 2009 +0900
@@ -38,10 +38,10 @@
 
     if(node->frame%ENCOUNT == ENCOUNT-1) {
       if(random()%2) {
-	  add_cubecollision_object(redcube,node,screen_w,screen_h, sgroot);
+          add_cubecollision_object(redcube,node,screen_w,screen_h, sgroot);
       }
       else {
-	  add_cubecollision_object(enemy,node,screen_w,screen_h, sgroot);
+          add_cubecollision_object(enemy,node,screen_w,screen_h, sgroot);
       }
     }