• R/O
  • SSH
  • HTTPS

marathon: コミット


コミットメタ情報

リビジョン364 (tree)
日時2007-07-05 01:03:27
作者hogepiyo

ログメッセージ

*** empty log message ***

変更サマリ

差分

--- marathon/trunk/MapEditorWX/src/MapEditorMainFrame.cpp (revision 363)
+++ marathon/trunk/MapEditorWX/src/MapEditorMainFrame.cpp (revision 364)
@@ -16,7 +16,6 @@
1616 EVT_MENU(ID_PrintPreview, MapEditorMainFrame::OnPrintPreview)
1717 EVT_MENU(ID_PrintSetup, MapEditorMainFrame::OnPrintSetup)
1818 EVT_MENU(ID_New, MapEditorMainFrame::OnNew)
19- EVT_MENU(ID_NewLevel, MapEditorMainFrame::OnNewLevel)
2019 EVT_MENU(ID_Open, MapEditorMainFrame::OnOpen)
2120 EVT_MENU(ID_Save, MapEditorMainFrame::OnSave)
2221 EVT_MENU(ID_SaveAs, MapEditorMainFrame::OnSaveAs)
@@ -155,7 +154,6 @@
155154 //ファイルメニュー <en> file menu
156155 wxMenu *menuFile = new wxMenu;
157156 menuFile->Append(ID_New, _T("&New"), _T("create new map"));
158- menuFile->Append(ID_NewLevel, _T("&NewLevel"), _T("insert new level"));
159157 menuFile->Append(ID_Open, _T("&Open"), _T("open map file"));
160158 menuFile->Append(ID_Save, _T("&Save"), _T("save current map"));
161159 menuFile->Append(ID_SaveAs, _T("SaveAs ..."), _T("save current map as another name"));
@@ -164,6 +162,8 @@
164162 menuFile->Append(ID_PrintPreview, _T("Print Preview"), _T("print preview"));
165163 menuFile->Append(ID_PrintSetup, _T("Print Setup ..."), _T("print setup"));
166164 menuFile->AppendSeparator();
165+ menuFile->Append(ID_Merge, _T("&Merge ..."), _T("merge map"));
166+ menuFile->AppendSeparator();
167167 menuFile->Append(ID_Quit, _T("E&xit"), _T("exit program"));
168168
169169 //編集メニュー <en> Edit menu
--- marathon/trunk/MapEditorWX/src/ObjectPropDialog.cpp (revision 363)
+++ marathon/trunk/MapEditorWX/src/ObjectPropDialog.cpp (revision 364)
@@ -28,7 +28,7 @@
2828 EVT_TEXT(ID_X, ObjectPropDialog::OnXEdit)
2929 EVT_TEXT(ID_Y, ObjectPropDialog::OnYEdit)
3030 EVT_TEXT(ID_Z, ObjectPropDialog::OnZEdit)
31- EVT_PAINT(ObjectPropDialog::OnPaint)
31+// EVT_PAINT(ObjectPropDialog::OnPaint)
3232 END_EVENT_TABLE()
3333 ObjectPropDialog::ObjectPropDialog()
3434 {
@@ -225,7 +225,7 @@
225225 if(*index == NONE){
226226 return false;
227227 }
228- if(*index < 0 || *index >= SavedObjectList.size()){
228+ if(*index < 0 || *index >= (int)SavedObjectList.size()){
229229 hpl::error::caution("target object not found.");
230230 *index = NONE;
231231 return false;
--- marathon/trunk/MapEditorWX/src/MainFrameLeftDown.cpp (revision 363)
+++ marathon/trunk/MapEditorWX/src/MainFrameLeftDown.cpp (revision 364)
@@ -8,6 +8,13 @@
88 */
99 void MapEditorMainFrame::OnLeftDown(wxMouseEvent &ev)
1010 {
11+ //線・点・オブジェクト・ポリゴン・Sideの指定を解除する
12+ linePropDialog.setLineIndex(NONE);
13+ pointPropDialog.setIndex(NONE);
14+ objPropDialog.setObjIndex(NONE);
15+ polyPropDialog.setPolyIndex(NONE);
16+ sidePropDialog.setIndex(NONE);
17+
1118 //カーソル設定
1219 wxGetApp().setCursor();
1320 //マウス座標記録
--- marathon/trunk/MapEditorWX/src/MapEditorMainFrame.h (revision 363)
+++ marathon/trunk/MapEditorWX/src/MapEditorMainFrame.h (revision 364)
@@ -42,7 +42,6 @@
4242 enum
4343 {
4444 ID_New = wxID_NEW,
45- ID_NewLevel = 0,
4645 ID_Open = wxID_OPEN,
4746 ID_Save = wxID_SAVE,
4847 ID_SaveAs = wxID_SAVEAS,
@@ -202,7 +201,6 @@
202201 //メニュー<en> menu
203202 //ファイルメニュー <en>Files menu
204203 void OnNew(wxCommandEvent& ev);
205- void OnNewLevel(wxCommandEvent& ev);
206204 void OnOpen(wxCommandEvent& ev);
207205 void OnSave(wxCommandEvent& ev);
208206 void OnSaveAs(wxCommandEvent& ev);
--- marathon/trunk/MapEditorWX/src/MainFrameMenuEvent.cpp (revision 363)
+++ marathon/trunk/MapEditorWX/src/MainFrameMenuEvent.cpp (revision 364)
@@ -192,7 +192,7 @@
192192 */
193193 //bool result =
194194 }
195-void MapEditorMainFrame::OnUndo(wxCommandEvent& ev)
195+void MapEditorMainFrame::OnRedo(wxCommandEvent& ev)
196196 {
197197 //TODO REDO
198198 }
--- marathon/trunk/MapEditorWX/WXTODOリスト.txt (revision 363)
+++ marathon/trunk/MapEditorWX/WXTODOリスト.txt (revision 364)
@@ -167,7 +167,7 @@
167167 ?????Ԃ?????ĂȂ??H
168168 --
169169 TODO 2007 07 01
170-Jump (Select) other level
170+?H Jump (Select) other level
171171 object place
172172 placement dialog edit <-> listctrl
173173 object/point/side/line prop
@@ -180,10 +180,10 @@
180180 texture dialog
181181 load textures from shapes file
182182 level info dialog I/O
183-double click when line tool using
184-LineList?Ȃǂ?vector??push_back,remove?Ȃǂ?????ƁA???????̍Ċ??蓖?āi?T?C?Y?ύX?j
183+?ς? double click when line tool using
184+???? LineList?Ȃǂ?vector??push_back,remove?Ȃǂ?????ƁA???????̍Ċ??蓖?āi?T?C?Y?ύX?j
185185 ?ɂ???ă|?C???^?A?h???X???ω????邱?Ƃ?????B
186-?lj??E?폜?????ꍇ?A????܂łɕێ????Ă???line_data*?Ȃǂ̃|?C???^?͎g??Ȃ????ƁI
186+ ?lj??E?폜?????ꍇ?A????܂łɕێ????Ă???line_data*?Ȃǂ̃|?C???^?͎g??Ȃ????ƁI
187187
188188 ?ς? quickSort?̌???
189189 ?ς? TODO ???lj????ƒlj??I???i?J?n?O?j?ƂŃJ?[?\???̌`??ς???
@@ -198,3 +198,8 @@
198198 ???̂Ƃ??^?C?g???? MapEditorOneWX * [???x???ԍ?] [???x????]?ɂ???
199199 TODO Merge Map ???j???[?A?C?e???̒lj?
200200 TODO ?ǂݍ??݁??ۑ??̎??ɁA?f?t?H???g?????x?????ɂ???H
201+
202+TODO ?T?E???h?I???????S
203+TODO ???̃I?u?W?F?N?g??I?????Ă??A?????????肵?Ȃ??ƕς??Ȃ?
204+ Refresh?
205+TODO ?|???S???h??‚Ԃ????s?̎??̃_?C?A???O????????
--- marathon/trunk/HPLLib/HPLDoneHistory.cpp (revision 363)
+++ marathon/trunk/HPLLib/HPLDoneHistory.cpp (revision 364)
@@ -1,9 +1,6 @@
11 #include "HPLDoneHistory.h"
2+#include "HPLError.h"
23
3-#ifdef __WXDEBUG__
4-#include <wx/debug.h>
5-#endif
6-
74 hpl::aleph::map::HPLActionItem::HPLActionItem(int t, hpl::aleph::map::HPLSelectData& sel, hpl::aleph::map::HPLRealMapData& real)
85 {
96 type = t;
@@ -22,13 +19,12 @@
2219 }
2320 hpl::aleph::map::HPLDoneHistory::~HPLDoneHistory()
2421 {
25- dataList.clear();
26- realList.clear();
22+ actionList.clear();
2723 }
2824 /**
2925 情報を追加します
3026 */
31-void hpl::aleph::map::HPLDoneHistory::push_back(int type, HPLSelectData& selectData)
27+void hpl::aleph::map::HPLDoneHistory::push_back(int type, HPLSelectData& selData)
3228 {
3329 //現在の位置(index)から後ろ部分を削除します
3430 if(index >= 0){
@@ -38,22 +34,16 @@
3834 it = actionList.erase(it);
3935 }
4036 }
41- while(index >= 0 && index < actionList.size()){
42- actionList.
43- }
4437 //実データを取得します
4538 hpl::aleph::map::HPLRealMapData realData;
46- realData.set(&selectData);
39+ realData.set(&selData);
4740
48- //コピー
49- hpl::aleph::map::HPLSelectData selDat;
50- memcpy(&selData, &selectData, sizeof(hpl::aleph::map::HPLSelectData));
5141 //追加
52- hpl::aleph::map::HPLActionItem act = hpl::aleph::map::HPLActionItem(type, selDat, realData);
42+ hpl::aleph::map::HPLActionItem act = hpl::aleph::map::HPLActionItem(type, selData, realData);
5343 this->actionList.push_back(act);
5444
5545
56- index = actionList.size() - 1;
46+ index = (int)actionList.size() - 1;
5747 }
5848
5949 /**
@@ -79,7 +69,7 @@
7969 }
8070 bool hpl::aleph::map::HPLDoneHistory::forward(int *type, HPLSelectData* selectData, HPLRealMapData* realData)
8171 {
82- if(index >= this->actionList.size()){
72+ if(index >= (int)this->actionList.size()){
8373 return false;
8474 }
8575 hpl::aleph::map::HPLActionItem act = this->actionList[index];
@@ -104,9 +94,9 @@
10494 }
10595 int hpl::aleph::map::HPLDoneHistory::getRemainUndoCount()
10696 {
107- //TODO
97+ return index;
10898 }
10999 int hpl::aleph::map::HPLDoneHistory::getRemainRedoCount()
110100 {
111- //TODO
101+ return actionList.size() - index;
112102 }
--- marathon/trunk/HPLLib/HPLDoneHistory.h (revision 363)
+++ marathon/trunk/HPLLib/HPLDoneHistory.h (revision 364)
@@ -53,7 +53,7 @@
5353 情報を追加します
5454 @param type ActionTypeで定義している、ユーザが取った行動
5555 */
56- void push_back(int type, HPLSelectData& selectData);
56+ void push_back(int type, HPLSelectData& selData);
5757
5858 /**
5959 index番目のものを取り出します。
@@ -64,8 +64,8 @@
6464 */
6565 bool back(int *type, hpl::aleph::map::HPLSelectData* selectData, hpl::aleph::map::HPLRealMapData* realData);
6666
67- void forward(int *type, hpl::aleph::map::HPLSelectData* selectData,
68- hpl::aleph::map::HPLRealMapData* realData);
67+ bool forward(int *type, HPLSelectData* selectData, HPLRealMapData* realData);
68+
6969 /**
7070 インデックス番号を削除後のものに対応させます。
7171 */
--- marathon/trunk/HPLLib/HPLError.cpp (revision 363)
+++ marathon/trunk/HPLLib/HPLError.cpp (revision 364)
@@ -6,8 +6,11 @@
66 const int BUF_MAX = 1024;
77
88 #ifdef WX
9+#include <wx/wx.h>
10+#endif
911
10-#include <wx/wx.h>
12+#ifdef __WXDEBUG__
13+
1114 #include <wx/defs.h>
1215 #include <wx/debug.h>
1316
旧リポジトリブラウザで表示