• R/O
  • SSH
  • HTTPS

marathon: コミット


コミットメタ情報

リビジョン453 (tree)
日時2007-08-20 20:09:03
作者hogepiyo

ログメッセージ

*** empty log message ***

変更サマリ

差分

--- marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/ProjectilePanel.cpp (revision 452)
+++ marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/ProjectilePanel.cpp (revision 453)
@@ -1,5 +1,8 @@
11 #include "ProjectilePanel.h"
22
3+BEGIN_EVENT_TABLE(ProjectilePanel, wxPanel)
4+END_EVENT_TABLE()
5+
36 ProjectilePanel::ProjectilePanel(wxWindow* parent, wxWindowID id):
47 wxPanel(parent, id)
58 {
--- marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/PhysicsPanel.cpp (revision 452)
+++ marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/PhysicsPanel.cpp (revision 453)
@@ -1,5 +1,8 @@
11 #include "PhysicsPanel.h"
22
3+BEGIN_EVENT_TABLE(PhysicsPanel, wxPanel)
4+END_EVENT_TABLE()
5+
36 PhysicsPanel::PhysicsPanel(wxWindow* parent, wxWindowID id):
47 wxPanel(parent, id)
58 {
--- marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/MonsterFlagsPanel.cpp (revision 452)
+++ marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/MonsterFlagsPanel.cpp (revision 453)
@@ -1,4 +1,5 @@
11 #include "MonsterFlagsPanel.h"
2+#include "../PhysicsEditorOneWX.h"
23
34 enum{
45 ID_IMMUNITIES,
@@ -19,16 +20,36 @@
1920 {
2021 //create
2122 for(int i = 0; i < NUMBER_OF_DAMAGE_TYPES; i ++){
22- this->immunities[i] = new wxCheckBox(this, ID_IMMUNITIES);
23- this->weaknesses[i] = new wxCheckBox(this, ID_WEAKNESSES);
23+ this->immunities[i] = new wxCheckBox(this, ID_IMMUNITIES, _T(""));
24+ this->weaknesses[i] = new wxCheckBox(this, ID_WEAKNESSES,
25+ wxConvertMB2WX(wxGetApp().damageInfo[i].jname.c_str()));
2426 }
25- for(int i = 0l i < NUMBER_OF_CLASS_INFORMATIONS; i ++){
26- this->friends[i] = new wxCheckBox(this, ID_FRIENDS);
27- this->enemies[i] = new wxCheckBox(this, ID_ENEMIES);
27+ for(int i = 0; i < NUMBER_OF_CLASS_INFORMATIONS; i ++){
28+ this->friends[i] = new wxCheckBox(this, ID_FRIENDS, _T(""));
29+ this->enemies[i] = new wxCheckBox(this, ID_ENEMIES,
30+ wxConvertMB2WX(wxGetApp().monsterInfo[i].jname.c_str()));
2831 }
2932 //setting
3033 //layout
3134 wxGridSizer* sizerBase = new wxGridSizer(1, 3);
35+ wxFlexGridSizer* sizerDamage = new wxFlexGridSizer(28, 2);
36+ for(int i = 0; i < NUMBER_OF_DAMAGE_TYPES; i ++){
37+ sizerDamage->Add(this->immunities[i]);
38+ }
39+ wxStaticBoxSizer* staticDamage = new wxStaticBoxSizer(wxHORIZONTAL, this, _T("Immunities/Weaknesses"));
40+ staticDamage->Add(sizerDamage);
41+
42+ wxFlexGridSizer* sizerEnemy = new wxFlexGridSizer(16,2);
43+ wxStaticBoxSizer* staticEnemy = new wxStaticBoxSizer(wxHORIZONTAL, this, _T("Enemies/Friends"));
44+ staticEnemy->Add(sizerEnemy);
45+
46+ wxFlexGridSizer* sizerFlags = new wxFlexGridSizer(28);
47+ wxStaticBoxSizer* staticFlags = new wxStaticBoxSizer(wxHORIZONTAL, this, _T("Flags"));
48+ sizerFlags->Add(sizerFlags);
49+
50+ sizerBase->Add(staticDamage);
51+ sizerBase->Add(staticEnemy);
52+ sizerBase->Add(staticFlags);
3253 this->SetSizer(sizerBase);
3354 sizerBase->Fit(this);
3455 this->Layout();
@@ -40,6 +61,10 @@
4061
4162 void MonsterFlagsPanel::OnImmunities(wxCommandEvent& ev)
4263 {
64+/* //全フラグチェックボックスの状態をデータにコピー
65+ for(int i = 0; i < NUMBER_OF_DAMAGE_TYPES; i ++){
66+ SET_FLAG32(monster_definitions[wxGetApp().frame->get]
67+ }*/
4368 }
4469 void MonsterFlagsPanel::OnWeaknesses(wxCommandEvent& ev)
4570 {
--- marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/WeaponPanel.cpp (revision 452)
+++ marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/WeaponPanel.cpp (revision 453)
@@ -1,5 +1,8 @@
11 #include "WeaponPanel.h"
22
3+BEGIN_EVENT_TABLE(WeaponPanel, wxPanel)
4+END_EVENT_TABLE()
5+
36 WeaponPanel::WeaponPanel(wxWindow* parent, wxWindowID id):
47 wxPanel(parent, id)
58 {
--- marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/EffectPanel.cpp (revision 452)
+++ marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/EffectPanel.cpp (revision 453)
@@ -1,5 +1,8 @@
11 #include "EffectPanel.h"
22
3+BEGIN_EVENT_TABLE(EffectPanel, wxPanel)
4+END_EVENT_TABLE()
5+
36 EffectPanel::EffectPanel(wxWindow* parent, wxWindowID id):
47 wxPanel(parent, id)
58 {
--- marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/MainFrame.cpp (revision 452)
+++ marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/MainFrame.cpp (revision 453)
@@ -75,6 +75,11 @@
7575
7676 //モンスターパネル
7777 this->monsterPanel = new MonsterPanel(this, wxID_ANY);
78+ wxGridSizer* sizerMonster = new wxGridSizer(1,1);
79+ sizerMonster->Add(monsterPanel);
80+ monsterPage->SetSizer(sizerMonster);
81+ sizerMonster->Fit(monsterPage);
82+
7883 this->effectPanel = new EffectPanel(this, wxID_ANY);
7984 this->projectilePanel = new ProjectilePanel(this, wxID_ANY);
8085 this->physicsPanel = new PhysicsPanel(this, wxID_ANY);
--- marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/PhysicsEditorOneWX.h (revision 452)
+++ marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/PhysicsEditorOneWX.h (revision 453)
@@ -76,6 +76,13 @@
7676
7777 /**読み込んだ場合保存先のパス*/
7878 std::string saveFilePath;
79+
80+ /**編集中のモンスターインデックス*/
81+ int editingMonsterIndex;
82+ int editingEffectIndex;
83+ int editingProjectileIndex;
84+ int editingPhysicsIndex;
85+ int editingWeaponIndex;
7986 public:
8087 private:
8188 bool OnInit();
@@ -118,6 +125,20 @@
118125 Save and/or create PhysicsFile
119126 */
120127 void savePhysicsFile(const char* filePath);
128+
129+ /**
130+ 現在編集中のモンスターインデックスを取得
131+ */
132+ int getEditingMonsterIndex();
133+ int getEditingEffectIndex();
134+ int getEditingProjectileIndex();
135+ int getEditingPhysicsIndex();
136+ int getEditingWeaponIndex();
137+ void setEditingMonsterIndex(int index);
138+ void setEditingEffectIndex(int index);
139+ void setEditingProjectileIndex(int index);
140+ void setEditingPhysicsIndex(int index);
141+ void setEditingWeaponIndex(int index);
121142 };
122143
123144 DECLARE_APP(PhysicsEditorOneWX)
--- marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/PhysicsEditorOneWX.cpp (revision 452)
+++ marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/PhysicsEditorOneWX.cpp (revision 453)
@@ -227,7 +227,11 @@
227227 hpl::aleph::loadInformation("data/ShellCasingTypes.txt", NUMBER_OF_SHELL_CASING_TYPES,
228228 weaponShellCasingInfo);
229229
230-
230+ this->editingMonsterIndex = 0;
231+ this->editingEffectIndex = 0;
232+ this->editingProjectileIndex = 0;
233+ this->editingPhysicsIndex = 0;
234+ this->editingWeaponIndex = 0;
231235 }
232236
233237 /**
@@ -338,3 +342,47 @@
338342 //更新・新規設定
339343 this->setNewAndChanged(false, false);
340344 }
345+
346+/**
347+ 現在編集中のモンスターインデックスを取得
348+*/
349+int PhysicsEditorOneWX::getEditingMonsterIndex()
350+{
351+ return editingMonsterIndex;
352+}
353+int PhysicsEditorOneWX::getEditingEffectIndex()
354+{
355+ return editingEffectIndex;
356+}
357+int PhysicsEditorOneWX::getEditingProjectileIndex()
358+{
359+ return editingProjectileIndex;
360+}
361+int PhysicsEditorOneWX::getEditingPhysicsIndex()
362+{
363+ return editingPhysicsIndex;
364+}
365+int PhysicsEditorOneWX::getEditingWeaponIndex()
366+{
367+ return editingWeaponIndex;
368+}
369+void PhysicsEditorOneWX::setEditingMonsterIndex(int index)
370+{
371+ editingMonsterIndex = index;
372+}
373+void PhysicsEditorOneWX::setEditingEffectIndex(int index)
374+{
375+ editingEffectIndex = index;
376+}
377+void PhysicsEditorOneWX::setEditingProjectileIndex(int index)
378+{
379+ editingProjectileIndex = index;
380+}
381+void PhysicsEditorOneWX::setEditingPhysicsIndex(int index)
382+{
383+ editingPhysicsIndex = index;
384+}
385+void PhysicsEditorOneWX::setEditingWeaponIndex(int index)
386+{
387+ editingWeaponIndex = index;
388+}
旧リポジトリブラウザで表示