Violet Vreath is Shooter Game for Windows XP+(個人制作シューティングゲーム)
リビジョン | 5f1f0a6fe093a69d90367bf1cc510280ecdfd621 (tree) |
---|---|
日時 | 2023-08-23 21:01:12 |
作者 | gecchi <gecchi@boch...> |
コミッター | gecchi |
MyLockonControllerのpTargetが不正ポインタになる場合があるバグ修正
@@ -89,21 +89,21 @@ public: | ||
89 | 89 | static double SE_VOLUME_RATE_MAX_DEPTH; |
90 | 90 | |
91 | 91 | /** [r] 3Dモデルの定義ファイル(modelxファイル)の格納ディレクトリ名 */ |
92 | - static std::string DIRNAME_RESOURCE_SKIN_XXX_MODEL; | |
92 | + static std::string DIRNAME_RESOURCE_SKINXXX_MODEL; | |
93 | 93 | /** [r] 3Dメッシュモ定義ファイル(Xファイル)の格納ディレクトリ名 */ |
94 | - static std::string DIRNAME_RESOURCE_SKIN_XXX_MESH; | |
94 | + static std::string DIRNAME_RESOURCE_SKINXXX_MODELXXX_MESH; | |
95 | 95 | /** [r] 3Dポイントスプライト定義ファイル(Xファイル)の格納ディレクトリ名 */ |
96 | - static std::string DIRNAME_RESOURCE_SKIN_XXX_POINT_SPRITE3D; | |
96 | + static std::string DIRNAME_RESOURCE_SKINXXX_MODELXXX_POINT_SPRITE3D; | |
97 | 97 | /** [r] 2Dスプライトモデルの定義ファイル(sprx)の格納ディレクトリ名 */ |
98 | - static std::string DIRNAME_RESOURCE_SKIN_XXX_SPRITE; | |
98 | + static std::string DIRNAME_RESOURCE_SKINXXX_MODELXXX_SPRITE; | |
99 | 99 | /** [r] テクスチャファイルの格納ディレクトリ名 */ |
100 | - static std::string DIRNAME_RESOURCE_SKIN_XXX_TEXTURE; | |
100 | + static std::string DIRNAME_RESOURCE_SKINXXX_TEXTURE; | |
101 | 101 | /** [r] エフェクトファイル(fxファイル)の格納ディレクトリ名 */ |
102 | - static std::string DIRNAME_RESOURCE_SKIN_XXX_EFFECT; | |
102 | + static std::string DIRNAME_RESOURCE_SKINXXX_EFFECT; | |
103 | 103 | /** [r] BGMファイル(oggファイル)の格納ディレクトリ名 */ |
104 | - static std::string DIRNAME_RESOURCE_SKIN_XXX_BGM; | |
104 | + static std::string DIRNAME_RESOURCE_SKINXXX_BGM; | |
105 | 105 | /** [r] SoundEffectファイル(waveファイル)の格納ディレクトリ名 */ |
106 | - static std::string DIRNAME_RESOURCE_SKIN_XXX_SE; | |
106 | + static std::string DIRNAME_RESOURCE_SKINXXX_SE; | |
107 | 107 | |
108 | 108 | /** [r] エフェクトファイル(fxファイル)を実行時にコンパイルするかどうか */ |
109 | 109 | static bool REALTIME_EFFECT_COMPILE; |
@@ -39,56 +39,56 @@ int Config::MAX_SE_AT_ONCE = 16; | ||
39 | 39 | int Config::FRAME_OF_SE_DELAY_MAX_DEPTH = 3000; |
40 | 40 | double Config::SE_VOLUME_RATE_MAX_DEPTH=0.2; |
41 | 41 | |
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"; | |
50 | 50 | |
51 | 51 | 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 + "/", | |
54 | 54 | GgafCore::Config::DIR_SKIN_KIND[2] + "/" |
55 | 55 | }; |
56 | 56 | |
57 | 57 | 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 + "/", | |
60 | 60 | Config::DIR_MODEL[2] + "/" |
61 | 61 | }; |
62 | 62 | 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 + "/", | |
65 | 65 | Config::DIR_MODEL[2] + "/" |
66 | 66 | }; |
67 | 67 | |
68 | 68 | 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 + "/", | |
71 | 71 | Config::DIR_MODEL[2] + "/" |
72 | 72 | }; |
73 | 73 | |
74 | 74 | 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 + "/", | |
77 | 77 | GgafCore::Config::DIR_SKIN_KIND[2] |
78 | 78 | }; |
79 | 79 | 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 + "/", | |
82 | 82 | GgafCore::Config::DIR_SKIN_KIND[2] |
83 | 83 | }; |
84 | 84 | 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 + "/", | |
87 | 87 | GgafCore::Config::DIR_SKIN_KIND[2] |
88 | 88 | }; |
89 | 89 | 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 + "/", | |
92 | 92 | GgafCore::Config::DIR_SKIN_KIND[2] |
93 | 93 | }; |
94 | 94 |
@@ -415,26 +415,26 @@ void Config::loadProperties(std::string prm_properties_filename) { | ||
415 | 415 | if (GgafCore::Config::_properties.isExistKey("SE_VOLUME_RATE_MAX_DEPTH")) { |
416 | 416 | Config::SE_VOLUME_RATE_MAX_DEPTH = GgafCore::Config::_properties.getDouble("SE_VOLUME_RATE_MAX_DEPTH"); |
417 | 417 | } |
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"); | |
420 | 420 | } |
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"); | |
423 | 423 | } |
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"); | |
426 | 426 | } |
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"); | |
429 | 429 | } |
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"); | |
432 | 432 | } |
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"); | |
435 | 435 | } |
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"); | |
438 | 438 | } |
439 | 439 | |
440 | 440 | if (Config::_properties.isExistKey("DIRNAME_RESOURCE_CURVE")) { |
@@ -470,23 +470,23 @@ void Config::loadProperties(std::string prm_properties_filename) { | ||
470 | 470 | Config::COLI_AABOARDRECT_MODEL = GgafCore::Config::_properties.getStr("COLI_AABOARDRECT_MODEL"); |
471 | 471 | } |
472 | 472 | |
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 + "/"; | |
481 | 481 | |
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 + "/"; | |
490 | 490 | |
491 | 491 | |
492 | 492 | Config::DIR_MODEL[2] = GgafCore::Config::DIR_SKIN_KIND[2] + "/"; |
@@ -514,42 +514,42 @@ void Config::loadProperties(std::string prm_properties_filename) { | ||
514 | 514 | } |
515 | 515 | |
516 | 516 | //リソースディレクトリ名指定があるのならば、デフォルトのスキンディレクトリのリソースディレクトリ存在チェック |
517 | - if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKIN_XXX_MODEL")) { | |
517 | + if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKINXXX_MODEL")) { | |
518 | 518 | if (!PathFileExists(Config::DIR_MODEL[0].c_str()) ) { |
519 | 519 | throwCriticalException("prm_properties_filename="<<prm_properties_filename<<" DIR_MODEL[0]("<<Config::DIR_MODEL[0]<<") のディレクトリが見つかりません。"); |
520 | 520 | } |
521 | 521 | } |
522 | - if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKIN_XXX_MESH")) { | |
522 | + if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKINXXX_MODELXXX_MESH")) { | |
523 | 523 | if (!PathFileExists(Config::DIR_MESH[0].c_str()) ) { |
524 | 524 | throwCriticalException("prm_properties_filename="<<prm_properties_filename<<" DIR_MESH[0]("<<Config::DIR_MESH[0]<<") のディレクトリが見つかりません。"); |
525 | 525 | } |
526 | 526 | } |
527 | - if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKIN_XXX_POINT_SPRITE3D")) { | |
527 | + if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKINXXX_MODELXXX_POINT_SPRITE3D")) { | |
528 | 528 | if (!PathFileExists(Config::DIR_POINT_SPRITE3D[0].c_str()) ) { |
529 | 529 | throwCriticalException("prm_properties_filename="<<prm_properties_filename<<" DIR_POINT_SPRITE3D[0]("<<Config::DIR_POINT_SPRITE3D[0]<<") のディレクトリが見つかりません。"); |
530 | 530 | } |
531 | 531 | } |
532 | - if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKIN_XXX_SPRITE")) { | |
532 | + if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKINXXX_MODELXXX_SPRITE")) { | |
533 | 533 | if (!PathFileExists(Config::DIR_SPRITE[0].c_str()) ) { |
534 | 534 | throwCriticalException("prm_properties_filename="<<prm_properties_filename<<" DIR_SPRITE[0]("<<Config::DIR_SPRITE[0]<<") のディレクトリが見つかりません。"); |
535 | 535 | } |
536 | 536 | } |
537 | - if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKIN_XXX_TEXTURE")) { | |
537 | + if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKINXXX_TEXTURE")) { | |
538 | 538 | if (!PathFileExists(Config::DIR_TEXTURE[0].c_str()) ) { |
539 | 539 | throwCriticalException("prm_properties_filename="<<prm_properties_filename<<" DIR_TEXTURE[0]("<<Config::DIR_TEXTURE[0]<<") のディレクトリが見つかりません。"); |
540 | 540 | } |
541 | 541 | } |
542 | - if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKIN_XXX_EFFECT")) { | |
542 | + if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKINXXX_EFFECT")) { | |
543 | 543 | if (!PathFileExists(Config::DIR_EFFECT[0].c_str()) ) { |
544 | 544 | throwCriticalException("prm_properties_filename="<<prm_properties_filename<<" DIR_EFFECT[0]("<<Config::DIR_EFFECT[0]<<") のディレクトリが見つかりません。"); |
545 | 545 | } |
546 | 546 | } |
547 | - if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKIN_XXX_BGM")) { | |
547 | + if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKINXXX_BGM")) { | |
548 | 548 | if (!PathFileExists(Config::DIR_BGM[0].c_str()) ) { |
549 | 549 | throwCriticalException("prm_properties_filename="<<prm_properties_filename<<" DIR_BGM[0]("<<Config::DIR_BGM[0]<<") のディレクトリが見つかりません。"); |
550 | 550 | } |
551 | 551 | } |
552 | - if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKIN_XXX_SE")) { | |
552 | + if (GgafCore::Config::_properties.isExistKey("DIRNAME_RESOURCE_SKINXXX_SE")) { | |
553 | 553 | if (!PathFileExists(Config::DIR_SE[0].c_str()) ) { |
554 | 554 | throwCriticalException("prm_properties_filename="<<prm_properties_filename<<" DIR_SE[0]("<<Config::DIR_SE[0]<<") のディレクトリが見つかりません。"); |
555 | 555 | } |
@@ -628,13 +628,13 @@ void Config::loadProperties(std::string prm_properties_filename) { | ||
628 | 628 | _TRACE_("Config::FRAME_OF_SE_DELAY_MAX_DEPTH=" << Config::FRAME_OF_SE_DELAY_MAX_DEPTH); |
629 | 629 | _TRACE_("Config::SE_VOLUME_RATE_MAX_DEPTH=" << Config::SE_VOLUME_RATE_MAX_DEPTH); |
630 | 630 | |
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); | |
638 | 638 | _TRACE_("Config::DIRNAME_RESOURCE_CURVE=" << Config::DIRNAME_RESOURCE_CURVE); |
639 | 639 | for (int i = 0; i < 3; i++) { |
640 | 640 | _TRACE_("Config::DIR_MODEL["<<i<<"]=" << Config::DIR_MODEL[i]); |
@@ -1364,7 +1364,9 @@ void Util::setWorldMatrix_BxyzMv(const GeometricActor* const prm_pActor, D3DXMAT | ||
1364 | 1364 | |
1365 | 1365 | void Util::setWorldMatrix_AlignAppScBxyzMv(const GeometricActor* const prm_pActor, D3DXMATRIX& out_matWorld) { |
1366 | 1366 | //見かけ上の大きさを揃えるビルボード |
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()); | |
1368 | 1370 | const D3DXMATRIX& matView = _pCam->_matView; |
1369 | 1371 | out_matWorld._11 = sr*matView._11; |
1370 | 1372 | out_matWorld._12 = sr*matView._21; |
@@ -766,38 +766,38 @@ void VvvWorld::processDragAndDrop() { | ||
766 | 766 | if (ext == "MODELX" || ext == "X" || ext == "SPRX" || ext == "PSPRX" || ext == "FSPRX" || ext == "RSPRX") { |
767 | 767 | //プロパティ書き換え |
768 | 768 | 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 + "/"; | |
770 | 770 | CONFIG::DIR_MODEL[2] = dropfile_dir; |
771 | 771 | 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 + "/"; | |
773 | 773 | CONFIG::DIR_MESH[2] = dropfile_dir; |
774 | 774 | 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 + "/"; | |
776 | 776 | CONFIG::DIR_POINT_SPRITE3D[2] = dropfile_dir; |
777 | 777 | 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 + "/"; | |
779 | 779 | CONFIG::DIR_SPRITE[2] = dropfile_dir; |
780 | 780 | 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 + "/"; | |
783 | 783 | } else { |
784 | 784 | string was_dropfile_dir = UTIL::getFileDirName(listActorInfo_.getCurrent()->dropfile_.c_str()) + "/"; |
785 | 785 | 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 + "/"; | |
787 | 787 | CONFIG::DIR_MODEL[2] = was_dropfile_dir; |
788 | 788 | 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 + "/"; | |
790 | 790 | CONFIG::DIR_MESH[2] = was_dropfile_dir; |
791 | 791 | 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 + "/"; | |
793 | 793 | CONFIG::DIR_POINT_SPRITE3D[2] = was_dropfile_dir; |
794 | 794 | 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 + "/"; | |
796 | 796 | CONFIG::DIR_SPRITE[2] = was_dropfile_dir; |
797 | 797 | |
798 | 798 | 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 + "/"; | |
801 | 801 | } |
802 | 802 | |
803 | 803 | { |
@@ -938,15 +938,15 @@ void VvvWorld::processDragAndDrop() { | ||
938 | 938 | string was_dropfile_dir = UTIL::getFileDirName(listActorInfo_.getCurrent()->dropfile_.c_str()) + "/"; |
939 | 939 | _TRACE_("was_dropfile_dir="<<was_dropfile_dir); |
940 | 940 | 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 + "/"; | |
943 | 943 | string was_model = UTIL::getFileBaseNameWithoutExt(listActorInfo_.getCurrent()->dropfile_.c_str()); |
944 | 944 | _TRACE_("was_model="<<was_model); |
945 | 945 | GgafLib::CubeMapMeshActor* pCubeMapMeshActor = |
946 | 946 | desireActor(VvvActor<GgafLib::CubeMapMeshActor>, "actor", was_model.c_str()); |
947 | 947 | 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 + "/"; | |
950 | 950 | pCubeMapMeshActor->setCubeMap(file_name_ext.c_str(), 0.5); |
951 | 951 | pNewActor = pCubeMapMeshActor; |
952 | 952 | pNewChecker = pCubeMapMeshActor->getWorldCollisionChecker(); |
@@ -956,15 +956,15 @@ void VvvWorld::processDragAndDrop() { | ||
956 | 956 | string was_dropfile_dir = UTIL::getFileDirName(listActorInfo_.getCurrent()->dropfile_.c_str()) + "/"; |
957 | 957 | _TRACE_("was_dropfile_dir="<<was_dropfile_dir); |
958 | 958 | 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 + "/"; | |
961 | 961 | string was_model = UTIL::getFileBaseNameWithoutExt(listActorInfo_.getCurrent()->dropfile_.c_str()); |
962 | 962 | _TRACE_("was_model="<<was_model); |
963 | 963 | GgafLib::CubeMapMorphMeshActor* pCubeMapMorphMeshActor = |
964 | 964 | desireActor(VvvActor<GgafLib::CubeMapMorphMeshActor>, "actor", was_model.c_str()); |
965 | 965 | 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 + "/"; | |
968 | 968 | pCubeMapMorphMeshActor->setCubeMap(file_name_ext.c_str(), 0.5); |
969 | 969 | pNewActor = pCubeMapMorphMeshActor; |
970 | 970 | pNewChecker = pCubeMapMorphMeshActor->getWorldCollisionChecker(); |
@@ -992,8 +992,8 @@ void VvvWorld::processDragAndDrop() { | ||
992 | 992 | ) { |
993 | 993 | GgafDx::FigureActor* pCurrentActor = listActorInfo_.getCurrent()->pActor_; |
994 | 994 | 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 + "/"; | |
997 | 997 | if (pCurrentActor->instanceOf(Obj_GgafDx_MeshActor)) { |
998 | 998 | ((GgafDx::MeshActor*)pCurrentActor)->effectBumpMapping(file_name_ext.c_str()); |
999 | 999 | } |
@@ -1 +1 @@ | ||
1 | -#define VERSION "VER 0.30.7531" | |
1 | +#define VERSION "VER 0.30.7536" |
@@ -57,6 +57,7 @@ void MyBunshinController::onReset() { | ||
57 | 57 | void MyBunshinController::onActive() { |
58 | 58 | GgafDx::LocoVehicle* pLocoVehicle = getLocoVehicle(); |
59 | 59 | pLocoVehicle->setRollFaceAngVelo(pBase_->bunshin_default_angvelo_mv_); //分身のクルクル速度 |
60 | + pBunshin_->onActive(); | |
60 | 61 | } |
61 | 62 | |
62 | 63 | void MyBunshinController::processBehavior() { |
@@ -71,6 +72,7 @@ void MyBunshinController::processJudgement() { | ||
71 | 72 | } |
72 | 73 | |
73 | 74 | void MyBunshinController::onInactive() { |
75 | + pBunshin_->onInactive(); | |
74 | 76 | } |
75 | 77 | |
76 | 78 | void MyBunshinController::effectFreeModeIgnited() { |
@@ -350,16 +350,16 @@ throwCriticalException("pLeaderChip_AimInfo_ | ||
350 | 350 | _z = _z + (coord)((pB->_z-_z)*0.2 + (pF->_z-_z)*0.4); |
351 | 351 | } |
352 | 352 | } 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); | |
363 | 363 | } |
364 | 364 | } |
365 | 365 |
@@ -14,4 +14,15 @@ LASER_THUNDER はそのままでつよいので、KOANYAをもっとなにか無 | ||
14 | 14 | + +V |
15 | 15 | |
16 | 16 | 編隊加算ポイントが、敵単位なのはおかしい。編隊もステータスをもたせる。 |
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 | + |