• R/O
  • SSH
  • HTTPS

marathon: コミット


コミットメタ情報

リビジョン462 (tree)
日時2007-08-31 00:39:49
作者hogepiyo

ログメッセージ

*** empty log message ***

変更サマリ

差分

--- marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/MonsterAttackPanel.h (revision 461)
+++ marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/MonsterAttackPanel.h (revision 462)
@@ -8,6 +8,30 @@
88 */
99 class MonsterAttackPanel: public wxPanel{
1010 private:
11+ wxTextCtrl* frequencyText;
12+
13+ //melee
14+ wxChoice* meleeTypeChoice;
15+ wxTextCtrl* meleeRepetitionsText;
16+ wxTextCtrl* meleeErrorText;
17+ wxTextCtrl* meleeRangeText;
18+ wxTextCtrl* meleeSequenceText;
19+ wxTextCtrl* meleeDXText;
20+ wxTextCtrl* meleeDYText;
21+ wxTextCtrl* meleeDZText;
22+ wxButton* meleeCopyFromButton;
23+
24+ //ranged
25+ wxChoice* rangedTypeChoice;
26+ wxTextCtrl* rangedRepetitionsText;
27+ wxTextCtrl* rangedErrorText;
28+ wxTextCtrl* rangedRangeText;
29+ wxTextCtrl* rangedSequenceText;
30+ wxTextCtrl* rangedDXText;
31+ wxTextCtrl* rangedDYText;
32+ wxTextCtrl* rangedDZText;
33+ wxButton* rangedCopyFromButton;
34+private:
1135 MonsterAttackPanel(){}
1236 public:
1337 MonsterAttackPanel(wxWindow* parent, wxWindowID id);
--- marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/MonsterAppearancePanel.cpp (revision 461)
+++ marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/MonsterAppearancePanel.cpp (revision 462)
@@ -198,9 +198,44 @@
198198 // appearance
199199 wxStaticBoxSizer* appearanceStaticSizer = new wxStaticBoxSizer(appearanceStaticBox,
200200 wxVERTICAL);
201+ wxFlexGridSizer* appearanceFlexSizer = new wxFlexGridSizer(9,2,0,0);
202+ appearanceFlexSizer->Add(new wxStaticText(this, wxID_ANY, _T("Stationaly")), 0, wxEXPAND);
203+ appearanceFlexSizer->Add(this->stationalyText, 0, wxEXPAND);
204+ appearanceFlexSizer->Add(new wxStaticText(this, wxID_ANY, _T("Moving")), 0, wxEXPAND);
205+ appearanceFlexSizer->Add(this->movingText, 0, wxEXPAND);
206+ appearanceFlexSizer->Add(new wxStaticText(this, wxID_ANY, _T("Hitting")), 0, wxEXPAND);
207+ appearanceFlexSizer->Add(this->hittingText, 0, wxEXPAND);
208+ appearanceFlexSizer->Add(new wxStaticText(this, wxID_ANY, _T("Soft Dying")), 0, wxEXPAND);
209+ appearanceFlexSizer->Add(this->softDyingText, 0, wxEXPAND);
210+ appearanceFlexSizer->Add(new wxStaticText(this, wxID_ANY, _T("Soft Dead")), 0, wxEXPAND);
211+ appearanceFlexSizer->Add(this->softDeadText, 0, wxEXPAND);
212+ appearanceFlexSizer->Add(new wxStaticText(this, wxID_ANY, _T("Hard Dying")), 0, wxEXPAND);
213+ appearanceFlexSizer->Add(this->hardDyingText, 0, wxEXPAND);
214+ appearanceFlexSizer->Add(new wxStaticText(this, wxID_ANY, _T("Hard Dead")), 0, wxEXPAND);
215+ appearanceFlexSizer->Add(this->hardDeadText, 0, wxEXPAND);
216+ appearanceFlexSizer->Add(new wxStaticText(this, wxID_ANY, _T("Teleport In")), 0, wxEXPAND);
217+ appearanceFlexSizer->Add(this->teleportInText, 0, wxEXPAND);
218+ appearanceFlexSizer->Add(new wxStaticText(this, wxID_ANY, _T("Teleport Out")), 0, wxEXPAND);
219+ appearanceFlexSizer->Add(this->teleportOutText, 0, wxEXPAND);
220+ appearanceStaticSizer->Add(appearanceFlexSizer);
201221 appearanceAndShrapnelSizer->Add(appearanceStaticSizer);
202222 // shrapnel
203223 wxStaticBoxSizer* shrapnelStaticSizer = new wxStaticBoxSizer(shrapnelStaticBox, wxVERTICAL);
224+ wxFlexGridSizer* shrapnelFlexSizer = new wxFlexGridSizer(2,1,0,0);
225+ wxFlexGridSizer* shrapnelDamageFlexSizer = new wxFlexGridSizer(5,2,0,0);
226+ shrapnelDamageFlexSizer->Add(new wxStaticText(this, wxID_ANY, _T("Radius")));
227+ shrapnelDamageFlexSizer->Add(this->shrapnelRadiusText);
228+ shrapnelDamageFlexSizer->Add(new wxStaticText(this, wxID_ANY, _T("Base")));
229+ shrapnelDamageFlexSizer->Add(this->shrapnelBaseText);
230+ shrapnelDamageFlexSizer->Add(new wxStaticText(this, wxID_ANY, _T("Random")));
231+ shrapnelDamageFlexSizer->Add(this->shrapnelRndText);
232+ shrapnelDamageFlexSizer->Add(new wxStaticText(this, wxID_ANY, _T("Scale")));
233+ shrapnelDamageFlexSizer->Add(this->shrapnelScaleText);
234+ shrapnelDamageFlexSizer->Add(new wxStaticText(this, wxID_ANY, _T("Type")));
235+ shrapnelDamageFlexSizer->Add(this->shrapnelTypeChoice);
236+ shrapnelFlexSizer->Add(shrapnelDamageFlexSizer);
237+ shrapnelFlexSizer->Add(this->shrapnelIsAlienCheckbox);
238+ shrapnelStaticSizer->Add(shrapnelFlexSizer);
204239 appearanceAndShrapnelSizer->Add(shrapnelStaticSizer);
205240 // button
206241 appearanceAndShrapnelSizer->Add(this->copyFromButton,0,wxEXPAND,0,0);
@@ -208,10 +243,45 @@
208243
209244 // right column
210245 wxFlexGridSizer* soundAndEffectSizer = new wxFlexGridSizer(3, 1, 0,0);
211- wxStaticBoxSizer* soundStaticSizer = new wxStaticBoxSizer(soundStaticBox, wxVERTICAL);
246+ // sound
247+ wxFlexGridSizer* soundFlexSizer = new wxFlexGridSizer(10,2,0,0);
248+ soundFlexSizer->Add(new wxStaticText(this, wxID_ANY, _T("Pitch")));
249+ soundFlexSizer->Add(this->soundPitchText);
250+ soundFlexSizer->Add(new wxStaticText(this, wxID_ANY, _T("Activation")));
251+ soundFlexSizer->Add(this->soundActivationChoice);
252+ soundFlexSizer->Add(new wxStaticText(this, wxID_ANY, _T("Friend Activation")));
253+ soundFlexSizer->Add(this->soundFriendActChoice);
254+ soundFlexSizer->Add(new wxStaticText(this, wxID_ANY, _T("Clear")));
255+ soundFlexSizer->Add(this->soundClearChoice);
256+ soundFlexSizer->Add(new wxStaticText(this, wxID_ANY, _T("Kill")));
257+ soundFlexSizer->Add(this->soundKillChoice);
258+ soundFlexSizer->Add(new wxStaticText(this, wxID_ANY, _T("Apology")));
259+ soundFlexSizer->Add(this->soundApologyChoice);
260+ soundFlexSizer->Add(new wxStaticText(this, wxID_ANY, _T("Friend Fire")));
261+ soundFlexSizer->Add(this->soundFriendFireChoice);
262+ soundFlexSizer->Add(new wxStaticText(this, wxID_ANY, _T("Flaming")));
263+ soundFlexSizer->Add(this->soundFlamingChoice);
264+ soundFlexSizer->Add(new wxStaticText(this, wxID_ANY, _T("Random")));
265+ soundFlexSizer->Add(this->soundRandomChoice);
266+ soundFlexSizer->Add(new wxStaticText(this, wxID_ANY, _T("Random Mask")));
267+ soundFlexSizer->Add(this->soundRandomMask);
268+
269+ wxStaticBoxSizer* soundStaticSizer = new wxStaticBoxSizer(soundStaticBox, wxVERTICAL);
270+ soundStaticSizer->Add(soundFlexSizer);
212271 soundAndEffectSizer->Add(soundStaticSizer);
213- wxStaticBoxSizer* effectStaticSizer = new wxStaticBoxSizer(effectStaticBox, wxVERTICAL);
272+ // effect
273+ wxFlexGridSizer* effectFlexSizer = new wxFlexGridSizer(3,2,0,0);
274+ effectFlexSizer->Add(new wxStaticText(this, wxID_ANY, _T("Effect")));
275+ effectFlexSizer->Add(this->effectChoice);
276+ effectFlexSizer->Add(new wxStaticText(this, wxID_ANY, _T("Melee Effect")));
277+ effectFlexSizer->Add(this->effectMeleeChoice);
278+ effectFlexSizer->Add(new wxStaticText(this, wxID_ANY, _T("Contrail Effect")));
279+ effectFlexSizer->Add(this->effectContrailChoice);
280+
281+ wxStaticBoxSizer* effectStaticSizer = new wxStaticBoxSizer(effectStaticBox, wxVERTICAL);
282+ effectStaticSizer->Add(effectFlexSizer);
214283 soundAndEffectSizer->Add(effectStaticSizer);
284+ soundAndEffectSizer->Add(this->resetButton);
215285
216286 baseSizer->Add(infoSizer);
217287 baseSizer->Add(appearanceAndShrapnelSizer);
@@ -225,3 +295,154 @@
225295 MonsterAppearancePanel::~MonsterAppearancePanel()
226296 {
227297 }
298+
299+void MonsterAppearancePanel::OnCollection(wxCommandEvent& ev)
300+{
301+}
302+void MonsterAppearancePanel::OnPalette(wxCommandEvent& ev)
303+{
304+}
305+void MonsterAppearancePanel::OnVitality(wxCommandEvent& ev)
306+{
307+}
308+void MonsterAppearancePanel::OnClass(wxCommandEvent& ev)
309+{
310+}
311+void MonsterAppearancePanel::OnRadius(wxCommandEvent& ev)
312+{
313+}
314+void MonsterAppearancePanel::OnHeight(wxCommandEvent& ev)
315+{
316+}
317+void MonsterAppearancePanel::OnHover(wxCommandEvent& ev)
318+{
319+}
320+void MonsterAppearancePanel::OnMinLedge(wxCommandEvent& ev)
321+{
322+}
323+void MonsterAppearancePanel::OnMaxLedge(wxCommandEvent& ev)
324+{
325+}
326+void MonsterAppearancePanel::OnExtVelScale(wxCommandEvent& ev)
327+{
328+}
329+void MonsterAppearancePanel::OnCarryItem(wxCommandEvent& ev)
330+{
331+}
332+void MonsterAppearancePanel::OnHalfVisualArc(wxCommandEvent& ev)
333+{
334+}
335+void MonsterAppearancePanel::OnVertVisualArc(wxCommandEvent& ev)
336+{
337+}
338+void MonsterAppearancePanel::OnIntelligence(wxCommandEvent& ev)
339+{
340+}
341+void MonsterAppearancePanel::OnSpeedText(wxCommandEvent& ev)
342+{
343+}
344+void MonsterAppearancePanel::OnSpeedChoice(wxCommandEvent& ev)
345+{
346+}
347+void MonsterAppearancePanel::OnGravity(wxCommandEvent& ev)
348+{
349+}
350+
351+void MonsterAppearancePanel::OnStationaly(wxCommandEvent& ev)
352+{
353+}
354+void MonsterAppearancePanel::OnMoving(wxCommandEvent& ev)
355+{
356+}
357+void MonsterAppearancePanel::OnHitting(wxCommandEvent& ev)
358+{
359+}
360+void MonsterAppearancePanel::OnSoftDying(wxCommandEvent& ev)
361+{
362+}
363+void MonsterAppearancePanel::OnSoftDead(wxCommandEvent& ev)
364+{
365+}
366+void MonsterAppearancePanel::OnHardDying(wxCommandEvent& ev)
367+{
368+}
369+void MonsterAppearancePanel::OnHardDead(wxCommandEvent& ev)
370+{
371+}
372+void MonsterAppearancePanel::OnTeleportIn(wxCommandEvent& ev)
373+{
374+}
375+void MonsterAppearancePanel::OnTeleportOut(wxCommandEvent& ev)
376+{
377+}
378+
379+void MonsterAppearancePanel::OnShrapnelRadius(wxCommandEvent& ev)
380+{
381+}
382+void MonsterAppearancePanel::OnShrapnelBase(wxCommandEvent& ev)
383+{
384+}
385+void MonsterAppearancePanel::OnShrapnelRnd(wxCommandEvent& ev)
386+{
387+}
388+void MonsterAppearancePanel::OnShrapnelScale(wxCommandEvent& ev)
389+{
390+}
391+void MonsterAppearancePanel::OnShrapnelType(wxCommandEvent& ev)
392+{
393+}
394+void MonsterAppearancePanel::OnShrapnelIsAlien(wxCommandEvent& ev)
395+{
396+}
397+void MonsterAppearancePanel::OnCopyFrom(wxCommandEvent& ev)
398+{
399+}
400+
401+void MonsterAppearancePanel::OnSoundPitch(wxCommandEvent& ev)
402+{
403+}
404+void MonsterAppearancePanel::OnSoundActivation(wxCommandEvent& ev)
405+{
406+}
407+void MonsterAppearancePanel::OnSoundFriendAct(wxCommandEvent& ev)
408+{
409+}
410+void MonsterAppearancePanel::OnSoundClear(wxCommandEvent& ev)
411+{
412+}
413+void MonsterAppearancePanel::OnSoundKill(wxCommandEvent& ev)
414+{
415+}
416+void MonsterAppearancePanel::OnSoundApology(wxCommandEvent& ev)
417+{
418+}
419+void MonsterAppearancePanel::OnSoundFriendFire(wxCommandEvent& ev)
420+{
421+}
422+void MonsterAppearancePanel::OnSoundFlaming(wxCommandEvent& ev)
423+{
424+}
425+void MonsterAppearancePanel::OnSoundRandom(wxCommandEvent& ev)
426+{
427+}
428+void MonsterAppearancePanel::OnSoundRandomMask(wxCommandEvent& ev)
429+{
430+}
431+
432+void MonsterAppearancePanel::OnEffect(wxCommandEvent& ev)
433+{
434+}
435+void MonsterAppearancePanel::OnEffectMelee(wxCommandEvent& ev)
436+{
437+}
438+void MonsterAppearancePanel::OnEffectContrail(wxCommandEvent& ev)
439+{
440+}
441+
442+void MonsterAppearancePanel::OnResetButton(wxCommandEvent& ev)
443+{
444+}
445+
446+void MonsterAppearancePanel::setup()
447+{
448+}
--- marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/MonsterAppearancePanel.h (revision 461)
+++ marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/MonsterAppearancePanel.h (revision 462)
@@ -73,6 +73,62 @@
7373 public:
7474 MonsterAppearancePanel(wxWindow* parent, wxWindowID id);
7575 virtual ~MonsterAppearancePanel();
76+protected:
77+ DECLARE_EVENT_TABLE()
78+ void OnCollection(wxCommandEvent& ev);
79+ void OnPalette(wxCommandEvent& ev);
80+ void OnVitality(wxCommandEvent& ev);
81+ void OnClass(wxCommandEvent& ev);
82+ void OnRadius(wxCommandEvent& ev);
83+ void OnHeight(wxCommandEvent& ev);
84+ void OnHover(wxCommandEvent& ev);
85+ void OnMinLedge(wxCommandEvent& ev);
86+ void OnMaxLedge(wxCommandEvent& ev);
87+ void OnExtVelScale(wxCommandEvent& ev);
88+ void OnCarryItem(wxCommandEvent& ev);
89+ void OnHalfVisualArc(wxCommandEvent& ev);
90+ void OnVertVisualArc(wxCommandEvent& ev);
91+ void OnIntelligence(wxCommandEvent& ev);
92+ void OnSpeedText(wxCommandEvent& ev);
93+ void OnSpeedChoice(wxCommandEvent& ev);
94+ void OnGravity(wxCommandEvent& ev);
95+
96+ void OnStationaly(wxCommandEvent& ev);
97+ void OnMoving(wxCommandEvent& ev);
98+ void OnHitting(wxCommandEvent& ev);
99+ void OnSoftDying(wxCommandEvent& ev);
100+ void OnSoftDead(wxCommandEvent& ev);
101+ void OnHardDying(wxCommandEvent& ev);
102+ void OnHardDead(wxCommandEvent& ev);
103+ void OnTeleportIn(wxCommandEvent& ev);
104+ void OnTeleportOut(wxCommandEvent& ev);
105+
106+ void OnShrapnelRadius(wxCommandEvent& ev);
107+ void OnShrapnelBase(wxCommandEvent& ev);
108+ void OnShrapnelRnd(wxCommandEvent& ev);
109+ void OnShrapnelScale(wxCommandEvent& ev);
110+ void OnShrapnelType(wxCommandEvent& ev);
111+ void OnShrapnelIsAlien(wxCommandEvent& ev);
112+ void OnCopyFrom(wxCommandEvent& ev);
113+
114+ void OnSoundPitch(wxCommandEvent& ev);
115+ void OnSoundActivation(wxCommandEvent& ev);
116+ void OnSoundFriendAct(wxCommandEvent& ev);
117+ void OnSoundClear(wxCommandEvent& ev);
118+ void OnSoundKill(wxCommandEvent& ev);
119+ void OnSoundApology(wxCommandEvent& ev);
120+ void OnSoundFriendFire(wxCommandEvent& ev);
121+ void OnSoundFlaming(wxCommandEvent& ev);
122+ void OnSoundRandom(wxCommandEvent& ev);
123+ void OnSoundRandomMask(wxCommandEvent& ev);
124+
125+ void OnEffect(wxCommandEvent& ev);
126+ void OnEffectMelee(wxCommandEvent& ev);
127+ void OnEffectContrail(wxCommandEvent& ev);
128+
129+ void OnResetButton(wxCommandEvent& ev);
130+public:
131+ void setup();
76132 };
77133
78134
--- marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/MainFrame.cpp (revision 461)
+++ marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/MainFrame.cpp (revision 462)
@@ -45,6 +45,10 @@
4545 CreateStatusBar();
4646 SetStatusText( _T("get ready..."));
4747
48+ wxFont font = GetFont();
49+ font.SetPointSize(8);
50+ SetFont(font);
51+
4852 //メニューの作成
4953 //File
5054 wxMenu* menuFile = new wxMenu;
旧リポジトリブラウザで表示