Mercurial > hg > old > magoroku_racing.bad

changeset 134:bb8bbca19a5f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
adjust string position
author Takao YONAMINE <e095763@ie.u-ryukyu.ac.jp>
date Thu, 21 Jul 2011 20:50:22 +0900
parents e7caa277d7e8
children
files magoroku schedule.cc schedule.cc~ schedule.o
diffstat 4 files changed, 29 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
Binary file magoroku has changed
--- a/schedule.cc	Thu Jul 21 18:16:26 2011 +0900
+++ b/schedule.cc	Thu Jul 21 20:50:22 2011 +0900
@@ -80,14 +80,6 @@
 static void
 set_schedule_assumption(void (*_func)(Game*) )
 {
-  //droot->createFromXMLfile("/Users/yonaminetakao/Desktop/Cerium/Renderer/Test/xml_file/universe.xml");
-  //SceneGraphPtr root = droot->createSceneGraph("Earth");
-  //droot->createStringFont(root,"As",80,640,480,0x00ff00ff);
-  //root->xyz[0] = 320;
-  //root->xyz[1] = 240;
-  //root->xyz[2] = 100;
-  //get_matrix(root->matrix, root->angle, root->xyz, camera->matrix);
-  //droot->setSceneData(root);
   sche_func_assumption = _func;
   change_state = 1;
 }
@@ -270,7 +262,8 @@
   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", 320, 480);
+  gFont_SetString("SELECT", 400, 480);
+  gFont_SetString("CAR",850,480);
 
   if (pad.right == 1) {
     game->car_id =
@@ -299,7 +292,8 @@
   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 COURSE", 150, 50);
+  gFont_SetString("SELECT", 300, 480);
+  gFont_SetString("COURSE",700,480);
 
   if (game->play_id == 1) {
     if (pad.right == 1) {
@@ -338,7 +332,8 @@
     
   /* 点滅 */
   if (blink_count < 35) {
-    gFont_SetString("GAME START !!", 220, 580);
+    gFont_SetString("GAME", 420, 580);
+    gFont_SetString("START !!", 620, 580);
   }
   blink_count = (blink_count > 70) ? 0 : blink_count + 1;
 
@@ -375,7 +370,7 @@
 static void
 sche_game_main_ready(Game *game)
 {
-  gFont_SetString("Loading....", 180, 100);
+  gFont_SetString("Loading....", 320, 480);
   set_schedule_assumption(sche_game_main);
 
 }
@@ -397,8 +392,8 @@
 
   time_count = game_time_get_msec() - start_time;
   game_time_set_raptime(raptime,time_count);
-  gFont_SetString("TIME",300,20);
-  gFont_SetString(raptime,400,20);
+  gFont_SetString("TIME",450,140);
+  gFont_SetString(raptime,550,140);
   /** end: dispaly RAP TIME **/
 
   // light_init と init_lightの書き間違え？
@@ -441,7 +436,8 @@
     set_schedule_assumption(sche_game_main_goal);
   }
 
-  gFont_SetStringInt((int)(100.0*game->jiki->speed), 380, 350);
+  gFont_SetStringInt((int)(100.0*game->jiki->speed), 330, 730);
+  gFont_SetString("km", 530, 730);
 
 
   
--- a/schedule.cc~	Thu Jul 21 18:16:26 2011 +0900
+++ b/schedule.cc~	Thu Jul 21 20:50:22 2011 +0900
@@ -157,7 +157,7 @@
   FVECTOR cA = { 0, 0, 0, 0 };//camera angle
   
   set_cameraPos( cP, cA );//camera set
-  gFont_SetString("test",10,10);
+  
 #ifdef LINDA
   //sche_func = &sche_game_wait;
   //set_schedule_assumption(sche_game_wait);
@@ -219,7 +219,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;
 
@@ -262,7 +262,8 @@
   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", 400, 480);
+  gFont_SetString("CAR",850,480);
 
   if (pad.right == 1) {
     game->car_id =
@@ -291,7 +292,8 @@
   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 COURSE", 150, 50);
+  gFont_SetString("SELECT", 300, 480);
+  gFont_SetString("COURSE",700,480);
 
   if (game->play_id == 1) {
     if (pad.right == 1) {
@@ -330,7 +332,8 @@
     
   /* 点滅 */
   if (blink_count < 35) {
-    gFont_SetString("GAME START !!", 170, 380);
+    gFont_SetString("GAME", 420, 580);
+    gFont_SetString("START !!", 620, 580);
   }
   blink_count = (blink_count > 70) ? 0 : blink_count + 1;
 
@@ -356,17 +359,18 @@
 
   
 // とりあえず、トップビューで
-  FVECTOR cPos = { game->jiki->location[0]+100,game->jiki->location[1],game->jiki->location[2],0 };
+  FVECTOR cPos = { game->jiki->location[0],game->jiki->location[1],game->jiki->location[2],0 };
   FVECTOR cAngle = { 0, 0, 0, 0 };
   //  FVECTOR cA = { 0, 0, 0, 0 };
   
   set_cameraPos( cPos, cAngle );
+  
 }
 
 static void
 sche_game_main_ready(Game *game)
 {
-  gFont_SetString("Loading....", 180, 100);
+  gFont_SetString("Loading....", 320, 480);
   set_schedule_assumption(sche_game_main);
 
 }
@@ -375,8 +379,8 @@
 sche_game_main(Game *game)
 {
   printf("sche_game_main()\n");
-  FVECTOR cPos = { game->jiki->location[0],game->jiki->location[1]-100,game->jiki->location[2]+500 ,0 };
-  FVECTOR cAngle = { 90, 0, 0, 0 };
+  FVECTOR cPos = { game->jiki->location[0],game->jiki->location[1],game->jiki->location[2] ,0 };
+  FVECTOR cAngle = {0, 0, 0, 0 };
   // jikiによってカメラも移動( camera_update()って関数のほう使うあらイラんね )
   //  set_cameraPos( game->jiki->body->xyz, game->jiki->body->angle );
 
@@ -388,8 +392,8 @@
 
   time_count = game_time_get_msec() - start_time;
   game_time_set_raptime(raptime,time_count);
-  gFont_SetString("TIME",300,20);
-  gFont_SetString(raptime,400,20);
+  gFont_SetString("TIME",450,140);
+  gFont_SetString(raptime,550,140);
   /** end: dispaly RAP TIME **/
 
   // light_init と init_lightの書き間違え？
@@ -432,16 +436,16 @@
     set_schedule_assumption(sche_game_main_goal);
   }
 
-  gFont_SetStringInt((int)(100.0*game->jiki->speed), 380, 350);
+  gFont_SetStringInt((int)(100.0*game->jiki->speed), 380, 730);
 
 
   
   
   if( pad.up > 0 ){
-    game->jiki->direction[1] ++;
+    game->jiki->direction[2] ++;
   }
   if( pad.down > 0 ){
-    game->jiki->direction[1] --;
+    game->jiki->direction[2] --;
   }
   if( pad.right > 0 ){
     game->jiki->direction[0] ++;
@@ -450,8 +454,6 @@
     game->jiki->direction[0] --;
   }
  
-
-  
   
   if ((pad.right > 0) && ((game->jiki->speed != 0) || (pad.circle > 0))) {
     car_swerve(game->jiki, 1);
Binary file schedule.o has changed