• R/O
  • SSH
  • HTTPS

marathon: コミット


コミットメタ情報

リビジョン332 (tree)
日時2007-06-15 00:01:02
作者hogepiyo

ログメッセージ

*** empty log message ***

変更サマリ

差分

--- marathon/trunk/MapEditorWX/src/MainFrameDraw.cpp (revision 331)
+++ marathon/trunk/MapEditorWX/src/MainFrameDraw.cpp (revision 332)
@@ -381,7 +381,8 @@
381381
382382 //描画
383383 bool transparent = true;
384- dc->DrawBitmap(*bmp, vpoint[0], vpoint[1], transparent);
384+ dc->DrawBitmap(*bmp, vpoint[0] - bmp->GetWidth() / 2, vpoint[1] - bmp->GetHeight() /2,
385+ transparent);
385386 }
386387 }
387388 }
--- marathon/trunk/MapEditorWX/src/AnnotationDialog.cpp (revision 331)
+++ marathon/trunk/MapEditorWX/src/AnnotationDialog.cpp (revision 332)
@@ -70,9 +70,12 @@
7070 polyChoice->Insert(wxString(_T("NONE")), n);
7171 polygonBox->Add(polyChoice);
7272
73- //OKボタン
74- boxSizer->Add(new wxButton(this, wxID_OK, _T("OK")));
75- boxSizer->Add(new wxButton(this, wxID_CANCEL, _T("Cancel")));
73+ //ボタンは横置き!
74+ wxBoxSizer* btnBox = new wxBoxSizer(wxHORIZONTAL);
75+ //OKボタン
76+ btnBox->Add(new wxButton(this, wxID_OK, _T("OK")));
77+ btnBox->Add(new wxButton(this, wxID_CANCEL, _T("Cancel")));
78+ boxSizer->Add(btnBox);
7679 boxSizer->Fit(this);
7780 Layout();
7881 return result;
--- marathon/trunk/MapEditorWX/src/MainFrameEvent.cpp (revision 331)
+++ marathon/trunk/MapEditorWX/src/MainFrameEvent.cpp (revision 332)
@@ -116,6 +116,7 @@
116116 //<en> clicked on selection datas
117117 //-> set offsets
118118 this->setupSelectDataGroupOffsets(mx, my);
119+ return;
119120 }else{
120121 //クリックしていない
121122 //→選択解除
@@ -123,20 +124,18 @@
123124 //-> release all selections
124125 sel->clear();
125126 }
126-
127+ }
128+ //何も選択していない状態
129+ //一つを選択できるか試してみます
130+ if(this->tryToSelectOneItem(ev)){
131+ //選択範囲は解除します
132+ wxGetApp().getEventManager()->setSelectingGroup(false);
127133 }else{
128- //何も選択していない状態
129- //一つを選択できるか試してみます
130- if(this->tryToSelectOneItem(ev)){
131- //選択範囲は解除します
132- wxGetApp().getEventManager()->setSelectingGroup(false);
133- }else{
134- //選択されなかった
135- //範囲選択の開始
136- wxGetApp().getEventManager()->setSelectGroupStartPoint(mx, my);
137- //選択情報の解除
138- sel->clear();
139- }
134+ //選択されなかった
135+ //範囲選択の開始
136+ wxGetApp().getEventManager()->setSelectGroupStartPoint(mx, my);
137+ //選択情報の解除
138+ sel->clear();
140139 }
141140 }
142141
@@ -161,7 +160,7 @@
161160 }
162161
163162 //線 <en> lines
164- for(int i = 0; (int)sel->getSelLines()->size(); i ++){
163+ for(int i = 0; i < (int)sel->getSelLines()->size(); i ++){
165164 line_data* line = get_line_data(sel->getSelLines()->at(i).index);
166165 endpoint_data* begin = get_endpoint_data(line->endpoint_indexes[0]);
167166 endpoint_data* end = get_endpoint_data(line->endpoint_indexes[1]);
@@ -178,7 +177,7 @@
178177 }
179178
180179 //ポリゴン
181- for(int i = 0; (int)sel->getSelPolygons()->size(); i ++){
180+ for(int i = 0; i < (int)sel->getSelPolygons()->size(); i ++){
182181 hpl::aleph::map::SelPolygon* selpoly = &sel->getSelPolygons()->at(i);
183182 polygon_data* poly = get_polygon_data(selpoly->index);
184183 int n = poly->vertex_count;
--- marathon/trunk/MapEditorWX/src/res/Dialogues.h (revision 331)
+++ marathon/trunk/MapEditorWX/src/res/Dialogues.h (revision 332)
@@ -1,4 +1,4 @@
1-// -*- C++ -*- generated by wxGlade 0.5 on Wed Jun 13 16:40:26 2007 from C:\0save\marathon\MapEditorWX\src\res\MapEditorWX.wxg
1+// -*- C++ -*- generated by wxGlade 0.5 on Thu Jun 14 22:31:15 2007 from C:\Documents and Settings\koji\My Documents\saved_\repository_\marathon\MapEditorWX\src\res\MapEditorWX.wxg
22
33 #include <wx/wx.h>
44 #include <wx/image.h>
@@ -25,6 +25,9 @@
2525
2626 protected:
2727 // begin wxGlade: wxDialog::attributes
28+ wxStaticBox* sizer_31_staticbox;
29+ wxStaticBox* sizer_27_staticbox;
30+ wxStaticBox* sizer_28_staticbox;
2831 wxStaticBox* sizer_19_staticbox;
2932 wxStaticBox* sizer_12_staticbox;
3033 wxStaticBox* sizer_11_staticbox;
@@ -58,6 +61,28 @@
5861 wxCheckBox* checkbox_10;
5962 wxStaticText* label_7;
6063 wxChoice* choice_5;
64+ wxCheckBox* checkbox_15;
65+ wxCheckBox* checkbox_16;
66+ wxCheckBox* checkbox_17;
67+ wxCheckBox* checkbox_18;
68+ wxCheckBox* checkbox_19;
69+ wxStaticText* label_8;
70+ wxChoice* choice_6;
71+ wxRadioButton* radio_btn_4;
72+ wxRadioButton* radio_btn_5;
73+ wxRadioButton* radio_btn_6;
74+ wxCheckBox* checkbox_12;
75+ wxCheckBox* checkbox_13;
76+ wxCheckBox* checkbox_14;
77+ wxCheckBox* checkbox_20;
78+ wxCheckBox* checkbox_21;
79+ wxCheckBox* checkbox_22;
80+ wxCheckBox* checkbox_24;
81+ wxCheckBox* checkbox_23;
82+ wxCheckBox* checkbox_25;
83+ wxCheckBox* checkbox_26;
84+ wxButton* button_1;
85+ wxButton* button_2;
6186 // end wxGlade
6287
6388 DECLARE_EVENT_TABLE();
--- marathon/trunk/MapEditorWX/src/res/Dialogues.cpp (revision 331)
+++ marathon/trunk/MapEditorWX/src/res/Dialogues.cpp (revision 332)
@@ -1,4 +1,4 @@
1-// -*- C++ -*- generated by wxGlade 0.5 on Wed Jun 13 16:40:26 2007 from C:\0save\marathon\MapEditorWX\src\res\MapEditorWX.wxg
1+// -*- C++ -*- generated by wxGlade 0.5 on Thu Jun 14 22:31:15 2007 from C:\Documents and Settings\koji\My Documents\saved_\repository_\marathon\MapEditorWX\src\res\MapEditorWX.wxg
22
33 #include "Dialogues.h"
44
@@ -10,6 +10,9 @@
1010 sizer_11_staticbox = new wxStaticBox(this, -1, wxT("Controlled by"));
1111 sizer_12_staticbox = new wxStaticBox(this, -1, wxT("When Bites"));
1212 sizer_19_staticbox = new wxStaticBox(this, -1, wxT("Open"));
13+ sizer_28_staticbox = new wxStaticBox(this, -1, wxT("Activates"));
14+ sizer_27_staticbox = new wxStaticBox(this, -1, wxT("Deactivates"));
15+ sizer_31_staticbox = new wxStaticBox(this, -1, wxT("Misc"));
1316 sizer_10_staticbox = new wxStaticBox(this, -1, wxT("Initially"));
1417 label_1 = new wxStaticText(this, wxID_ANY, wxT("Type"));
1518 const wxString choice_1_choices[] = {
@@ -46,7 +49,7 @@
4649
4750 };
4851 choice_4 = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, choice_4_choices, 0);
49- radio_btn_1 = new wxRadioButton(this, wxID_ANY, wxT("From Floor"));
52+ radio_btn_1 = new wxRadioButton(this, wxID_ANY, wxT("From Floor"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
5053 radio_btn_2 = new wxRadioButton(this, wxID_ANY, wxT("From Ceiling"));
5154 radio_btn_3 = new wxRadioButton(this, wxID_ANY, wxT("From Both"));
5255 checkbox_10 = new wxCheckBox(this, wxID_ANY, wxT("Floor to Ceiling"));
@@ -55,6 +58,31 @@
5558
5659 };
5760 choice_5 = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, choice_5_choices, 0);
61+ checkbox_15 = new wxCheckBox(this, wxID_ANY, wxT("Only once"));
62+ checkbox_16 = new wxCheckBox(this, wxID_ANY, wxT("Activates polygon lights"));
63+ checkbox_17 = new wxCheckBox(this, wxID_ANY, wxT("Activates adjacent polygon"));
64+ checkbox_18 = new wxCheckBox(this, wxID_ANY, wxT("Deactivates adjacent polygon"));
65+ checkbox_19 = new wxCheckBox(this, wxID_ANY, wxT("Adjacent at each level"));
66+ label_8 = new wxStaticText(this, wxID_ANY, wxT("Tag"));
67+ const wxString choice_6_choices[] = {
68+
69+ };
70+ choice_6 = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, choice_6_choices, 0);
71+ radio_btn_4 = new wxRadioButton(this, wxID_ANY, wxT("Never"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
72+ radio_btn_5 = new wxRadioButton(this, wxID_ANY, wxT("At each level"));
73+ radio_btn_6 = new wxRadioButton(this, wxID_ANY, wxT("At initial level"));
74+ checkbox_12 = new wxCheckBox(this, wxID_ANY, wxT("Deactivates polygon lights"));
75+ checkbox_13 = new wxCheckBox(this, wxID_ANY, wxT("Deactivates adjacent platform"));
76+ checkbox_14 = new wxCheckBox(this, wxID_ANY, wxT("Activates adjacent platform"));
77+ checkbox_20 = new wxCheckBox(this, wxID_ANY, wxT("Can't deactivate extenally"));
78+ checkbox_21 = new wxCheckBox(this, wxID_ANY, wxT("Uses native polygon heights"));
79+ checkbox_22 = new wxCheckBox(this, wxID_ANY, wxT("Delay befire activation"));
80+ checkbox_24 = new wxCheckBox(this, wxID_ANY, wxT("Doesn't activate parent"));
81+ checkbox_23 = new wxCheckBox(this, wxID_ANY, wxT("Contracts slower"));
82+ checkbox_25 = new wxCheckBox(this, wxID_ANY, wxT("Locked"));
83+ checkbox_26 = new wxCheckBox(this, wxID_ANY, wxT("Secret"));
84+ button_1 = new wxButton(this, wxID_ANY, wxT("OK"));
85+ button_2 = new wxButton(this, wxID_ANY, wxT("Cancel"));
5886
5987 set_properties();
6088 do_layout();
@@ -98,14 +126,22 @@
98126 void wxDialog::do_layout()
99127 {
100128 // begin wxGlade: wxDialog::do_layout
101- wxBoxSizer* sizer_1 = new wxBoxSizer(wxVERTICAL);
129+ wxFlexGridSizer* sizer_1 = new wxFlexGridSizer(1, 2, 0, 0);
130+ wxBoxSizer* sizer_21 = new wxBoxSizer(wxHORIZONTAL);
131+ wxBoxSizer* sizer_30 = new wxBoxSizer(wxVERTICAL);
132+ wxFlexGridSizer* sizer_32 = new wxFlexGridSizer(1, 2, 0, 0);
133+ wxStaticBoxSizer* sizer_31 = new wxStaticBoxSizer(sizer_31_staticbox, wxVERTICAL);
134+ wxStaticBoxSizer* sizer_27 = new wxStaticBoxSizer(sizer_27_staticbox, wxVERTICAL);
135+ wxBoxSizer* sizer_26 = new wxBoxSizer(wxVERTICAL);
136+ wxFlexGridSizer* sizer_29 = new wxFlexGridSizer(1, 2, 0, 0);
137+ wxStaticBoxSizer* sizer_28 = new wxStaticBoxSizer(sizer_28_staticbox, wxVERTICAL);
102138 wxBoxSizer* sizer_2 = new wxBoxSizer(wxHORIZONTAL);
103- wxBoxSizer* sizer_16 = new wxBoxSizer(wxVERTICAL);
139+ wxFlexGridSizer* sizer_16 = new wxFlexGridSizer(1, 3, 0, 0);
104140 wxBoxSizer* sizer_18 = new wxBoxSizer(wxHORIZONTAL);
105141 wxBoxSizer* sizer_20 = new wxBoxSizer(wxVERTICAL);
106142 wxStaticBoxSizer* sizer_19 = new wxStaticBoxSizer(sizer_19_staticbox, wxVERTICAL);
107143 wxBoxSizer* sizer_17 = new wxBoxSizer(wxHORIZONTAL);
108- wxBoxSizer* sizer_3 = new wxBoxSizer(wxVERTICAL);
144+ wxFlexGridSizer* sizer_3 = new wxFlexGridSizer(1, 2, 0, 0);
109145 wxBoxSizer* sizer_4 = new wxBoxSizer(wxHORIZONTAL);
110146 wxStaticBoxSizer* sizer_12 = new wxStaticBoxSizer(sizer_12_staticbox, wxVERTICAL);
111147 wxStaticBoxSizer* sizer_11 = new wxStaticBoxSizer(sizer_11_staticbox, wxVERTICAL);
@@ -117,7 +153,7 @@
117153 wxBoxSizer* sizer_6 = new wxBoxSizer(wxVERTICAL);
118154 wxBoxSizer* sizer_9 = new wxBoxSizer(wxHORIZONTAL);
119155 wxBoxSizer* sizer_8 = new wxBoxSizer(wxHORIZONTAL);
120- wxBoxSizer* sizer_7 = new wxBoxSizer(wxHORIZONTAL);
156+ wxFlexGridSizer* sizer_7 = new wxFlexGridSizer(1, 2, 0, 0);
121157 sizer_7->Add(label_1, 0, 0, 0);
122158 sizer_7->Add(choice_1, 0, 0, 0);
123159 sizer_6->Add(sizer_7, 1, wxEXPAND, 0);
@@ -166,6 +202,36 @@
166202 sizer_16->Add(sizer_18, 1, wxEXPAND, 0);
167203 sizer_2->Add(sizer_16, 1, wxEXPAND, 0);
168204 sizer_1->Add(sizer_2, 1, wxEXPAND, 0);
205+ sizer_28->Add(checkbox_15, 0, 0, 0);
206+ sizer_28->Add(checkbox_16, 0, 0, 0);
207+ sizer_28->Add(checkbox_17, 0, 0, 0);
208+ sizer_28->Add(checkbox_18, 0, 0, 0);
209+ sizer_28->Add(checkbox_19, 0, 0, 0);
210+ sizer_26->Add(sizer_28, 1, wxEXPAND, 0);
211+ sizer_29->Add(label_8, 0, 0, 0);
212+ sizer_29->Add(choice_6, 0, 0, 0);
213+ sizer_26->Add(sizer_29, 1, wxEXPAND, 0);
214+ sizer_21->Add(sizer_26, 1, wxEXPAND, 0);
215+ sizer_27->Add(radio_btn_4, 0, 0, 0);
216+ sizer_27->Add(radio_btn_5, 0, 0, 0);
217+ sizer_27->Add(radio_btn_6, 0, 0, 0);
218+ sizer_27->Add(checkbox_12, 0, 0, 0);
219+ sizer_27->Add(checkbox_13, 0, 0, 0);
220+ sizer_27->Add(checkbox_14, 0, 0, 0);
221+ sizer_21->Add(sizer_27, 1, wxEXPAND, 0);
222+ sizer_31->Add(checkbox_20, 0, 0, 0);
223+ sizer_31->Add(checkbox_21, 0, 0, 0);
224+ sizer_31->Add(checkbox_22, 0, 0, 0);
225+ sizer_31->Add(checkbox_24, 0, 0, 0);
226+ sizer_31->Add(checkbox_23, 0, 0, 0);
227+ sizer_31->Add(checkbox_25, 0, 0, 0);
228+ sizer_31->Add(checkbox_26, 0, 0, 0);
229+ sizer_30->Add(sizer_31, 1, wxEXPAND, 0);
230+ sizer_32->Add(button_1, 0, 0, 0);
231+ sizer_32->Add(button_2, 0, 0, 0);
232+ sizer_30->Add(sizer_32, 1, wxEXPAND, 0);
233+ sizer_21->Add(sizer_30, 1, 0, 0);
234+ sizer_1->Add(sizer_21, 1, wxEXPAND, 0);
169235 SetSizer(sizer_1);
170236 sizer_1->Fit(this);
171237 Layout();
@@ -226,7 +292,3 @@
226292 // end wxGlade
227293 }
228294
229-
230-
231-
232-
--- marathon/trunk/MapEditorCommonSrc/MapEditorOneSetting.h (revision 331)
+++ marathon/trunk/MapEditorCommonSrc/MapEditorOneSetting.h (revision 332)
@@ -24,8 +24,8 @@
2424 const int NUMBER_OF_LANDSPACES = 4;
2525 //点とクリック地点の距離がこれ以下であれば選択する。
2626 //リスト順に探索する
27-const int POINT_DISTANCE_EPSILON = 5;
28-const int OBJECT_DISTANCE_EPSILON = 8;
27+const int POINT_DISTANCE_EPSILON = 10;
28+const int OBJECT_DISTANCE_EPSILON = 10;
2929 const int LINE_DISTANCE_EPSILON = 5;
3030
3131 // CMonsterPropertyDialog ダイアログ
旧リポジトリブラウザで表示