Commit: 56587fff6abc9f8ab8dca02d23d5ff800b86df3d - MyMain01 (git)

Violet Vreath is Shooter Game for Windows XP+(個人制作シューティングゲーム)

Commit MetaInfo

• Révision: 56587fff6abc9f8ab8dca02d23d5ff800b86df3d (tree)
• l'heure: 2020-03-17 00:13:00
• Auteur: gecchi <gecchi@XPS8...>
• Commiter: gecchi

Message de Log

Puppeteer改造中

Change Summary

• modified: GgafCore/GgafCore.vcxproj
• modified: GgafCore/GgafCore_VC14.vcxproj
• modified: GgafCore/GgafCore_VC14.vcxproj.filters
• modified: GgafCore/include/GgafCommonHeader.h
• add: GgafCore/include/jp/ggaf/core/util/TransitionValue.hpp
• delete: GgafCore/include/jp/ggaf/core/util/{ValueAccelerator.hpp => AccelerationValue.hpp}
• modified: GgafDx/include/jp/ggaf/dx/actor/supporter/KagoAssistantA.h
• modified: GgafDx/include/jp/ggaf/dx/actor/supporter/MorpherAssistantA.hpp
• modified: GgafDx/include/jp/ggaf/dx/actor/supporter/Puppeteer.h
• modified: GgafDx/include/jp/ggaf/dx/actor/supporter/RikishaFaceAngAssistant.h
• modified: GgafDx/include/jp/ggaf/dx/actor/supporter/RikishaMvAngAssistant.h
• modified: GgafDx/include/jp/ggaf/dx/actor/supporter/RikishaMvAssistant.h
• modified: GgafDx/include/jp/ggaf/dx/model/SkinAniMeshModel.h
• modified: GgafDx/src/jp/ggaf/dx/actor/SkinAniMeshActor.cpp
• modified: GgafDx/src/jp/ggaf/dx/actor/supporter/KagoAssistantA.cpp
• modified: GgafDx/src/jp/ggaf/dx/actor/supporter/Puppeteer.cpp
• modified: GgafDx/src/jp/ggaf/dx/actor/supporter/RikishaFaceAngAssistant.cpp
• modified: GgafDx/src/jp/ggaf/dx/actor/supporter/RikishaMvAngAssistant.cpp
• modified: GgafDx/src/jp/ggaf/dx/actor/supporter/RikishaMvAssistant.cpp
• modified: GgafDx/src/jp/ggaf/dx/model/SkinAniMeshModel.cpp
• modified: VioletVreath/Version.h

Modification

--- a/GgafCore/GgafCore.vcxproj
+++ b/GgafCore/GgafCore.vcxproj
@@ -81,6 +81,7 @@
     <ClInclude Include="include\jp\ggaf\core\scene\mainscene.h" />
     <ClInclude Include="include\jp\ggaf\core\scene\scene.h" />
     <ClInclude Include="include\jp\ggaf\core\scene\spacetime.h" />
+    <ClInclude Include="include\jp\ggaf\core\util\AccelerationValue.hpp" />
     <ClInclude Include="include\jp\ggaf\core\util\CmRandomNumberGenerator.h" />
     <ClInclude Include="include\jp\ggaf\core\util\curtain.hpp" />
     <ClInclude Include="include\jp\ggaf\core\util\DetectMemoryLeaks.h" />
@@ -96,6 +97,7 @@
     <ClInclude Include="include\jp\ggaf\core\util\rgb.h" />
     <ClInclude Include="include\jp\ggaf\core\util\status.h" />
     <ClInclude Include="include\jp\ggaf\core\util\table.h" />
+    <ClInclude Include="include\jp\ggaf\core\util\TransitionValue.hpp" />
     <ClInclude Include="include\jp\ggaf\core\util\treeelem.hpp" />
     <ClInclude Include="include\jp\ggaf\core\util\treespace.hpp" />
     <ClInclude Include="include\jp\ggaf\core\util\util.h" />

--- a/GgafCore/GgafCore_VC14.vcxproj
+++ b/GgafCore/GgafCore_VC14.vcxproj
@@ -62,6 +62,7 @@
     <ClInclude Include="include\jp\ggaf\core\scene\MainScene.h" />
     <ClInclude Include="include\jp\ggaf\core\scene\Scene.h" />
     <ClInclude Include="include\jp\ggaf\core\scene\Spacetime.h" />
