Commit: 8f05e812e07fb7db2064b6f55559e86866079b41 - MyMain01 (git)

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

Commit MetaInfo

• Revision: 8f05e812e07fb7db2064b6f55559e86866079b41 (tree)
• Time: 2019-03-19 22:11:12
• Author: gecchi <gecchi@XPS8...>
• Commiter: gecchi

Log Message

平行曲線の奇跡

Change Summary

• modified: GgafDx/src/jp/ggaf/dx/actor/supporter/Kuroko.cpp
• modified: GgafDx/src/jp/ggaf/dx/actor/supporter/KurokoMvAngAssistant.cpp
• modified: GgafLib/include/jp/ggaf/lib/util/spline/FixedVelocitySplineKurokoLeader.h
• modified: GgafLib/include/jp/ggaf/lib/util/spline/SplineLeader.h
• modified: GgafLib/src/jp/ggaf/lib/util/spline/FixedVelocitySplineKurokoLeader.cpp
• modified: GgafLib/src/jp/ggaf/lib/util/spline/SplineLeader.cpp
• modified: Mogera/MgrRs/spline/FormationZako001_STEP.spl
• modified: Mogera/MgrRs/spline/ParallelCurve.spl
• modified: Mogera/src/actor/EnemyIdaBase.cpp
• modified: VioletVreath/Version.h
• modified: VioletVreath/tool/kiseki/kiseki.html
• modified: VioletVreath/tool/kiseki/kiseki.js

Incremental Difference

