チェンジセット 638:f0e586985b62

コミット日時:

2007/09/17 23:26:27 (1 年前)

コミッタ:

Issei Suzuki <issei@issei.org>

branch:

default

ログメッセージ:

ICO 初期設定用スクリプト組み込み

ファイル:

• GameObj.vcproj (更新) (4 diffs)
• data/polyinfo.ptxt (更新) (1 diff)
• data/resource.txt (更新) (1 diff)
• ico/TaskIco.cpp (更新) (10 diffs)
• scr/Makefile (更新) (2 diffs)
• scr/cscript/cscript.sch (更新) (1 diff)
• scr/cscript/ico.sch (追加)
• scr/ico/ico_app.scs (追加)
• scr/scrsys.mak (更新) (2 diffs)
• scr/sys/scr_ico_app.cc (追加)
• scr/sys/scr_ico_app.h (追加)

GameObj.vcproj

@@ -1039 +1039 @@
-            </File>
-            <File
+                RelativePath=".\tool\src\icodata\polyinfo.h"
+                >
+            </File>
+            <File
-                RelativePath=".\Project.h"
-                >
@@ -1115 +1119 @@
-                >
-                <File
-                    RelativePath=".\tool\src\icodata\polyinfo.h"
-                    >
-                </File>
-                <File
-                    RelativePath=".\scr\sys\vm_sys_vm.h"
-                    >
@@ -1143 +1143 @@
-                >
-                <File
+                    RelativePath=".\scr\sys\scr_ico_app.h"
+                    >
+                </File>
+                <File
-                    RelativePath=".\ico\TaskIco.h"
-                    >
@@ -1150 +1154 @@
-                Name="Source Files"
-                >
+                <File
+                    RelativePath=".\scr\sys\scr_ico_app.cc"
+                    >
+                </File>
-                <File
-                    RelativePath=".\ico\TaskIco.cpp"

data/polyinfo.ptxt

@@ +1 @@
+scr/ico/ico_app.scb
-res/ico/a03
-res/ico/a04

data/resource.txt

@@ -11 +11 @@
-scr/test/for.scb
-# ico
+scr/ico/ico_app.scb
-res/ico/a03
-res/ico/a04

ico/TaskIco.cpp

