Commit: 197d252fe47fa4cb7d67dccc66d191327d6762dd - MyMain01 (git)

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

Commit MetaInfo

• Révision: 197d252fe47fa4cb7d67dccc66d191327d6762dd (tree)
• l'heure: 2022-05-12 23:36:46
• Auteur: gecchi <gecchi@boch...>
• Commiter: gecchi

Message de Log

自機ホーミングレーザー周りちょっと整理

Change Summary

• modified: GgafDx/include/jp/ggaf/dx/actor/supporter/GeoVehicle.h
• modified: GgafDx/include/jp/ggaf/dx/util/Util.h
• modified: GgafDx/src/jp/ggaf/dx/actor/supporter/GeoVehicle.cpp
• modified: Mogera/src/actor/SmpActor2.cpp
• modified: VioletVreath/src/jp/gecchi/VioletVreath/actor/my/Bunshin/MyBunshinWateringLaserChip001.cpp
• modified: VioletVreath/src/jp/gecchi/VioletVreath/actor/my/Bunshin/MyBunshinWateringLaserChip001.h
• modified: VioletVreath_launcher/.cproject

Modification

--- a/GgafDx/include/jp/ggaf/dx/actor/supporter/GeoVehicle.h
+++ b/GgafDx/include/jp/ggaf/dx/actor/supporter/GeoVehicle.h
@@ -19,32 +19,31 @@ namespace GgafDx {
 class GeoVehicle : public ActorVehicle {
 
 public:
-
+    /** [r]移動速度 */
     velo _velo;
-    acce _acce;
-
-    /** [r/w]X軸方向移動速度 */
-    velo _velo_x;
-    /** [r/w]Y軸方向移動速度 */
-    velo _velo_y;
-    /** [r/w]Z軸方向移動速度 */
-    velo _velo_z;
-    /** [r/w]移動速度上限 */
+    /** [r]移動速度上限 */
     velo _top_velo;
-    /** [r/w]移動速度下限 */
+    /** [r]移動速度下限 */
     velo _bottom_velo;
-
-    /** [r/w]X軸方向移動加速度 */
-    acce _acce_x;
-    /** [r/w]Y軸方向移動加速度 */
-    acce _acce_y;
-    /** [r/w]Z軸方向移動加速度 */
-    acce _acce_z;
-    /** [r/w]移動加速度上限*/
+    /** [r]移動速度方向ベクトルX軸成分 */
+    velo _velo_vc_x;
+    /** [r]移動速度方向ベクトルY軸成分 */
+    velo _velo_vc_y;
+    /** [r]移動速度方向ベクトルZ軸成分 */
+    velo _velo_vc_z;
+
+    /** [r]移動加速度 */
+    acce _acce;
+    /** [r]移動加速度上限*/
     acce _top_acce;
-    /** [r/w]移動加速度下限*/
+    /** [r]移動加速度下限*/
     acce _bottom_acce;
-
+    /** [r]移動加速度方向ベクトルX軸成分 */
+    acce _acce_vc_x;
+    /** [r]移動加速度方向ベクトルY軸成分 */
+    acce _acce_vc_y;
+    /** [r]移動加速度方向ベクトルZ軸成分 */
+    acce _acce_vc_z;
 
 public:
     /**
@@ -68,23 +67,50 @@ public:
     void forceAcceRange(acce prm_acce01, acce prm_acce02);
 
     /**
-     * X軸Y軸Z軸方向の移動速度を目標座標と移動速度で設定する。
-     * @param prm_tx 目標X座標
-     * @param prm_ty 目標Y座標
-     * @param prm_tz 目標Z座標
+     * 移動方向を座標、移動速度を値で設定する。
+     * @param prm_tx 移動方向X座標
+     * @param prm_ty 移動方向Y座標
+     * @param prm_tz 移動方向Z座標
      * @param prm_velo 移動速度
      */
     void setVeloTwd(coord prm_tx, coord prm_ty, coord prm_tz, velo prm_velo);
 
+    /**
+     * 移動方向を軸回転(Rz, Ry)、移動速度を値で設定する。
+     * @param prm_rz 移動方向z軸回転値
+     * @param prm_ry 移動方向y軸回転値
+     * @param prm_velo 移動速度
+     */
     void setVeloTwd(angle prm_rz, angle prm_ry, velo prm_velo);
 
-    void setVelo(velo prm_velo_x, velo prm_velo_y, velo prm_velo_z);
+
+    /**
+     * XYZ軸ベクトル成分で、移動速度を設定する .
+     * @param prm_velo_vc_x
+     * @param prm_velo_vc_y
+     * @param prm_velo_vc_z
+     */
+    void setVeloByVc(velo prm_velo_vc_x, velo prm_velo_vc_y, velo prm_velo_vc_z);
 
     void setVeloZero();
 
+
+    /**
+     * 移動方向を座標、移動加速度を値で設定する。
+     * @param prm_tx 移動方向X座標
+     * @param prm_ty 移動方向Y座標
+     * @param prm_tz 移動方向Z座標
+     * @param prm_acce 移動加速度
+     */
     void setAcceTwd(coord prm_tx, coord prm_ty, coord prm_tz, acce prm_acce);
 
-    void setAcce(acce prm_acce_x, acce prm_acce_y, acce prm_acce_z);
+    /**
+     * XYZ軸ベクトル成分で、移動加速度を設定する .
+     * @param prm_acce_vc_x
+     * @param prm_acce_vc_y
+     * @param prm_acce_vc_z
+     */
+    void setAcceByVc(acce prm_acce_vc_x, acce prm_acce_vc_y, acce prm_acce_vc_z);
 
     void setAcceZero();
 

--- a/GgafDx/include/jp/ggaf/dx/util/Util.h
+++ b/GgafDx/include/jp/ggaf/dx/util/Util.h
@@ -404,9 +404,10 @@ public:
     }
 
     /**
-     * 距離の近似を計算 .
-     * @param x
-     * @param y
+     * 原点からの距離(2D)の近似を計算 .
+     * sqrt() を使用するよりも速い。
+     * @param x X座標
+     * @param y Y座標
      * @return
      */
     static int getApproxDistanceFromOrigin(int x, int y) {
@@ -420,9 +421,11 @@ public:
     }
 
     /**
-     * 距離の近似を計算（※ 引数がすべて正と予めわかっている場合のちょい速いバージョン） .
-     * @param abs_x
-     * @param abs_y
+     * 原点からの距離(2D)の近似を計算 .
+     * sqrt() を使用するよりも速い。
+     * 引数がすべて正と予めわかっている場合のちょい速いバージョン
+     * @param abs_x 正のX座標
+     * @param abs_y 正のY座標
      * @return 原点からの距離の近似
      */
     static int getApproxDistanceFromOrigin2(int abs_x, int abs_y) {
@@ -433,8 +436,20 @@ public:
         return (int)((d + 512) >> 10);
     }
 
+    /**
+     * 距離近似値計算(2D) .
+     * @param x1
+     * @param y1
+     * @param x2
+     * @param y2
+     * @return 距離の近似
+     */
+    static coord getApproxDistance(coord x1, coord y1, coord x2, coord y2) {
+        return Util::getApproxDistanceFromOrigin(x2-x1, y2-y1);
+    }
 
-// 引数３つバージョンは速度的にsqrt() と同じ。したがって制度が良い sqrt() を使うべき
+// 引数３つバージョンは速度的にsqrt() と同じ。
+// したがって精度が良い sqrt() を使うべき考えて、簡易版をいったん削除
 
 //    /**
 //     * 距離の近似を計算(3D) .
@@ -458,17 +473,6 @@ public:
 //        return Util::getApproxDistanceFromOrigin2(getApproxDistanceFromOrigin2(abs_x, abs_y), abs_z);
 //    }
 
-    /**
-     * 距離近似値計算(2D) .
-     * @param x1
-     * @param y1
-     * @param x2
-     * @param y2
-     * @return 距離の近似
-     */
-    static coord getApproxDistance(coord x1, coord y1, coord x2, coord y2) {
-        return Util::getApproxDistanceFromOrigin(x2-x1, y2-y1);
-    }
 //
 //    /**
 //     * 距離の近似を計算(3D) .

--- a/GgafDx/src/jp/ggaf/dx/actor/supporter/GeoVehicle.cpp
+++ b/GgafDx/src/jp/ggaf/dx/actor/supporter/GeoVehicle.cpp
@@ -5,27 +5,28 @@
 using namespace GgafDx;
 
 GeoVehicle::GeoVehicle(GeometricActor* prm_pActor)  : ActorVehicle(prm_pActor) {
-    _velo_x = 0;
-    _velo_y = 0;
-    _velo_z = 0;
-    _acce_x = 0;
-    _acce_y = 0;
-    _acce_z = 0;
-    //移動速度上限
+    _velo = 0;
     _top_velo = INT_MAX;
-    //移動速度下限
     _bottom_velo = 0;
-    //移動加速度上限
+    _velo_vc_x = 0;
+    _velo_vc_y = 0;
+    _velo_vc_z = 0;
+    _acce = 0;
     _top_acce = INT_MAX;
-    //移動加速度下限
     _bottom_acce = 0;
-
-    _velo = 0;
-    _acce = 0;
+    _acce_vc_x = 0;
+    _acce_vc_y = 0;
+    _acce_vc_z = 0;
 }
 
 
 void GeoVehicle::forceVeloRange(velo prm_velo01, velo prm_velo02) {
+#ifdef MY_DEBUG
+    if (prm_velo01 < 0 || prm_velo02 < 0) {
+        throwCriticalException("GeoVehicle::forceVeloRange() 負の速度を範囲設定することはできません。"
+                               " prm_velo01="<<prm_velo01<<",prm_velo02="<<prm_velo02<<"");
+    }
+#endif
     if (prm_velo01 < prm_velo02) {
         _top_velo = prm_velo02;
         _bottom_velo = prm_velo01;
@@ -33,16 +34,17 @@ void GeoVehicle::forceVeloRange(velo prm_velo01, velo prm_velo02) {
         _top_velo = prm_velo01;
         _bottom_velo = prm_velo02;
     }
-#ifdef MY_DEBUG
-    if (_top_velo == 0 ) {
-        _TRACE_("【警告】GeoVehicle::forceVeloRange() 。_top_velo が 0 っておかしいのでは？ prm_velo01="<<prm_velo01<<",prm_velo02="<<prm_velo02<<"");
-    }
-#endif
     //再設定して範囲内に補正
-    setVelo(_velo_x, _velo_y, _velo_z);
+    setVeloByVc(_velo_vc_x, _velo_vc_y, _velo_vc_z);
 }
 
 void GeoVehicle::forceAcceRange(acce prm_acce01, acce prm_acce02) {
+#ifdef MY_DEBUG
+    if (prm_acce01 < 0 || prm_acce02 < 0) {
+        throwCriticalException("GeoVehicle::forceAcceRange() 負の加速度を範囲設定することはできません。"
+                               " prm_acce01="<<prm_acce01<<",prm_acce02="<<prm_acce02<<"");
+    }
+#endif
     if (prm_acce01 < prm_acce02) {
         _top_acce = prm_acce02;
         _bottom_acce = prm_acce01;
@@ -51,28 +53,31 @@ void GeoVehicle::forceAcceRange(acce prm_acce01, acce prm_acce02) {
         _bottom_acce = prm_acce02;
     }
     //再設定して範囲内に補正
-    setAcce(_acce_x, _acce_y, _acce_z);
+    setAcceByVc(_acce_vc_x, _acce_vc_y, _acce_vc_z);
 }
 
 
 void GeoVehicle::setVeloTwd(coord prm_tx, coord prm_ty, coord prm_tz, velo prm_velo) {
+    if (prm_velo == 0) {
+        _velo_vc_x = _bottom_velo;
+        _velo_vc_y = 0;
+        _velo_vc_z = 0;
+        _velo = _bottom_velo;
+        return;
+    }
     double vx = prm_tx - _pActor->_x;
     double vy = prm_ty - _pActor->_y;
     double vz = prm_tz - _pActor->_z;
     double p = vx*vx + vy*vy + vz*vz;
     if (ZEROd_EQ(p)) {
-        if (_acce == 0) {
-            _velo_x = _bottom_velo;
-            _velo_y = 0;
-            _velo_z = 0;
-            _velo = _bottom_velo;
-            return;
-        }
-        p = 1.0*_acce_x*_acce_x + 1.0*_acce_y*_acce_y + 1.0*_acce_z*_acce_z;
+        //速度が０になってしまったら
+        //加速度の方向ベクトルに最低速度を設定
+        p = 1.0*_acce_vc_x*_acce_vc_x + 1.0*_acce_vc_y*_acce_vc_y + 1.0*_acce_vc_z*_acce_vc_z;
         if (ZEROd_EQ(p)) {
-            _velo_x = _bottom_velo;
-            _velo_y = 0;
-            _velo_z = 0;
+            //加速度も０なら、あきらめて _velo_vc_x に最低速度を設定
+            _velo_vc_x = _bottom_velo;
+            _velo_vc_y = 0;
+            _velo_vc_z = 0;
             _velo = _bottom_velo;
             return;
         }
@@ -83,41 +88,30 @@ void GeoVehicle::setVeloTwd(coord prm_tx, coord prm_ty, coord prm_tz, velo prm_v
     } else if (prm_velo < _bottom_velo) {
         velo_xyz = _bottom_velo;
     }
-    if (velo_xyz == 0) {
-        _velo_x = _bottom_velo;
-        _velo_y = 0;
-        _velo_z = 0;
-        _velo = _bottom_velo;
-    } else {
-        double t = (velo_xyz / sqrt(p));
-        _velo_x = t * vx;
-        _velo_y = t * vy;
-        _velo_z = t * vz;
-        _velo = velo_xyz;
-    }
+    double t = (velo_xyz / sqrt(p));
+    _velo_vc_x = t * vx;
+    _velo_vc_y = t * vy;
+    _velo_vc_z = t * vz;
+    _velo = velo_xyz;
 }
 
 void GeoVehicle::setVeloTwd(angle prm_rz, angle prm_ry, velo prm_velo) {
     float vx, vy, vz;
     UTIL::convRzRyToVector(prm_rz, prm_ry, vx, vy, vz);
-    setVelo(vx*prm_velo, vy*prm_velo, vz*prm_velo);
+    setVeloByVc(vx*prm_velo, vy*prm_velo, vz*prm_velo);
 }
 
-void GeoVehicle::setVelo(velo prm_velo_x, velo prm_velo_y, velo prm_velo_z) {
-    double p = 1.0*prm_velo_x*prm_velo_x + 1.0*prm_velo_y*prm_velo_y + 1.0*prm_velo_z*prm_velo_z;
+void GeoVehicle::setVeloByVc(velo prm_velo_vc_x, velo prm_velo_vc_y, velo prm_velo_vc_z) {
+    double p = 1.0*prm_velo_vc_x*prm_velo_vc_x + 1.0*prm_velo_vc_y*prm_velo_vc_y + 1.0*prm_velo_vc_z*prm_velo_vc_z;
     if (ZEROd_EQ(p)) {
-        if (_acce == 0) {
-            _velo_x = _bottom_velo;
-            _velo_y = 0;
-            _velo_z = 0;
-            _velo = _bottom_velo;
-            return;
-        }
-        p = 1.0*_acce_x*_acce_x + 1.0*_acce_y*_acce_y + 1.0*_acce_z*_acce_z;
+        //速度が０になってしまったら
+        //加速度の方向ベクトルに最低速度を設定
+        p = 1.0*_acce_vc_x*_acce_vc_x + 1.0*_acce_vc_y*_acce_vc_y + 1.0*_acce_vc_z*_acce_vc_z;
         if (ZEROd_EQ(p)) {
-            _velo_x = _bottom_velo;
-            _velo_y = 0;
-            _velo_z = 0;
+            //加速度も０なら、あきらめて _velo_vc_x に最低速度を設定
+            _velo_vc_x = _bottom_velo;
+            _velo_vc_y = 0;
+            _velo_vc_z = 0;
             _velo = _bottom_velo;
             return;
         }
@@ -125,29 +119,28 @@ void GeoVehicle::setVelo(velo prm_velo_x, velo prm_velo_y, velo prm_velo_z) {
     double velo_xyz = sqrt(p);
     if (velo_xyz > _top_velo) {
         double t = _top_velo/velo_xyz;
-        _velo_x = t * prm_velo_x;
-        _velo_y = t * prm_velo_y;
-        _velo_z = t * prm_velo_z;
+        _velo_vc_x = t * prm_velo_vc_x;
+        _velo_vc_y = t * prm_velo_vc_y;
+        _velo_vc_z = t * prm_velo_vc_z;
         _velo = _top_velo;
         return;
     } else if (velo_xyz < _bottom_velo) {
         double t = _bottom_velo/velo_xyz;
-        _velo_x = t * prm_velo_x;
-        _velo_y = t * prm_velo_y;
-        _velo_z = t * prm_velo_z;
+        _velo_vc_x = t * prm_velo_vc_x;
+        _velo_vc_y = t * prm_velo_vc_y;
+        _velo_vc_z = t * prm_velo_vc_z;
         _velo = _bottom_velo;
         return;
     } else {
-        double t = 1.0;
-        _velo_x = t * prm_velo_x;
-        _velo_y = t * prm_velo_y;
-        _velo_z = t * prm_velo_z;
+        _velo_vc_x = prm_velo_vc_x;
+        _velo_vc_y = prm_velo_vc_y;
+        _velo_vc_z = prm_velo_vc_z;
         _velo = velo_xyz;
         return;
     }
 }
 void GeoVehicle::setVeloZero() {
-    setVelo(0,0,0);
+    setVeloByVc(0,0,0);
 }
 
 void GeoVehicle::setAcceTwd(coord prm_tx, coord prm_ty, coord prm_tz, acce prm_acce) {
@@ -162,68 +155,66 @@ void GeoVehicle::setAcceTwd(coord prm_tx, coord prm_ty, coord prm_tz, acce prm_a
     double vz = prm_tz - _pActor->_z;
     double p = vx*vx + vy*vy + vz*vz;
     if (ZEROd_EQ(p)) {
-        _acce_x = _bottom_acce;
-        _acce_y = 0;
-        _acce_z = 0;
+        _acce_vc_x = _bottom_acce;
+        _acce_vc_y = 0;
+        _acce_vc_z = 0;
         _acce = _bottom_acce;
     } else {
         double t = (acce_xyz / sqrt(vx*vx + vy*vy + vz*vz));
-        _acce_x = t * vx;
-        _acce_y = t * vy;
-        _acce_z = t * vz;
+        _acce_vc_x = t * vx;
+        _acce_vc_y = t * vy;
+        _acce_vc_z = t * vz;
         _acce = acce_xyz;
     }
 }
 
-void GeoVehicle::setAcce(acce prm_acce_x, acce prm_acce_y, acce prm_acce_z) {
-    double p = 1.0 * prm_acce_x * prm_acce_x + 1.0 * prm_acce_y * prm_acce_y + 1.0 * prm_acce_z * prm_acce_z;
+void GeoVehicle::setAcceByVc(acce prm_acce_vc_x, acce prm_acce_vc_y, acce prm_acce_vc_z) {
+    double p = 1.0 * prm_acce_vc_x * prm_acce_vc_x + 1.0 * prm_acce_vc_y * prm_acce_vc_y + 1.0 * prm_acce_vc_z * prm_acce_vc_z;
     if (ZEROd_EQ(p)) {
-        _acce_x = _bottom_acce;
-        _acce_y = 0;
-        _acce_z = 0;
+        _acce_vc_x = _bottom_acce;
+        _acce_vc_y = 0;
+        _acce_vc_z = 0;
         _acce = _bottom_acce;
     } else {
         double acce_xyz = sqrt(p);
         if (acce_xyz > _top_acce) {
             double t = _top_acce/acce_xyz;
-            _acce_x = t * prm_acce_x;
-            _acce_y = t * prm_acce_y;
-            _acce_z = t * prm_acce_z;
+            _acce_vc_x = t * prm_acce_vc_x;
+            _acce_vc_y = t * prm_acce_vc_y;
+            _acce_vc_z = t * prm_acce_vc_z;
             _acce = _top_acce;
         } else if (acce_xyz < _bottom_acce) {
             double t = _bottom_acce/acce_xyz;
-            _acce_x = t * prm_acce_x;
-            _acce_y = t * prm_acce_y;
-            _acce_z = t * prm_acce_z;
+            _acce_vc_x = t * prm_acce_vc_x;
+            _acce_vc_y = t * prm_acce_vc_y;
+            _acce_vc_z = t * prm_acce_vc_z;
             _acce = _bottom_acce;
         } else {
-            double t = 1.0;
-            _acce_x = t * prm_acce_x;
-            _acce_y = t * prm_acce_y;
-            _acce_z = t * prm_acce_z;
+            _acce_vc_x = prm_acce_vc_x;
+            _acce_vc_y = prm_acce_vc_y;
+            _acce_vc_z = prm_acce_vc_z;
             _acce = acce_xyz;
             return;
         }
     }
 }
+
 void GeoVehicle::setAcceZero() {
-    _acce_x = _bottom_acce;
-    _acce_y = 0;
-    _acce_z = 0;
+    _acce_vc_x = _bottom_acce;
+    _acce_vc_y = 0;
+    _acce_vc_z = 0;
     _acce = _bottom_acce;
 }
 
-
 void GeoVehicle::behave() {
     if (_acce != 0) {
-        setVelo(_velo_x+_acce_x, _velo_y+_acce_y, _velo_z+_acce_z);
+        setVeloByVc(_velo_vc_x+_acce_vc_x, _velo_vc_y+_acce_vc_y, _velo_vc_z+_acce_vc_z);
     }
     //Actorに反映
-    _pActor->_x += _velo_x;
-    _pActor->_y += _velo_y;
-    _pActor->_z += _velo_z;
+    _pActor->_x += _velo_vc_x;
+    _pActor->_y += _velo_vc_y;
+    _pActor->_z += _velo_vc_z;
 }
 
-
 GeoVehicle::~GeoVehicle() {
 }

--- a/Mogera/src/actor/SmpActor2.cpp
+++ b/Mogera/src/actor/SmpActor2.cpp
@@ -72,7 +72,7 @@ void SmpActor2::processBehavior() {
 
     if (GgafDx::Input::isPressedKey(DIK_A)) {
         pGeoVehicle->forceVeloRange(0, PX_C(3));
-        pGeoVehicle->setAcce(PX_C(0.01), PX_C(0.02), PX_C(0));
+        pGeoVehicle->setAcceByVc(PX_C(0.01), PX_C(0.02), PX_C(0));
 
     }
     _TRACE_("x,y,z="<<_x<<", "<<_y<<", "<<_z);

--- a/VioletVreath/src/jp/gecchi/VioletVreath/actor/my/Bunshin/MyBunshinWateringLaserChip001.cpp
+++ b/VioletVreath/src/jp/gecchi/VioletVreath/actor/my/Bunshin/MyBunshinWateringLaserChip001.cpp
@@ -25,10 +25,10 @@ using namespace VioletVreath;
 
 const velo MyBunshinWateringLaserChip001::MAX_VELO_RENGE = PX_C(512); //この値を大きくすると、最高速度が早くなる。
 const double MyBunshinWateringLaserChip001::INV_MAX_VELO_RENGE = 1.0 / MAX_VELO_RENGE;
-const int MyBunshinWateringLaserChip001::R_MAX_ACCE = 15; //この値を大きくすると、カーブが緩くなる
-const velo MyBunshinWateringLaserChip001::INITIAL_VELO = MAX_VELO_RENGE*0.5; //レーザー発射時の初期速度
+const int MyBunshinWateringLaserChip001::R_MAX_ACCE = 16; //この値を大きくすると、カーブが緩くなる
+const velo MyBunshinWateringLaserChip001::INITIAL_VELO = MAX_VELO_RENGE*0.6; //レーザー発射時の初期速度
 const double MyBunshinWateringLaserChip001::RR_MAX_ACCE = 1.0 / R_MAX_ACCE; //計算簡素化用
-const float MyBunshinWateringLaserChip001::MAX_ACCE_RENGE = MAX_VELO_RENGE/R_MAX_ACCE;
+const acce MyBunshinWateringLaserChip001::MAX_ACCE_RENGE = MAX_VELO_RENGE/R_MAX_ACCE;
 const velo MyBunshinWateringLaserChip001::MIN_VELO_ = MyBunshinWateringLaserChip001::INITIAL_VELO/10; // ÷10 は、最低移動する各軸のINITIAL_VELOの割合
 GgafDx::Model* MyBunshinWateringLaserChip001::pModel_ = nullptr;
 int MyBunshinWateringLaserChip001::tex_no_ = 0;
@@ -95,17 +95,11 @@ void MyBunshinWateringLaserChip001::processBehavior() {
     double power = active_frame <= 300 ? UTIL::SHOT_POWER[active_frame] : UTIL::SHOT_POWER[300];
     getStatus()->set(STAT_AttackPowerRate, power);
     _power = power;
-
     GgafDx::GeoVehicle* const pGeoVehicle = getGeoVehicle();
-
-//    if (strcmp(getName(), "Bunshin4's LaserChip(75)") == 0 && _frame_of_life > 4413) {
-//        _TRACE_("なんでや1 "<<pGeoVehicle->_velo_x<<","<<pGeoVehicle->_velo_y<<","<<pGeoVehicle->_velo_z);
-//    }
-
     MyBunshin::AimInfo* pAimInfo = pAimInfo_;
 
-    if (active_frame >= 60*20) {
-        sayonara(); //保険のタイムアウト20秒
+    if (active_frame >= 60*10) {
+        sayonara(); //保険のタイムアウト10秒
     } else if (pAimInfo == nullptr || active_frame < 7) {
         //なにもしない
     } else {
@@ -125,17 +119,17 @@ void MyBunshinWateringLaserChip001::processBehavior() {
                     //●Leader が t1 へ Aim
                     if (pAimTarget->isActiveInTheTree() && active_frame < aim_time_out_t1)  {
                         //pAimTarget が存命
-                        int vx1 = pGeoVehicle->_velo_x;
-                        int vy1 = pGeoVehicle->_velo_y;
-                        int vz1 = pGeoVehicle->_velo_z;
+                        int vx1 = pGeoVehicle->_velo_vc_x;
+                        int vy1 = pGeoVehicle->_velo_vc_y;
+                        int vz1 = pGeoVehicle->_velo_vc_z;
 
                         aimChip(pAimInfo->t1_x,
                                 pAimInfo->t1_y,
                                 pAimInfo->t1_z );
 
-                        int vx2 = pGeoVehicle->_velo_x;
-                        int vy2 = pGeoVehicle->_velo_y;
-                        int vz2 = pGeoVehicle->_velo_z;
+                        int vx2 = pGeoVehicle->_velo_vc_x;
+                        int vy2 = pGeoVehicle->_velo_vc_y;
+                        int vz2 = pGeoVehicle->_velo_vc_z;
 
                         int sgn_vx = SGN(vx1 - vx2);
                         int sgn_vy = SGN(vy1 - vy2);
@@ -154,6 +148,7 @@ void MyBunshinWateringLaserChip001::processBehavior() {
                         if (inv_cnt_ > 10) { //10回も速度の正負が入れ替わったら終了
                             pAimInfo_->spent_frames_to_t1 = active_frame; //Aim t1 終了
                         } else {
+                            // t1 と衝突したら終了
                             static const coord renge = MyBunshinWateringLaserChip001::INITIAL_VELO;
                             static const ucoord renge2 = renge*2;
                             if ( (ucoord)(_x - pAimInfo->t1_x + renge) <= renge2) {
@@ -173,7 +168,7 @@ void MyBunshinWateringLaserChip001::processBehavior() {
                     //●Leader が t1 へ Aim し終わったあと
                     //t2を決める
                     static const Spacetime* pSpaceTime =  pGOD->getSpacetime();
-                    static const double zf_r = UTIL::getDistance(
+                    static const double ZF_R = UTIL::getDistance(
                                                       0.0, 0.0, 0.0,
                                                       (double)(pSpaceTime->_x_bound_right),
                                                       (double)(pSpaceTime->_y_bound_top),
@@ -187,15 +182,15 @@ void MyBunshinWateringLaserChip001::processBehavior() {
                         }
                     }
                     if (pB) {
-                        pAimInfo->setT2(zf_r, pB->_x, pB->_y, pB->_z, _x, _y, _z);
+                        pAimInfo->setT2(ZF_R, pB->_x, pB->_y, pB->_z, _x, _y, _z);
                     } else {
-                        pAimInfo->setT2(zf_r, pOrg_->_x, pOrg_->_y, pOrg_->_z, _x, _y, _z);
+                        pAimInfo->setT2(ZF_R, pOrg_->_x, pOrg_->_y, pOrg_->_z, _x, _y, _z);
                     }
                     coord t2_d = UTIL::getDistance(_x, _y, _z,
                                                    pAimInfo->t2_x,
                                                    pAimInfo->t2_y,
                                                    pAimInfo->t2_z);
-                    pAimInfo->spent_frames_to_t2 = active_frame + (frame)(t2_d*MyBunshinWateringLaserChip001::INV_MAX_VELO_RENGE); //t2到達時間概算
+                    pAimInfo->spent_frames_to_t2 = active_frame + (frame)(t2_d/MyBunshinWateringLaserChip001::MAX_VELO_RENGE); //t2到達時間概算
                     aimChip(pAimInfo->t2_x,
                             pAimInfo->t2_y,
                             pAimInfo->t2_z );
@@ -206,9 +201,9 @@ void MyBunshinWateringLaserChip001::processBehavior() {
                                 pAimInfo->t2_y,
                                 pAimInfo->t2_z );
                     } else {
-                        aimChip(_x + pGeoVehicle->_velo_x*4+1,
-                                _y + pGeoVehicle->_velo_y*4+1,
-                                _z + pGeoVehicle->_velo_z*4+1 );
+                        aimChip(_x + pGeoVehicle->_velo_vc_x*4+1,
+                                _y + pGeoVehicle->_velo_vc_y*4+1,
+                                _z + pGeoVehicle->_velo_vc_z*4+1 );
                     }
                 }
             } else {
@@ -236,9 +231,9 @@ void MyBunshinWateringLaserChip001::processBehavior() {
                                 pAimLeaderChip->_y,
                                 pAimLeaderChip->_z );
                     } else {
-                        aimChip(pAimInfo->t1_x,
-                                pAimInfo->t1_y,
-                                pAimInfo->t1_z );
+                        aimChip(_x + pGeoVehicle->_velo_vc_x*4+1,
+                                _y + pGeoVehicle->_velo_vc_y*4+1,
+                                _z + pGeoVehicle->_velo_vc_z*4+1 );
                     }
                 } else if (active_frame <= pAimInfo->spent_frames_to_t1) {
                     //●Leader以外が t1 が定まってから t1 到達までの動き
@@ -254,17 +249,23 @@ void MyBunshinWateringLaserChip001::processBehavior() {
                                     pAimLeaderChip->_y,
                                     pAimLeaderChip->_z );
                         } else {
-                            aimChip(_x + pGeoVehicle->_velo_x*4+1,
-                                    _y + pGeoVehicle->_velo_y*4+1,
-                                    _z + pGeoVehicle->_velo_z*4+1 );
+                            aimChip(_x + pGeoVehicle->_velo_vc_x*4+1,
+                                    _y + pGeoVehicle->_velo_vc_y*4+1,
+                                    _z + pGeoVehicle->_velo_vc_z*4+1 );
                         }
                     } else if (active_frame <= pAimInfo->spent_frames_to_t2) {
                         //●その後 Leader以外が t2 が定まって、t2に向かうまでの動き
+                        //aimChip(pAimInfo->t2_x,
+                        //		pAimInfo->t2_y,
+                        //		pAimInfo->t2_z );
+
+                        //t2 ではなくて、あえて LeaderChip を優先で追いかける。そのほうがそれっぽい動きになる。
                         if (pAimLeaderChip) {
                             aimChip(pAimLeaderChip->_x,
                                     pAimLeaderChip->_y,
                                     pAimLeaderChip->_z );
                         } else {
+                            // LeaderChip がいないなら、仕方ないので本来の t2 へ
                             aimChip(pAimInfo->t2_x,
                                     pAimInfo->t2_y,
                                     pAimInfo->t2_z );
@@ -276,9 +277,9 @@ void MyBunshinWateringLaserChip001::processBehavior() {
                                     pAimLeaderChip->_y,
                                     pAimLeaderChip->_z );
                         } else {
-                            aimChip(_x + pGeoVehicle->_velo_x*4+1,
-                                    _y + pGeoVehicle->_velo_y*4+1,
-                                    _z + pGeoVehicle->_velo_z*4+1 );
+                            aimChip(_x + pGeoVehicle->_velo_vc_x*4+1,
+                                    _y + pGeoVehicle->_velo_vc_y*4+1,
+                                    _z + pGeoVehicle->_velo_vc_z*4+1 );
                         }
                     } else {
                         _TRACE_("【警告】ありえない");
@@ -289,23 +290,7 @@ void MyBunshinWateringLaserChip001::processBehavior() {
         } //if (pAimTarget)
 
     }
-
-
-//    if (strcmp(getName(), "Bunshin4's LaserChip(75)") == 0 && _frame_of_life > 4413) {
-//        _TRACE_("なんでや3 "<<pGeoVehicle->_velo_x<<","<<pGeoVehicle->_velo_y<<","<<pGeoVehicle->_velo_z);
-//    }
-//
-//    if (strcmp(getName(), "Bunshin4's LaserChip(75)") == 0 && _frame_of_life == 4416) {
-//        _TRACE_("きたで3 "<<pGeoVehicle->_velo_x<<","<<pGeoVehicle->_velo_y<<","<<pGeoVehicle->_velo_z);
-//    }
-
-
     pGeoVehicle->behave();
-
-//    if (strcmp(getName(), "Bunshin4's LaserChip(75)") == 0 && _frame_of_life > 4413) {
-////    	&& pGeoVehicle->_velo_x == 0 && pGeoVehicle->_velo_y == 0 && pGeoVehicle->_velo_z == 0) {
-//        _TRACE_("なんでや4 "<<pGeoVehicle->_velo_x<<","<<pGeoVehicle->_velo_y<<","<<pGeoVehicle->_velo_z);
-//    }
     WateringLaserChip::processBehavior();
 
     tmp_x_ = _x;
@@ -316,11 +301,6 @@ void MyBunshinWateringLaserChip001::processBehavior() {
 void MyBunshinWateringLaserChip001::processSettlementBehavior() {
     //分身はFKなので、絶対座標の確定が processSettlementBehavior() 以降となるため、ここで初期設定が必要
     GgafDx::GeoVehicle* const pGeoVehicle = getGeoVehicle();
-
-//    if (strcmp(getName(), "Bunshin4's LaserChip(75)") == 0 && _frame_of_life > 4413) {
-//        _TRACE_("なんでや5 "<<pGeoVehicle->_velo_x<<","<<pGeoVehicle->_velo_y<<","<<pGeoVehicle->_velo_z);
-//    }
-
     if (hasJustChangedToActive()) {
         //チップの初期設定
         //ロックオン情報の引き継ぎ
@@ -345,15 +325,9 @@ void MyBunshinWateringLaserChip001::processSettlementBehavior() {
                 pAimInfo_->pLeaderChip = this;
                 pAimInfo_->pTarget = nullptr;
             }
-            pGeoVehicle->forceVeloRange(MIN_VELO_, MAX_VELO_RENGE);
         } else {
             //先端以外は前のを受け継ぐ
             pAimInfo_ = pF->pAimInfo_; //受け継ぐ
-
-            pGeoVehicle->forceVeloRange(MIN_VELO_, MAX_VELO_RENGE);
-
-//            velo v = MAX_VELO_RENGE - PX_C(1); //レーザーが弛まないように PX_C(1) 遅くした
-//            pGeoVehicle->forceVeloRange(MIN_VELO_, v);
 #ifdef MY_DEBUG
 if (pAimInfo_ == nullptr) {
 throwCriticalException("pAimInfo_ が引き継がれていません！"<<this<<
@@ -415,13 +389,9 @@ throwCriticalException("pAimInfo_ 
 //                                   pGeoVehicle->_velo_z,
 //                                   _rz, _ry );
         }
-
-//        if (strcmp(getName(), "Bunshin4's LaserChip(75)") == 0 && _frame_of_life > 4413) {
-//            _TRACE_("なんでや6 "<<pGeoVehicle->_velo_x<<","<<pGeoVehicle->_velo_y<<","<<pGeoVehicle->_velo_z);
-//        }
-        UTIL::convVectorToRzRy(pGeoVehicle->_velo_x,
-                               pGeoVehicle->_velo_y,
-                               pGeoVehicle->_velo_z,
+        UTIL::convVectorToRzRy(pGeoVehicle->_velo_vc_x,
+                               pGeoVehicle->_velo_vc_y,
+                               pGeoVehicle->_velo_vc_z,
                                _rz, _ry );
     }
     WateringLaserChip::processSettlementBehavior();
@@ -472,44 +442,24 @@ void MyBunshinWateringLaserChip001::aimChip(int tX, int tY, int tZ) {
 #endif
 
 
-    static const coord rv = 10.0;
+    static const coord rv = 10; // 5
     GgafDx::GeoVehicle* pGeoVehicle = getGeoVehicle();
     //自→仮、自方向ベクトル(vM)
-    coord vMx = pGeoVehicle->_velo_x;
-    coord vMy = pGeoVehicle->_velo_y;
-    coord vMz = pGeoVehicle->_velo_z;
+    coord vMx = pGeoVehicle->_velo_vc_x;
+    coord vMy = pGeoVehicle->_velo_vc_y;
+    coord vMz = pGeoVehicle->_velo_vc_z;
     //|vM|
-//    double lvM = sqrt(vMx*vMx + vMy*vMy + vMz*vMz);
-//    coord lvM = UTIL::getDistanceFromOrigin(vMx, vMy, vMz);
-
     coord lvM = pGeoVehicle->_velo;
-    //|vM|があまりに小さい場合＝速度が遅すぎる場合を考慮
-//    if  (lvM < MIN_VELO_) { //縮こまらないように
-//        if (ZEROd_EQ(lvM)) {
-//            //速度が殆ど０でもうどっち向いてるかわからんので、X軸方向に飛ばす
-//            pGeoVehicle->setVelo(MIN_VELO_, 0, 0);
-//        } else {
-//            //速度 MIN_VELO_ を保証する
-//            double r = (1.0*MIN_VELO_/lvM);
-//            pGeoVehicle->setVelo(vMx*r, vMy*r, vMz*r);
-//        }
-//        vMx = pGeoVehicle->_velo_x;
-//        vMy = pGeoVehicle->_velo_y;
-//        vMz = pGeoVehicle->_velo_z;
-//        lvM = MIN_VELO_;
-//    }
+
     coord vVMx = vMx * rv;
     coord vVMy = vMy * rv;
     coord vVMz = vMz * rv;
     coord lvVM = lvM * rv;
-
-
     //自→的、方向ベクトル (vT)
     coord vTx = tX - _x;
     coord vTy = tY - _y;
     coord vTz = tZ - _z;
     //|vT|
-//    double lvT = sqrt(vTx*vTx + vTy*vTy + vTz*vTz);
     coord lvT = UTIL::getDistanceFromOrigin(vTx, vTy, vTz);
     //|仮的| を lvVM の長さに合わせて作成
     double rMT = (lvVM * 1.2 / lvT) ;
@@ -519,20 +469,11 @@ void MyBunshinWateringLaserChip001::aimChip(int tX, int tY, int tZ) {
     coord vVTy = vTy * rMT;
     coord vVTz = vTz * rMT;
     coord lvVT = lvT * rMT;
-//    double cos_th = ((vMx*vTx + vMy*vTy + vMz*vTz) / (lvT * lvM)); //なす角
-//    if (cos_th < 0.5) {
-//        cos_th = 0.5;
-//    }
     //vVP 仮自→仮的 の加速度設定
     //→vVP=( vVTx-vVMx, vVTy-vVMy, vVTz-vVMz )
-    const acce accX = (vVTx-vVMx) * RR_MAX_ACCE; // * cos_th;
-    const acce accY = (vVTy-vVMy) * RR_MAX_ACCE; // * cos_th;
-    const acce accZ = (vVTz-vVMz) * RR_MAX_ACCE; // * cos_th;
-//    double top_acce_mv = pGeoVehicle->_top_acce_x*1.05; //ちょっとずつなら拡張しちょいよみたいな
-//    if (MAX_VELO_RENGE < top_acce_mv && top_acce_mv < MAX_VELO_RENGE) {
-//        pGeoVehicle->forceAcceXYZRange(-top_acce_mv, top_acce_mv);
-//    }
-    pGeoVehicle->setAcce(accX, accY, accZ);
+    pGeoVehicle->setAcceByVc((vVTx-vVMx) * RR_MAX_ACCE,
+                             (vVTy-vVMy) * RR_MAX_ACCE,
+                             (vVTz-vVMz) * RR_MAX_ACCE);
 }
 
 
@@ -553,8 +494,7 @@ void MyBunshinWateringLaserChip001::onHit(const GgafCore::Actor* prm_pOtherActor
         if (stamina <= 0) {
             //一撃でチップ消滅の攻撃力
             getStatus()->set(STAT_Stamina, default_stamina_);
-//TODO:ここで sayonara() せずに、しばらく理想のホーミングレーザー軌跡を研究する！
-            //sayonara();
+            sayonara();
         } else {
             //耐えれるならば、通貫し、スタミナ回復（攻撃力100の雑魚ならば通貫）
             getStatus()->set(STAT_Stamina, default_stamina_);

--- a/VioletVreath/src/jp/gecchi/VioletVreath/actor/my/Bunshin/MyBunshinWateringLaserChip001.h
+++ b/VioletVreath/src/jp/gecchi/VioletVreath/actor/my/Bunshin/MyBunshinWateringLaserChip001.h
@@ -42,8 +42,8 @@ public:
     static const velo MAX_VELO_RENGE;
     /** [r]計算用 */
     static const double INV_MAX_VELO_RENGE;
-    /** 加速度範囲(-MAX_ACCE_RENGE, MAX_ACCE_RENGE) */
-    static const float MAX_ACCE_RENGE;
+    /** 加速度範囲(0, MAX_ACCE_RENGE) */
+    static const acce MAX_ACCE_RENGE;
 
     static const velo INITIAL_VELO;
 

--- a/VioletVreath_launcher/.cproject
+++ b/VioletVreath_launcher/.cproject
@@ -822,7 +822,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.VCErrorParser" id="cdt.managedbuild.config.gnu.cygwin.exe.debug.2121379341.247885131.632570595.1831413570" name="DebugCdt_x64" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=" parent="cdt.managedbuild.config.gnu.cygwin.exe.debug" postannouncebuildStep="" postbuildStep="" preannouncebuildStep="" prebuildStep="pwd">
+				<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.VCErrorParser" id="cdt.managedbuild.config.gnu.cygwin.exe.debug.2121379341.247885131.632570595.1831413570" name="DebugCdt_x64" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=" parent="cdt.managedbuild.config.gnu.cygwin.exe.debug" postannouncebuildStep="" postbuildStep="" preannouncebuildStep="" prebuildStep="pwd">
 					<folderInfo id="cdt.managedbuild.config.gnu.cygwin.exe.debug.2121379341.247885131.632570595.1831413570." name="/" resourcePath="">
 						<toolChain errorParsers="" id="cdt.managedbuild.toolchain.gnu.mingw.base.1846276466" name="MinGW GCC" superClass="cdt.managedbuild.toolchain.gnu.mingw.base">
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.PE;org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.GNU_ELF" id="cdt.managedbuild.target.gnu.platform.mingw.base.1860135973" name="デバッグ・プラットフォーム" osList="win32" superClass="cdt.managedbuild.target.gnu.platform.mingw.base"/>