+    <ClInclude Include="include\jp\ggaf\core\util\AccelerationValue.hpp" />
     <ClInclude Include="include\jp\ggaf\core\util\CmRandomNumberGenerator.h" />
     <ClInclude Include="include\jp\ggaf\core\util\Curtain.hpp" />
     <ClInclude Include="include\jp\ggaf\core\util\DetectMemoryLeaks.h" />
@@ -77,6 +78,7 @@
     <ClInclude Include="include\jp\ggaf\core\util\Rgb.h" />
     <ClInclude Include="include\jp\ggaf\core\util\Status.h" />
     <ClInclude Include="include\jp\ggaf\core\util\Table.h" />
+    <ClInclude Include="include\jp\ggaf\core\util\TransitionValue.hpp" />
     <ClInclude Include="include\jp\ggaf\core\util\TreeElem.hpp" />
     <ClInclude Include="include\jp\ggaf\core\util\TreeSpace.hpp" />
     <ClInclude Include="include\jp\ggaf\core\util\Util.h" />

--- a/GgafCore/GgafCore_VC14.vcxproj.filters
+++ b/GgafCore/GgafCore_VC14.vcxproj.filters
@@ -159,6 +159,12 @@
     <ClInclude Include="include\jp\ggaf\core\util\ValueTransitioner.hpp">
       <Filter>ヘッダー ファイル</Filter>
     </ClInclude>
+    <ClInclude Include="include\jp\ggaf\core\util\AccelerationValue.hpp">
+      <Filter>ヘッダー ファイル</Filter>
+    </ClInclude>
+    <ClInclude Include="include\jp\ggaf\core\util\TransitionValue.hpp">
+      <Filter>ヘッダー ファイル</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\jp\ggaf\core\actor\ex\ActorDepository.cpp">

--- a/GgafCore/include/GgafCommonHeader.h
+++ b/GgafCore/include/GgafCommonHeader.h
@@ -378,7 +378,7 @@ template<class T>
 class LinkedListRing;
 
 template<class VAL_TYPE>
-class ValueAccelerator;
+class AccelerationValue;
 
 template<class VAL_TYPE, int N>
 class ValueTransitioner;

