Mercurial > hg > Game > Cerium

changeset 362:cb0d89a35861 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
vacuum -sg 15
author e065746@localhost.localdomain
date Fri, 17 Jul 2009 23:02:07 +0900
parents 1b5382495230
children 73630476453a
files TaskManager/Test/test_render/SGList.cpp TaskManager/Test/test_render/SGList.h TaskManager/Test/test_render/viewer.cpp
diffstat 3 files changed, 113 insertions(+), 105 deletions(-) [+]
line wrap: on
line diff
--- a/TaskManager/Test/test_render/SGList.cpp	Fri Jul 17 22:58:28 2009 +0900
+++ b/TaskManager/Test/test_render/SGList.cpp	Fri Jul 17 23:02:07 2009 +0900
@@ -1,5 +1,5 @@
 #include "SGList.h"
 
 const char *sglist_table[SGLIST_LENGTH] = {
-    "Ball", "LongCube", "Venus000", "Venus001", "Venus002", "Venus008", "Venus003", "Venus007", "Venus006", "Venus004", "Venus005", "Venus009", "BLAST8", "BLAST7", "BLAST6", "BLAST5", "BLAST4", "BLAST3", "BLAST2", "BLAST1", "BOSS1", "BOSS1_L", "BOSS1_R", "Cube", "BigCube", "Plane", "SmallCube", "Diry", "Dirz", "Dirx", "arm_L_D", "foot_L_B", "foot_L_E", "foot_L_C", "shield_L_C", "arm_L_G", "arm_L_E", "arm_R_F", "arm_R_A", "arm_R_E", "shoulder_R_C", "shoulder_R_B", "chest_L_A", "shoulder_R_A", "head_E", "shield_L_E", "shield_L_D", "shield_R_D", "shield_L_A", "arm_R_C", "arm_R_B", "arm_L_C", "eye", "booster_B", "booster_A", "chest_R_A", "chest_center_A", "shoulder_L_A", "body_A", "body_B", "body_C", "chest_center_B", "chest_R_C", "chest_L_C", "chest_L_B", "chest_R_B", "west_D", "west_A", "west_B", "body_L_A", "body_R_A", "chest_center_C", "chest_B", "head_C", "head_F", "head_D", "head_R_B", "head_L_B", "head_L_A", "head_R_A", "head_B", "head_A", "shoulder_L_B", "shoulder_L_C", "arm_L_A", "arm_L_B", "arm_R_D", "arm_L_F", "arm_R_G", "shield_R_C", "shield_R_E", "shield_L_B", "shield_R_B", "shield_R_A", "west_C", "foot_L_D", "foot_R_D", "foot_L_F", "foot_R_F", "foot_R_C", "foot_R_E", "foot_R_A", "foot_R_B", "chest_A", "foot_L_A", "IEBOSS", "IEJIKI", "IETAMA", "MCUBE_BACK", "MCUBE", "BIGMCUBE", "CUBE", "P_SHOT1", "PANEL_1024", "PANEL_2048", "PANEL_512", "BACK", "BULEBULLET", "E_PLANE", "IDLE", "PLAYER", "PLAYER_L", "PLAYER_LL", "PLAYER_R", "PLAYER_RR", "Sphere", "BigSphere", "Earth", "Moon"
+    "Ball", "LongCube", "Venus000", "Venus001", "Venus002", "Venus008", "Venus003", "Venus007", "Venus006", "Venus004", "Venus005", "Venus009", "BLAST8", "BLAST7", "BLAST6", "BLAST5", "BLAST4", "BLAST3", "BLAST2", "BLAST1", "BOSS1", "BOSS1_L", "BOSS1_R", "Cube", "BigCube", "Plane", "SmallCube", "Diry", "Dirz", "Dirx", "LOCK", "ENEMY", "REDCUBE", "BIGCUBE", "GAMEOVER", "arm_L_D", "foot_L_B", "foot_L_E", "foot_L_C", "shield_L_C", "arm_L_G", "arm_L_E", "arm_R_F", "arm_R_A", "arm_R_E", "shoulder_R_C", "shoulder_R_B", "chest_L_A", "shoulder_R_A", "head_E", "shield_L_E", "shield_L_D", "shield_R_D", "shield_L_A", "arm_R_C", "arm_R_B", "arm_L_C", "eye", "booster_B", "booster_A", "chest_R_A", "chest_center_A", "shoulder_L_A", "body_A", "body_B", "body_C", "chest_center_B", "chest_R_C", "chest_L_C", "chest_L_B", "chest_R_B", "west_D", "west_A", "west_B", "body_L_A", "body_R_A", "chest_center_C", "chest_B", "head_C", "head_F", "head_D", "head_R_B", "head_L_B", "head_L_A", "head_R_A", "head_B", "head_A", "shoulder_L_B", "shoulder_L_C", "arm_L_A", "arm_L_B", "arm_R_D", "arm_L_F", "arm_R_G", "shield_R_C", "shield_R_E", "shield_L_B", "shield_R_B", "shield_R_A", "west_C", "foot_L_D", "foot_R_D", "foot_L_F", "foot_R_F", "foot_R_C", "foot_R_E", "foot_R_A", "foot_R_B", "chest_A", "foot_L_A", "IEBOSS", "IEJIKI", "IETAMA", "MCUBE_BACK", "MCUBE", "BIGMCUBE", "CUBE", "P_SHOT1", "PANEL_1024", "PANEL_2048", "PANEL_512", "BACK", "BULEBULLET", "E_PLANE", "IDLE", "PLAYER", "PLAYER_L", "PLAYER_LL", "PLAYER_R", "PLAYER_RR", "Sphere", "BigSphere", "TITLE", "Earth", "Moon"
 };
