Mercurial > hg > Game > Cerium

changeset 365:fafed60e2fca draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
modify types.h
author aaa
date Fri, 24 Jul 2009 18:08:43 +0900
parents fd0c819bab53
children 0251d06467de
files TaskManager/Test/test_render/SGList.cpp TaskManager/Test/test_render/SGList.h include/TaskManager/CellDmaManager.h include/TaskManager/types.h
diffstat 4 files changed, 39 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/TaskManager/Test/test_render/SGList.cpp	Fri Jul 24 17:40:53 2009 +0900
+++ b/TaskManager/Test/test_render/SGList.cpp	Fri Jul 24 18:08:43 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", "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"
+    "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", "arm", "skirt", "leg", "hand", "right_eye", "left_eye", "twin_tail", "hair_band", "hair", "body", "P_SHOT1", "PANEL_1024", "PANEL_2048", "PANEL_512", "BACK", "BULEBULLET", "E_PLANE", "IDLE", "PLAYER", "PLAYER_L", "PLAYER_LL", "PLAYER_R", "PLAYER_RR", "Sphere", "BigSphere", "Cube", "TITLE", "Earth", "Moon"
 };
--- a/TaskManager/Test/test_render/SGList.h	Fri Jul 24 17:40:53 2009 +0900
+++ b/TaskManager/Test/test_render/SGList.h	Fri Jul 24 18:08:43 2009 +0900
@@ -150,46 +150,61 @@
 #define BIGMCUBE	 115
 #define CUBE	 116
 
+/* xml_file/nendoLoid.xml */
+#define arm	 117
+#define skirt	 118
+#define leg	 119
+#define hand	 120
+#define right_eye	 121
+#define left_eye	 122
+#define twin_tail	 123
+#define hair_band	 124
+#define hair	 125
+#define body	 126
+
 /* xml_file/p_shot.xml */
-#define P_SHOT1	 117
+#define P_SHOT1	 127
 
 /* xml_file/panel_1024.xml */
-#define PANEL_1024	 118
+#define PANEL_1024	 128
 
 /* xml_file/panel_2048.xml */
-#define PANEL_2048	 119
+#define PANEL_2048	 129
 
 /* xml_file/panel_512.xml */
-#define PANEL_512	 120
+#define PANEL_512	 130
 
 /* xml_file/player.xml */
-#define BACK	 121
-#define BULEBULLET	 122
-#define E_PLANE	 123
-#define IDLE	 124
+#define BACK	 131
+#define BULEBULLET	 132
+#define E_PLANE	 133
+#define IDLE	 134
 
 /* xml_file/player1.xml */
-#define PLAYER	 125
-#define PLAYER_L	 126
-#define PLAYER_LL	 127
-#define PLAYER_R	 128
-#define PLAYER_RR	 129
+#define PLAYER	 135
+#define PLAYER_L	 136
+#define PLAYER_LL	 137
+#define PLAYER_R	 138
+#define PLAYER_RR	 139
 
 /* xml_file/sphere.xml */
-#define Sphere	 130
+#define Sphere	 140
 
 /* xml_file/sphere_big.xml */
-#define BigSphere	 131
+#define BigSphere	 141
+
+/* xml_file/test_eye.xml */
+#define Cube	 142
 
 /* xml_file/title.xml */
-#define TITLE	 132
+#define TITLE	 143
 
 /* xml_file/universe.xml */
-#define Earth	 133
-#define Moon	 134
+#define Earth	 144
+#define Moon	 145
 
 /* Number of Scene */
-#define SGLIST_LENGTH 135
+#define SGLIST_LENGTH 146
 
 /* Scene Table */
 extern const char *sglist_table[SGLIST_LENGTH];
--- a/include/TaskManager/CellDmaManager.h	Fri Jul 24 17:40:53 2009 +0900
+++ b/include/TaskManager/CellDmaManager.h	Fri Jul 24 18:08:43 2009 +0900
@@ -23,7 +23,7 @@
 
     /* functions */
     void dma_load(void *buf, memaddr addr, uint32 size, uint32 mask);
-    void dma_store(void *buf,memaddr addr, uint32 size, uint32 mask);
+    void dma_store(void *buf, memaddr addr, uint32 size, uint32 mask);
     void dma_wait(uint32 mask) ;
     void start_dmawait_profile();
     void end_dmawait_profile();
--- a/include/TaskManager/types.h	Fri Jul 24 17:40:53 2009 +0900
+++ b/include/TaskManager/types.h	Fri Jul 24 18:08:43 2009 +0900
@@ -6,12 +6,12 @@
 typedef uint32_t uint32;
 typedef uint64_t uint64;
 #ifdef SPU
-typedef memaddr  uint64;
+typedef uint64_t memaddr;
 #else
 #if (sizeof (void*) == 8)
-typedef memaddr  uint64;
+typedef uint64_t memaddr;
 #else
-typedef memaddr  uint32;
+typedef uint32_t memaddr;
 #endif
 #endif