• R/O
  • SSH
  • HTTPS

marathon: コミット


コミットメタ情報

リビジョン378 (tree)
日時2007-07-12 07:25:23
作者hogepiyo

ログメッセージ

*** empty log message ***

変更サマリ

差分

--- marathon/trunk/MapEditorWX/src/MapEditorMainFrame.cpp (revision 377)
+++ marathon/trunk/MapEditorWX/src/MapEditorMainFrame.cpp (revision 378)
@@ -117,7 +117,6 @@
117117 this->lightPaletteDialog.Create(this, wxID_ANY);
118118 this->mediaPaletteDialog.Create(this, wxID_ANY);
119119 this->soundPaletteDialog.Create(this, wxID_ANY);
120- this->textureDialog.Create(this, wxID_ANY);
121120
122121 //プロパティ
123122 this->objPropDialog.Create(this, wxID_ANY);
@@ -219,6 +218,7 @@
219218 }
220219 }
221220 }
221+ this->textureDialog.Create(this, wxID_ANY);
222222 }
223223
224224 //セットアップ
--- marathon/trunk/MapEditorWX/src/SidePropDialog.h (revision 377)
+++ marathon/trunk/MapEditorWX/src/SidePropDialog.h (revision 378)
@@ -7,6 +7,7 @@
77 int index;
88 public:
99 void setIndex(int ind);
10+ int getIndex();
1011 SidePropDialog();
1112 bool Create(wxWindow* parent, wxWindowID id);
1213 virtual ~SidePropDialog();
--- marathon/trunk/MapEditorWX/src/PointPropDialog.h (revision 377)
+++ marathon/trunk/MapEditorWX/src/PointPropDialog.h (revision 378)
@@ -25,6 +25,7 @@
2525 wxChoice* choice_11;
2626 int index;
2727 public:
28+ int getIndex();
2829 void setIndex(int ind);
2930 PointPropDialog();
3031 bool Create(wxWindow* parent, wxWindowID id);
--- marathon/trunk/MapEditorWX/src/TextureDialog.cpp (revision 377)
+++ marathon/trunk/MapEditorWX/src/TextureDialog.cpp (revision 378)
@@ -12,6 +12,7 @@
1212 ID_COLLECTION,
1313 ID_CLUT,
1414 ID_TYPE,
15+ ID_SCROLL,
1516 };
1617
1718 BEGIN_EVENT_TABLE(TextureDialog, wxDialog)
@@ -19,6 +20,8 @@
1920 EVT_CHOICE(wxID_ANY, TextureDialog::OnType)
2021 EVT_CHOICE(wxID_ANY, TextureDialog::OnCollection)
2122 EVT_CHOICE(ID_TYPE, TextureDialog::OnCLUT)
23+ EVT_PAINT(TextureDialog::OnPaint)
24+ EVT_SCROLLWIN( TextureDialog::OnScroll)
2225 // end wxGlade
2326 END_EVENT_TABLE()
2427 TextureDialog::TextureDialog()
@@ -33,7 +36,7 @@
3336
3437 label_75 = new wxStaticText(this, wxID_ANY, wxT("type"));
3538 choice_30 = new wxChoice(this, ID_TYPE);
36- panel_13 = new wxScrolledWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER|wxTAB_TRAVERSAL);
39+ panel_13 = new wxScrolledWindow(this, ID_SCROLL, wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER|wxTAB_TRAVERSAL);
3740 wxStaticText* label_collection = new wxStaticText(this, wxID_ANY, wxT("Collection"));
3841 choice_collection = new wxChoice(this, ID_COLLECTION);
3942 wxStaticText* label_clut = new wxStaticText(this, wxID_ANY, wxT("CLUT"));
@@ -40,7 +43,10 @@
4043 choice_clut = new wxChoice(this, ID_CLUT);
4144
4245 panel_13->SetMinSize(wxSize(480, 120));
46+ panel_13->SetMaxSize(wxSize(480, 600));
47+ panel_13->SetVirtualSize(wxSize(480, 600));
4348 panel_13->SetScrollRate(10, 10);
49+ panel_13->SetScrollbars(100, 120, 5, 10);
4450
4551 wxFlexGridSizer* grid_sizer_44 = new wxFlexGridSizer(2, 1, 0, 0);
4652 wxFlexGridSizer* grid_sizer_45 = new wxFlexGridSizer(1, 6, 0, 0);
@@ -57,7 +63,7 @@
5763 Layout();
5864
5965 //TODO Shapesファイルが読み込まれていない場合は警告を出して閉じる
60- if(wxGetApp().getShapesManager()->isLoadedShapesFile()){
66+ if(!wxGetApp().getShapesManager()->isLoadedShapesFile()){
6167 hpl::error::caution("Shapes file not loaded");
6268 Destroy();
6369 return false;
@@ -74,10 +80,12 @@
7480 if(counter == 0){
7581 collection = it->first;
7682 }
77- choice_collection->Insert(counter, getString("%d", it->first));
83+ choice_collection->Insert(getString("%d", it->first), counter);
84+ collectionIndexTable.push_back(it->first);
7885 counter ++;
7986 }
80-
87+ choice_collection->SetSelection(0);
88+
8189 //タイプ
8290 //TODO
8391
@@ -92,25 +100,28 @@
92100 }
93101 void TextureDialog::OnCollection(wxCommandEvent &event)
94102 {
95- int collection = event.GetSelection();
103+ int collection = collectionIndexTable[event.GetSelection()];
96104 //TODO
105+ setupDialog(collection);
97106 }
98107 void TextureDialog::OnCLUT(wxCommandEvent &event)
99108 {
100109 int clut = event.GetSelection();
101110 //TODO
111+ setupDialog(collectionIndexTable[choice_collection->GetSelection()]);
102112 }
103113 void TextureDialog::setFloor(bool floor)
104114 {
105115 this->isFloor_ = floor;
106116 }
107-void TextureDialog::drawPanel(int collection, int clut, std::map<int, wxImage>* imgMap)
117+void TextureDialog::drawPanel(int collection, int clut, std::map<int, wxImage>* imgMap,
118+ wxDC* dc)
108119 {
109- wxPaintDC dc(panel_13);
110- wxSize size = panel_13->GetSize();
111- dc.SetPen(*wxWHITE_PEN);
112- dc.SetBrush(*wxWHITE_BRUSH);
113- dc.DrawRectangle(0,0,size.GetWidth(), size.GetHeight());
120+// wxWindowDC dc(panel_13);
121+ wxSize size = panel_13->GetMaxSize();
122+ dc->SetPen(*wxWHITE_PEN);
123+ dc->SetBrush(*wxWHITE_BRUSH);
124+ dc->DrawRectangle(0,0,size.GetWidth(), size.GetHeight());
114125
115126 //パレット表示
116127 const int MERGIN_X = 10;
@@ -119,19 +130,62 @@
119130 const int ITEM_H = ITEM_W;
120131 const int ITEM_INTERVAL_X = 10;
121132 const int ITEM_INTERVAL_Y = 10;
122- const int PITCH = 10;
133+ const int PITCH = (size.GetWidth() - MERGIN_X * 2) / (ITEM_W + ITEM_INTERVAL_X);
134+
135+ std::map<int, wxImage>::iterator it;
136+ int counter = 0;
137+ for(it = imgMap->begin(); it != imgMap->end(); it ++){
138+ int x = (counter % PITCH) * (ITEM_W + ITEM_INTERVAL_X) + MERGIN_X;
139+ int y = (counter / PITCH) * (ITEM_H + ITEM_INTERVAL_Y) + MERGIN_Y;
140+ wxImage scaledImg = it->second.Scale(ITEM_W, ITEM_H);
141+ wxBitmap bmp(scaledImg);
142+ dc->DrawBitmap(bmp, x, y);
143+ counter ++;
144+ }
145+
123146 }
124147 void TextureDialog::setupDialog(int collection)
125148 {
126- std::map<int, std::map<int, std::map<int, wxImage> > >* tmap = &((MapEditorMainFrame*)GetParent())->textureMap;
127- //setup clut choice
128- choice_clut->Clear();
129- std::map<int, std::map<int, wxImage> >::iterator it1;
130- int clutCounter = 0;
131- for(it1 = tmap->begin(); it1 != tmap->end(); it1 ++){
132- choice_clut->Insert(clutCounter, getString("%d", it1->second));
133- clutCounter ++;
134- }
135- //TODO
136- drawPanel(collection, clut, &tmap->get(collection)[clut]);
149+ if(wxGetApp().getShapesManager()->isLoadedShapesFile()){
150+ std::map<int, std::map<int, std::map<int, wxImage> > >* tmap = &((MapEditorMainFrame*)GetParent())->textureMap;
151+ //setup clut choice
152+ choice_clut->Clear();
153+ std::map<int, std::map<int, wxImage> >::iterator it1;
154+ int clutCounter = 0;
155+ for(it1 = tmap->find(collection)->second.begin(); it1 != tmap->find(collection)->second.end(); it1 ++){
156+ choice_clut->Insert(getString("%d", it1->first), clutCounter);
157+ clutCounter ++;
158+ }
159+ choice_clut->SetSelection(0);
160+ choice_30->SetSelection(0);
161+
162+ //drawPanel(collection, 0, &tmap->find(collection)->second[0]);
163+ Refresh();
164+ }
137165 }
166+int TextureDialog::getIndexSelected()
167+{
168+ //選択されたテクスチャ
169+ //TODO
170+ return indexSelected;
171+}
172+
173+void TextureDialog::OnPaint(wxPaintEvent &event)
174+{
175+ wxPaintDC dc(this);
176+
177+ wxPaintDC dcW(panel_13);
178+ int colIndex = choice_collection->GetSelection();
179+ if(colIndex >= 0){
180+ int collection = collectionIndexTable[colIndex];
181+ int clut = choice_clut->GetSelection();
182+
183+ std::map<int, std::map<int, std::map<int, wxImage> > >* tmap = &((MapEditorMainFrame*)GetParent())->textureMap;
184+ this->drawPanel(collection, clut, &tmap->find(collection)->second[clut], &dcW);
185+ }
186+}
187+
188+void TextureDialog::OnScroll(wxScrollWinEvent &event)
189+{
190+ Refresh();
191+}
--- marathon/trunk/MapEditorWX/src/ObjectPropDialog.cpp (revision 377)
+++ marathon/trunk/MapEditorWX/src/ObjectPropDialog.cpp (revision 378)
@@ -1,5 +1,13 @@
11 #include "ObjectPropDialog.h"
22 #include "MapEditorWX.h"
3+static char* DIR_CIRCLE_IMG_PATH = "./data/Toolbar/ObjectProperties/direction circle.BMP";
4+static char* DIR_MARKER_IMG_PATH = "./data/Toolbar/ObjectProperties/direction marker.BMP";
5+//facingデータの一周
6+const double FACING_ROUND = 512;
7+const double DEGREE_ROUND = 360;
8+//半径
9+const double DIRECTION_MARKER_RADIUS = 20;
10+
311 enum{
412 ID_TYPE,
513 ID_INDEX,
@@ -28,6 +36,7 @@
2836 EVT_TEXT(ID_X, ObjectPropDialog::OnXEdit)
2937 EVT_TEXT(ID_Y, ObjectPropDialog::OnYEdit)
3038 EVT_TEXT(ID_Z, ObjectPropDialog::OnZEdit)
39+ EVT_PAINT(ObjectPropDialog::OnPaint)
3140 END_EVENT_TABLE()
3241 ObjectPropDialog::ObjectPropDialog()
3342 {
@@ -132,6 +141,11 @@
132141 }
133142
134143 this->objIndex = NONE;
144+
145+ //イメージファイル読み込み
146+ wxGetApp().loadImage(DIR_CIRCLE_IMG_PATH, &this->directionCircle, 255,255,255);
147+ wxGetApp().loadImage(DIR_MARKER_IMG_PATH, &this->directionMarker, 255,255,255);
148+
135149 return result;
136150 }
137151 void ObjectPropDialog::setObjIndex(int index)
@@ -143,7 +157,7 @@
143157 {
144158 return this->objIndex;
145159 }
146-void ObjectPropDialog::setObject(map_object& obj){
160+void ObjectPropDialog::setObject(map_object obj){
147161 int oldSel = choice_21->GetSelection();
148162 this->text_ctrl_27->SetValue(getString("%d", obj.type));
149163 this->choice_21->SetSelection(obj.type);
@@ -205,7 +219,8 @@
205219 this->text_ctrl_39->SetValue(getString("%d", obj.location.x));
206220 this->text_ctrl_41->SetValue(getString("%d", obj.location.y));
207221 this->text_ctrl_40->SetValue(getString("%d", obj.location.z));
208-
222+
223+ Refresh();
209224 }
210225 void ObjectPropDialog::setupDialog()
211226 {
@@ -246,6 +261,8 @@
246261 void ObjectPropDialog::OnIndexChoice(wxCommandEvent &event)
247262 {
248263 if(!isValidIndex(&this->objIndex))return;
264+ map_object* obj = &SavedObjectList[this->objIndex];
265+ obj->index = event.GetSelection();
249266 }
250267
251268
@@ -252,6 +269,7 @@
252269 void ObjectPropDialog::OnHiddenCheck(wxCommandEvent &event)
253270 {
254271 if(!isValidIndex(&this->objIndex))return;
272+ map_object* obj = &SavedObjectList[this->objIndex];
255273 }
256274
257275
@@ -258,6 +276,7 @@
258276 void ObjectPropDialog::OnCeilingCheck(wxCommandEvent &event)
259277 {
260278 if(!isValidIndex(&this->objIndex))return;
279+ map_object* obj = &SavedObjectList[this->objIndex];
261280 }
262281
263282
@@ -264,6 +283,7 @@
264283 void ObjectPropDialog::OnSeeCheck(wxCommandEvent &event)
265284 {
266285 if(!isValidIndex(&this->objIndex))return;
286+ map_object* obj = &SavedObjectList[this->objIndex];
267287 }
268288
269289
@@ -270,6 +290,7 @@
270290 void ObjectPropDialog::OnHearCheck(wxCommandEvent &event)
271291 {
272292 if(!isValidIndex(&this->objIndex))return;
293+ map_object* obj = &SavedObjectList[this->objIndex];
273294 }
274295
275296
@@ -276,6 +297,7 @@
276297 void ObjectPropDialog::OnAerialCheck(wxCommandEvent &event)
277298 {
278299 if(!isValidIndex(&this->objIndex))return;
300+ map_object* obj = &SavedObjectList[this->objIndex];
279301 }
280302
281303
@@ -282,6 +304,8 @@
282304 void ObjectPropDialog::OnNetCheck(wxCommandEvent &event)
283305 {
284306 if(!isValidIndex(&this->objIndex))return;
307+ map_object* obj = &SavedObjectList[this->objIndex];
308+
285309 }
286310
287311
@@ -288,6 +312,8 @@
288312 void ObjectPropDialog::OnLaunchChoice(wxCommandEvent &event)
289313 {
290314 if(!isValidIndex(&this->objIndex))return;
315+ map_object* obj = &SavedObjectList[this->objIndex];
316+ //TODO launch?
291317 }
292318
293319
@@ -294,6 +320,7 @@
294320 void ObjectPropDialog::OnXEdit(wxCommandEvent &event)
295321 {
296322 if(!isValidIndex(&this->objIndex))return;
323+ map_object* obj = &SavedObjectList[this->objIndex];
297324 }
298325
299326
@@ -300,6 +327,7 @@
300327 void ObjectPropDialog::OnYEdit(wxCommandEvent &event)
301328 {
302329 if(!isValidIndex(&this->objIndex))return;
330+ map_object* obj = &SavedObjectList[this->objIndex];
303331 }
304332
305333
@@ -306,6 +334,7 @@
306334 void ObjectPropDialog::OnZEdit(wxCommandEvent &event)
307335 {
308336 if(!isValidIndex(&this->objIndex))return;
337+ map_object* obj = &SavedObjectList[this->objIndex];
309338 }
310339 map_object ObjectPropDialog::getObject()
311340 {
@@ -331,7 +360,39 @@
331360 obj.location.x = atoi(wxConvertWX2MB(text_ctrl_41->GetValue()));
332361 return obj;
333362 }
334-void ObjectPropDialog::drawFacing(wxWindow* panel)
363+void ObjectPropDialog::drawFacing(wxWindow* panel, int facing, wxDC* dc)
335364 {
336- //TODO
365+ //degreeに変換
366+ double degree = DEGREE_ROUND * (double)facing / FACING_ROUND;
367+ //radianに変換
368+ double rad = hpl::math::getRadianFromDegree(degree);
369+ //中心位置
370+ int centerX = this->directionCircle.GetWidth() / 2;
371+ int centerY = this->directionCircle.GetHeight() / 2;
372+ int x = centerX + DIRECTION_MARKER_RADIUS * cos(rad);
373+ int y = centerY + DIRECTION_MARKER_RADIUS * sin(rad);
374+ int markerW = this->directionMarker.GetWidth();
375+ int markerH = this->directionMarker.GetHeight();
376+
377+ //wxWindowDC dc(panel);
378+ //circle
379+ wxBitmap circleBmp(this->directionCircle);
380+ dc->DrawBitmap(circleBmp, 0,0);
381+
382+ //marker
383+ wxBitmap markerBmp(this->directionMarker);
384+ dc->DrawBitmap(markerBmp, x - markerW / 2, y - markerH / 2);
337385 }
386+
387+void ObjectPropDialog::OnPaint(wxPaintEvent &event)
388+{
389+ wxPaintDC dc(this);
390+ wxPaintDC dcw(panel_16);
391+ //wxDialog::OnPaint();
392+ if(this->getObjIndex() != NONE){
393+ map_object* obj = &SavedObjectList[this->objIndex];
394+ drawFacing(panel_16, obj->facing, &dcw);
395+ }else{
396+ drawFacing(panel_16, 0, &dcw);
397+ }
398+}
--- marathon/trunk/MapEditorWX/src/MainFrameLeftDown.cpp (revision 377)
+++ marathon/trunk/MapEditorWX/src/MainFrameLeftDown.cpp (revision 378)
@@ -159,16 +159,20 @@
159159
160160 void MapEditorMainFrame::unselect()
161161 {
162- if(pointPropDialog.getPointIndex() != NONE)
163- this->pointPropDialog.setPointIndex(NONE);
164- if(objPropDialog.getObjectIndex() != NONE)
165- this->objPropDialog.setObjectIndex(NONE);
166- if(linePropDialog.getLineIndex() != NONE)
167- this->pointLineDialog.setLineIndex(NONE);
168- if(sidePropDialog.getSideIndex() != NONE)
169- this->pointSideDialog.setSideIndex(NONE);
170- if(polygonPropDialog.getPolygonIndex() != NONE)
171- this->pointPolygonDialog.setPolygonIndex(NONE);
162+ hpl::aleph::map::HPLSelectData* sel = &wxGetApp().selectData;
163+ //点を選択していないのにindexがNONEではない
164+ if(!sel->isSelectOnePoint() && pointPropDialog.getIndex() != NONE){
165+ //その場合選択をNONEにする
166+ this->pointPropDialog.setIndex(NONE);
167+ }
168+ if(!sel->isSelectOneObject() && objPropDialog.getObjIndex() != NONE)
169+ this->objPropDialog.setObjIndex(NONE);
170+ if(!sel->isSelectOneLine() && linePropDialog.getLineIndex() != NONE)
171+ this->linePropDialog.setLineIndex(NONE);
172+ if(!sel->isSelectOneSide() && sidePropDialog.getIndex() != NONE)
173+ this->sidePropDialog.setIndex(NONE);
174+ if(!sel->isSelectOnePolygon() && polyPropDialog.getPolyIndex() != NONE)
175+ this->polyPropDialog.setPolyIndex(NONE);
172176 }
173177
174178 /**
@@ -224,7 +228,7 @@
224228 continue;
225229 }
226230
227- //点選択検査
231+ //オブジェクト選択検査
228232 if(hpl::aleph::map::isSelectPoint(mx, my,
229233 x, y, voffset[0], voffset[1],
230234 OFFSET_X_WORLD, OFFSET_Y_WORLD, div, OBJECT_DISTANCE_EPSILON))
--- marathon/trunk/MapEditorWX/src/SidePropDialog.cpp (revision 377)
+++ marathon/trunk/MapEditorWX/src/SidePropDialog.cpp (revision 378)
@@ -18,3 +18,7 @@
1818 {
1919 this->index = ind;
2020 }
21+int SidePropDialog::getIndex()
22+{
23+ return this->index;
24+}
--- marathon/trunk/MapEditorWX/src/MapEditorMainFrame.h (revision 377)
+++ marathon/trunk/MapEditorWX/src/MapEditorMainFrame.h (revision 378)
@@ -112,6 +112,11 @@
112112 PolygonTypeDialog polyTypeDialog;
113113 PolygonPropDialog polyPropDialog;
114114 SidePropDialog sidePropDialog;
115+ /**
116+ stocked textures
117+ [collection][clut][index]
118+ */
119+ std::map<int, std::map<int, std::map<int, wxImage> > > textureMap;
115120 private:
116121 //ダブルバッファリング用Bitmap
117122 wxBitmap doubleBufferingBitmap;
@@ -200,11 +205,6 @@
200205 wxImage texture;
201206 wxImage paletteImg;
202207
203- /**
204- stocked textures
205- [collection][clut][index]
206- */
207- std::map<int, std::map<int, std::map<int, wxImage> > > textureMap;
208208 public:
209209 MapEditorMainFrame(const wxString& title,
210210 const wxPoint& pos = wxDefaultPosition,
--- marathon/trunk/MapEditorWX/src/PointPropDialog.cpp (revision 377)
+++ marathon/trunk/MapEditorWX/src/PointPropDialog.cpp (revision 378)
@@ -130,3 +130,8 @@
130130 event.Skip();
131131 std::cout<<"Event handler (PointPropDialog::OnPolyChoice) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
132132 }
133+
134+int PointPropDialog::getIndex()
135+{
136+ return this->index;
137+}
--- marathon/trunk/MapEditorWX/src/LinePropDialog.h (revision 377)
+++ marathon/trunk/MapEditorWX/src/LinePropDialog.h (revision 378)
@@ -51,10 +51,10 @@
5151 void OnClockwisePoly(wxCommandEvent &event); // wxGlade: <event_handler>
5252 void OnCClockwisePoly(wxCommandEvent &event); // wxGlade: <event_handler>
5353
54- int getLineIndex();
5554 public:
5655 void setupDialog();
5756 void setLineIndex(int index);
57+ int getLineIndex();
5858 };
5959
6060 #endif
--- marathon/trunk/MapEditorWX/src/DlgCommon.h (revision 377)
+++ marathon/trunk/MapEditorWX/src/DlgCommon.h (revision 378)
@@ -17,6 +17,7 @@
1717 #include <wx/bmpbuttn.h>
1818 #include <wx/colordlg.h>
1919 #include <wx/scrolwin.h>
20+#include <wx/event.h>
2021
2122 #include "HPLLib/HPLEventManager.h"
2223 #include "MapEditorOneSetting.h"
@@ -24,7 +25,8 @@
2425
2526 #include <string>
2627 #include <set>
27-
28+#include <vector>
29+#include <map>
2830 #include <iostream>
2931
3032 #endif
--- marathon/trunk/MapEditorWX/src/TextureDialog.h (revision 377)
+++ marathon/trunk/MapEditorWX/src/TextureDialog.h (revision 378)
@@ -12,6 +12,10 @@
1212 wxChoice* choice_clut;
1313
1414 bool isFloor_;
15+ int indexSelected;
16+
17+ //コレクションチョイスと実際のコレクション番号との対応リスト
18+ std::vector<int> collectionIndexTable;
1519 public:
1620 TextureDialog();
1721 bool Create(wxWindow* parent, wxWindowID id);
@@ -21,11 +25,15 @@
2125 void OnType(wxCommandEvent &event); // wxGlade: <event_handler>
2226 void OnCollection(wxCommandEvent &event); // wxGlade: <event_handler>
2327 void OnCLUT(wxCommandEvent &event); // wxGlade: <event_handler>
28+ void OnPaint(wxPaintEvent &event);
29+ void OnScroll(wxScrollWinEvent &event);
2430
2531 public:
2632 void setFloor(bool floor);
27- void drawPanel(int collection, int clut, std::map<int, wxImage>* imgMap);
33+ void drawPanel(int collection, int clut, std::map<int, wxImage>* imgMap, wxDC* dc);
2834 void setupDialog(int collection);
35+
36+ int getIndexSelected();
2937 // bool isFloor();
3038 };
3139
--- marathon/trunk/MapEditorWX/src/ObjectPropDialog.h (revision 377)
+++ marathon/trunk/MapEditorWX/src/ObjectPropDialog.h (revision 378)
@@ -34,6 +34,9 @@
3434
3535 //編集しているオブジェクトインデックス
3636 int objIndex;
37+
38+ wxImage directionCircle;
39+ wxImage directionMarker;
3740 public:
3841 ObjectPropDialog();
3942 bool Create(wxWindow* parent, wxWindowID id);
@@ -42,7 +45,7 @@
4245 void setObjIndex(int index);
4346 int getObjIndex();
4447 map_object getObject();
45- void setObject(map_object& obj);
48+ void setObject(map_object obj);
4649 private:
4750 void setupDialog();
4851 //イベントテーブル作成<en>declare
@@ -62,7 +65,7 @@
6265
6366 void OnPaint(wxPaintEvent &event);
6467
65- void drawFacing(wxWindow* panel);
68+ void drawFacing(wxWindow* panel, int facing, wxDC* dc);
6669 };
6770
6871 #endif
旧リポジトリブラウザで表示