• R/O
  • SSH
  • HTTPS

marathon: コミット


コミットメタ情報

リビジョン345 (tree)
日時2007-06-24 01:19:15
作者hogepiyo

ログメッセージ

*** empty log message ***

変更サマリ

差分

--- marathon/trunk/MapEditorWX/src/AnnotationDialog.h (revision 344)
+++ marathon/trunk/MapEditorWX/src/AnnotationDialog.h (revision 345)
@@ -16,7 +16,7 @@
1616 */
1717
1818 /**
19- あのテーション追加・変更ダイアログ
19+ アノテーション追加・変更ダイアログ
2020 */
2121 class AnnotationDialog: public wxDialog{
2222 private:
@@ -45,6 +45,9 @@
4545 設定した値でデータを取得する
4646 */
4747 map_annotation getAnnotation();
48+
49+ //位置
50+ world_point2d wpoint;
4851
4952 //イベントテーブル作成<en>declare
5053 DECLARE_EVENT_TABLE()
--- marathon/trunk/MapEditorWX/src/PolygonPropDialog.cpp (revision 344)
+++ marathon/trunk/MapEditorWX/src/PolygonPropDialog.cpp (revision 345)
@@ -37,13 +37,13 @@
3737 EVT_TEXT(PolyProp::ID_Perm, PolygonPropDialog::OnPermuEdit)
3838 EVT_TEXT(PolyProp::ID_CenterX, PolygonPropDialog::OnCenterXEdit)
3939 EVT_CHOICE(PolyProp::ID_FloorLight, PolygonPropDialog::OnFloorLightEdit)
40- EVT_TEXT(PolyProp::CenterY, PolygonPropDialog::OnCenterYEdit)
41- EVT_CHOICE(PolyProp::CeilingLight, PolygonPropDialog::OnCeilingLightEdit)
40+ EVT_TEXT(PolyProp::ID_CenterY, PolygonPropDialog::OnCenterYEdit)
41+ EVT_CHOICE(PolyProp::ID_CeilingLight, PolygonPropDialog::OnCeilingLightEdit)
4242 EVT_TEXT(PolyProp::ID_Area, PolygonPropDialog::OnAreaEdit)
43- EVT_TEXT(PolyProp::FloorOriginX, PolygonPropDialog::OnFloorOriginXEdit)
44- EVT_TEXT(PolyProp::FloorOriginY, PolygonPropDialog::OnFloorOriginYEdit)
45- EVT_TEXT(PolyProp::CeilingOriginX, PolygonPropDialog::OnCeilingOriginXEdit)
46- EVT_TEXT(PolyProp::CeilingOriginY, PolygonPropDialog::OnCeilingOriginYEdit)
43+ EVT_TEXT(PolyProp::ID_FloorOriginX, PolygonPropDialog::OnFloorOriginXEdit)
44+ EVT_TEXT(PolyProp::ID_FloorOriginY, PolygonPropDialog::OnFloorOriginYEdit)
45+ EVT_TEXT(PolyProp::ID_CeilingOriginX, PolygonPropDialog::OnCeilingOriginXEdit)
46+ EVT_TEXT(PolyProp::ID_CeilingOriginY, PolygonPropDialog::OnCeilingOriginYEdit)
4747 EVT_CHOICE(PolyProp::ID_FirstObj, PolygonPropDialog::OnFirstObjChoice)
4848 EVT_CHOICE(PolyProp::ID_Media, PolygonPropDialog::OnMediaChoice)
4949 EVT_TEXT(PolyProp::ID_FirstExZone, PolygonPropDialog::OnFirstExZoneEdit)
@@ -80,19 +80,19 @@
8080 label_37 = new wxStaticText(this, wxID_ANY, wxT("Floor light"));
8181 choice_13 = new wxChoice(this, PolyProp::ID_FloorLight);
8282 label_49 = new wxStaticText(this, wxID_ANY, wxT("Center Y"));
83- text_ctrl_24 = new wxTextCtrl(this, PolyProp::CenterY, wxEmptyString);
83+ text_ctrl_24 = new wxTextCtrl(this, PolyProp::ID_CenterY, wxEmptyString);
8484 label_38 = new wxStaticText(this, wxID_ANY, wxT("Ceiling light"));
85- choice_14 = new wxChoice(this, PolyProp::CeilingLight);
85+ choice_14 = new wxChoice(this, PolyProp::ID_CeilingLight);
8686 label_26 = new wxStaticText(this, wxID_ANY, wxT("Floor origin"));
87- text_ctrl_33 = new wxTextCtrl(this, PolyProp::FloorOriginX, wxEmptyString);
87+ text_ctrl_33 = new wxTextCtrl(this, PolyProp::ID_FloorOriginX, wxEmptyString);
8888 label_27 = new wxStaticText(this, wxID_ANY, wxT("x"));
89- text_ctrl_35 = new wxTextCtrl(this, PolyProp::FloorOriginY, wxEmptyString);
89+ text_ctrl_35 = new wxTextCtrl(this, PolyProp::ID_FloorOriginY, wxEmptyString);
9090 label_39 = new wxStaticText(this, wxID_ANY, wxT("Area"));
9191 text_ctrl_26 = new wxTextCtrl(this, PolyProp::ID_Area, wxEmptyString);
9292 label_55 = new wxStaticText(this, wxID_ANY, wxT("Ceiling origin"));
93- text_ctrl_34 = new wxTextCtrl(this, PolyProp::CeilingOriginX, wxEmptyString);
93+ text_ctrl_34 = new wxTextCtrl(this, PolyProp::ID_CeilingOriginX, wxEmptyString);
9494 label_28 = new wxStaticText(this, wxID_ANY, wxT("x"));
95- text_ctrl_36 = new wxTextCtrl(this, PolyProp::CeilingOriginY, wxEmptyString);
95+ text_ctrl_36 = new wxTextCtrl(this, PolyProp::ID_CeilingOriginY, wxEmptyString);
9696 label_40 = new wxStaticText(this, wxID_ANY, wxT("First object"));
9797 choice_19 = new wxChoice(this, PolyProp::ID_FirstObj);
9898 label_54 = new wxStaticText(this, wxID_ANY, wxT("Media"));
@@ -112,7 +112,7 @@
112112 label_44 = new wxStaticText(this, wxID_ANY, wxT("Ceiling trans"));
113113 text_ctrl_31 = new wxTextCtrl(this, PolyProp::ID_CeilingTrans, wxEmptyString);
114114 label_50 = new wxStaticText(this, wxID_ANY, wxT("Rnd snd"));
115- choice_18 = new wxChoice(this, wxID_PolyProp::ID_RndSndANY);
115+ choice_18 = new wxChoice(this, PolyProp::ID_RndSnd);
116116 button_21 = new wxButton(this, PolyProp::ID_Platform, wxT("Platform settings"));
117117 panel_10 = new wxPanel(this, wxID_ANY);
118118 panel_11 = new wxPanel(this, wxID_ANY);
--- marathon/trunk/MapEditorWX/src/AnnotationDialog.cpp (revision 344)
+++ marathon/trunk/MapEditorWX/src/AnnotationDialog.cpp (revision 345)
@@ -61,6 +61,25 @@
6161 sizer_33->Fit(this);
6262 Layout();
6363
64+ //値設定
65+ choice_8->SetSelection(annotation.type);
66+ text_ctrl_7->SetValue(wxConvertMB2WX(annotation.text));
67+ this->wpoint.x = annotation.location.x;
68+ this->wpoint.y = annotation.location.y;
69+ //ポリゴン情報を代入
70+ //TODO
71+ for(int i = 0; i < (int)PolygonList.size(); i ++){
72+ char buf[BUF_MAX];
73+ sprintf(buf, "%d", i);
74+ choice_7->Insert(wxConvertMB2WX(buf), i);
75+ }
76+ //最後にNONE
77+ choice_7->Insert(_T("NONE"), PolygonList.size());
78+ if(annotation.polygon_index == NONE){
79+ choice_7->SetSelection(PolygonList.size());
80+ }else{
81+ choice_7->SetSelection(annotation.polygon_index);
82+ }
6483 return result;
6584 }
6685 /**
@@ -70,6 +89,14 @@
7089 {
7190 //TODO
7291 map_annotation annotation = {NULL};
92+ annotation.location.x = this->wpoint.x;
93+ annotation.location.y = this->wpoint.y;
94+ strcpy(annotation.text, wxConvertWX2MB(text_ctrl_7->GetValue()));
95+ annotation.type = choice_8->GetSelection();
96+ annotation.polygon_index = choice_7->GetSelection();
97+ if(annotation.polygon_index == PolygonList.size()){
98+ annotation.polygon_index = NONE;
99+ }
73100 return annotation;
74101 }
75102 //OKボタン押した時
--- marathon/trunk/MapEditorWX/src/MainFrameMenuEvent.cpp (revision 344)
+++ marathon/trunk/MapEditorWX/src/MainFrameMenuEvent.cpp (revision 345)
@@ -294,8 +294,10 @@
294294 void MapEditorMainFrame::OnJumpLevel(wxCommandEvent& ev)
295295 {
296296 //TODO
297- //JumpLevelDialog dlg;
298- //dlg.Create(this, wxID_ANY);
297+ JumpLevelDialog dlg;
298+ dlg.Create(this, wxID_ANY);
299+ if(dlg.ShowModal() == wxID_OK){
300+ }
299301 }
300302 void MapEditorMainFrame::OnLevelInfo(wxCommandEvent& ev)
301303 {
--- marathon/trunk/MapEditorWX/src/TerminalDialog.cpp (revision 344)
+++ marathon/trunk/MapEditorWX/src/TerminalDialog.cpp (revision 345)
@@ -54,6 +54,16 @@
5454 SetSizer(grid_sizer_5);
5555 grid_sizer_5->Fit(this);
5656 Layout();
57+
58+ //terminal index -> listbox_1
59+ for(int i = 0; i < (int)map_terminal_text.size(); i ++){
60+ //terminal_text_t* terminal = &map_terminal_text[i];
61+ char cstr[256];
62+ sprintf(cstr, "terminal%3d", i);
63+ list_box_1->Insert(i, wxConvertMB2WX(cstr));
64+ }
65+ if(map_terminal_text.size() > 0){
66+ }
5767 return result;
5868 }
5969 void TerminalDialog::OnOk(wxCommandEvent& ev)
--- marathon/trunk/MapEditorWX/WXTODOリスト.txt (revision 344)
+++ marathon/trunk/MapEditorWX/WXTODOリスト.txt (revision 345)
@@ -26,12 +26,12 @@
2626
2727 ///MAXIMUM_VERTICES_PER_POLYGON=8
2828
29-?EwxGlade??
30-?E?z?u
31-?E?Ăяo???????L?q
32-?E?f?[?^???o?͋L?q
29+?P?FwxGlade??
30+?Q?F?z?u
31+?R?F?Ăяo???????L?q
32+?S?F?f?[?^???o?͋L?q
3333
34-Annotation :?z?u?ς?
34+Annotation :???o??
3535 ColorCustomize :?z?u?ς?
3636 EditPreferences :?z?u?ς?
3737 Height :?z?u?ς݁B
@@ -53,9 +53,9 @@
5353 Visual
5454
5555 JumpLevel :wx
56-MediaPalette
57-LightPalette
58-SoundPalette
56+MediaPalette :
57+LightPalette :
58+SoundPalette :
5959
6060 ???C?x???g?????̋L?q?͏I????Ă??邩?H?̃??X?g
6161 ?ETODO????Ȃ炻?̓??e??????
旧リポジトリブラウザで表示