changeset 13:806d978e7d99

merge.
author koba <koba@cr.ie.u-ryukyu.ac.jp>
date Thu, 16 Dec 2010 15:25:31 +0900
parents 56d9dabb6630 (diff) 8a614bb55d00 (current diff)
children c7e7971a76d0
files
diffstat 4 files changed, 56 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ppe/SimpleState.cc	Thu Dec 16 15:25:31 2010 +0900
@@ -0,0 +1,15 @@
+#include "SimpleState.h"
+#include "Character_state.h"
+#include "tobject.h"
+
+SchedDefineTask(SimpleState);
+
+static int
+run(SchedTask *smanager, void *rbuf, void *wbuf)
+{
+    CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
+    p = (*p->state)(p);
+    
+    smanager->swap();
+    return 0;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ppe/SimpleState.h	Thu Dec 16 15:25:31 2010 +0900
@@ -0,0 +1,8 @@
+#ifndef INCLUDE_SIMPLE_STATE
+#define INCLUDE_SIMPLE_STATE
+
+#ifndef INCLUDED_SCHED_TASK
+#include "SchedTask.h"
+#endif
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/state_task.cc	Thu Dec 16 15:25:31 2010 +0900
@@ -0,0 +1,32 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <SDL.h>
+#include "SDL_opengl.h"
+#include "object.h"
+#include "Character.h"
+#include "Character_state.h"
+#include "tokuten.h"
+#include "collision.h"
+#include "bom.h"
+#include "count2.h"
+#include "sgoex.h"
+#include "TaskManager.h"
+#include "Func.h"
+#include "property.h"
+#include "state_task.h"
+
+extern TaskManager *tmanager;
+
+void
+SimpleStateTask(CHARACTER *p)
+{
+//    CHARACTER *one = new CHARACTER;
+    HTaskPtr state_task = tmanager->create_task(SIMPLE_STATE);
+
+//    one = p;
+    state_task->add_inData(p, sizeof(CHARACTER));
+    state_task->add_outData(p, sizeof(CHARACTER));
+
+    state_task->set_cpu(SPE_ANY);
+    state_task->spawn();
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/state_task.h	Thu Dec 16 15:25:31 2010 +0900
@@ -0,0 +1,1 @@
+void SimpleStateTask(CHARACTER *p);