Mercurial > hg > Members > kono > Cerium

changeset 300:0691f38195f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove TaskManager/Fifo/MainScheduler.o TaskManeger/Test/test_render/test_nogl
author tkaito@localhost.localdomain
date Sun, 07 Jun 2009 17:44:08 +0900
parents 56f81a4335ea
children bcb81858aa62
files TaskManager/Cell/CellTaskManagerImpl.cc TaskManager/Cell/spe/Scheduler.cc TaskManager/Fifo/MainScheduler.o TaskManager/Test/test_render/SGList.cpp TaskManager/Test/test_render/SGList.h TaskManager/Test/test_render/test_nogl example/many_task/Makefile.def
diffstat 7 files changed, 20 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/TaskManager/Cell/CellTaskManagerImpl.cc	Sun Jun 07 15:20:10 2009 +0900
+++ b/TaskManager/Cell/CellTaskManagerImpl.cc	Sun Jun 07 17:44:08 2009 +0900
@@ -221,7 +221,7 @@
 		     * ここでは TaskList を allocate(new) して登録してやろうか
 		     */
 
-		    speThreads->add_output_tasklist(command, (void*)alloc_info[1], alloc_size);
+		    speThreads->add_output_tasklist(command, alloc_info[1], alloc_size);
 
 		    speThreads->send_mail(id, 2, alloc_info);
 		} else if (data > MY_SPE_NOP) {
--- a/TaskManager/Cell/spe/Scheduler.cc	Sun Jun 07 15:20:10 2009 +0900
+++ b/TaskManager/Cell/spe/Scheduler.cc	Sun Jun 07 17:44:08 2009 +0900
@@ -11,6 +11,9 @@
     delete connector;
 }
 
+/*! @brief speTaskの入出力のパイプラインバッファを確保する
+ */
+
 void
 Scheduler::init(void)
 {
Binary file TaskManager/Fifo/MainScheduler.o has changed
--- a/TaskManager/Test/test_render/SGList.cpp	Sun Jun 07 15:20:10 2009 +0900
+++ b/TaskManager/Test/test_render/SGList.cpp	Sun Jun 07 17:44:08 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", "IEBOSS", "IEJIKI", "IETAMA", "MCUBE_BACK", "MCUBE", "BIGMCUBE", "CUBE", "P_SHOT1", "PANEL_1024", "PANEL_2048", "PANEL_512", "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", "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"
 };
--- a/TaskManager/Test/test_render/SGList.h	Sun Jun 07 15:20:10 2009 +0900
+++ b/TaskManager/Test/test_render/SGList.h	Sun Jun 07 17:44:08 2009 +0900
@@ -77,26 +77,27 @@
 #define PANEL_512	 40
 
 /* xml_file/player.xml */
-#define PLAYER	 41
-#define PLAYER_L	 42
-#define PLAYER_LL	 43
-#define PLAYER_R	 44
-#define PLAYER_RR	 45
+#define BACK	 41
+#define BULEBULLET	 42
+#define E_PLANE	 43
+#define IDLE	 44
+
+/* xml_file/player1.xml */
+#define PLAYER	 45
+#define PLAYER_L	 46
+#define PLAYER_LL	 47
+#define PLAYER_R	 48
+#define PLAYER_RR	 49
 
 /* xml_file/sphere.xml */
-#define Sphere	 46
+#define Sphere	 50
 
 /* xml_file/sphere_big.xml */
-#define BigSphere	 47
+#define BigSphere	 51
 
 /* xml_file/universe.xml */
-#define Earth	 48
-#define Moon	 49
-
-#define BACK 50
-#define BULEBULLET 51
-#define E_PLANE 52
-#define IDLE 53
+#define Earth	 52
+#define Moon	 53
 
 /* Number of Scene */
 #define SGLIST_LENGTH 54
Binary file TaskManager/Test/test_render/test_nogl has changed
--- a/example/many_task/Makefile.def	Sun Jun 07 15:20:10 2009 +0900
+++ b/example/many_task/Makefile.def	Sun Jun 07 17:44:08 2009 +0900
@@ -4,10 +4,6 @@
 # ex  macosx
 #CERIUM = /Users/gongo/Source/Concurrency/Game_project/Cerium
 
-<<<<<<< /home/teacher/kono/src/Cerium/example/many_task/Makefile.def
-# ex  linux/ps3
-CERIUM = ../../../Cerium
-=======
 # ex: linux/ps3
 CERIUM = ../../../Cerium
 
@@ -16,4 +12,3 @@
 
 INCLUDE = -I${CERIUM}/include/TaskManager -I. -I..
 LIBS = -L${CERIUM}/TaskManager
->>>>>>> /tmp/Makefile.def~other.2eIJvO