--- a/TaskManager/Test/test_render/SGList.h	Fri Jul 17 22:58:28 2009 +0900
+++ b/TaskManager/Test/test_render/SGList.h	Fri Jul 17 23:02:07 2009 +0900
@@ -49,135 +49,147 @@
 #define Dirz	 28
 #define Dirx	 29
 
+/* xml_file/gamecube.xml */
+#define LOCK	 30
+#define ENEMY	 31
+#define REDCUBE	 32
+#define BIGCUBE	 33
+
+/* xml_file/gameover.xml */
+#define GAMEOVER	 34
+
 /* xml_file/gap_plane_test.xml */
-#define arm_L_D	 30
-#define foot_L_B	 31
-#define foot_L_E	 32
-#define foot_L_C	 33
-#define shield_L_C	 34
-#define arm_L_G	 35
-#define arm_L_E	 36
-#define arm_R_F	 37
-#define arm_R_A	 38
-#define arm_R_E	 39
-#define shoulder_R_C	 40
-#define shoulder_R_B	 41
-#define chest_L_A	 42
-#define shoulder_R_A	 43
-#define head_E	 44
-#define shield_L_E	 45
-#define shield_L_D	 46
-#define shield_R_D	 47
-#define shield_L_A	 48
-#define arm_R_C	 49
-#define arm_R_B	 50
-#define arm_L_C	 51
-#define eye	 52
-#define booster_B	 53
-#define booster_A	 54
-#define chest_R_A	 55
-#define chest_center_A	 56
-#define shoulder_L_A	 57
-#define body_A	 58
-#define body_B	 59
-#define body_C	 60
-#define chest_center_B	 61
-#define chest_R_C	 62
-#define chest_L_C	 63
-#define chest_L_B	 64
-#define chest_R_B	 65
-#define west_D	 66
-#define west_A	 67
-#define west_B	 68
-#define body_L_A	 69
-#define body_R_A	 70
-#define chest_center_C	 71
-#define chest_B	 72
-#define head_C	 73
-#define head_F	 74
-#define head_D	 75
-#define head_R_B	 76
-#define head_L_B	 77
-#define head_L_A	 78
-#define head_R_A	 79
-#define head_B	 80
-#define head_A	 81
-#define shoulder_L_B	 82
-#define shoulder_L_C	 83
-#define arm_L_A	 84
-#define arm_L_B	 85
-#define arm_R_D	 86
-#define arm_L_F	 87
-#define arm_R_G	 88
-#define shield_R_C	 89
-#define shield_R_E	 90
-#define shield_L_B	 91
-#define shield_R_B	 92
-#define shield_R_A	 93
-#define west_C	 94
-#define foot_L_D	 95
-#define foot_R_D	 96
-#define foot_L_F	 97
-#define foot_R_F	 98
-#define foot_R_C	 99
-#define foot_R_E	 100
-#define foot_R_A	 101
-#define foot_R_B	 102
-#define chest_A	 103
-#define foot_L_A	 104
+#define arm_L_D	 35
+#define foot_L_B	 36
+#define foot_L_E	 37
+#define foot_L_C	 38
+#define shield_L_C	 39
+#define arm_L_G	 40
+#define arm_L_E	 41
+#define arm_R_F	 42
+#define arm_R_A	 43
+#define arm_R_E	 44
+#define shoulder_R_C	 45
+#define shoulder_R_B	 46
+#define chest_L_A	 47
+#define shoulder_R_A	 48
+#define head_E	 49
+#define shield_L_E	 50
+#define shield_L_D	 51
+#define shield_R_D	 52
+#define shield_L_A	 53
+#define arm_R_C	 54
+#define arm_R_B	 55
+#define arm_L_C	 56
+#define eye	 57
+#define booster_B	 58
+#define booster_A	 59
+#define chest_R_A	 60
+#define chest_center_A	 61
+#define shoulder_L_A	 62
+#define body_A	 63
+#define body_B	 64
+#define body_C	 65
+#define chest_center_B	 66
+#define chest_R_C	 67
+#define chest_L_C	 68
+#define chest_L_B	 69
+#define chest_R_B	 70
+#define west_D	 71
+#define west_A	 72
+#define west_B	 73
+#define body_L_A	 74
+#define body_R_A	 75
+#define chest_center_C	 76
+#define chest_B	 77
+#define head_C	 78
+#define head_F	 79
+#define head_D	 80
+#define head_R_B	 81
+#define head_L_B	 82
+#define head_L_A	 83
+#define head_R_A	 84
+#define head_B	 85
+#define head_A	 86
+#define shoulder_L_B	 87
+#define shoulder_L_C	 88
+#define arm_L_A	 89
+#define arm_L_B	 90
+#define arm_R_D	 91
+#define arm_L_F	 92
+#define arm_R_G	 93
+#define shield_R_C	 94
+#define shield_R_E	 95
+#define shield_L_B	 96
+#define shield_R_B	 97
+#define shield_R_A	 98
+#define west_C	 99
+#define foot_L_D	 100
+#define foot_R_D	 101
+#define foot_L_F	 102
+#define foot_R_F	 103
+#define foot_R_C	 104
+#define foot_R_E	 105
+#define foot_R_A	 106
+#define foot_R_B	 107
+#define chest_A	 108
+#define foot_L_A	 109
 
 /* xml_file/ieboss.xml */