--- a/GgafCore/include/jp/ggaf/core/util/ValueAccelerator.hpp
+++ b/GgafCore/include/jp/ggaf/core/util/AccelerationValue.hpp
@@ -16,7 +16,7 @@ namespace GgafCore {
  * @author Masatoshi Tsuge
  */
 template<class VAL_TYPE>
-class ValueAccelerator : public Object {
+class AccelerationValue : public Object {
 
 private:
     enum {
@@ -74,7 +74,7 @@ public:
     VAL_TYPE _t_acce;
 
 public:
-    ValueAccelerator() {
+    AccelerationValue() {
         _is_accelerating = false;
         _zero_acc_end_flg = true;
         _top_velo = 0;
@@ -759,7 +759,7 @@ public:
 #endif
     }
 
-    virtual ~ValueAccelerator() {
+    virtual ~AccelerationValue() {
     }
 };
 

--- /dev/null
+++ b/GgafCore/include/jp/ggaf/core/util/TransitionValue.hpp
@@ -0,0 +1,66 @@
+#ifndef GGAF_CORE_TRANSITIONVALUE_H_
+#define GGAF_CORE_TRANSITIONVALUE_H_
+#include "GgafCommonHeader.h"
+#include "jp/ggaf/core/util/ValueTransitioner.hpp"
+
+#include "jp/ggaf/core/util/Util.h"
+
+namespace GgafCore {
+
+/**
+ * 値の遷移ヘルパー .
+ * 終に念願の共通化。
+ * @tparam VAL_TYPE 遷移値のデータ型
+ * @tparam N インデックス(軸等)の数
+ * @version 1.00
+ * @since 2014/02/19
+ * @author Masatoshi Tsuge
+ */
+template<class VAL_TYPE>
+class TransitionValue : public ValueTransitioner<VAL_TYPE, 1> {
+public:
+    VAL_TYPE _value;
+public:
+    /**
+     * コンストラクタ<BR>
+     */
+    TransitionValue() : ValueTransitioner<VAL_TYPE, 1>() {
+        _value = (VAL_TYPE)0;
+    }
+
+    /**
+     * 値を取得する（要実装） .
+     * @param idx インデックス
+     * @return 値
+     */
+    virtual VAL_TYPE getValue(int idx) override {
+        return _value;
+    }
+
+    virtual VAL_TYPE getValue() {
+        return _value;
+    }
+
+    /**
+     * 値を設定する（要実装） .
+     * @param idx インデックス
+     * @param value 値
+     */
+    virtual void setValue(int idx, VAL_TYPE value) override {
+        _value = value;
+    }
+
+    virtual void setValue(VAL_TYPE value) {
+        _value = value;
+    }
+
+public:
+
+    virtual ~TransitionValue() {
+    }
+};
+
+}
+
+#endif /*GGAF_CORE_TRANSITIONVALUE_H_*/
+

--- a/GgafDx/include/jp/ggaf/dx/actor/supporter/KagoAssistantA.h
+++ b/GgafDx/include/jp/ggaf/dx/actor/supporter/KagoAssistantA.h
@@ -2,7 +2,7 @@
 #define GGAF_DX_KAGOASSISTANT_H_
 #include "GgafDxCommonHeader.h"
 #include "jp/ggaf/core/Object.h"
-#include "jp/ggaf/core/util/ValueAccelerator.hpp"
+#include "jp/ggaf/core/util/AccelerationValue.hpp"
 #include "jp/ggaf/dx/actor/GeometricActor.h"
 
 namespace GgafDx {
@@ -21,11 +21,11 @@ private:
     /** [r]師匠 */
     Kago* _pMaster;
     /** X軸方向加速装置 */
-    GgafCore::ValueAccelerator<coord> _smthVxMv;
+    GgafCore::AccelerationValue<coord> _smthVxMv;
     /** Y軸方向加速装置 */
-    GgafCore::ValueAccelerator<coord> _smthVyMv;
+    GgafCore::AccelerationValue<coord> _smthVyMv;
     /** Z軸方向加速装置 */
-    GgafCore::ValueAccelerator<coord> _smthVzMv;
+    GgafCore::AccelerationValue<coord> _smthVzMv;
 
     virtual void behave();
 

--- a/GgafDx/include/jp/ggaf/dx/actor/supporter/MorpherAssistantA.hpp
+++ b/GgafDx/include/jp/ggaf/dx/actor/supporter/MorpherAssistantA.hpp
@@ -2,7 +2,7 @@
 #define GGAF_DX_MORPHERASSISTANT_H_
 #include "GgafDxCommonHeader.h"
 #include "jp/ggaf/core/Object.h"
-#include "jp/ggaf/core/util/ValueAccelerator.hpp"
+#include "jp/ggaf/core/util/AccelerationValue.hpp"
 
 namespace GgafDx {
 
@@ -25,7 +25,7 @@ private:
     /** [r]師匠 */
     Morpher<T>* _pMaster;
     /** [r]重み加速器 */
-    GgafCore::ValueAccelerator<float>* _pa_smthMph;
+    GgafCore::AccelerationValue<float>* _pa_smthMph;
     /** [r]モーフターゲット数(利用頻度が高いので、モデルからコピーして保持) */
     int _target_num;
 
@@ -130,7 +130,7 @@ MorpherAssistantA<T>::MorpherAssistantA(Morpher<T>* prm_pMaster) : GgafCore::Obj
         _pMaster(prm_pMaster) {
     _target_num = prm_pMaster->_pActor->_pMorphMeshModel->_morph_target_num;
 
-    _pa_smthMph = NEW GgafCore::ValueAccelerator<float>[_target_num+1];
+    _pa_smthMph = NEW GgafCore::AccelerationValue<float>[_target_num+1];
     for (int i = 1; i <= _target_num; i++) {
         _pa_smthMph[i]._t_velo = _pMaster->_velo[i];
         _pa_smthMph[i]._t_acce = _pMaster->_acce[i];
@@ -139,7 +139,7 @@ MorpherAssistantA<T>::MorpherAssistantA(Morpher<T>* prm_pMaster) : GgafCore::Obj
 
 template<class T>
 void MorpherAssistantA<T>::behave() {
-    GgafCore::ValueAccelerator<float>* pSmthMph = _pa_smthMph;
+    GgafCore::AccelerationValue<float>* pSmthMph = _pa_smthMph;
     GgafCore::ValueTransitioner<float, (MAX_MORPH_TARGET+1)>::Parameter* p = _pMaster->_parameter;
     for (int i = 1; i <= _target_num; i++) {
         if (pSmthMph->isAccelerating()) {

--- a/GgafDx/include/jp/ggaf/dx/actor/supporter/Puppeteer.h
+++ b/GgafDx/include/jp/ggaf/dx/actor/supporter/Puppeteer.h
@@ -3,6 +3,7 @@
 #include "GgafDxCommonHeader.h"
 #include "jp/ggaf/core/Object.h"
 #include "jp/ggaf/dx/exception/CriticalException.h"
+#include "jp/ggaf/core/util/AccelerationValue.hpp"
 #include <vector>
 #include <d3dx9.h>
 #include <d3dx9anim.h>
@@ -38,7 +39,7 @@ class Puppeteer : public GgafCore::Object {
 private:
     /** [r]パペットのアニメーションコントローラー */
     ID3DXAnimationController* _pAc;
-    FLOAT _track_speed;
+//    FLOAT _track_speed;
     /**
      * 芸(モーション) .
      */
@@ -51,13 +52,13 @@ private:
         /** １ループの時間 */
         frame _one_loop_frames;
         /** ローカルタイム */
-        double _local_time;
-        double _local_time_inc;
+        GgafCore::AccelerationValue<double> _local_time;
+//        double _local_time_inc;
         /** 目標ループ回数(1.5回などの指定も可能) */
         double _target_loop;
 
         double _loop_count;
-        double _weight;
+        GgafCore::AccelerationValue<double> _weight;
         /** ループ方法 */
         PuppeteerMethod _method;
     public:
@@ -90,7 +91,7 @@ public:
      * @param prm_pPuppet 操られる者
      * @return
      */
-    explicit Puppeteer(ID3DXAnimationController* prm_pAc_cloned,  FLOAT prm_track_speed = 60.0f / 4800.0f);
+    explicit Puppeteer(ID3DXAnimationController* prm_pAc_cloned);
 
 //    void restore(ID3DXAnimationController* prm_pAc_cloned);
 

--- a/GgafDx/include/jp/ggaf/dx/actor/supporter/RikishaFaceAngAssistant.h
+++ b/GgafDx/include/jp/ggaf/dx/actor/supporter/RikishaFaceAngAssistant.h
@@ -3,7 +3,7 @@
 #include "GgafDxCommonHeader.h"
 
 #include "jp/ggaf/core/Object.h"
-#include "jp/ggaf/core/util/ValueAccelerator.hpp"
+#include "jp/ggaf/core/util/AccelerationValue.hpp"
 
 namespace GgafDx {
 
@@ -33,7 +33,7 @@ private:
 
     /** [r]師匠 */
     Rikisha* const _pMaster;
-    GgafCore::ValueAccelerator<int> _smthFaceAng[3];
+    GgafCore::AccelerationValue<int> _smthFaceAng[3];
     /** ツイスト情報 */
     Twist _tw[3];
 

--- a/GgafDx/include/jp/ggaf/dx/actor/supporter/RikishaMvAngAssistant.h
+++ b/GgafDx/include/jp/ggaf/dx/actor/supporter/RikishaMvAngAssistant.h
@@ -2,7 +2,7 @@
 #define GGAF_DX_RIKISHAMVANGASSISTANT_H_
 #include "GgafDxCommonHeader.h"
 #include "jp/ggaf/core/Object.h"
-#include "jp/ggaf/core/util/ValueAccelerator.hpp"
+#include "jp/ggaf/core/util/AccelerationValue.hpp"
 
 namespace GgafDx {
 
@@ -36,8 +36,8 @@ private:
     Pendulum _pnd_ry;
     /** [r]師匠 */
     Rikisha* const _pMaster;
-    GgafCore::ValueAccelerator<int> _smthMvRzAng;
-    GgafCore::ValueAccelerator<int> _smthMvRyAng;
+    GgafCore::AccelerationValue<int> _smthMvRzAng;
+    GgafCore::AccelerationValue<int> _smthMvRyAng;
 
     /**
      * 力車の助手が振る舞う .

--- a/GgafDx/include/jp/ggaf/dx/actor/supporter/RikishaMvAssistant.h
+++ b/GgafDx/include/jp/ggaf/dx/actor/supporter/RikishaMvAssistant.h
@@ -2,7 +2,7 @@
 #define GGAF_DX_RIKISHAMVASSISTANT_H_
 #include "GgafDxCommonHeader.h"
 #include "jp/ggaf/core/Object.h"
-#include "jp/ggaf/core/util/ValueAccelerator.hpp"
+#include "jp/ggaf/core/util/AccelerationValue.hpp"
 
 namespace GgafDx {
 
@@ -19,7 +19,7 @@ class RikishaMvAssistant : public GgafCore::Object {
 private:
     /** [r]師匠 */
     Rikisha* const _pMaster;
-    GgafCore::ValueAccelerator<int> _smthMv;
+    GgafCore::AccelerationValue<int> _smthMv;
 
     /**
      * 力車の助手が振る舞う .

--- a/GgafDx/include/jp/ggaf/dx/model/SkinAniMeshModel.h
+++ b/GgafDx/include/jp/ggaf/dx/model/SkinAniMeshModel.h
@@ -108,7 +108,7 @@ public:
     /** [アニメーションセットインデックス][フレームインデックス] で アニメーションセットのアニメーション対象のフレームであるかどうかが返る */
     bool** _papaBool_AnimationSetIndex_BoneFrameIndex_is_act;
 
-    int _anim_ticks_per_second;
+//    int _anim_ticks_per_second;
     /** 60フレーム(1秒)で1ループする場合の1フレーム辺りの時間 */
 //    double _advance_time_per_frame0;//60フレーム(1秒)で1ループすることを標準設定とする。
 
@@ -126,7 +126,7 @@ public:
 
     ID3DXAnimationController* getCloneAnimationController();
 
-    static int getAnimTicksPerSecond(std::string& prm_xfile_name);
+//    static int getAnimTicksPerSecond(std::string& prm_xfile_name);
 
     /** フレームを巡って情報取得 */
     void setFrameInfo(SkinAniMeshFrame* prm_pFrame);

--- a/GgafDx/src/jp/ggaf/dx/actor/SkinAniMeshActor.cpp
+++ b/GgafDx/src/jp/ggaf/dx/actor/SkinAniMeshActor.cpp
@@ -33,8 +33,8 @@ _stackWorldMat() {
     defineRotMvWorldMatrix(UTIL::setWorldMatrix_RxRzRyMv); //デフォルトの回転×移動の変換行列
 
     ID3DXAnimationController* pAc_cloned = _pSkinAniMeshModel->getCloneAnimationController();
-    FLOAT track_speed = 60.0f / (FLOAT)(_pSkinAniMeshModel->_anim_ticks_per_second);
-    _pPuppeteer = NEW Puppeteer(pAc_cloned, track_speed);
+//    FLOAT track_speed = 60.0f / (FLOAT)(_pSkinAniMeshModel->_anim_ticks_per_second);
+    _pPuppeteer = NEW Puppeteer(pAc_cloned);
     SkinAniMeshFrame* pFrameRoot = _pSkinAniMeshModel->_pFrameRoot;
     _stackWorldMat.registerFrameTransformationMatrix(pFrameRoot);
 }

--- a/GgafDx/src/jp/ggaf/dx/actor/supporter/KagoAssistantA.cpp
+++ b/GgafDx/src/jp/ggaf/dx/actor/supporter/KagoAssistantA.cpp
@@ -1,6 +1,6 @@
 #include "jp/ggaf/dx/actor/supporter/KagoAssistantA.h"
 
-#include "jp/ggaf/core/util/ValueAccelerator.hpp"
+#include "jp/ggaf/core/util/AccelerationValue.hpp"
 #include "jp/ggaf/dx/actor/supporter/Kago.h"
 #include "jp/ggaf/dx/util/Util.h"
 

--- a/GgafDx/src/jp/ggaf/dx/actor/supporter/Puppeteer.cpp
+++ b/GgafDx/src/jp/ggaf/dx/actor/supporter/Puppeteer.cpp
@@ -11,12 +11,12 @@ Puppeteer::Performance::Performance() {
     _pAnimationSet = nullptr;
     _animation_set_index = 0;
     _one_loop_frames    = 60;
-    _local_time         = 0.0;
-    _local_time_inc     = 0.0;
+    _local_time._t_value = 0.0;
+//    _local_time_inc = 0.0;
     _target_loop        = -1;
     _loop_count         = 0;
     _period             = 1.0;
-    _weight             = 1.0;
+    _weight._t_value = 1.0;
     _method             = NO_CHENGE;
 }
 void Puppeteer::Performance::setAnimationSet(LPD3DXANIMATIONSET prm_pAnimationSet, UINT prm_animation_set_index) {
@@ -29,11 +29,11 @@ Puppeteer::Performance::~Performance() {
 
 
 
-Puppeteer::Puppeteer(ID3DXAnimationController* prm_pAc_cloned, FLOAT prm_track_speed) : GgafCore::Object() {
+Puppeteer::Puppeteer(ID3DXAnimationController* prm_pAc_cloned) : GgafCore::Object() {
     _num_perform = 0;
     _paPerformances = nullptr;
     _pAc = prm_pAc_cloned;
-    _track_speed = prm_track_speed;
+//    _track_speed = prm_track_speed;
     HRESULT hr;
     _num_perform = _pAc->GetMaxNumAnimationSets();
 #ifdef MY_DEBUG
@@ -133,8 +133,19 @@ void Puppeteer::play(PuppeteerStick prm_handed,
     }
     Performance* p = &(_paPerformances[prm_performance_no]);
     p->_one_loop_frames = prm_one_loop_frames;
-    p->_local_time = 0;
-    p->_local_time_inc =  p->_period / p->_one_loop_frames;
+//    p->_local_time._t_value = 0.0;
+//    p->_local_time_inc =  p->_period / p->_one_loop_frames;
+    p->_local_time.accelerateByDt(
+            p->_period,           //VAL_TYPE prm_target_value_distance,
+            p->_one_loop_frames, //frame prm_frame_of_target,
+            0.4, 0.6,            //double prm_p1, double prm_p2,
+            0.0,                  //VAL_TYPE prm_end_velo,
+            true                  //bool prm_zero_acc_end_flg
+    );
+
+
+
+
     p->_target_loop = prm_loopnum;
     p->_loop_count = 0;
     p->_method     = prm_method;
@@ -150,19 +161,25 @@ void Puppeteer::behave() {
             if (p->_method == NO_CHENGE) {
                 break;
             } else if (p->_method == PLAY_LOOPING) {
-                p->_local_time += (p->_local_time_inc);
-
-                //ループ完判定
-                if (p->_target_loop > 0 && p->_target_loop < ABS(p->_local_time) / p->_period) {
-                    if (p->_local_time > 0) {
-                        //理想値に補正
-                        p->_local_time = p->_target_loop * p->_period;
-                    } else {
-                        //理想値に補正
-                        p->_local_time = - (p->_target_loop * p->_period);
-                    }
-                    p->_method = NO_CHENGE;
+//                p->_local_time._t_value += (p->_local_time_inc);
+
+                if (p->_local_time.isAccelerating()) {
+                    p->_local_time.behave();
+                } else {
+                     p->_method = NO_CHENGE;
                 }
+
+//                //ループ完判定
+//                if (p->_target_loop > 0 && p->_target_loop < ABS(p->_local_time._t_value) / p->_period) {
+//                    if (p->_local_time._t_value > 0) {
+//                        //理想値に補正
+//                        p->_local_time._t_value = p->_target_loop * p->_period;
+//                    } else {
+//                        //理想値に補正
+//                        p->_local_time._t_value = - (p->_target_loop * p->_period);
+//                    }
+//                    p->_method = NO_CHENGE;
+//                }
             } else {
                 throwCriticalException("そんなメソッドはは未サポートです。 p->_method="<<p->_method);
             }
@@ -215,11 +232,11 @@ void Puppeteer::updateAnimationTrack() {
         if (pPerformance) {
             hr = pAc->SetTrackAnimationSet(tno, pPerformance->_pAnimationSet);
             checkDxException(hr, D3D_OK, "失敗しました。");
-            hr = pAc->SetTrackPosition(tno, pPerformance->_local_time);
+            hr = pAc->SetTrackPosition(tno, pPerformance->_local_time._t_value);
             checkDxException(hr, D3D_OK, "失敗しました。");
             hr = pAc->SetTrackSpeed(tno, pPerformance->_period);
             checkDxException(hr, D3D_OK, "失敗しました。");
-            hr = pAc->SetTrackWeight(tno, pPerformance->_weight);
+            hr = pAc->SetTrackWeight(tno, pPerformance->_weight._t_value);
             checkDxException(hr, D3D_OK, "失敗しました。");
             _paAs[tno] = pPerformance->_pAnimationSet;
         } else {

--- a/GgafDx/src/jp/ggaf/dx/actor/supporter/RikishaFaceAngAssistant.cpp
+++ b/GgafDx/src/jp/ggaf/dx/actor/supporter/RikishaFaceAngAssistant.cpp
@@ -1,6 +1,6 @@
 #include "jp/ggaf/dx/actor/supporter/RikishaFaceAngAssistant.h"
 
-#include "jp/ggaf/core/util/ValueAccelerator.hpp"
+#include "jp/ggaf/core/util/AccelerationValue.hpp"
 #include "jp/ggaf/dx/actor/supporter/Rikisha.h"
 #include "jp/ggaf/dx/util/Util.h"
 

--- a/GgafDx/src/jp/ggaf/dx/actor/supporter/RikishaMvAngAssistant.cpp
+++ b/GgafDx/src/jp/ggaf/dx/actor/supporter/RikishaMvAngAssistant.cpp
@@ -1,6 +1,6 @@
 #include "jp/ggaf/dx/actor/supporter/RikishaMvAngAssistant.h"
 
-#include "jp/ggaf/core/util/ValueAccelerator.hpp"
+#include "jp/ggaf/core/util/AccelerationValue.hpp"
 #include "jp/ggaf/dx/actor/supporter/Rikisha.h"
 #include "jp/ggaf/dx/util/Util.h"
 

--- a/GgafDx/src/jp/ggaf/dx/actor/supporter/RikishaMvAssistant.cpp
+++ b/GgafDx/src/jp/ggaf/dx/actor/supporter/RikishaMvAssistant.cpp
@@ -1,7 +1,7 @@
 #include "jp/ggaf/dx/actor/supporter/RikishaMvAssistant.h"
 
 #include "jp/ggaf/dx/actor/supporter/Rikisha.h"
-#include "jp/ggaf/core/util/ValueAccelerator.hpp"
+#include "jp/ggaf/core/util/AccelerationValue.hpp"
 
 
 using namespace GgafDx;

--- a/GgafDx/src/jp/ggaf/dx/model/SkinAniMeshModel.cpp
+++ b/GgafDx/src/jp/ggaf/dx/model/SkinAniMeshModel.cpp
@@ -25,7 +25,7 @@ SkinAniMeshModel::SkinAniMeshModel(const char* prm_model_name) : Model(prm_model
     _pFrameRoot = nullptr;
     _pAniControllerBase = nullptr;
     _num_materials = 0L;
-    _anim_ticks_per_second = 4800; //restoreSkinAniMeshModel で上書きされる場合がある。
+//    _anim_ticks_per_second = 4800; //restoreSkinAniMeshModel で上書きされる場合がある。
     _paVtxBuffer_data = nullptr;
     _paIndexBuffer_data = nullptr;
     _pVertexDeclaration = nullptr;
@@ -182,12 +182,12 @@ void SkinAniMeshModel::restore() {
         std::string xfile_name = ModelManager::getMeshFileName(_model_name);
         TextureManager* pTextureManager = pGOD->_pModelManager->_pModelTextureManager;
         //AnimTicksPerSecondを独自に取り出す。デフォルトは4800
-        _anim_ticks_per_second = SkinAniMeshModel::getAnimTicksPerSecond(xfile_name);
+//        _anim_ticks_per_second = SkinAniMeshModel::getAnimTicksPerSecond(xfile_name);
 //DEBUG
-_TRACE_("SkinAniMeshModel::restore() _anim_ticks_per_second="<<_anim_ticks_per_second);
-        if (_anim_ticks_per_second < 0) {
-            _anim_ticks_per_second = 4800;
-        }
+//_TRACE_("SkinAniMeshModel::restore() _anim_ticks_per_second="<<_anim_ticks_per_second);
+//        if (_anim_ticks_per_second < 0) {
+//            _anim_ticks_per_second = 4800;
+//        }
         //Xファイルのファイルロード
         _pAllocHierarchy = NEW SkinAniMeshAllocHierarchy(); // CAllocHierarchyBaseの派生クラス
         hr = D3DXLoadMeshHierarchyFromX(
@@ -898,46 +898,46 @@ ID3DXAnimationController* SkinAniMeshModel::getCloneAnimationController() {
     checkDxException(hr, D3D_OK, "アニメーションコントローラーのクローンに失敗しました。");
     return _pAc;
 }
-int SkinAniMeshModel::getAnimTicksPerSecond(std::string& prm_xfile_name) {
-    if (prm_xfile_name == "") {
-         throwCriticalException("SkinAniMeshModel::getAnimTicksPerSecond() メッシュファイル("<<prm_xfile_name<<".x)が見つかりません。");
-    }
-    //XファイルからAnimTicksPerSecondの値を独自に取り出す
-    std::ifstream ifs(prm_xfile_name.c_str());
-    if (ifs.fail()) {
-        throwCriticalException("["<<prm_xfile_name<<"] が開けません");
-    }
-    std::string buf;
-    bool isdone = false;
-    int anim_ticks_per_second = -1;
-    std::string data;
-    while (isdone == false && !ifs.eof()) {
-        ifs >> data;
-        if (data == "AnimTicksPerSecond" || data == "AnimTicksPerSecond{") {
-            while (isdone == false) {
-                ifs >> data;
-                if (data == "{") {
-                    continue;
-                } else if (data == "}") {
-                    isdone = true;
-                    break;
-                } else {
-                    anim_ticks_per_second = atoi(data.c_str()); //"60;" → 60を得る
-                    if (anim_ticks_per_second == 0) {
-                        //数値に変換できない場合は無効
-                        anim_ticks_per_second = -1;
-                        isdone = false;
-                    } else {
-                        isdone = true;
-                    }
-                    break;
-                }
-            }
-        }
-    }
-    ifs.close();
-    return anim_ticks_per_second;
-}
+//int SkinAniMeshModel::getAnimTicksPerSecond(std::string& prm_xfile_name) {
+//    if (prm_xfile_name == "") {
+//         throwCriticalException("SkinAniMeshModel::getAnimTicksPerSecond() メッシュファイル("<<prm_xfile_name<<".x)が見つかりません。");
+//    }
+//    //XファイルからAnimTicksPerSecondの値を独自に取り出す
+//    std::ifstream ifs(prm_xfile_name.c_str());
+//    if (ifs.fail()) {
+//        throwCriticalException("["<<prm_xfile_name<<"] が開けません");
+//    }
+//    std::string buf;
+//    bool isdone = false;
+//    int anim_ticks_per_second = -1;
+//    std::string data;
+//    while (isdone == false && !ifs.eof()) {
+//        ifs >> data;
+//        if (data == "AnimTicksPerSecond" || data == "AnimTicksPerSecond{") {
+//            while (isdone == false) {
+//                ifs >> data;
+//                if (data == "{") {
+//                    continue;
+//                } else if (data == "}") {
+//                    isdone = true;
+//                    break;
+//                } else {
+//                    anim_ticks_per_second = atoi(data.c_str()); //"60;" → 60を得る
+//                    if (anim_ticks_per_second == 0) {
+//                        //数値に変換できない場合は無効
+//                        anim_ticks_per_second = -1;
+//                        isdone = false;
+//                    } else {
+//                        isdone = true;
+//                    }
+//                    break;
+//                }
+//            }
+//        }
+//    }
+//    ifs.close();
+//    return anim_ticks_per_second;
+//}
 
 void SkinAniMeshModel::setFrameInfo(SkinAniMeshFrame* prm_pFrame) {
     prm_pFrame->_frame_index = _tmp_frame_index; //フレームインデックスを保持

--- a/VioletVreath/Version.h
+++ b/VioletVreath/Version.h
@@ -1 +1 @@
-#define VERSION "VER 0.30.6738"
+#define VERSION "VER 0.30.6740"