• R/O
  • HTTP
  • SSH
  • HTTPS

コミット

よく使われているワード(クリックで追加)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

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


コミットメタ情報

リビジョン5f1f0a6fe093a69d90367bf1cc510280ecdfd621 (tree)
日時2023-08-23 21:01:12
作者gecchi <gecchi@boch...>
コミッターgecchi

ログメッセージ

MyLockonControllerのpTargetが不正ポインタになる場合があるバグ修正

変更サマリ

差分

--- a/GgafDx/include/jp/ggaf/dx/Config.h
+++ b/GgafDx/include/jp/ggaf/dx/Config.h
@@ -89,21 +89,21 @@ public:
8989 static double SE_VOLUME_RATE_MAX_DEPTH;
9090
9191 /** [r] 3Dモデルの定義ファイル(modelxファイル)の格納ディレクトリ名 */
92- static std::string DIRNAME_RESOURCE_SKIN_XXX_MODEL;
92+ static std::string DIRNAME_RESOURCE_SKINXXX_MODEL;
9393 /** [r] 3Dメッシュモ定義ファイル(Xファイル)の格納ディレクトリ名 */
94- static std::string DIRNAME_RESOURCE_SKIN_XXX_MESH;
94+ static std::string DIRNAME_RESOURCE_SKINXXX_MODELXXX_MESH;
9595 /** [r] 3Dポイントスプライト定義ファイル(Xファイル)の格納ディレクトリ名 */
96- static std::string DIRNAME_RESOURCE_SKIN_XXX_POINT_SPRITE3D;
96+ static std::string DIRNAME_RESOURCE_SKINXXX_MODELXXX_POINT_SPRITE3D;
9797 /** [r] 2Dスプライトモデルの定義ファイル(sprx)の格納ディレクトリ名 */
98- static std::string DIRNAME_RESOURCE_SKIN_XXX_SPRITE;
98+ static std::string DIRNAME_RESOURCE_SKINXXX_MODELXXX_SPRITE;
9999 /** [r] テクスチャファイルの格納ディレクトリ名 */
100- static std::string DIRNAME_RESOURCE_SKIN_XXX_TEXTURE;
100+ static std::string DIRNAME_RESOURCE_SKINXXX_TEXTURE;
101101 /** [r] エフェクトファイル(fxファイル)の格納ディレクトリ名 */
102- static std::string DIRNAME_RESOURCE_SKIN_XXX_EFFECT;
102+ static std::string DIRNAME_RESOURCE_SKINXXX_EFFECT;
103103 /** [r] BGMファイル(oggファイル)の格納ディレクトリ名 */
104- static std::string DIRNAME_RESOURCE_SKIN_XXX_BGM;
104+ static std::string DIRNAME_RESOURCE_SKINXXX_BGM;
105105 /** [r] SoundEffectファイル(waveファイル)の格納ディレクトリ名 */
106- static std::string DIRNAME_RESOURCE_SKIN_XXX_SE;
106+ static std::string DIRNAME_RESOURCE_SKINXXX_SE;
107107
108108 /** [r] エフェクトファイル(fxファイル)を実行時にコンパイルするかどうか */
109109 static bool REALTIME_EFFECT_COMPILE;
--- a/GgafDx/src/jp/ggaf/dx/Config.cpp
+++ b/GgafDx/src/jp/ggaf/dx/Config.cpp
@@ -39,56 +39,56 @@ int Config::MAX_SE_AT_ONCE = 16;
3939 int Config::FRAME_OF_SE_DELAY_MAX_DEPTH = 3000;
4040 double Config::SE_VOLUME_RATE_MAX_DEPTH=0.2;
4141
42-std::string Config::DIRNAME_RESOURCE_SKIN_XXX_MODEL = "model";
43-std::string Config::DIRNAME_RESOURCE_SKIN_XXX_MESH = "mesh";
44-std::string Config::DIRNAME_RESOURCE_SKIN_XXX_POINT_SPRITE3D = "psprite3d";
45-std::string Config::DIRNAME_RESOURCE_SKIN_XXX_SPRITE = "sprite";
46-std::string Config::DIRNAME_RESOURCE_SKIN_XXX_TEXTURE = "texture";
47-std::string Config::DIRNAME_RESOURCE_SKIN_XXX_EFFECT = "effect";
48-std::string Config::DIRNAME_RESOURCE_SKIN_XXX_BGM = "bgm";
49-std::string Config::DIRNAME_RESOURCE_SKIN_XXX_SE = "se";
42+std::string Config::DIRNAME_RESOURCE_SKINXXX_MODEL = "model";
43+std::string Config::DIRNAME_RESOURCE_SKINXXX_MODELXXX_MESH = "mesh";
44+std::string Config::DIRNAME_RESOURCE_SKINXXX_MODELXXX_POINT_SPRITE3D = "psprite3d";
45+std::string Config::DIRNAME_RESOURCE_SKINXXX_MODELXXX_SPRITE = "sprite";
46+std::string Config::DIRNAME_RESOURCE_SKINXXX_TEXTURE = "texture";
47+std::string Config::DIRNAME_RESOURCE_SKINXXX_EFFECT = "effect";
48+std::string Config::DIRNAME_RESOURCE_SKINXXX_BGM = "bgm";
49+std::string Config::DIRNAME_RESOURCE_SKINXXX_SE = "se";
5050
5151 std::string Config::DIR_MODEL[] = {
52- GgafCore::Config::DIR_SKIN_KIND[0] + "/" + Config::DIRNAME_RESOURCE_SKIN_XXX_MODEL + "/",
53- GgafCore::Config::DIR_SKIN_KIND[1] + "/" + Config::DIRNAME_RESOURCE_SKIN_XXX_MODEL + "/",
52+ GgafCore::Config::DIR_SKIN_KIND[0] + "/" + Config::DIRNAME_RESOURCE_SKINXXX_MODEL + "/",
53+ GgafCore::Config::DIR_SKIN_KIND[1] + "/" + Config::DIRNAME_RESOURCE_SKINXXX_MODEL + "/",
5454 GgafCore::Config::DIR_SKIN_KIND[2] + "/"
5555 };
5656
5757 std::string Config::DIR_MESH[] = {
58- Config::DIR_MODEL[0] + "/" + Config::DIRNAME_RESOURCE_SKIN_XXX_MESH + "/",
59- Config::DIR_MODEL[1] + "/" + Config::DIRNAME_RESOURCE_SKIN_XXX_MESH + "/",
58+ Config::DIR_MODEL[0] + "/" + Config::DIRNAME_RESOURCE_SKINXXX_MODELXXX_MESH + "/",
59+ Config::DIR_MODEL[1] + "/" + Config::DIRNAME_RESOURCE_SKINXXX_MODELXXX_MESH + "/",
6060 Config::DIR_MODEL[2] + "/"
6161 };
6262 std::string Config::DIR_POINT_SPRITE3D[] = {
63- Config::DIR_MODEL[0] + "/" + Config::DIRNAME_RESOURCE_SKIN_XXX_POINT_SPRITE3D + "/",
64- Config::DIR_MODEL[1] + "/" + Config::DIRNAME_RESOURCE_SKIN_XXX_POINT_SPRITE3D + "/",
63+ Config::DIR_MODEL[0] + "/" + Config::DIRNAME_RESOURCE_SKINXXX_MODELXXX_POINT_SPRITE3D + "/",
64+ Config::DIR_MODEL[1] + "/" + Config::DIRNAME_RESOURCE_SKINXXX_MODELXXX_POINT_SPRITE3D + "/",
6565 Config::DIR_MODEL[2] + "/"
6666 };
6767
6868 std::string Config::DIR_SPRITE[] = {
69- Config::DIR_MODEL[0] + "/" + Config::DIRNAME_RESOURCE_SKIN_XXX_SPRITE + "/",
70- Config::DIR_MODEL[1] + "/" + Config::DIRNAME_RESOURCE_SKIN_XXX_SPRITE + "/",
69+ Config::DIR_MODEL[0] + "/" + Config::DIRNAME_RESOURCE_SKINXXX_MODELXXX_SPRITE + "/",
70+ Config::DIR_MODEL[1] + "/" + Config::DIRNAME_RESOURCE_SKINXXX_MODELXXX_SPRITE + "/",
7171 Config::DIR_MODEL[2] + "/"
7272 };
7373
7474 std::string Config::DIR_TEXTURE[] = {
75- GgafCore::Config::DIR_SKIN_KIND[0] + "/" + Config::DIRNAME_RESOURCE_SKIN_XXX_TEXTURE + "/",
76- GgafCore::Config::DIR_SKIN_KIND[1] + "/" + Config::DIRNAME_RESOURCE_SKIN_XXX_TEXTURE + "/",
75+ GgafCore::Config::DIR_SKIN_KIND[0] + "/" + Config::DIRNAME_RESOURCE_SKINXXX_TEXTURE + "/",
76+ GgafCore::Config::DIR_SKIN_KIND[1] + "/" + Config::DIRNAME_RESOURCE_SKINXXX_TEXTURE + "/",
7777 GgafCore::Config::DIR_SKIN_KIND[2]
7878 };
7979 std::string Config::DIR_EFFECT[] = {
80- GgafCore::Config::DIR_SKIN_KIND[0] + "/" + Config::DIRNAME_RESOURCE_SKIN_XXX_EFFECT + "/",
81- GgafCore::Config::DIR_SKIN_KIND[1] + "/" + Config::DIRNAME_RESOURCE_SKIN_XXX_EFFECT + "/",
80+ GgafCore::Config::DIR_SKIN_KIND[0] + "/" + Config::DIRNAME_RESOURCE_SKINXXX_EFFECT + "/",
81+ GgafCore::Config::DIR_SKIN_KIND[1] + "/" + Config::DIRNAME_RESOURCE_SKINXXX_EFFECT + "/",
8282 GgafCore::Config::DIR_SKIN_KIND[2]
8383 };
8484 std::string Config::DIR_BGM[] = {
85- GgafCore::Config::DIR_SKIN_KIND[0] + "/" + Config::DIRNAME_RESOURCE_SKIN_XXX_BGM + "/",
86- GgafCore::Config::DIR_SKIN_KIND[1] + "/" + Config::DIRNAME_RESOURCE_SKIN_XXX_BGM + "/",
85+ GgafCore::Config::DIR_SKIN_KIND[0] + "/" + Config::DIRNAME_RESOURCE_SKINXXX_BGM + "/",
86+ GgafCore::Config::DIR_SKIN_KIND[1] + "/" + Config::DIRNAME_RESOURCE_SKINXXX_BGM + "/",
8787 GgafCore::Config::DIR_SKIN_KIND[2]
8888 };
8989 std::string Config::DIR_SE[] = {
90- GgafCore::Config::DIR_SKIN_KIND[0] + "/" + Config::DIRNAME_RESOURCE_SKIN_XXX_SE + "/",
91- GgafCore::Config::DIR_SKIN_KIND[1] + "/" + Config::DIRNAME_RESOURCE_SKIN_XXX_SE + "/",
90+ GgafCore::Config::DIR_SKIN_KIND[0] + "/" + Config::DIRNAME_RESOURCE_SKINXXX_SE + "/",
91+ GgafCore::Config::DIR_SKIN_KIND[1] + "/" + Config::DIRNAME_RESOURCE_SKINXXX_SE + "/",
9292 GgafCore::Config::DIR_SKIN_KIND[2]
9393 };
9494
@@ -415,26 +415,26 @@ void Config::loadProperties(std::string prm_properties_filename) {
415415 if (GgafCore::Config::_properties.isExistKey("SE_VOLUME_RATE_MAX_DEPTH")) {
416416 Config::SE_VOLUME_RATE_MAX_DEPTH = GgafCore::Config::_properties.getDouble("SE_VOLUME_RATE_MAX_DEPTH");
417417 }
418- if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKIN_XXX_MODEL")) {
419- Config::DIRNAME_RESOURCE_SKIN_XXX_MODEL = GgafCore::Config::_properties.getStr("DIRNAME_RESOURCE_SKIN_XXX_MODEL");
418+ if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKINXXX_MODEL")) {
419+ Config::DIRNAME_RESOURCE_SKINXXX_MODEL = GgafCore::Config::_properties.getStr("DIRNAME_RESOURCE_SKINXXX_MODEL");
420420 }
421- if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKIN_XXX_MESH")) {
422- Config::DIRNAME_RESOURCE_SKIN_XXX_MESH = GgafCore::Config::_properties.getStr("DIRNAME_RESOURCE_SKIN_XXX_MESH");
421+ if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKINXXX_MODELXXX_MESH")) {
422+ Config::DIRNAME_RESOURCE_SKINXXX_MODELXXX_MESH = GgafCore::Config::_properties.getStr("DIRNAME_RESOURCE_SKINXXX_MODELXXX_MESH");
423423 }
424- if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKIN_XXX_SPRITE")) {
425- Config::DIRNAME_RESOURCE_SKIN_XXX_SPRITE = GgafCore::Config::_properties.getStr("DIRNAME_RESOURCE_SKIN_XXX_SPRITE");
424+ if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKINXXX_MODELXXX_SPRITE")) {
425+ Config::DIRNAME_RESOURCE_SKINXXX_MODELXXX_SPRITE = GgafCore::Config::_properties.getStr("DIRNAME_RESOURCE_SKINXXX_MODELXXX_SPRITE");
426426 }
427- if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKIN_XXX_TEXTURE")) {
428- Config::DIRNAME_RESOURCE_SKIN_XXX_TEXTURE = GgafCore::Config::_properties.getStr("DIRNAME_RESOURCE_SKIN_XXX_TEXTURE");
427+ if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKINXXX_TEXTURE")) {
428+ Config::DIRNAME_RESOURCE_SKINXXX_TEXTURE = GgafCore::Config::_properties.getStr("DIRNAME_RESOURCE_SKINXXX_TEXTURE");
429429 }
430- if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKIN_XXX_EFFECT")) {
431- Config::DIRNAME_RESOURCE_SKIN_XXX_EFFECT = GgafCore::Config::_properties.getStr("DIRNAME_RESOURCE_SKIN_XXX_EFFECT");
430+ if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKINXXX_EFFECT")) {
431+ Config::DIRNAME_RESOURCE_SKINXXX_EFFECT = GgafCore::Config::_properties.getStr("DIRNAME_RESOURCE_SKINXXX_EFFECT");
432432 }
433- if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKIN_XXX_BGM")) {
434- Config::DIRNAME_RESOURCE_SKIN_XXX_BGM = GgafCore::Config::_properties.getStr("DIRNAME_RESOURCE_SKIN_XXX_BGM");
433+ if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKINXXX_BGM")) {
434+ Config::DIRNAME_RESOURCE_SKINXXX_BGM = GgafCore::Config::_properties.getStr("DIRNAME_RESOURCE_SKINXXX_BGM");
435435 }
436- if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKIN_XXX_SE")) {
437- Config::DIRNAME_RESOURCE_SKIN_XXX_SE = GgafCore::Config::_properties.getStr("DIRNAME_RESOURCE_SKIN_XXX_SE");
436+ if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKINXXX_SE")) {
437+ Config::DIRNAME_RESOURCE_SKINXXX_SE = GgafCore::Config::_properties.getStr("DIRNAME_RESOURCE_SKINXXX_SE");
438438 }
439439
440440 if (Config::_properties.isExistKey("DIRNAME_RESOURCE_CURVE")) {
@@ -470,23 +470,23 @@ void Config::loadProperties(std::string prm_properties_filename) {
470470 Config::COLI_AABOARDRECT_MODEL = GgafCore::Config::_properties.getStr("COLI_AABOARDRECT_MODEL");
471471 }
472472
473- Config::DIR_MODEL[0] = GgafCore::Config::DIR_SKIN_KIND[0] + "/" + Config::DIRNAME_RESOURCE_SKIN_XXX_MODEL + "/";
474- Config::DIR_MESH[0] = Config::DIR_MODEL[0] + "/" + Config::DIRNAME_RESOURCE_SKIN_XXX_MESH + "/";
475- Config::DIR_POINT_SPRITE3D[0] = Config::DIR_MODEL[0] + "/" + Config::DIRNAME_RESOURCE_SKIN_XXX_POINT_SPRITE3D + "/";
476- Config::DIR_SPRITE[0] = Config::DIR_MODEL[0] + "/" + Config::DIRNAME_RESOURCE_SKIN_XXX_SPRITE + "/";
477- Config::DIR_TEXTURE[0] = GgafCore::Config::DIR_SKIN_KIND[0] + "/" + Config::DIRNAME_RESOURCE_SKIN_XXX_TEXTURE + "/";
478- Config::DIR_EFFECT[0] = GgafCore::Config::DIR_SKIN_KIND[0] + "/" + Config::DIRNAME_RESOURCE_SKIN_XXX_EFFECT + "/";
479- Config::DIR_BGM[0] = GgafCore::Config::DIR_SKIN_KIND[0] + "/" + Config::DIRNAME_RESOURCE_SKIN_XXX_BGM + "/";
480- Config::DIR_SE[0] = GgafCore::Config::DIR_SKIN_KIND[0] + "/" + Config::DIRNAME_RESOURCE_SKIN_XXX_SE + "/";
473+ Config::DIR_MODEL[0] = GgafCore::Config::DIR_SKIN_KIND[0] + "/" + Config::DIRNAME_RESOURCE_SKINXXX_MODEL + "/";
474+ Config::DIR_MESH[0] = Config::DIR_MODEL[0] + "/" + Config::DIRNAME_RESOURCE_SKINXXX_MODELXXX_MESH + "/";
475+ Config::DIR_POINT_SPRITE3D[0] = Config::DIR_MODEL[0] + "/" + Config::DIRNAME_RESOURCE_SKINXXX_MODELXXX_POINT_SPRITE3D + "/";
476+ Config::DIR_SPRITE[0] = Config::DIR_MODEL[0] + "/" + Config::DIRNAME_RESOURCE_SKINXXX_MODELXXX_SPRITE + "/";
477+ Config::DIR_TEXTURE[0] = GgafCore::Config::DIR_SKIN_KIND[0] + "/" + Config::DIRNAME_RESOURCE_SKINXXX_TEXTURE + "/";
478+ Config::DIR_EFFECT[0] = GgafCore::Config::DIR_SKIN_KIND[0] + "/" + Config::DIRNAME_RESOURCE_SKINXXX_EFFECT + "/";
479+ Config::DIR_BGM[0] = GgafCore::Config::DIR_SKIN_KIND[0] + "/" + Config::DIRNAME_RESOURCE_SKINXXX_BGM + "/";
480+ Config::DIR_SE[0] = GgafCore::Config::DIR_SKIN_KIND[0] + "/" + Config::DIRNAME_RESOURCE_SKINXXX_SE + "/";
481481
482- Config::DIR_MODEL[1] = GgafCore::Config::DIR_SKIN_KIND[1] + "/" + Config::DIRNAME_RESOURCE_SKIN_XXX_MODEL + "/";
483- Config::DIR_MESH[1] = Config::DIR_MODEL[1] + "/" + Config::DIRNAME_RESOURCE_SKIN_XXX_MESH + "/";
484- Config::DIR_POINT_SPRITE3D[1] = Config::DIR_MODEL[1] + "/" + Config::DIRNAME_RESOURCE_SKIN_XXX_POINT_SPRITE3D + "/";
485- Config::DIR_SPRITE[1] = Config::DIR_MODEL[1] + "/" + Config::DIRNAME_RESOURCE_SKIN_XXX_SPRITE + "/";
486- Config::DIR_TEXTURE[1] = GgafCore::Config::DIR_SKIN_KIND[1] + "/" + Config::DIRNAME_RESOURCE_SKIN_XXX_TEXTURE + "/";
487- Config::DIR_EFFECT[1] = GgafCore::Config::DIR_SKIN_KIND[1] + "/" + Config::DIRNAME_RESOURCE_SKIN_XXX_EFFECT + "/";
488- Config::DIR_BGM[1] = GgafCore::Config::DIR_SKIN_KIND[1] + "/" + Config::DIRNAME_RESOURCE_SKIN_XXX_BGM + "/";
489- Config::DIR_SE[1] = GgafCore::Config::DIR_SKIN_KIND[1] + "/" + Config::DIRNAME_RESOURCE_SKIN_XXX_SE + "/";
482+ Config::DIR_MODEL[1] = GgafCore::Config::DIR_SKIN_KIND[1] + "/" + Config::DIRNAME_RESOURCE_SKINXXX_MODEL + "/";
483+ Config::DIR_MESH[1] = Config::DIR_MODEL[1] + "/" + Config::DIRNAME_RESOURCE_SKINXXX_MODELXXX_MESH + "/";
484+ Config::DIR_POINT_SPRITE3D[1] = Config::DIR_MODEL[1] + "/" + Config::DIRNAME_RESOURCE_SKINXXX_MODELXXX_POINT_SPRITE3D + "/";
485+ Config::DIR_SPRITE[1] = Config::DIR_MODEL[1] + "/" + Config::DIRNAME_RESOURCE_SKINXXX_MODELXXX_SPRITE + "/";
486+ Config::DIR_TEXTURE[1] = GgafCore::Config::DIR_SKIN_KIND[1] + "/" + Config::DIRNAME_RESOURCE_SKINXXX_TEXTURE + "/";
487+ Config::DIR_EFFECT[1] = GgafCore::Config::DIR_SKIN_KIND[1] + "/" + Config::DIRNAME_RESOURCE_SKINXXX_EFFECT + "/";
488+ Config::DIR_BGM[1] = GgafCore::Config::DIR_SKIN_KIND[1] + "/" + Config::DIRNAME_RESOURCE_SKINXXX_BGM + "/";
489+ Config::DIR_SE[1] = GgafCore::Config::DIR_SKIN_KIND[1] + "/" + Config::DIRNAME_RESOURCE_SKINXXX_SE + "/";
490490
491491
492492 Config::DIR_MODEL[2] = GgafCore::Config::DIR_SKIN_KIND[2] + "/";
@@ -514,42 +514,42 @@ void Config::loadProperties(std::string prm_properties_filename) {
514514 }
515515
516516 //リソースディレクトリ名指定があるのならば、デフォルトのスキンディレクトリのリソースディレクトリ存在チェック
517- if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKIN_XXX_MODEL")) {
517+ if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKINXXX_MODEL")) {
518518 if (!PathFileExists(Config::DIR_MODEL[0].c_str()) ) {
519519 throwCriticalException("prm_properties_filename="<<prm_properties_filename<<" DIR_MODEL[0]("<<Config::DIR_MODEL[0]<<") のディレクトリが見つかりません。");
520520 }
521521 }
522- if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKIN_XXX_MESH")) {
522+ if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKINXXX_MODELXXX_MESH")) {
523523 if (!PathFileExists(Config::DIR_MESH[0].c_str()) ) {
524524 throwCriticalException("prm_properties_filename="<<prm_properties_filename<<" DIR_MESH[0]("<<Config::DIR_MESH[0]<<") のディレクトリが見つかりません。");
525525 }
526526 }
527- if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKIN_XXX_POINT_SPRITE3D")) {
527+ if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKINXXX_MODELXXX_POINT_SPRITE3D")) {
528528 if (!PathFileExists(Config::DIR_POINT_SPRITE3D[0].c_str()) ) {
529529 throwCriticalException("prm_properties_filename="<<prm_properties_filename<<" DIR_POINT_SPRITE3D[0]("<<Config::DIR_POINT_SPRITE3D[0]<<") のディレクトリが見つかりません。");
530530 }
531531 }
532- if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKIN_XXX_SPRITE")) {
532+ if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKINXXX_MODELXXX_SPRITE")) {
533533 if (!PathFileExists(Config::DIR_SPRITE[0].c_str()) ) {
534534 throwCriticalException("prm_properties_filename="<<prm_properties_filename<<" DIR_SPRITE[0]("<<Config::DIR_SPRITE[0]<<") のディレクトリが見つかりません。");
535535 }
536536 }
537- if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKIN_XXX_TEXTURE")) {
537+ if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKINXXX_TEXTURE")) {
538538 if (!PathFileExists(Config::DIR_TEXTURE[0].c_str()) ) {
539539 throwCriticalException("prm_properties_filename="<<prm_properties_filename<<" DIR_TEXTURE[0]("<<Config::DIR_TEXTURE[0]<<") のディレクトリが見つかりません。");
540540 }
541541 }
542- if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKIN_XXX_EFFECT")) {
542+ if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKINXXX_EFFECT")) {
543543 if (!PathFileExists(Config::DIR_EFFECT[0].c_str()) ) {
544544 throwCriticalException("prm_properties_filename="<<prm_properties_filename<<" DIR_EFFECT[0]("<<Config::DIR_EFFECT[0]<<") のディレクトリが見つかりません。");
545545 }
546546 }
547- if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKIN_XXX_BGM")) {
547+ if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKINXXX_BGM")) {
548548 if (!PathFileExists(Config::DIR_BGM[0].c_str()) ) {
549549 throwCriticalException("prm_properties_filename="<<prm_properties_filename<<" DIR_BGM[0]("<<Config::DIR_BGM[0]<<") のディレクトリが見つかりません。");
550550 }
551551 }
552- if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKIN_XXX_SE")) {
552+ if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKINXXX_SE")) {
553553 if (!PathFileExists(Config::DIR_SE[0].c_str()) ) {
554554 throwCriticalException("prm_properties_filename="<<prm_properties_filename<<" DIR_SE[0]("<<Config::DIR_SE[0]<<") のディレクトリが見つかりません。");
555555 }
@@ -628,13 +628,13 @@ void Config::loadProperties(std::string prm_properties_filename) {
628628 _TRACE_("Config::FRAME_OF_SE_DELAY_MAX_DEPTH=" << Config::FRAME_OF_SE_DELAY_MAX_DEPTH);
629629 _TRACE_("Config::SE_VOLUME_RATE_MAX_DEPTH=" << Config::SE_VOLUME_RATE_MAX_DEPTH);
630630
631- _TRACE_("Config::DIRNAME_RESOURCE_SKIN_XXX_MODEL=" << Config::DIRNAME_RESOURCE_SKIN_XXX_MODEL);
632- _TRACE_("Config::DIRNAME_RESOURCE_SKIN_XXX_MESH=" << Config::DIRNAME_RESOURCE_SKIN_XXX_MESH);
633- _TRACE_("Config::DIRNAME_RESOURCE_SKIN_XXX_SPRITE=" << Config::DIRNAME_RESOURCE_SKIN_XXX_SPRITE);
634- _TRACE_("Config::DIRNAME_RESOURCE_SKIN_XXX_TEXTURE=" << Config::DIRNAME_RESOURCE_SKIN_XXX_TEXTURE);
635- _TRACE_("Config::DIRNAME_RESOURCE_SKIN_XXX_EFFECT=" << Config::DIRNAME_RESOURCE_SKIN_XXX_EFFECT);
636- _TRACE_("Config::DIRNAME_RESOURCE_SKIN_XXX_BGM=" << Config::DIRNAME_RESOURCE_SKIN_XXX_BGM);
637- _TRACE_("Config::DIRNAME_RESOURCE_SKIN_XXX_SE=" << Config::DIRNAME_RESOURCE_SKIN_XXX_SE);
631+ _TRACE_("Config::DIRNAME_RESOURCE_SKINXXX_MODEL=" << Config::DIRNAME_RESOURCE_SKINXXX_MODEL);
632+ _TRACE_("Config::DIRNAME_RESOURCE_SKINXXX_MODELXXX_MESH=" << Config::DIRNAME_RESOURCE_SKINXXX_MODELXXX_MESH);
633+ _TRACE_("Config::DIRNAME_RESOURCE_SKINXXX_MODELXXX_SPRITE=" << Config::DIRNAME_RESOURCE_SKINXXX_MODELXXX_SPRITE);
634+ _TRACE_("Config::DIRNAME_RESOURCE_SKINXXX_TEXTURE=" << Config::DIRNAME_RESOURCE_SKINXXX_TEXTURE);
635+ _TRACE_("Config::DIRNAME_RESOURCE_SKINXXX_EFFECT=" << Config::DIRNAME_RESOURCE_SKINXXX_EFFECT);
636+ _TRACE_("Config::DIRNAME_RESOURCE_SKINXXX_BGM=" << Config::DIRNAME_RESOURCE_SKINXXX_BGM);
637+ _TRACE_("Config::DIRNAME_RESOURCE_SKINXXX_SE=" << Config::DIRNAME_RESOURCE_SKINXXX_SE);
638638 _TRACE_("Config::DIRNAME_RESOURCE_CURVE=" << Config::DIRNAME_RESOURCE_CURVE);
639639 for (int i = 0; i < 3; i++) {
640640 _TRACE_("Config::DIR_MODEL["<<i<<"]=" << Config::DIR_MODEL[i]);
--- a/GgafDx/src/jp/ggaf/dx/util/Util.cpp
+++ b/GgafDx/src/jp/ggaf/dx/util/Util.cpp
@@ -1364,7 +1364,9 @@ void Util::setWorldMatrix_BxyzMv(const GeometricActor* const prm_pActor, D3DXMAT
13641364
13651365 void Util::setWorldMatrix_AlignAppScBxyzMv(const GeometricActor* const prm_pActor, D3DXMATRIX& out_matWorld) {
13661366 //見かけ上の大きさを揃えるビルボード
1367- double sr = (prm_pActor->_dest_from_vppln_back+_pCam->getZFar())/(-_pCam->getZOrigin());
1367+ coord d = UTIL::getDistance((GeometricActor*)Util::_pCam, (GeometricActor*)prm_pActor);
1368+ double sr = C_DX(d)/(-Util::_pCam->getZOrigin());
1369+ //double sr = (prm_pActor->_dest_from_vppln_back+_pCam->getZFar())/(-_pCam->getZOrigin());
13681370 const D3DXMATRIX& matView = _pCam->_matView;
13691371 out_matWorld._11 = sr*matView._11;
13701372 out_matWorld._12 = sr*matView._21;
--- a/VVViewer/src/scene/VvvSpacetime/VvvWorld.cpp
+++ b/VVViewer/src/scene/VvvSpacetime/VvvWorld.cpp
@@ -766,38 +766,38 @@ void VvvWorld::processDragAndDrop() {
766766 if (ext == "MODELX" || ext == "X" || ext == "SPRX" || ext == "PSPRX" || ext == "FSPRX" || ext == "RSPRX") {
767767 //プロパティ書き換え
768768 CONFIG::DIR_MODEL[0] = vvv_dir_model_system; //vvv_dir_model_system はシステムスキンディレクトリ
769- CONFIG::DIR_MODEL[1] = dropfile_dir + CONFIG::DIRNAME_RESOURCE_SKIN_XXX_MODEL + "/";
769+ CONFIG::DIR_MODEL[1] = dropfile_dir + CONFIG::DIRNAME_RESOURCE_SKINXXX_MODEL + "/";
770770 CONFIG::DIR_MODEL[2] = dropfile_dir;
771771 CONFIG::DIR_MESH[0] = vvv_dir_mesh_system; //vvv_dir_mesh_system はシステムスキンディレクトリ
772- CONFIG::DIR_MESH[1] = dropfile_dir + CONFIG::DIRNAME_RESOURCE_SKIN_XXX_MESH + "/";
772+ CONFIG::DIR_MESH[1] = dropfile_dir + CONFIG::DIRNAME_RESOURCE_SKINXXX_MODELXXX_MESH + "/";
773773 CONFIG::DIR_MESH[2] = dropfile_dir;
774774 CONFIG::DIR_POINT_SPRITE3D[0] = vvv_dir_pointsprite_system; //vvv_dir_pointsprite_system はシステムスキンディレクトリ
775- CONFIG::DIR_POINT_SPRITE3D[1] = dropfile_dir + CONFIG::DIRNAME_RESOURCE_SKIN_XXX_POINT_SPRITE3D + "/";
775+ CONFIG::DIR_POINT_SPRITE3D[1] = dropfile_dir + CONFIG::DIRNAME_RESOURCE_SKINXXX_MODELXXX_POINT_SPRITE3D + "/";
776776 CONFIG::DIR_POINT_SPRITE3D[2] = dropfile_dir;
777777 CONFIG::DIR_SPRITE[0] = vvv_dir_sprite_system; //vvv_dir_mesh_system はシステムスキンディレクトリ
778- CONFIG::DIR_SPRITE[1] = dropfile_dir + CONFIG::DIRNAME_RESOURCE_SKIN_XXX_SPRITE + "/";
778+ CONFIG::DIR_SPRITE[1] = dropfile_dir + CONFIG::DIRNAME_RESOURCE_SKINXXX_MODELXXX_SPRITE + "/";
779779 CONFIG::DIR_SPRITE[2] = dropfile_dir;
780780 CONFIG::DIR_TEXTURE[0] = vvv_dir_texture_system; //ここは dropfile_dir
781- CONFIG::DIR_TEXTURE[1] = dropfile_dir + "/../../" + CONFIG::DIRNAME_RESOURCE_SKIN_XXX_TEXTURE + "/";
782- CONFIG::DIR_TEXTURE[2] = dropfile_dir + "/../" + CONFIG::DIRNAME_RESOURCE_SKIN_XXX_TEXTURE + "/";
781+ CONFIG::DIR_TEXTURE[1] = dropfile_dir + "/../../" + CONFIG::DIRNAME_RESOURCE_SKINXXX_TEXTURE + "/";
782+ CONFIG::DIR_TEXTURE[2] = dropfile_dir + "/../" + CONFIG::DIRNAME_RESOURCE_SKINXXX_TEXTURE + "/";
783783 } else {
784784 string was_dropfile_dir = UTIL::getFileDirName(listActorInfo_.getCurrent()->dropfile_.c_str()) + "/";
785785 CONFIG::DIR_MODEL[0] = vvv_dir_model_system; //vvv_dir_model_system はシステムスキンディレクトリ
786- CONFIG::DIR_MODEL[1] = was_dropfile_dir + CONFIG::DIRNAME_RESOURCE_SKIN_XXX_MODEL + "/";
786+ CONFIG::DIR_MODEL[1] = was_dropfile_dir + CONFIG::DIRNAME_RESOURCE_SKINXXX_MODEL + "/";
787787 CONFIG::DIR_MODEL[2] = was_dropfile_dir;
788788 CONFIG::DIR_MESH[0] = vvv_dir_mesh_system; //vvv_dir_mesh_system はシステムスキンディレクトリ
789- CONFIG::DIR_MESH[1] = was_dropfile_dir + CONFIG::DIRNAME_RESOURCE_SKIN_XXX_MESH + "/";
789+ CONFIG::DIR_MESH[1] = was_dropfile_dir + CONFIG::DIRNAME_RESOURCE_SKINXXX_MODELXXX_MESH + "/";
790790 CONFIG::DIR_MESH[2] = was_dropfile_dir;
791791 CONFIG::DIR_POINT_SPRITE3D[0] = vvv_dir_pointsprite_system; //vvv_dir_pointsprite_system はシステムスキンディレクトリ
792- CONFIG::DIR_POINT_SPRITE3D[1] = was_dropfile_dir + CONFIG::DIRNAME_RESOURCE_SKIN_XXX_POINT_SPRITE3D + "/";
792+ CONFIG::DIR_POINT_SPRITE3D[1] = was_dropfile_dir + CONFIG::DIRNAME_RESOURCE_SKINXXX_MODELXXX_POINT_SPRITE3D + "/";
793793 CONFIG::DIR_POINT_SPRITE3D[2] = was_dropfile_dir;
794794 CONFIG::DIR_SPRITE[0] = vvv_dir_sprite_system; //vvv_dir_mesh_system はシステムスキンディレクトリ
795- CONFIG::DIR_SPRITE[1] = was_dropfile_dir + CONFIG::DIRNAME_RESOURCE_SKIN_XXX_SPRITE + "/";
795+ CONFIG::DIR_SPRITE[1] = was_dropfile_dir + CONFIG::DIRNAME_RESOURCE_SKINXXX_MODELXXX_SPRITE + "/";
796796 CONFIG::DIR_SPRITE[2] = was_dropfile_dir;
797797
798798 CONFIG::DIR_TEXTURE[0] = vvv_dir_texture_system;
799- CONFIG::DIR_TEXTURE[1] = was_dropfile_dir + "/../../" + CONFIG::DIRNAME_RESOURCE_SKIN_XXX_TEXTURE + "/";
800- CONFIG::DIR_TEXTURE[2] = was_dropfile_dir + "/../" + CONFIG::DIRNAME_RESOURCE_SKIN_XXX_TEXTURE + "/";
799+ CONFIG::DIR_TEXTURE[1] = was_dropfile_dir + "/../../" + CONFIG::DIRNAME_RESOURCE_SKINXXX_TEXTURE + "/";
800+ CONFIG::DIR_TEXTURE[2] = was_dropfile_dir + "/../" + CONFIG::DIRNAME_RESOURCE_SKINXXX_TEXTURE + "/";
801801 }
802802
803803 {
@@ -938,15 +938,15 @@ void VvvWorld::processDragAndDrop() {
938938 string was_dropfile_dir = UTIL::getFileDirName(listActorInfo_.getCurrent()->dropfile_.c_str()) + "/";
939939 _TRACE_("was_dropfile_dir="<<was_dropfile_dir);
940940 CONFIG::DIR_TEXTURE[0] = was_dropfile_dir;
941- CONFIG::DIR_TEXTURE[1] = was_dropfile_dir + "/../" + CONFIG::DIRNAME_RESOURCE_SKIN_XXX_TEXTURE + "/";
942- CONFIG::DIR_TEXTURE[2] = was_dropfile_dir + "/../../" + CONFIG::DIRNAME_RESOURCE_SKIN_XXX_TEXTURE + "/";
941+ CONFIG::DIR_TEXTURE[1] = was_dropfile_dir + "/../" + CONFIG::DIRNAME_RESOURCE_SKINXXX_TEXTURE + "/";
942+ CONFIG::DIR_TEXTURE[2] = was_dropfile_dir + "/../../" + CONFIG::DIRNAME_RESOURCE_SKINXXX_TEXTURE + "/";
943943 string was_model = UTIL::getFileBaseNameWithoutExt(listActorInfo_.getCurrent()->dropfile_.c_str());
944944 _TRACE_("was_model="<<was_model);
945945 GgafLib::CubeMapMeshActor* pCubeMapMeshActor =
946946 desireActor(VvvActor<GgafLib::CubeMapMeshActor>, "actor", was_model.c_str());
947947 CONFIG::DIR_TEXTURE[0] = dropfile_dir;
948- CONFIG::DIR_TEXTURE[1] = dropfile_dir + "/../" + CONFIG::DIRNAME_RESOURCE_SKIN_XXX_TEXTURE + "/";
949- CONFIG::DIR_TEXTURE[2] = dropfile_dir + "/../../" + CONFIG::DIRNAME_RESOURCE_SKIN_XXX_TEXTURE + "/";
948+ CONFIG::DIR_TEXTURE[1] = dropfile_dir + "/../" + CONFIG::DIRNAME_RESOURCE_SKINXXX_TEXTURE + "/";
949+ CONFIG::DIR_TEXTURE[2] = dropfile_dir + "/../../" + CONFIG::DIRNAME_RESOURCE_SKINXXX_TEXTURE + "/";
950950 pCubeMapMeshActor->setCubeMap(file_name_ext.c_str(), 0.5);
951951 pNewActor = pCubeMapMeshActor;
952952 pNewChecker = pCubeMapMeshActor->getWorldCollisionChecker();
@@ -956,15 +956,15 @@ void VvvWorld::processDragAndDrop() {
956956 string was_dropfile_dir = UTIL::getFileDirName(listActorInfo_.getCurrent()->dropfile_.c_str()) + "/";
957957 _TRACE_("was_dropfile_dir="<<was_dropfile_dir);
958958 CONFIG::DIR_TEXTURE[0] = was_dropfile_dir;
959- CONFIG::DIR_TEXTURE[1] = was_dropfile_dir + "/../" + CONFIG::DIRNAME_RESOURCE_SKIN_XXX_TEXTURE + "/";
960- CONFIG::DIR_TEXTURE[2] = was_dropfile_dir + "/../../" + CONFIG::DIRNAME_RESOURCE_SKIN_XXX_TEXTURE + "/";
959+ CONFIG::DIR_TEXTURE[1] = was_dropfile_dir + "/../" + CONFIG::DIRNAME_RESOURCE_SKINXXX_TEXTURE + "/";
960+ CONFIG::DIR_TEXTURE[2] = was_dropfile_dir + "/../../" + CONFIG::DIRNAME_RESOURCE_SKINXXX_TEXTURE + "/";
961961 string was_model = UTIL::getFileBaseNameWithoutExt(listActorInfo_.getCurrent()->dropfile_.c_str());
962962 _TRACE_("was_model="<<was_model);
963963 GgafLib::CubeMapMorphMeshActor* pCubeMapMorphMeshActor =
964964 desireActor(VvvActor<GgafLib::CubeMapMorphMeshActor>, "actor", was_model.c_str());
965965 CONFIG::DIR_TEXTURE[0] = dropfile_dir;
966- CONFIG::DIR_TEXTURE[1] = dropfile_dir + "/../" + CONFIG::DIRNAME_RESOURCE_SKIN_XXX_TEXTURE + "/";
967- CONFIG::DIR_TEXTURE[2] = dropfile_dir + "/../../" + CONFIG::DIRNAME_RESOURCE_SKIN_XXX_TEXTURE + "/";
966+ CONFIG::DIR_TEXTURE[1] = dropfile_dir + "/../" + CONFIG::DIRNAME_RESOURCE_SKINXXX_TEXTURE + "/";
967+ CONFIG::DIR_TEXTURE[2] = dropfile_dir + "/../../" + CONFIG::DIRNAME_RESOURCE_SKINXXX_TEXTURE + "/";
968968 pCubeMapMorphMeshActor->setCubeMap(file_name_ext.c_str(), 0.5);
969969 pNewActor = pCubeMapMorphMeshActor;
970970 pNewChecker = pCubeMapMorphMeshActor->getWorldCollisionChecker();
@@ -992,8 +992,8 @@ void VvvWorld::processDragAndDrop() {
992992 ) {
993993 GgafDx::FigureActor* pCurrentActor = listActorInfo_.getCurrent()->pActor_;
994994 CONFIG::DIR_TEXTURE[0] = dropfile_dir;
995- CONFIG::DIR_TEXTURE[1] = dropfile_dir + "/../" + CONFIG::DIRNAME_RESOURCE_SKIN_XXX_TEXTURE + "/";
996- CONFIG::DIR_TEXTURE[2] = dropfile_dir + "/../../" + CONFIG::DIRNAME_RESOURCE_SKIN_XXX_TEXTURE + "/";
995+ CONFIG::DIR_TEXTURE[1] = dropfile_dir + "/../" + CONFIG::DIRNAME_RESOURCE_SKINXXX_TEXTURE + "/";
996+ CONFIG::DIR_TEXTURE[2] = dropfile_dir + "/../../" + CONFIG::DIRNAME_RESOURCE_SKINXXX_TEXTURE + "/";
997997 if (pCurrentActor->instanceOf(Obj_GgafDx_MeshActor)) {
998998 ((GgafDx::MeshActor*)pCurrentActor)->effectBumpMapping(file_name_ext.c_str());
999999 }
--- a/VioletVreath/src/jp/gecchi/VioletVreath/Version.h
+++ b/VioletVreath/src/jp/gecchi/VioletVreath/Version.h
@@ -1 +1 @@
1-#define VERSION "VER 0.30.7531"
1+#define VERSION "VER 0.30.7536"
--- a/VioletVreath/src/jp/gecchi/VioletVreath/actor/my/Bunshin/MyBunshinController.cpp
+++ b/VioletVreath/src/jp/gecchi/VioletVreath/actor/my/Bunshin/MyBunshinController.cpp
@@ -57,6 +57,7 @@ void MyBunshinController::onReset() {
5757 void MyBunshinController::onActive() {
5858 GgafDx::LocoVehicle* pLocoVehicle = getLocoVehicle();
5959 pLocoVehicle->setRollFaceAngVelo(pBase_->bunshin_default_angvelo_mv_); //分身のクルクル速度
60+ pBunshin_->onActive();
6061 }
6162
6263 void MyBunshinController::processBehavior() {
@@ -71,6 +72,7 @@ void MyBunshinController::processJudgement() {
7172 }
7273
7374 void MyBunshinController::onInactive() {
75+ pBunshin_->onInactive();
7476 }
7577
7678 void MyBunshinController::effectFreeModeIgnited() {
--- a/VioletVreath/src/jp/gecchi/VioletVreath/actor/my/Bunshin/MyBunshinWateringLaserChip001.cpp
+++ b/VioletVreath/src/jp/gecchi/VioletVreath/actor/my/Bunshin/MyBunshinWateringLaserChip001.cpp
@@ -350,16 +350,16 @@ throwCriticalException("pLeaderChip_AimInfo_
350350 _z = _z + (coord)((pB->_z-_z)*0.2 + (pF->_z-_z)*0.4);
351351 }
352352 } else {
353- //レーザー末尾がはねる(髪の毛がはねるみたいになる)のを若干防ぐ
354- //一つ前の座標と、自身の座標を直線で結んで、仮想の自分の後ろの点を作成。
355- //一つ前の座標、自身の座標、仮想の自分の後ろの点で平均を取る
356- //座標の重みは、(仮想のひとつ前, 自身(末尾), 一つ先)= (0.2, 0.3, 0.4)
357- coord v_b_x = _x - (pF->_x - _x);
358- coord v_b_y = _y - (pF->_y - _y);
359- coord v_b_z = _z - (pF->_z - _z);
360- _x = _x + (coord)((v_b_x-_x)*0.2 + (pF->_x-_x)*0.4);
361- _y = _y + (coord)((v_b_y-_y)*0.2 + (pF->_y-_y)*0.4);
362- _z = _z + (coord)((v_b_z-_z)*0.2 + (pF->_z-_z)*0.4);
353+// //レーザー末尾がはねる(髪の毛がはねるみたいになる)のを若干防ぐ
354+// //一つ前の座標と、自身の座標を直線で結んで、仮想の自分の後ろの点を作成。
355+// //一つ前の座標、自身の座標、仮想の自分の後ろの点で平均を取る
356+// //座標の重みは、(仮想のひとつ前, 自身(末尾), 一つ先)= (0.1, 0.7, 0.2)
357+// coord v_b_x = _x - (pF->_x - _x);
358+// coord v_b_y = _y - (pF->_y - _y);
359+// coord v_b_z = _z - (pF->_z - _z);
360+// _x = _x + (coord)((v_b_x-_x)*0.1 + (pF->_x-_x)*0.2);
361+// _y = _y + (coord)((v_b_y-_y)*0.1 + (pF->_y-_y)*0.2);
362+// _z = _z + (coord)((v_b_z-_z)*0.1 + (pF->_z-_z)*0.2);
363363 }
364364 }
365365
--- a/VioletVreath_launcher/TODO.txt
+++ b/VioletVreath_launcher/TODO.txt
@@ -14,4 +14,15 @@ LASER_THUNDER はそのままでつよいので、KOANYAをもっとなにか無
1414 + +V
1515
1616 編隊加算ポイントが、敵単位なのはおかしい。編隊もステータスをもたせる。
17-onDispatch() コールバック共通化
\ No newline at end of file
17+onDispatch() コールバック共通化
18+
19+自機が死んだ場合に、ロックオンターゲットpTargetのポインタが残り、不正ポインタになる場合がある。
20+void MyLockonController::processBehavior() {
21+ //ロックオンターゲット生存確認
22+ GgafDx::GeometricActor* pMainLockonTarget = listTarget_.getCurrent(); //メインロックオンのターゲット
23+ GgafDx::GeometricActor* pTarget = listTarget_.getCurrent(); //ターゲットカーソル
24+ GgafCore::MainActor* pLockonCursor_Active = (GgafCore::MainActor*)getChildFirst(); //ロックオンエフェクトカーソル
25+ int n = listTarget_.length();
26+ for (int i = 0; i < n; i++) {
27+ if (pTarget->isActiveInTheTree() && pTarget->getStatus()->get(STAT_Stamina) > 0) {
28+