-#define IEBOSS	 105
+#define IEBOSS	 110
 
 /* xml_file/iejiki.xml */
-#define IEJIKI	 106
+#define IEJIKI	 111
 
 /* xml_file/ietama.xml */
-#define IETAMA	 107
+#define IETAMA	 112
 
 /* xml_file/mcube.xml */
-#define MCUBE_BACK	 108
-#define MCUBE	 109
-#define BIGMCUBE	 110
-#define CUBE	 111
+#define MCUBE_BACK	 113
+#define MCUBE	 114
+#define BIGMCUBE	 115
+#define CUBE	 116
 
 /* xml_file/p_shot.xml */
-#define P_SHOT1	 112
+#define P_SHOT1	 117
 
 /* xml_file/panel_1024.xml */
-#define PANEL_1024	 113
+#define PANEL_1024	 118
 
 /* xml_file/panel_2048.xml */
-#define PANEL_2048	 114
+#define PANEL_2048	 119
 
 /* xml_file/panel_512.xml */
-#define PANEL_512	 115
+#define PANEL_512	 120
 
 /* xml_file/player.xml */
-#define BACK	 116
-#define BULEBULLET	 117
-#define E_PLANE	 118
-#define IDLE	 119
+#define BACK	 121
+#define BULEBULLET	 122
+#define E_PLANE	 123
+#define IDLE	 124
 
 /* xml_file/player1.xml */
-#define PLAYER	 120
-#define PLAYER_L	 121
-#define PLAYER_LL	 122
-#define PLAYER_R	 123
-#define PLAYER_RR	 124
+#define PLAYER	 125
+#define PLAYER_L	 126
+#define PLAYER_LL	 127
+#define PLAYER_R	 128
+#define PLAYER_RR	 129
 
 /* xml_file/sphere.xml */
-#define Sphere	 125
+#define Sphere	 130
 
 /* xml_file/sphere_big.xml */
-#define BigSphere	 126
+#define BigSphere	 131
+
+/* xml_file/title.xml */
+#define TITLE	 132
 
 /* xml_file/universe.xml */
-#define Earth	 127
-#define Moon	 128
+#define Earth	 133
+#define Moon	 134
 
 /* Number of Scene */
-#define SGLIST_LENGTH 129
+#define SGLIST_LENGTH 135
 
 /* Scene Table */
 extern const char *sglist_table[SGLIST_LENGTH];
--- a/TaskManager/Test/test_render/viewer.cpp	Fri Jul 17 22:58:28 2009 +0900
+++ b/TaskManager/Test/test_render/viewer.cpp	Fri Jul 17 23:02:07 2009 +0900
@@ -97,7 +97,6 @@
 extern void boss1_init(int w, int h);
 extern void init_gaplant(int w, int h);
 extern void vacuum_init2(int w, int h);
-extern void init_miku(int w, int h);
 
 void
 Viewer::run_init(const char *xml, int sg_number)
@@ -155,9 +154,6 @@
     case 15:
 	vacuum_init2(this->width, this->height);
 	break;
-    case 16:
-	init_miku(this->width, this->height);
-	break;
     default:
 	node_init();
 	break;