# HG changeset patch
# User Shinji KONO <kono@ie.u-ryukyu.ac.jp>
# Date 1297175987 -32400
# Node ID 3b7e57614d9352018eb2ff68cfb592cc408a1125
# Parent  00ef8386edd67c9caea55f75e584421340881b96
fix

diff -r 00ef8386edd6 -r 3b7e57614d93 Dandy.cc
--- a/Dandy.cc	Sat Dec 25 21:04:59 2010 +0900
+++ b/Dandy.cc	Tue Feb 08 23:39:47 2011 +0900
@@ -578,7 +578,7 @@
 
     float scale[] = {my_scale,my_scale,1};
     float c_xyz[] = {0,0,0};
-    //scale_matrix(object->matrix, object->matrix, scale, c_xyz);
+    scale_matrix(object->matrix, scale, c_xyz);
     /*法線用の行列。Cameraの行列を抜いている(Cameraのコンストラクタで、単位行列にしている)*/
     get_matrix(object->real_matrix, object->angle, object->xyz, root->real_matrix);
 }
@@ -611,7 +611,7 @@
     object->angle[3] = angle * (3.1415926*2/4096);
     get_matrix(object->matrix, object->angle, object->xyz, root->matrix);
     float c_xyz[] = {0,0,0};
-    //scale_matrix(object->matrix, object->matrix, scale, c_xyz);
+    scale_matrix(object->matrix, scale, c_xyz);
     /*法線用の行列。Cameraの行列を抜いている(Cameraのコンストラクタで、単位行列にしている)*/
     get_matrix(object->real_matrix, object->angle, object->xyz, root->real_matrix);
 }
diff -r 00ef8386edd6 -r 3b7e57614d93 Makefile
--- a/Makefile	Sat Dec 25 21:04:59 2010 +0900
+++ b/Makefile	Tue Feb 08 23:39:47 2011 +0900
@@ -4,7 +4,7 @@
 srcdir  = .
 ABI = -m$(ABIBIT)
 
-CFLAGS  += -g $(ABI) -Wall `sdl-config --cflags` `xml2-config --cflags` $(INCLUDE)
+CFLAGS  += -DINVISIBLE_MODE -g $(ABI) -Wall `sdl-config --cflags` `xml2-config --cflags` $(INCLUDE)
 LIBS	+=  `sdl-config --libs`,-framework,OpenGL -lSDL_mixer -lSDL_image `xml2-config --libs`
 LIBS += -lCerium -lFifoManager
 
diff -r 00ef8386edd6 -r 3b7e57614d93 count2.c
--- a/count2.c	Sat Dec 25 21:04:59 2010 +0900
+++ b/count2.c	Tue Feb 08 23:39:47 2011 +0900
@@ -107,10 +107,9 @@
     if ((pad[0].left == 0) && (pad[0].right == 0))
 	charcount = 0;
     jiki.ch =
-	3 * (charcount < 3) * (charcount > -3) + 2 * (charcount <
-						      -3) * (charcount >=
-							     -15) +
-	1 * (charcount < -15)
+	3 * (charcount <= 3) * (charcount > -3) 
+	+ 2 * (charcount < -3) * (charcount >= -15) 
+	+ 1 * (charcount < -15)
 	+ 4 * (charcount > 3) * (charcount <= 15) + 5 * (charcount > 15);