# HG changeset patch
# User tkaito
# Date 1289828365 -32400
# Node ID 22d7263cec2db16096ddbff8474b1d7d3632ed8d
# Parent  3191cae6f7a2175f2ed09bd939b96091c4e153ba
copy script add.

diff -r 3191cae6f7a2 -r 22d7263cec2d Renderer/Test/Makefile.cell
--- a/Renderer/Test/Makefile.cell	Mon Nov 08 19:01:25 2010 +0900
+++ b/Renderer/Test/Makefile.cell	Mon Nov 15 22:39:25 2010 +0900
@@ -14,7 +14,7 @@
 %.pb.cc: $(PROTODIR)/%.proto
 	$(PROTO) $(PROTOFLAGS) $<
 
-ALL = spe-main ball_bound boss1_action direction gaplant ieshoot node panel universe untitled vacuum dynamic viewer SgRootChange property_test create_task property_universe chain_old property_chain aquarium network init_aquarium 
+ALL = spe-main ball_bound boss1_action direction gaplant ieshoot node panel universe untitled vacuum dynamic viewer SgRootChange property_test create_task property_universe chain_old property_chain aquarium network init_aquarium
 
 all: $(ALL)
 
diff -r 3191cae6f7a2 -r 22d7263cec2d Renderer/Test/Makefile.macosx
--- a/Renderer/Test/Makefile.macosx	Mon Nov 08 19:01:25 2010 +0900
+++ b/Renderer/Test/Makefile.macosx	Mon Nov 15 22:39:25 2010 +0900
@@ -13,7 +13,7 @@
 %.pb.cc: $(PROTODIR)/%.proto
 	$(PROTO) $(PROTOFLAGS) $<
 
-ALL =  ball_bound boss1_action direction gaplant ieshoot node panel universe untitled vacuum property_test send_linda dynamic writer chain_old SgRootChange viewer aquarium network init_aquarium test_linda
+ALL =  ball_bound boss1_action direction gaplant ieshoot node panel universe untitled vacuum property_test send_linda dynamic writer chain_old SgRootChange viewer aquarium network init_aquarium test_linda 
 
 oFLAGS=-g -O2
 CFLAGt=-g -O2
@@ -103,6 +103,7 @@
 test_linda : $(TEST_LINDA_OBJ)
 	$(CC) -o $@ $? $(LIBS) $(PROTOLIBS)
 
+
 run: $(TARGET)
 	sudo ./$(TARGET) -width 576 -height 384 -bpp 32
 
diff -r 3191cae6f7a2 -r 22d7263cec2d Renderer/Test/ball_bound.cc
--- a/Renderer/Test/ball_bound.cc	Mon Nov 08 19:01:25 2010 +0900
+++ b/Renderer/Test/ball_bound.cc	Mon Nov 15 22:39:25 2010 +0900
@@ -81,8 +81,8 @@
 static void
 ball_move(SceneGraphPtr node, void *sgroot_, int screen_w, int screen_h)
 {
-    vy += g * dt;
-    node->xyz[1] += vy * dt;
+  vy += g * dt;
+   node->xyz[1] += vy * dt;
     //    node->xyz[0] += 10.0f;
 }
 
@@ -95,15 +95,15 @@
 ball_collision(SceneGraphPtr node, void *sgroot_, int screen_w, int screen_h,
 			   SceneGraphPtr tree)
 {
-    if (node->xyz[1] > screen_h - ball_radius) {
-		node->xyz[1] = screen_h - ball_radius;
-
-		vy *= e;
-		if (vy > -g && vy < 0) {
-			vy = 0.0;
-			node->set_move_collision(ball_move_idle, ball_collision_idle);
-		}
-    }
+  if (node->xyz[1] > screen_h - ball_radius) {
+  		node->xyz[1] = screen_h - ball_radius;
+  
+  		vy *= e;
+  		if (vy > -g && vy < 0) {
+  			vy = 0.0;
+  			node->set_move_collision(ball_move_idle, ball_collision_idle);
+  		}
+  }
 }
 
 MainLoopPtr 
diff -r 3191cae6f7a2 -r 22d7263cec2d SceneGraph/BlenderScript/export_xml.py
--- a/SceneGraph/BlenderScript/export_xml.py	Mon Nov 08 19:01:25 2010 +0900
+++ b/SceneGraph/BlenderScript/export_xml.py	Mon Nov 15 22:39:25 2010 +0900
@@ -447,8 +447,8 @@
 def loadTexture(texture):
 	global images, imageCount
 	name = texture.getName()
-	if name in images:
-		return "\t\t<image name=\"" + name + "\"/>\n"	
+	#if name in images:
+	#	return "\t\t<image name=\"" + name + "\"/>\n"	
 	out = "\t\t<image name=\"" + name + "\">\n"
 	imageCount += 1
 	images[name] = imageCount
diff -r 3191cae6f7a2 -r 22d7263cec2d SceneGraph/BlenderScript/script_copy.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SceneGraph/BlenderScript/script_copy.sh	Mon Nov 15 22:39:25 2010 +0900
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+cp $1 /Applications/*blender*/blender.app/Contents/MacOS/.blender/scripts/