• R/O
  • SSH
  • HTTPS

marathon: コミット


コミットメタ情報

リビジョン470 (tree)
日時2007-09-06 19:09:10
作者hogepiyo

ログメッセージ

*** empty log message ***

変更サマリ

差分

--- marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/EffectPanel.cpp (revision 469)
+++ marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/EffectPanel.cpp (revision 470)
@@ -30,9 +30,9 @@
3030 this->typeListBox = new wxListBox(this, ID_TYPE);
3131 this->collectionChoice = new wxChoice(this, ID_COLLECTION);
3232 this->paletteText = new wxTextCtrl(this, ID_PALETTE);
33- this->sequenceText = new wxTextCtrl(this, ID_);
34- this-> = new wxTextCtrl(this, ID_);
35- this-> = new wxTextCtrl(this, ID_);
33+ this->sequenceText = new wxTextCtrl(this, ID_SEQUENCE);
34+ this->soundPitchText = new wxTextCtrl(this, ID_SOUND_PITCH);
35+ this->delayText = new wxTextCtrl(this, ID_DELAY);
3636 this->delaySoundChoice = new wxChoice(this, ID_DELAY_SOUND);
3737 this->flags[0] = new wxCheckBox(this, ID_FLAGS,
3838 _T("End When Animation Loops"));
@@ -45,6 +45,8 @@
4545 this->flags[4] = new wxCheckBox(this, ID_FLAGS,
4646 _T("Media Effect"));
4747 //set
48+ this->typeListBox->SetMinSize(wxSize(-1,300));
49+
4850 for(int i = 0; i < NUMBER_OF_EFFECT_TYPES; i ++){
4951 this->typeListBox->Insert(wxConvertMB2WX(
5052 wxGetApp().effectInfo[i].jname.c_str()), i);
@@ -142,11 +144,11 @@
142144 this->delayText->SetValue(
143145 wx::string::getString("%d",
144146 effect_definitions[type].delay));
145- setChoice(effect_definitions[type].delay_sound,
146- this->delaySoundChoice, NUMBER_OF_SOUND_DEFINITIONS);
147+ setChoice(this->delaySoundChoice, effect_definitions[type].delay_sound,
148+ NUMBER_OF_SOUND_DEFINITIONS);
147149 for(int i = 0; i < NUMBER_OF_EFFECT_FLAG_INFORMATIONS; i ++){
148150 this->flags[i]->SetValue(TEST_FLAG16(
149151 effect_definitions[type].flags,
150- wxGetApp().effect
152+ wxGetApp().effectFlagsBind[i].bind));
151153 }
152154 }
--- marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/ProjectilePanel.cpp (revision 469)
+++ marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/ProjectilePanel.cpp (revision 470)
@@ -1,9 +1,127 @@
11 #include "ProjectilePanel.h"
22
3+enum{
4+ ID_TYPE,
5+ ID_COLLECTION,
6+ ID_PALETTE,
7+ ID_SEQUENCE,
8+ ID_DETONATION_EFFECT,
9+ ID_DETONATION_MEDIA_EFFECT,
10+ ID_CONTRAIL_EFFECT,
11+ ID_TICKS_BETWEEN_CONTRAILS,
12+ ID_MAX_CONTRAILS,
13+ ID_MEDIA_PROMOTION,
14+ ID_RADIUS,
15+ ID_AREA,
16+
17+ ID_DAMAGE_TYPE,
18+ ID_DAMAGE_BASE,
19+ ID_DAMAGE_RANDOM,
20+ ID_DAMAGE_SCALE,
21+ ID_DAMAGE_IS_ALIEN,
22+
23+ ID_FLAGS,
24+ ID_RESET,
25+};
26+
327 BEGIN_EVENT_TABLE(ProjectilePanel, wxPanel)
28+ EVT_LISTBOX(ID_TYPE, ProjectilePanel::OnCollection)
29+
30+ EVT_CHOICE(ID_COLLECTION, ProjectilePanel::OnCollection)
31+ EVT_TEXT(ID_COLLECTION, ProjectilePanel::OnCollection)
32+ EVT_TEXT(ID_COLLECTION, ProjectilePanel::OnCollection)
33+ EVT_CHOICE(ID_COLLECTION, ProjectilePanel::OnCollection)
34+ EVT_CHOICE(ID_COLLECTION, ProjectilePanel::OnCollection)
35+ EVT_CHOICE(ID_COLLECTION, ProjectilePanel::OnCollection)
36+ EVT_TEXT(ID_COLLECTION, ProjectilePanel::OnCollection)
37+ EVT_TEXT(ID_COLLECTION, ProjectilePanel::OnCollection)
38+ EVT_TEXT(ID_COLLECTION, ProjectilePanel::OnCollection)
39+ EVT_TEXT(ID_COLLECTION, ProjectilePanel::OnCollection)
40+ EVT_TEXT(ID_COLLECTION, ProjectilePanel::OnCollection)
41+
42+ EVT_CHOICE(ID_COLLECTION, ProjectilePanel::OnCollection)
43+ EVT_TEXT(ID_COLLECTION, ProjectilePanel::OnCollection)
44+ EVT_TEXT(ID_COLLECTION, ProjectilePanel::OnCollection)
45+ EVT_TEXT(ID_COLLECTION, ProjectilePanel::OnCollection)
46+ EVT_CHECKBOX(ID_COLLECTION, ProjectilePanel::OnCollection)
47+
48+ EVT_CHECKBOX(ID_COLLECTION, ProjectilePanel::OnCollection)
49+
50+ EVT_BUTTON(ID_COLLECTION, ProjectilePanel::OnCollection)
51+
452 END_EVENT_TABLE()
553
654 ProjectilePanel::ProjectilePanel(wxWindow* parent, wxWindowID id):
755 wxPanel(parent, id)
856 {
57+ projectile_definitions[i]
958 }
59+
60+ProjectilePanel::~ProjectilePanel()
61+{
62+}
63+
64+void ProjectilePanel::OnType(wxCommandEvent& ev)
65+{
66+}
67+void ProjectilePanel::OnCollection(wxCommandEvent& ev)
68+{
69+}
70+void ProjectilePanel::OnPalette(wxCommandEvent& ev)
71+{
72+}
73+void ProjectilePanel::OnSequence(wxCommandEvent& ev)
74+{
75+}
76+void ProjectilePanel::OnDetonationEffect(wxCommandEvent& ev)
77+{
78+}
79+void ProjectilePanel::OnDetonationMediaEffect(wxCommandEvent& ev)
80+{
81+}
82+void ProjectilePanel::OnContrailEffect(wxCommandEvent& ev)
83+{
84+}
85+void ProjectilePanel::OnTicksBetweenContrails(wxCommandEvent& ev)
86+{
87+}
88+void ProjectilePanel::OnMaxContrail(wxCommandEvent& ev)
89+{
90+}
91+void ProjectilePanel::OnMediaPromotion(wxCommandEvent& ev)
92+{
93+}
94+void ProjectilePanel::OnRadius(wxCommandEvent& ev)
95+{
96+}
97+void ProjectilePanel::OnArea(wxCommandEvent& ev)
98+{
99+}
100+
101+void ProjectilePanel::OnDamageType(wxCommandEvent& ev)
102+{
103+}
104+void ProjectilePanel::OnDamageBase(wxCommandEvent& ev)
105+{
106+}
107+void ProjectilePanel::OnDamageRandom(wxCommandEvent& ev)
108+{
109+}
110+void ProjectilePanel::OnDamageScale(wxCommandEvent& ev)
111+{
112+}
113+void ProjectilePanel::OnDamageIsAlien(wxCommandEvent& ev)
114+{
115+}
116+
117+void ProjectilePanel::OnFlags(wxCommandEvent& ev)
118+{
119+}
120+
121+void ProjectilePanel::OnReset(wxCommandEvent& ev)
122+{
123+}
124+
125+void ProjectilePanel::setup()
126+{
127+}
--- marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/ProjectilePanel.h (revision 469)
+++ marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/ProjectilePanel.h (revision 470)
@@ -4,9 +4,65 @@
44 #include "../Common.h"
55
66 class ProjectilePanel: public wxPanel{
7+private:
8+ wxListBox* typeListBox;
9+
10+ wxChoice* collectionChoice;
11+ wxTextCtrl* paletteType;
12+ wxTextCtrl* sequenceText;
13+ wxChoice* detonationEffectChoice;
14+ wxChoice* detonationMediaEffectChoice;
15+ wxChoice* contrailEffectChoice;
16+ wxTextCtrl* ticksBetweenContrailsText;
17+ wxTextCtrl* maxContrailsText;
18+ wxTextCtrl* mediaPromotionText;
19+ wxTextCtrl* radiusText;
20+ wxTextCtrl* areaText;
21+
22+ //damages
23+ wxChoice* damageTypeChoice;
24+ wxTextCtrl* damageBaseText;
25+ wxTextCtrl* damageRandomText;
26+ wxTextCtrl* damageScaleText;
27+ wxCheckBox* damageIsAlienCheckBox;
28+
29+ //flags
30+ wxCheckBox* flags[NUMBER_OF_PROJECTILE_FLAG_INFORMATIONS];
31+
32+ //reset
33+ wxButton* resetButton;
34+
35+private:
36+ ProjectilePanel();
737 public:
838 ProjectilePanel(wxWindow* parent, wxWindowID id);
39+ virtual ~ProjectilePanel();
40+
941 DECLARE_EVENT_TABLE()
42+ void OnType(wxCommandEvent& ev);
43+ void OnCollection(wxCommandEvent& ev);
44+ void OnPalette(wxCommandEvent& ev);
45+ void OnSequence(wxCommandEvent& ev);
46+ void OnDetonationEffect(wxCommandEvent& ev);
47+ void OnDetonationMediaEffect(wxCommandEvent& ev);
48+ void OnContrailEffect(wxCommandEvent& ev);
49+ void OnTicksBetweenContrails(wxCommandEvent& ev);
50+ void OnMaxContrail(wxCommandEvent& ev);
51+ void OnMediaPromotion(wxCommandEvent& ev);
52+ void OnRadius(wxCommandEvent& ev);
53+ void OnArea(wxCommandEvent& ev);
54+
55+ void OnDamageType(wxCommandEvent& ev);
56+ void OnDamageBase(wxCommandEvent& ev);
57+ void OnDamageRandom(wxCommandEvent& ev);
58+ void OnDamageScale(wxCommandEvent& ev);
59+ void OnDamageIsAlien(wxCommandEvent& ev);
60+
61+ void OnFlags(wxCommandEvent& ev);
62+
63+ void OnReset(wxCommandEvent& ev);
64+private:
65+ void setup();
1066 };
1167
1268 #endif
旧リポジトリブラウザで表示