--- a/GgafDx/src/jp/ggaf/dx/actor/supporter/Kuroko.cpp
+++ b/GgafDx/src/jp/ggaf/dx/actor/supporter/Kuroko.cpp
@@ -665,8 +665,8 @@ void Kuroko::forceRzMvAngVeloRange(angvelo prm_angvelo_rz_mv01,
 }
 
 void Kuroko::setStopTargetRzMvAng(angle prm_target_rz_mv,
-                                        int prm_allow_way,
-                                        angvelo prm_allow_angvelo) {
+                                  int prm_allow_way,
+                                  angvelo prm_allow_angvelo) {
     _is_targeting_rz_mv = true;
     _rz_mv_targeting_stop_flg = true;
     _target_rz_mv = UTIL::simplifyAng(prm_target_rz_mv);
@@ -1071,8 +1071,8 @@ void Kuroko::turnRzRyFaceAngTo(angle prm_rz_target, angle prm_ry_target,
 }
 
 void Kuroko::turnFaceAngTwd(coord prm_tx, coord prm_ty, coord prm_tz,
-                                  angvelo prm_angvelo, angacce prm_angacce,
-                                  int prm_way, bool prm_optimize_ang) {
+                            angvelo prm_angvelo, angacce prm_angacce,
+                            int prm_way, bool prm_optimize_ang) {
     coord vx = prm_tx - _pActor->_x;
     coord vy = prm_ty - _pActor->_y;
     coord vz = prm_tz - _pActor->_z;
@@ -1092,8 +1092,8 @@ void Kuroko::turnFaceAngTwd(coord prm_tx, coord prm_ty, coord prm_tz,
 
 
 void Kuroko::turnFaceAng(axis prm_axis,
-                               angle prm_distance,
-                               angvelo prm_angvelo, angacce prm_angacce) {
+                         angle prm_distance,
+                         angvelo prm_angvelo, angacce prm_angacce) {
     int s = SGN(prm_distance);
     setFaceAngVelo(prm_axis, ABS(prm_angvelo)*s);
     setFaceAngAcce(prm_axis, ABS(prm_angacce)*s);
@@ -1104,8 +1104,8 @@ void Kuroko::turnFaceAng(axis prm_axis,
 
 
 void Kuroko::turnRzFaceAngTo(angle prm_rz_target,
-                                    angvelo prm_angvelo, angacce prm_angacce,
-                                    int prm_way) {
+                             angvelo prm_angvelo, angacce prm_angacce,
+                             int prm_way) {
     if (getFaceAngDistance(AXIS_Z, prm_rz_target, prm_way) > 0) {
         setFaceAngVelo(AXIS_Z, prm_angvelo);
         setFaceAngAcce(AXIS_Z, prm_angacce);
@@ -1134,8 +1134,8 @@ void Kuroko::turnRyFaceAngTo(angle prm_ry_target,
 }
 
 void Kuroko::rollFaceAngTo(angle prm_rx_target,
-                                 angvelo prm_angvelo, angacce prm_angacce,
-                                 int prm_way) {
+                           angvelo prm_angvelo, angacce prm_angacce,
+                           int prm_way) {
     if (getFaceAngDistance(AXIS_X, prm_rx_target, prm_way) > 0) {
         setFaceAngVelo(AXIS_X, prm_angvelo);
         setFaceAngAcce(AXIS_X, prm_angacce);
@@ -1147,8 +1147,8 @@ void Kuroko::rollFaceAngTo(angle prm_rx_target,
 }
 
 void Kuroko::turnRzRyMvAngTo(angle prm_rz_target, angle prm_ry_target,
-                                   angvelo prm_angvelo, angacce prm_angacce,
-                                   int prm_way, bool prm_optimize_ang) {
+                             angvelo prm_angvelo, angacce prm_angacce,
+                             int prm_way, bool prm_optimize_ang) {
     angle out_d_rz;
     angle out_d_ry;
     if (prm_optimize_ang) {
@@ -1236,8 +1236,8 @@ void Kuroko::turnRzRyMvAngTo(angle prm_rz_target, angle prm_ry_target,
 }
 
 void Kuroko::turnMvAngTwd(coord prm_tx, coord prm_ty, coord prm_tz,
-                                angvelo prm_angvelo, angacce prm_angacce,
-                                int prm_way, bool prm_optimize_ang) {
+                          angvelo prm_angvelo, angacce prm_angacce,
+                          int prm_way, bool prm_optimize_ang) {
     coord vx = prm_tx - _pActor->_x;
     coord vy = prm_ty - _pActor->_y;
     coord vz = prm_tz - _pActor->_z;
@@ -1256,7 +1256,7 @@ void Kuroko::turnMvAngTwd(coord prm_tx, coord prm_ty, coord prm_tz,
 }
 
 void Kuroko::turnRzMvAng(angle prm_rz_distance,
-                               angvelo prm_angvelo, angacce prm_angacce) {
+                         angvelo prm_angvelo, angacce prm_angacce) {
     int s = SGN(prm_rz_distance);
     setRzMvAngVelo(ABS(prm_angvelo) * s);
     setRzMvAngAcce(ABS(prm_angacce) * s);
@@ -1264,7 +1264,7 @@ void Kuroko::turnRzMvAng(angle prm_rz_distance,
 }
 
 void Kuroko::turnRyMvAng(angle prm_ry_distance,
-                               angvelo prm_angvelo, angacce prm_angacce) {
+                         angvelo prm_angvelo, angacce prm_angacce) {
     int s = SGN(prm_ry_distance);
     setRyMvAngVelo(ABS(prm_angvelo) * s);
     setRyMvAngAcce(ABS(prm_angacce) * s);
@@ -1272,8 +1272,8 @@ void Kuroko::turnRyMvAng(angle prm_ry_distance,
 }
 
 void Kuroko::turnRzMvAngTo(angle prm_rz_target,
-                                 angvelo prm_angvelo, angacce prm_angacce,
-                                 int prm_way) {
+                           angvelo prm_angvelo, angacce prm_angacce,
+                           int prm_way) {
     if (getRzMvAngDistance(prm_rz_target, prm_way) > 0) {
         setRzMvAngVelo(prm_angvelo);
         setRzMvAngAcce(prm_angacce);
@@ -1285,8 +1285,8 @@ void Kuroko::turnRzMvAngTo(angle prm_rz_target,
 }
 
 void Kuroko::turnRyMvAngTo(angle prm_ry_target,
-                                 angvelo prm_angvelo, angacce prm_angacce,
-                                 int prm_way) {
+                           angvelo prm_angvelo, angacce prm_angacce,
+                           int prm_way) {
     if (getRyMvAngDistance(prm_ry_target, prm_way) > 0) {
         setRyMvAngVelo(prm_angvelo);
         setRyMvAngAcce(prm_angacce);

--- a/GgafDx/src/jp/ggaf/dx/actor/supporter/KurokoMvAngAssistant.cpp
+++ b/GgafDx/src/jp/ggaf/dx/actor/supporter/KurokoMvAngAssistant.cpp
@@ -144,16 +144,16 @@ void KurokoMvAngAssistant::turnRyByVd(
 
 
 void KurokoMvAngAssistant::turnRzByDtTo(angle prm_rz_target, int prm_way, int prm_target_frames,
-                                              float prm_p1, float prm_p2, angvelo prm_end_angvelo,
-                                              bool prm_zero_acc_end_flg) {
+                                        float prm_p1, float prm_p2, angvelo prm_end_angvelo,
+                                        bool prm_zero_acc_end_flg) {
     angle distance = _pMaster->getRzMvAngDistance(prm_rz_target, prm_way);
     turnRzByDt(distance, prm_target_frames,
-                    prm_p1, prm_p2, prm_end_angvelo,
-                    prm_zero_acc_end_flg);
+               prm_p1, prm_p2, prm_end_angvelo,
+               prm_zero_acc_end_flg);
 }
 void KurokoMvAngAssistant::turnRyByDtTo(angle prm_ry_target, int prm_way, int prm_target_frames,
-                                              float prm_p1, float prm_p2, angvelo prm_end_angvelo,
-                                              bool prm_zero_acc_end_flg) {
+                                        float prm_p1, float prm_p2, angvelo prm_end_angvelo,
+                                        bool prm_zero_acc_end_flg) {
     angle distance = _pMaster->getRyMvAngDistance(prm_ry_target, prm_way);
     turnRyByDt(distance, prm_target_frames,
                prm_p1, prm_p2, prm_end_angvelo,
@@ -177,11 +177,11 @@ void KurokoMvAngAssistant::turnRzRyByDtTo(
     }
 
     turnRzByDt(out_rz_distance, prm_target_frames,
-                        prm_p1, prm_p2, prm_end_angvelo,
-                        prm_zero_acc_end_flg);
+               prm_p1, prm_p2, prm_end_angvelo,
+               prm_zero_acc_end_flg);
     turnRyByDt(out_ry_distance, prm_target_frames,
-                        prm_p1, prm_p2, prm_end_angvelo,
-                        prm_zero_acc_end_flg);
+               prm_p1, prm_p2, prm_end_angvelo,
+               prm_zero_acc_end_flg);
 }
 
 void KurokoMvAngAssistant::turnByDtTwd(

--- a/GgafLib/include/jp/ggaf/lib/util/spline/FixedVelocitySplineKurokoLeader.h
+++ b/GgafLib/include/jp/ggaf/lib/util/spline/FixedVelocitySplineKurokoLeader.h
@@ -18,7 +18,6 @@ namespace GgafLib {
  */
 class FixedVelocitySplineKurokoLeader : public SplineLeader {
 
-
 public:
     GgafDx::Kuroko* _pKuroko_target;
     /** [r]スプライン情報セット(splファイルの情報に相当)  */

--- a/GgafLib/include/jp/ggaf/lib/util/spline/SplineLeader.h
+++ b/GgafLib/include/jp/ggaf/lib/util/spline/SplineLeader.h
@@ -70,6 +70,8 @@ public:
     float _sinRy_begin;
     float _cosRy_begin;
 
+    bool _turn_smooth;
+
 public:
     /**
      * コンストラクタ .

--- a/GgafLib/src/jp/ggaf/lib/util/spline/FixedVelocitySplineKurokoLeader.cpp
+++ b/GgafLib/src/jp/ggaf/lib/util/spline/FixedVelocitySplineKurokoLeader.cpp
@@ -2,6 +2,7 @@
 
 #include "jp/ggaf/dx/exception/CriticalException.h"
 #include "jp/ggaf/dx/actor/supporter/Kuroko.h"
+#include "jp/ggaf/dx/actor/supporter/KurokoMvAngAssistant.h"
 #include "jp/ggaf/lib/util/StgUtil.h"
 #include "jp/ggaf/lib/util/spline/SplineSource.h"
 #include "jp/ggaf/lib/util/spline/FixedVelocitySplineManufacture.h"
@@ -56,17 +57,25 @@ again:
                 _float_frame_of_next = (1.0*_distance_to_begin / _pFixedVeloSplManuf->_velo_mvUnit) +
                                      _pFixedVeloSplManuf->_paFrame_need_at[_point_index];
             }
+            if (_leadning_float_frames >= _float_frame_of_next) {
+                //_float_frame_of_nextを次に進めても足りない場合、もう一つ_point_indexを進める
+                goto again;
+            }
+            coord x, y, z;
+            getPointCoord(_point_index, x, y, z);
+            if (_turn_smooth) {
+                pKuroko_target->asstMvAng()->turnByVdTwd(
+                        _pFixedVeloSplManuf->_angvelo_rzry_mv,
+                        x, y, z, _pFixedVeloSplManuf->_turn_way, _pFixedVeloSplManuf->_turn_optimize,
+                        0.3, 0.7, 0,
+                        true);
+            } else {
+                pKuroko_target->turnMvAngTwd(x, y, z,
+                                             _pFixedVeloSplManuf->_angvelo_rzry_mv, 0,
+                                             _pFixedVeloSplManuf->_turn_way,
+                                             _pFixedVeloSplManuf->_turn_optimize);
+            }
         }
-        if (_leadning_float_frames >= _float_frame_of_next) {
-            //_float_frame_of_nextを次に進めても足りない場合、もう一つ_point_indexを進める
-            goto again;
-        }
-        coord x, y, z;
-        getPointCoord(_point_index, x, y, z);
-        pKuroko_target->turnMvAngTwd(x, y, z,
-                                     _pFixedVeloSplManuf->_angvelo_rzry_mv, 0,
-                                     _pFixedVeloSplManuf->_turn_way,
-                                     _pFixedVeloSplManuf->_turn_optimize);
         //キャラの速度が1000ならば、_leadning_float_frames ++;
         //キャラの速度が2000ならば  _leadning_float_frames += 2.0;
         //キャラの速度が500ならば、 _leadning_float_frames += 0.5

--- a/GgafLib/src/jp/ggaf/lib/util/spline/SplineLeader.cpp
+++ b/GgafLib/src/jp/ggaf/lib/util/spline/SplineLeader.cpp
@@ -42,6 +42,7 @@ SplineLeader::SplineLeader(SplineManufacture* prm_pManufacture, GgafDx::Geometri
     _is_fix_pos = false;
     _is_force_start_ang = false;
 //    _is_loop_ang_by_face = true;
+    _turn_smooth = false;
 }
 
 void SplineLeader::getPointCoord(int prm_point_index, coord& out_x, coord& out_y, coord& out_z) {

--- a/Mogera/MgrRs/spline/FormationZako001_STEP.spl
+++ b/Mogera/MgrRs/spline/FormationZako001_STEP.spl
@@ -1,12 +1,12 @@
 SPLINE=Hilbert4_STEP.dat
-MAG_X=2500000
-MAG_Y=2500000
-MAG_Z=2500000
-CLASS=SteppedCoordSpline
+MAG_X=1000000
+MAG_Y=1000000
+MAG_Z=1000000
+CLASS=FixedVelocitySpline
 #SPENT_FRAME=7200
-#ANGLE_VELOCITY=10000
-#TURN_WAY=TURN_CLOSE_TO
-#TURN_OPTIMIZE=false
+ANGLE_VELOCITY=100000
+TURN_WAY=TURN_CLOSE_TO
+TURN_OPTIMIZE=false
 
 #SteppedCoordSpline
 #FixedVelocitySpline

--- a/Mogera/MgrRs/spline/ParallelCurve.spl
+++ b/Mogera/MgrRs/spline/ParallelCurve.spl
@@ -1,10 +1,10 @@
 SPLINE=ParallelCurve.dat
-MAG_X=800000
-MAG_Y=800000
-MAG_Z=800000
+MAG_X=1000
+MAG_Y=1000
+MAG_Z=1000
 CLASS=FixedVelocitySpline
 #SPENT_FRAME=7200
-ANGLE_VELOCITY=1000
+ANGLE_VELOCITY=2000
 TURN_WAY=TURN_CLOSE_TO
 TURN_OPTIMIZE=false
 

--- a/Mogera/src/actor/EnemyIdaBase.cpp
+++ b/Mogera/src/actor/EnemyIdaBase.cpp
@@ -7,6 +7,7 @@
 #include "jp/ggaf/lib/util/spline/SplineLeader.h"
 #include "jp/ggaf/lib/manager/SplineManufactureConnection.h"
 #include "jp/ggaf/lib/util/spline/SplineManufacture.h"
+#include "jp/ggaf/dx/util/Input.h"
 
 using namespace GgafLib;
 using namespace Mogera;
@@ -19,14 +20,15 @@ enum {
 
 EnemyIdaBase::EnemyIdaBase(const char* prm_name) :
         DefaultMeshSetActor(prm_name, "Ida") {
-    pConn_pSplManuf_ = connectToSplineManufactureManager("ParallelCurve");
+//    pConn_pSplManuf_ = connectToSplineManufactureManager("ParallelCurve");
+    pConn_pSplManuf_ = connectToSplineManufactureManager("FormationZako001_STEP");
     pKurokoLeader_ = pConn_pSplManuf_->peek()->createKurokoLeader(getKuroko());
+    pKurokoLeader_->_turn_smooth = true;
     int n = 4;
     coord D = PX_C(20);
     for (int i = 0; i < n; i++) {
         EnemyIda* p1 = NEW EnemyIda("ida");
         appendGroupChildAsFk(p1, 0, D*(i + 1), 0, 0, 0, 0);
-
         EnemyIda* p2 = NEW EnemyIda("ida");
         appendGroupChildAsFk(p2, 0, -D*(i + 1), 0, 0, 0, 0);
     }
@@ -38,7 +40,7 @@ void EnemyIdaBase::initialize() {
 }
 
 void EnemyIdaBase::onActive() {
-    setPosition(0, 0, 0);
+    setPosition(PX_C(-300), PX_C(-200), 0);
     getProgress()->reset(PROG_INIT);
 }
 
@@ -47,13 +49,15 @@ void EnemyIdaBase::processBehavior() {
     GgafCore::Progress* const pProg = getProgress();
     switch (pProg->get()) {
         case PROG_INIT: {
-            pProg->changeNext();
+            if (GgafDx::Input::isPushedDownKey(DIK_RETURN)) {
+                pProg->changeNext();
+            }
             break;
         }
         case PROG_MOVE: {
             if (pProg->hasJustChanged()) {
                 pKurokoLeader_->start(RELATIVE_COORD);
-                pKuroko->setMvVelo(PX_C(1));
+                pKuroko->setMvVelo(PX_C(2));
             }
             pKurokoLeader_->behave();
 
@@ -72,10 +76,10 @@ void EnemyIdaBase::processBehavior() {
 void EnemyIdaBase::processJudgement() {
 }
 
+
 void EnemyIdaBase::onInactive() {
 }
 
 EnemyIdaBase::~EnemyIdaBase() {
 }
 
-

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

--- a/VioletVreath/tool/kiseki/kiseki.html
+++ b/VioletVreath/tool/kiseki/kiseki.html
@@ -21,6 +21,7 @@
 <br>
 <textarea id="mogera"></textarea>
 <div style="font-size:10px;text-align:center;"></div>
-<script type="text/javascript" src="kiseki.js"></script>
+<script type="text/javascript" src="./kiseki.js"></script>
 </body>
 </html>
+

--- a/VioletVreath/tool/kiseki/kiseki.js
+++ b/VioletVreath/tool/kiseki/kiseki.js
@@ -25,7 +25,7 @@ function msOpInit()// 初期設定
    document.onmousedown = function(){ mouse_down=true };
    document.onmouseup = function(){
      mouse_down=false;
-     out_put "-------------------\n" += out_put;
+     out_put = "-------------------\n" + out_put;
      var mogera = document.getElementById("mogera");
      mogera.value=out_put;
      mogera.select();
@@ -49,7 +49,7 @@ function msOpMove(e)// マウスが動くとここが実行されます
   my=document.body.scrollTop+event.clientY;
   msWx=window.document.body.clientWidth+document.body.scrollLeft;
   msWy=window.document.body.clientHeight+document.body.scrollTop;
-   out_put += mx+","+my+"\n";
+   out_put += mx+"  "+my+"\n";
    msOMx[msOw]=mx;// マウスの座標を履歴に書き込み
    msOMy[msOw]=my;
    msOw++;// 書き込む位置の設定