• R/O
  • SSH
  • HTTPS

marathon: コミット


コミットメタ情報

リビジョン351 (tree)
日時2007-06-28 01:30:17
作者hogepiyo

ログメッセージ

*** empty log message ***

変更サマリ

差分

--- marathon/trunk/MapEditorWX/src/MapEditorWX.cpp (revision 350)
+++ marathon/trunk/MapEditorWX/src/MapEditorWX.cpp (revision 351)
@@ -270,3 +270,14 @@
270270 ::wxSetCursor(cursors[0]);
271271 }
272272 }
273+
274+//char->wx
275+wxString getString(const char* format, ...)
276+{
277+ char message[BUF_MAX];
278+ va_list maker;
279+ va_start(maker, format);
280+ vsprintf(message, format, maker);
281+ wxString str = wxConvertMB2WX(message);
282+ return str;
283+}
--- marathon/trunk/MapEditorWX/src/ColorCustomizeDialog.h (revision 350)
+++ marathon/trunk/MapEditorWX/src/ColorCustomizeDialog.h (revision 351)
@@ -32,6 +32,7 @@
3232 virtual ~ColorCustomizeDialog();
3333
3434 ColorSettings getColor();
35+ void setColor(int cols[]);
3536
3637 void OnOk(wxCommandEvent& ev);
3738 void OnCancel(wxCommandEvent &ev);
--- marathon/trunk/MapEditorWX/src/PlacementDialog.cpp (revision 350)
+++ marathon/trunk/MapEditorWX/src/PlacementDialog.cpp (revision 351)
@@ -1,4 +1,5 @@
11 #include "PlacementDialog.h"
2+#include "MapEditorWX.h"
23
34 enum{
45 ID_INITIAL,
@@ -30,6 +31,32 @@
3031 PlacementDialog::~PlacementDialog()
3132 {
3233 }
34+
35+const int COLUMN_NUM = 7;
36+
37+static void addListItem(wxListCtrl* lstctrl, object_frequency_definition* placement, wxString type,
38+ int id){
39+ wxString str[COLUMN_NUM];
40+ str[0] = type;
41+ str[1] = getString("%d", placement->minimum_count);
42+ str[2] = getString("%d", placement->maximum_count);
43+ str[3] = getString("%d", placement->initial_count);
44+ str[4] = getString("%d", placement->random_count);
45+ str[5] = getString("%d", placement->random_chance);
46+ str[6] = getString("%d", placement->flags);
47+
48+ for(int j = 0; j < COLUMN_NUM; j ++){
49+ wxListItem item;
50+ item.SetId(id);
51+ item.SetColumn(j);
52+ item.SetText(str[j]);
53+ if(j == 0){
54+ lstctrl->InsertItem(item);
55+ }else{
56+ lstctrl->SetItem(item);
57+ }
58+ }
59+}
3360 bool PlacementDialog::Create(wxWindow* parent, wxWindowID id)
3461 {
3562 bool result = wxDialog::Create(parent, id, _T("Placement"));
@@ -82,6 +109,25 @@
82109 grid_sizer_1->Fit(this);
83110 Layout();
84111
112+ //データ設定
113+ char columnNames[][100] = {
114+ "Type", "Min", "Max", "Initial",
115+ "Rnd Count", "Rnd Chance", "Flags"
116+ };
117+ for(int i = 0; i < COLUMN_NUM; i ++){
118+ list_ctrl_1->InsertColumn(i, wxConvertMB2WX(columnNames[i]));
119+ }
120+ for(int i = 0; i < NUMBER_OF_DEFINED_ITEMS; i ++){
121+ object_frequency_definition* placement = hpl::aleph::map::getPlacementData(_saved_item, i);
122+ addListItem(this->list_ctrl_1, placement,
123+ wxConvertMB2WX(wxGetApp().itemTypeInfo[i].jname.c_str()), i);
124+ }
125+ for(int i = 0; i < NUMBER_OF_MONSTER_TYPES; i ++){
126+ object_frequency_definition* placement = hpl::aleph::map::getPlacementData(_saved_monster, i);
127+ addListItem(this->list_ctrl_1, placement,
128+ wxConvertMB2WX(wxGetApp().monsterTypeInfo[i].jname.c_str()),
129+ i + NUMBER_OF_DEFINED_ITEMS);
130+ }
85131 return result;
86132 }
87133 //OKボタン押した時
@@ -92,12 +138,15 @@
92138 }
93139 void PlacementDialog::OnInf(wxCommandEvent &ev)
94140 {
141+ //TODO
95142 }
96143 void PlacementDialog::OnAllInf(wxCommandEvent &ev)
97144 {
145+ //TODO
98146 }
99147 void PlacementDialog::OnSetInitial(wxCommandEvent &ev)
100148 {
149+ //TODO
101150 }
102151 void PlacementDialog::OnEditInitial(wxCommandEvent &event)
103152 {
--- marathon/trunk/MapEditorWX/src/EditorPreferencesDialog.h (revision 350)
+++ marathon/trunk/MapEditorWX/src/EditorPreferencesDialog.h (revision 351)
@@ -18,16 +18,17 @@
1818 EditorPreferencesDialog();
1919 bool Create(wxWindow* parent, wxWindowID id);
2020 virtual ~EditorPreferencesDialog();
21- //イベントテーブル作成<en>declare
2221
2322 private:
2423 void setupDialog(MapEditorOneSetting* setting);
2524
25+ //イベントテーブル作成<en>declare
2626 DECLARE_EVENT_TABLE()
2727 void OnDefault(wxCommandEvent &event); // wxGlade: <event_handler>
2828 void OnOk(wxCommandEvent &event); // wxGlade: <event_handler>
2929 void OnCancel(wxCommandEvent &event); // wxGlade: <event_handler>
3030 void OnColor(wxCommandEvent &event);
31+ void OnGrid(wxCommandEvent &event);
3132 };
3233
3334 #endif
--- marathon/trunk/MapEditorWX/src/ColorCustomizeDialog.cpp (revision 350)
+++ marathon/trunk/MapEditorWX/src/ColorCustomizeDialog.cpp (revision 351)
@@ -106,46 +106,58 @@
106106 SetReturnCode(wxID_OK);
107107 Destroy();
108108 }
109+void ColorCustomizeDialog::setColor(int cols[]){
110+ wxColor col = wxGetColourFromUser(this);
111+ cols[0] = col.Red();
112+ cols[1] = col.Green();
113+ cols[2] = col.Blue();
114+}
115+
109116 void ColorCustomizeDialog::OnBackground(wxCommandEvent &event)
110117 {
111- //TODO カラー選択ダイアログを出す
112- event.Skip();
113- std::cout<<"Event handler (ColorCustomizeDialog::OnBackground) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
118+ ColorSettings* cols = wxGetApp().setting.getColorSetting();
119+ cols->type = COL_CUSTOM;
120+ setColor(cols->background);
114121 }
115122
116123
117124 void ColorCustomizeDialog::OnGrid(wxCommandEvent &event)
118125 {
119- event.Skip();
120- std::cout<<"Event handler (ColorCustomizeDialog::OnGrid) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
126+ ColorSettings* cols = wxGetApp().setting.getColorSetting();
127+ cols->type = COL_CUSTOM;
128+ setColor(cols->gridLine);
121129 }
122130
123131
124132 void ColorCustomizeDialog::OnLines(wxCommandEvent &event)
125133 {
126- event.Skip();
127- std::cout<<"Event handler (ColorCustomizeDialog::OnLines) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
134+ ColorSettings* cols = wxGetApp().setting.getColorSetting();
135+ cols->type = COL_CUSTOM;
136+ setColor(cols->lines);
128137 }
129138
130139
131140 void ColorCustomizeDialog::OnPolygons(wxCommandEvent &event)
132141 {
133- event.Skip();
134- std::cout<<"Event handler (ColorCustomizeDialog::OnPolygons) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
142+ ColorSettings* cols = wxGetApp().setting.getColorSetting();
143+ cols->type = COL_CUSTOM;
144+ setColor(cols->polygons);
135145 }
136146
137147
138148 void ColorCustomizeDialog::OnStrings(wxCommandEvent &event)
139149 {
140- event.Skip();
141- std::cout<<"Event handler (ColorCustomizeDialog::OnStrings) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
150+ ColorSettings* cols = wxGetApp().setting.getColorSetting();
151+ cols->type = COL_CUSTOM;
152+ setColor(cols->strings);
142153 }
143154
144155
145156 void ColorCustomizeDialog::OnPoints(wxCommandEvent &event)
146157 {
147- event.Skip();
148- std::cout<<"Event handler (ColorCustomizeDialog::OnPoints) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
158+ ColorSettings* cols = wxGetApp().setting.getColorSetting();
159+ cols->type = COL_CUSTOM;
160+ setColor(cols->points);
149161 }
150162
151163 void ColorCustomizeDialog::OnPaint(wxPaintEvent &event)
@@ -170,32 +182,32 @@
170182 switch(type){
171183 case ColorType::Background:
172184 for(int i = 0; i < COL_NUM; i ++){
173- col[i] = this->colorSetting.background[0];
185+ col[i] = this->colorSetting.background[i];
174186 }
175187 break;
176188 case ColorType::GridLine:
177189 for(int i = 0; i < COL_NUM; i ++){
178- col[i] = this->colorSetting.gridLine[0];
190+ col[i] = this->colorSetting.gridLine[i];
179191 }
180192 break;
181193 case ColorType::Lines:
182194 for(int i = 0; i < COL_NUM; i ++){
183- col[i] = this->colorSetting.lines[0];
195+ col[i] = this->colorSetting.lines[i];
184196 }
185197 break;
186198 case ColorType::Polygons:
187199 for(int i = 0; i < COL_NUM; i ++){
188- col[i] = this->colorSetting.polygons[0];
200+ col[i] = this->colorSetting.polygons[i];
189201 }
190202 break;
191203 case ColorType::Strings:
192204 for(int i = 0; i < COL_NUM; i ++){
193- col[i] = this->colorSetting.strings[0];
205+ col[i] = this->colorSetting.strings[i];
194206 }
195207 break;
196208 case ColorType::Points:
197209 for(int i = 0; i < COL_NUM; i ++){
198- col[i] = this->colorSetting.points[0];
210+ col[i] = this->colorSetting.points[i];
199211 }
200212 break;
201213 default:
--- marathon/trunk/MapEditorWX/src/MainFrameEvent.cpp (revision 350)
+++ marathon/trunk/MapEditorWX/src/MainFrameEvent.cpp (revision 351)
@@ -613,12 +613,16 @@
613613 #else
614614 //範囲選択開始
615615 //TODO
616- //wxGetApp().getEventManager()->
616+ wxGetApp().getEventManager()->setSelectingGroup(true);
617+ wxGetApp().getEventManager()->setSelectGroupStartPoint(ev.m_x, ev.m_y);
617618 #endif
618619 }
619620
620621 void MapEditorMainFrame::doLButtonOnPolygonMode(wxMouseEvent& ev)
621622 {
623+#ifdef MAP_VIEWER
624+#else
625+#endif
622626 }
623627 void MapEditorMainFrame::doLButtonOnFloorHeightMode(wxMouseEvent& ev)
624628 {
@@ -691,8 +695,46 @@
691695 {
692696 //カーソル設定
693697 wxGetApp().setCursor();
698+ int mx = ev.m_x;
699+ int my = ev.m_y;
700+
694701 //マウス座標記録
695- wxGetApp().getViewGridManager()->setNewMousePoint(ev.m_x, ev.m_y);
702+ wxGetApp().getViewGridManager()->setNewMousePoint(mx, my);
703+
704+ //ポリゴンモードの時新しいポリゴンを作る
705+ hpl::aleph::HPLEventManager* emgr = wxGetApp().getEventManager();
706+ int editMode = emgr->getEditModeType();
707+ int toolType = emgr->getToolType();
708+ if(editMode == EditModeType::EM_DRAW &&
709+ toolType == ToolType::TI_POLYGON)
710+ {
711+ if(emgr->isSelectingGroup()){
712+ //選択範囲中だった
713+ //→独立ポリゴンの作成
714+ int n = wxGetApp().nPolygonPoints;
715+ int selStartPoint[2];
716+ emgr->getSelectGroupStartPoint(selStartPoint);
717+ //n角形の座標を取得
718+ double polyPointsView[8][2];
719+ hpl::math::getRectangleScaledPreparedPolygon(
720+ selStartPoint[0], selStartPoint[1], mx, my,
721+ n, polyPointsView);
722+
723+ //ワールド系に座標変換
724+ world_point2d polyPointsWorld[8];
725+ for(int i = 0; i < n; i ++){
726+ polyPointsWorld[i] =
727+ wxGetApp().getWorldPointFromViewPoint(
728+ (int)polyPointsView[i][0],
729+ (int)polyPointsView[i][1]);
730+ }
731+
732+ //ポリゴン生成
733+ hpl::aleph::map::addNewPolygon(polyPointsWorld, n);
734+ }
735+
736+ }
737+
696738 }
697739 void MapEditorMainFrame::OnLeftUp(wxMouseEvent& ev)
698740 {
@@ -1044,7 +1086,7 @@
10441086 struct hpl::aleph::map::SelPoint* selp = &sel->getSelPoints()->at(i);
10451087 //位置変更
10461088 get_endpoint_data(selp->index)->vertex.x = wmp.x + selp->offset[0] * div;
1047- get_endpoint_data(selp->index)->vertex.y = wmp.x + selp->offset[1] * div;
1089+ get_endpoint_data(selp->index)->vertex.y = wmp.y + selp->offset[1] * div;
10481090 }
10491091
10501092 //線
--- marathon/trunk/MapEditorWX/src/MapEditorWX.h (revision 350)
+++ marathon/trunk/MapEditorWX/src/MapEditorWX.h (revision 351)
@@ -262,3 +262,6 @@
262262
263263 //実体を持たせます
264264 DECLARE_APP(MapEditorWX)
265+
266+//char->wx
267+wxString getString(const char* format, ...);
--- marathon/trunk/MapEditorWX/src/DlgCommon.h (revision 350)
+++ marathon/trunk/MapEditorWX/src/DlgCommon.h (revision 351)
@@ -15,9 +15,12 @@
1515 #include <wx/listctrl.h>
1616 #include <wx/listbox.h>
1717 #include <wx/bmpbuttn.h>
18+#include <wx/colordlg.h>
1819
1920 #include "HPLLib/HPLEventManager.h"
2021 #include "MapEditorOneSetting.h"
22+#include "HPLLib/HPLMapTool.h"
23+
2124 #include <string>
2225
2326 #include <iostream>
--- marathon/trunk/MapEditorWX/src/MainFrameMenuEvent.cpp (revision 350)
+++ marathon/trunk/MapEditorWX/src/MainFrameMenuEvent.cpp (revision 351)
@@ -40,6 +40,8 @@
4040
4141 //データの初期化
4242 wxGetApp().getStockManager()->resetDeletes();
43+ wxGetApp().getViewGridManager()->setViewHeightMin(SHRT_MAX);
44+ wxGetApp().getViewGridManager()->setViewHeightMin(SHRT_MIN);
4345 Refresh();
4446 }
4547 void MapEditorMainFrame::OnNewLevel(wxCommandEvent& ev)
--- marathon/trunk/MapEditorWX/src/EditorPreferencesDialog.cpp (revision 350)
+++ marathon/trunk/MapEditorWX/src/EditorPreferencesDialog.cpp (revision 351)
@@ -5,6 +5,8 @@
55 enum{
66 ID_DEFAULT,
77 ID_COLOR,
8+ ID_GRID,
9+ ID_FLAG,
810 };
911
1012 BEGIN_EVENT_TABLE(EditorPreferencesDialog, wxDialog)
@@ -13,6 +15,7 @@
1315 EVT_BUTTON(wxID_OK, EditorPreferencesDialog::OnOk)
1416 EVT_BUTTON(wxID_CANCEL, EditorPreferencesDialog::OnCancel)
1517 EVT_CHOICE(ID_COLOR, EditorPreferencesDialog::OnColor)
18+ EVT_CHOICE(ID_GRID, EditorPreferencesDialog::OnGrid)
1619 // end wxGlade
1720 END_EVENT_TABLE();
1821 EditorPreferencesDialog::EditorPreferencesDialog()
@@ -25,24 +28,24 @@
2528 {
2629 bool result = wxDialog::Create(parent, id, _T("Editor Preferences"));
2730 label_19 = new wxStaticText(this, wxID_ANY, wxT("Grid size"));
28- choice_9 = new wxChoice(this, wxID_ANY);
29- checkbox[0] = new wxCheckBox(this, wxID_ANY, wxT("Show grid"));
30- checkbox[1] = new wxCheckBox(this, wxID_ANY, wxT("Fit to grid"));
31- checkbox[2] = new wxCheckBox(this, wxID_ANY, wxT("Show monsters"));
32- checkbox[3] = new wxCheckBox(this, wxID_ANY, wxT("Show items"));
33- checkbox[4] = new wxCheckBox(this, wxID_ANY, wxT("Show scenery"));
34- checkbox[5] = new wxCheckBox(this, wxID_ANY, wxT("Show players"));
35- checkbox[6] = new wxCheckBox(this, wxID_ANY, wxT("Show goals"));
36- checkbox[7] = new wxCheckBox(this, wxID_ANY, wxT("Show sounds"));
37- checkbox[8] = new wxCheckBox(this, wxID_ANY, wxT("Show annotations"));
38- checkbox[9] = new wxCheckBox(this, wxID_ANY, wxT("Visual mode-Crossfair"));
31+ choice_9 = new wxChoice(this, ID_GRID);
32+ checkbox[0] = new wxCheckBox(this, ID_FLAG, wxT("Show grid"));
33+ checkbox[1] = new wxCheckBox(this, ID_FLAG, wxT("Fit to grid"));
34+ checkbox[2] = new wxCheckBox(this, ID_FLAG, wxT("Show monsters"));
35+ checkbox[3] = new wxCheckBox(this, ID_FLAG, wxT("Show items"));
36+ checkbox[4] = new wxCheckBox(this, ID_FLAG, wxT("Show scenery"));
37+ checkbox[5] = new wxCheckBox(this, ID_FLAG, wxT("Show players"));
38+ checkbox[6] = new wxCheckBox(this, ID_FLAG, wxT("Show goals"));
39+ checkbox[7] = new wxCheckBox(this, ID_FLAG, wxT("Show sounds"));
40+ checkbox[8] = new wxCheckBox(this, ID_FLAG, wxT("Show annotations"));
41+ checkbox[9] = new wxCheckBox(this, ID_FLAG, wxT("Visual mode-Crossfair"));
3942 label_20 = new wxStaticText(this, wxID_ANY, wxT("Color set"));
4043 choice_10 = new wxChoice(this, ID_COLOR);
41- checkbox[10] = new wxCheckBox(this, wxID_ANY, wxT("Show polygons"));
42- checkbox[11] = new wxCheckBox(this, wxID_ANY, wxT("Show lines"));
44+ checkbox[10] = new wxCheckBox(this, ID_FLAG, wxT("Show polygons"));
45+ checkbox[11] = new wxCheckBox(this, ID_FLAG, wxT("Show lines"));
4346 button_15 = new wxButton(this, ID_DEFAULT, wxT("Set as default"));
44- button_13 = new wxButton(this, wxID_ANY, wxT("OK"));
45- button_14 = new wxButton(this, wxID_ANY, wxT("Cancel"));
47+ button_13 = new wxButton(this, wxID_OK, wxT("OK"));
48+ button_14 = new wxButton(this, wxID_CANCEL, wxT("Cancel"));
4649
4750 wxFlexGridSizer* sizer_45 = new wxFlexGridSizer(3, 1, 0, 0);
4851 wxBoxSizer* sizer_48 = new wxBoxSizer(wxHORIZONTAL);
@@ -79,7 +82,7 @@
7982 }
8083
8184 char colorSets[][100] = {"Forge", "Marathon", "Customize..."};
82- for(int i = 0; i < NUMBER_OF_GLID; i ++){
85+ for(int i = 0; i < 3; i ++){
8386 this->choice_10->Insert(wxString(wxConvertMB2WX(colorSets[i])), i);
8487 }
8588
@@ -164,3 +167,7 @@
164167 MapEditorOneSetting def = MapEditorOneSetting::getDefaultSetting();
165168 setupDialog(&def);
166169 }
170+void EditorPreferencesDialog::OnGrid(wxCommandEvent &ev)
171+{
172+
173+}
\ No newline at end of file
--- marathon/trunk/MapEditorWX/src/HeightDialog.cpp (revision 350)
+++ marathon/trunk/MapEditorWX/src/HeightDialog.cpp (revision 351)
@@ -1,6 +1,9 @@
11 #include "HeightDialog.h"
22 #include "MapEditorWX.h"
33
4+const int BUF_MAX = 1024;
5+const int LINE_SIZE = 1;
6+
47 //ID
58 enum{
69 ID_FLOOR_SLIDER,
@@ -30,8 +33,10 @@
3033 //create items
3134 label_9 = new wxStaticText(this, wxID_ANY, wxT("Floor"));
3235 text_ctrl_5 = new wxTextCtrl(this, ID_FLOOR_EDIT, wxEmptyString);
33- slider_2 = new wxSlider(this, ID_FLOOR_SLIDER, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_VERTICAL);
34- slider_3 = new wxSlider(this, ID_CEILING_SLIDER, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_VERTICAL);
36+ slider_2 = new wxSlider(this, ID_FLOOR_SLIDER, 0, 0, 10, wxDefaultPosition, wxDefaultSize,
37+ wxSL_VERTICAL | wxSL_INVERSE | wxSL_AUTOTICKS);
38+ slider_3 = new wxSlider(this, ID_CEILING_SLIDER, 0, 0, 10, wxDefaultPosition, wxDefaultSize,
39+ wxSL_VERTICAL | wxSL_INVERSE | wxSL_AUTOTICKS);
3540 label_10 = new wxStaticText(this, wxID_ANY, wxT("Ceiling"));
3641 text_ctrl_6 = new wxTextCtrl(this, ID_CEILING_EDIT, wxEmptyString);
3742 checkbox_11 = new wxCheckBox(this, ID_DRAW_HIDDEN_CHECK, wxT("Draw hidden lines"));
@@ -61,31 +66,61 @@
6166 sizer_22->Fit(this);
6267 Layout();
6368
69+ //高さ初期化
70+ //floor
71+ int zMin = SHRT_MIN;
72+ int zMax = SHRT_MAX;
73+ this->text_ctrl_5->SetValue(getString("%d", zMin));
74+ //最大値・最小値
75+ this->slider_2->SetRange(zMin,zMax);
76+ this->slider_2->SetLineSize(LINE_SIZE);
77+ this->slider_2->SetPageSize(zMin / WORLD_ONE);
78+ this->slider_2->SetValue(zMin);
79+
80+ this->text_ctrl_6->SetValue(getString("%d", zMax));
81+ this->slider_3->SetRange(zMin,zMax);
82+ this->slider_3->SetLineSize(LINE_SIZE);
83+ this->slider_3->SetPageSize(zMin / WORLD_ONE);
84+ this->slider_3->SetValue(zMax);
85+
6486 return result;
6587 }
6688
6789 void HeightDialog::OnEditFloor(wxCommandEvent& ev)
6890 {
69- //TODO
91+ int pos = atoi(ev.GetString().mb_str());
92+ wxGetApp().getViewGridManager()->setViewHeightMin(pos);
7093 //スライダーの位置を変更する
94+ this->slider_2->SetValue(pos);
95+ this->GetParent()->Refresh();
7196 }
7297 void HeightDialog::OnEditCeiling(wxCommandEvent& ev)
7398 {
74- //TODO
75- //同上
99+ int pos = atoi(ev.GetString().mb_str());
100+ wxGetApp().getViewGridManager()->setViewHeightMax(pos);
101+ //スライダーの位置を変更する
102+ this->slider_3->SetValue(pos);
103+ this->GetParent()->Refresh();
76104 }
77105 void HeightDialog::OnSliderFloor(wxCommandEvent& ev)
78106 {
79- //TODO
80- //テキストボックスの値を変更する
107+ int pos = slider_2->GetValue();
108+ wxGetApp().getViewGridManager()->setViewHeightMin(pos);
109+ //
110+ this->text_ctrl_5->SetValue(getString("%d", pos));
111+ this->GetParent()->Refresh();
81112 }
82113 void HeightDialog::OnSliderCeiling(wxCommandEvent& ev)
83114 {
84- //TODO
85- //同上
115+ int pos = slider_3->GetValue();
116+ wxGetApp().getViewGridManager()->setViewHeightMax(pos);
117+ //テキストボックスの値を変更する
118+ this->text_ctrl_6->SetValue(getString("%d", pos));
119+ this->GetParent()->Refresh();
86120 }
87121 void HeightDialog::OnDrawCheck(wxCommandEvent& ev)
88122 {
89- //TODO
90123 //シングルトンさんのisDrawHiddenLinesを操作する
124+ wxGetApp().isRevealHiddenLines = ev.IsChecked();
125+ this->GetParent()->Refresh();
91126 }
--- marathon/trunk/MapEditorWX/setting.ini (revision 350)
+++ marathon/trunk/MapEditorWX/setting.ini (revision 351)
@@ -1,9 +1,9 @@
1-GRID_SIZE_INDEX=0
2-COLOR_PRESET=0
3-BACKGROUND=255,255,255
4-GRID=100,100,100
5-LINES=0,0,0
6-POLYGONS=200,200,200
7-STRINGS=0,0,0
8-POINTS=0,0,255
1+GRID_SIZE_INDEX=3
2+COLOR_PRESET=1
3+BACKGROUND=0,0,0
4+GRID=10,10,10
5+LINES=50,255,0
6+POLYGONS=0,50,0
7+STRINGS=100,255,0
8+POINTS=255,255,0
99 FLAGS=1,1,1,1,1,1,1,1,1,1,1,1,
\ No newline at end of file
--- marathon/trunk/MapEditorWX/WXTODOリスト.txt (revision 350)
+++ marathon/trunk/MapEditorWX/WXTODOリスト.txt (revision 351)
@@ -33,17 +33,17 @@
3333 ?T?F?f?o?b?O????
3434
3535 Annotation :?f?o?b?O?????i?I?????[?h?͖????j
36-ColorCustomize :?Ăяo??
37-EditPreferences :?z?u?ς?
38-Height :?z?u?ς݁B
36+ColorCustomize :???o??
37+EditPreferences :???o??
38+Height :???o??
3939 HeightPallet :
4040 LevelInfo
4141 LineProp :wx
4242 ObjectProp :wx
43-Placement :?z?u?ς?
43+Placement :???o??
4444 Platform :?z?u?ς݁B
4545 PointProp :?z?u
46-PolygonNum :?z?u
46+PolygonNum :???o??
4747 PolygonProp :?z?u
4848 PolygonType :wx
4949 SelectLevel :?z?u
@@ -154,4 +154,8 @@
154154
155155 TODO ?_?C?A???O?̍쐬
156156 TODO VisualMode oh visual mode!
157-TODO Polygon tool
\ No newline at end of file
157+TODO Polygon tool
158+TODO ?͈͊O?̂??̂??I???ł???o?O
159+TODO ?X???C?_?[?𓮂?????0?ɌŒ肳??Ă??܂?
160+TODO ??ԏオMin?ɂȂ??Ă?
161+TODO ObjectPlacement
\ No newline at end of file
--- marathon/trunk/MapDemergerOneWX/src/MapDemergerOneWX.cpp (revision 350)
+++ marathon/trunk/MapDemergerOneWX/src/MapDemergerOneWX.cpp (revision 351)
@@ -63,9 +63,6 @@
6363 if(last != _T("\\") && last != _T("/")){
6464 dirPath.Append(_T("/"));
6565 }
66-#ifdef MAC
67- //TODO separator in MacOSX may not be "/" nor "\".
68-#endif
6966
7067 //インデックス取得
7168 std::vector<std::string> names = getLevelList();
旧リポジトリブラウザで表示