# HG changeset patch
# User Takao YONAMINE <e095763@ie.u-ryukyu.ac.jp>
# Date 1311239786 -32400
# Node ID e7caa277d7e80007190ca016149df34b9fa8cfc0
# Parent  d84ee8b2cfd9fc004a3aeba4a05fd0528553f98c
add createStringFont()

diff -r d84ee8b2cfd9 -r e7caa277d7e8 gFont.cc
--- a/gFont.cc	Thu Jul 21 17:25:59 2011 +0900
+++ b/gFont.cc	Thu Jul 21 18:16:26 2011 +0900
@@ -24,7 +24,7 @@
 static unsigned int  sp_counter;
 static bool          flag_spriteInited = false; // スプライトロードフラグ
 //static TEXTURE *font_tex;
-
+extern SceneGraphPtr root;
 
 static void
 gFont_Init_Png(const char *texname)
@@ -159,6 +159,7 @@
 gFont_SetString(const char *str, int x, int y)
 {
   int number;
+  char *ch_str = (char *)str;
 
   while (*str != '\0') {
     number = get_number_char(*str);
@@ -167,8 +168,9 @@
     x += (int)CHAR_W_SIZE*1.5;
   }
   
-  //droot->createStringFont(root,"As",80,640,480,0x00ff00ff);
-
+  //SceneGraphPtr font = droot->createSceneGraph();
+  droot->createStringFont(root,ch_str,50,/*640*/x,/*480*/y,0x00ff00ff);
+  //droot->setSceneData(font);
 }
 
 /*
diff -r d84ee8b2cfd9 -r e7caa277d7e8 gFont.o
Binary file gFont.o has changed
diff -r d84ee8b2cfd9 -r e7caa277d7e8 gSprite.cc
--- a/gSprite.cc	Thu Jul 21 17:25:59 2011 +0900
+++ b/gSprite.cc	Thu Jul 21 18:16:26 2011 +0900
@@ -184,7 +184,7 @@
     }
   }
   root->addChild(object);
-
+  //droot->createStringFont(root,"As",80,640,480,0x00ff00ff);
   float scale[] = {my_scale,my_scale,1};
   
   if(test == 1){
diff -r d84ee8b2cfd9 -r e7caa277d7e8 magoroku
Binary file magoroku has changed
diff -r d84ee8b2cfd9 -r e7caa277d7e8 schedule.cc
--- a/schedule.cc	Thu Jul 21 17:25:59 2011 +0900
+++ b/schedule.cc	Thu Jul 21 18:16:26 2011 +0900
@@ -227,7 +227,7 @@
   //ここを現在通らないらしい。
   if (game->play_id==1){
     if (blink_count < 35) {
-      gFont_SetString("PUSH START !!", 170, 380);
+      gFont_SetString("PUSH START !!", 320, 480);
     }
     blink_count = (blink_count > 70) ? 0 : blink_count + 1;
 
@@ -270,7 +270,7 @@
   gSprite_PutSprite(true,R_ARROW, 750, 200, TEST_Z_GRID, 0);
   gSprite_PutSprite(true,L_ARROW, 450, 200, TEST_Z_GRID, 0 );
 
-  gFont_SetString("SELECT CAR", 180, 50);
+  gFont_SetString("SELECT CAR", 320, 480);
 
   if (pad.right == 1) {
     game->car_id =
@@ -338,7 +338,7 @@
     
   /* 点滅 */
   if (blink_count < 35) {
-    gFont_SetString("GAME START !!", 170, 380);
+    gFont_SetString("GAME START !!", 220, 580);
   }
   blink_count = (blink_count > 70) ? 0 : blink_count + 1;
 
diff -r d84ee8b2cfd9 -r e7caa277d7e8 schedule.o
Binary file schedule.o has changed