@@ -33 +33 @@
-#include "PackfileManager.h"
-#include "PackfileHandle.h"
+#pragma warning(push)
+// 4200:サイズ0の配列
+// 4819:現在のコードページで表示できない文字を含んでいる
+#pragma warning(disable : 4200 4819)
+#include "CScriptVM/vm_loader.h"
+#include "CScriptVM/vm.h"
+#pragma warning(pop)
+#include "scr/sys/scr_ico_app.h"
-#include "../tool/src/icodata/polyinfo.h"
-#include "data/polyinfo.packh"
-
-// TODO デバイス消失時に頂点バッファを作り直す
-
-ANON_NAMESPACE_BEGIN
-
-class TaskIco;
-
+/*!
+    TaskIco 階層型状態遷移用シグナル
+ */
-class Event
-    : public HsmEventBase<TaskIco, Event>
@@ -65 +74 @@
-
-
+/*!
+    ICO for Win32 メインタスク
+ */
-class TaskIco
-    : public ITask
-    , public ID3DRes
+    , public CScript::ISyscallIcoApp
-    , public D3DResBase<TaskIco>
-    , public HsmBase<TaskIco, Event>
-{
-public:
+    typedef CScript::vm_float_t vm_float_t;
+
-    TaskIco();
-    virtual ~TaskIco();
@@ -84 +99 @@
-    virtual void onResetDevice();
-
+    // ISyscallIcoApp
+    virtual void scr_icoSetColor(vm_float_t r, vm_float_t g, vm_float_t b);
+    virtual void scr_icoSetRotSpeed(vm_float_t avec);
+
-private:
+    // 頂点バッファ
-    struct CUSTOMVERTEX
-    {
@@ -94 +114 @@
-    PackfileHandle<MEM_SEG_ICO> m_pack;
-    int m_load_count;
+    D3DCOLORVALUE m_color;
+    FLOAT m_angle_vel;
-    PolyVertList const* m_pPoly;
-    CComPtr<IDirect3DVertexBuffer9> m_spVtxBuf;
-    FLOAT m_fAngle;
-
+    void _initConfig();
-    bool _initModel();
-    void _releaseModel();
@@ -117 +140 @@
-    : HsmBase<TaskIco, Event>(&TaskIco::_stateLoad)
-    , m_load_count(0)
+    , m_angle_vel(0.0f)
-    , m_pPoly(NULL)
-    , m_fAngle(0.0f)
-{
-    initHsm();
+    m_color.r = m_color.g = m_color.b = m_color.a = 1.0f;
-}
-
-TaskIco::~TaskIco()
-{}
+
+void TaskIco::scr_icoSetColor(vm_float_t r, vm_float_t g, vm_float_t b)
+{
+    dbAbortRange(r, 0.0f, 1.0f, _T("color out of range [0.0f, 1.0f]"));
+    dbAbortRange(g, 0.0f, 1.0f, _T("color out of range [0.0f, 1.0f]"));
+    dbAbortRange(b, 0.0f, 1.0f, _T("color out of range [0.0f, 1.0f]"));
+
+    m_color.r = r;
+    m_color.g = g;
+    m_color.b = b;
+    m_color.a = 1.0f;
+}
+
+void TaskIco::scr_icoSetRotSpeed(vm_float_t avel)
+{
+    m_angle_vel = avel;
+}
-
-void TaskIco::exec(ICtxTask& /*ctx*/, TASK_PRIO_TYPE /*prio*/)
@@ -148 +190 @@
-}
-
+void TaskIco::_initConfig()
+{
+    void const* scb = NULL;
+    m_pack.getRes(&scb, SCR_ICO_ICO_APP_SCB);
+
+    CScript::VirtualMachine vm;
+    vm.setScrArgH(0, this);
+    vm.setByteCode(scb, m_pack.getResSize(SCR_ICO_ICO_APP_SCB));
+    vm.run();
+    dbAbort(vm.getState() == CScript::VirtualMachine::STATE_HALT, _T("script runtime error : %d"), vm.getState());
+}
+
-bool TaskIco::_initModel()
-{
-    PolyVertList const* pPoly = NULL;
-1
+2
-
-    CComPtr<IDirect3DVertexBuffer9> spVtxBuf;
@@ -181 +235 @@
-    m_pPoly = NULL;
-    m_spVtxBuf.Release();
-
-}
-
@@ -231 +284 @@
-    D3DMATERIAL9 mtrl;
-    ::ZeroMemory(&mtrl, sizeof(mtrl));
-
-
-
-
+
-    g_d3ddev.SetMaterial(&mtrl);
-
@@ -282 +332 @@
-    case Event::NSIG_ENTER:
-    case Event::NSIG_RESET_DEVICE:
+        _initConfig();
-        _initModel();
-        return 0;
@@ -293 +344 @@
-            HSM_TRAN(&TaskIco::_stateTerm);
-
-D3DX_PI
+m_angle_vel
-        if ((padGetRep() & (PAD_SE | PAD_ST)) == (PAD_SE | PAD_ST))
-            HSM_TRAN(&TaskIco::_stateTerm);

scr/Makefile

@@ -1 +1 @@
-# Makefile
-
-
+ ico icoclean
-
-TOP=..
-include $(TOP)/scr/scrcfg.mak
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-sys:
@@ -15 +25 @@
-
-test:
-MAKE) -C test -f ../scrmak.mak TOP=../.. all
+scr-make-target)
-
-testclean:
-
+
+
+
+
+
+
+
+

scr/cscript/cscript.sch

@@ -63 +63 @@
-#define CSCR_VM_SYSNO_SYSFUNC_TEST_BEGIN        CSCR_VM_SYSNO_SYSFUNC_USER_BEGIN
-#define CSCR_VM_SYSNO_SYSFUNC_TEST_COUNT        (32)
-
+
+
+
+
+
-
-#endif // CSCRIPT_CSCRIPT_SCH__INCLUDED

scr/scrsys.mak

@@ -6 +6 @@
-include $(TOP)/scr/scrcfg.mak
-
-
-
+
+
+
+
+
-
-vm_sys_vm.h: vm_sys_d.cc
@@ -15 +18 @@
-
-scr_stdfunc.cc: $(SCRDIR)/cscript/stdfunc.sch
-
+
+
+
+
+
+
-
-clean:
-
+ scr_ico_app.cc scr_ico_app.h
-
-