• R/O
  • SSH
  • HTTPS

marathon: コミット


コミットメタ情報

リビジョン337 (tree)
日時2007-06-19 21:18:54
作者hogepiyo

ログメッセージ

*** empty log message ***

変更サマリ

差分

--- marathon/trunk/MapEditorWX/src/ColorCustomizeDialog.h (revision 336)
+++ marathon/trunk/MapEditorWX/src/ColorCustomizeDialog.h (revision 337)
@@ -31,7 +31,8 @@
3131 virtual ~ColorCustomizeDialog();
3232 //イベントテーブル作成<en>declare
3333 DECLARE_EVENT_TABLE()
34- void OnOk(wxCommandEvent& wv);
34+
35+ void OnOk(wxCommandEvent& ev);
3536 void OnCancel(wxCommandEvent &ev);
3637 void OnBackground(wxCommandEvent &event); // wxGlade: <event_handler>
3738 void OnGrid(wxCommandEvent &event); // wxGlade: <event_handler>
--- marathon/trunk/MapEditorWX/src/MainFrameDraw.cpp (revision 336)
+++ marathon/trunk/MapEditorWX/src/MainFrameDraw.cpp (revision 337)
@@ -158,7 +158,6 @@
158158 dc->SetBrush(this->invalidBrush);
159159 }
160160 }
161- //TODO 整合性
162161
163162 dc->DrawPolygon(vertexCount, points);
164163 }
--- marathon/trunk/MapEditorWX/src/ColorCustomizeDialog.cpp (revision 336)
+++ marathon/trunk/MapEditorWX/src/ColorCustomizeDialog.cpp (revision 337)
@@ -9,15 +9,16 @@
99 ID_POINTS,
1010 };
1111 BEGIN_EVENT_TABLE(ColorCustomizeDialog, wxDialog)
12- EVT_BUTTON(ID_BACKGROUND, ColorCustomize::OnBackground)
13- EVT_BUTTON(ID_GRID, ColorCustomize::OnGrid)
14- EVT_BUTTON(ID_LINES, ColorCustomize::OnLines)
15- EVT_BUTTON(ID_POLYGONS, ColorCustomize::OnPolygons)
16- EVT_BUTTON(ID_STRINGS, ColorCustomize::OnStrings)
17- EVT_BUTTON(ID_POINTS, ColorCustomize::OnPoints)
18- EVT_COMMAND(wxID_OK, ColorCustomizeDialog::OnOk)
19- EVT_COMMAND(wxID_CANCEL, ColorCustomizeDialog::OnCancel)
12+ EVT_BUTTON(ID_BACKGROUND, ColorCustomizeDialog::OnBackground)
13+ EVT_BUTTON(ID_GRID, ColorCustomizeDialog::OnGrid)
14+ EVT_BUTTON(ID_LINES, ColorCustomizeDialog::OnLines)
15+ EVT_BUTTON(ID_POLYGONS, ColorCustomizeDialog::OnPolygons)
16+ EVT_BUTTON(ID_STRINGS, ColorCustomizeDialog::OnStrings)
17+ EVT_BUTTON(ID_POINTS, ColorCustomizeDialog::OnPoints)
18+ EVT_BUTTON(wxID_OK, ColorCustomizeDialog::OnOk)
19+ EVT_BUTTON(wxID_CANCEL, ColorCustomizeDialog::OnCancel)
2020 END_EVENT_TABLE()
21+
2122 ColorCustomizeDialog::ColorCustomizeDialog()
2223 {
2324 }
@@ -92,7 +93,7 @@
9293
9394 return result;
9495 }
95-void ColorCustomize::OnOk(wxCommandEvent& wv)
96+void ColorCustomize::OnOk(wxCommandEvent& ev)
9697 {
9798 SetReturnCode(wxID_OK);
9899 Destroy();
--- marathon/trunk/MapEditorWX/src/PointPropDialog.cpp (revision 336)
+++ marathon/trunk/MapEditorWX/src/PointPropDialog.cpp (revision 337)
@@ -18,6 +18,8 @@
1818 EVT_TEXT(ID_TX, PointPropDialog::OnEditTX)
1919 EVT_TEXT(ID_TY, PointPropDialog::OnEditTY)
2020 EVT_CHOICE(ID_POLY_INDEX, PointPropDialog::OnPolyChoice)
21+END_EVENT_TABLE()
22+
2123 PointPropDialog::PointPropDialog()
2224 {
2325 }
--- marathon/trunk/MapEditorWX/src/DlgCommon.h (revision 336)
+++ marathon/trunk/MapEditorWX/src/DlgCommon.h (revision 337)
@@ -12,8 +12,12 @@
1212 #include <wx/sizer.h>
1313 #include <wx/image.h>
1414 #include <wx/radiobut.h>
15+#include <wx/listctrl.h>
16+#include <wx/listbox.h>
1517
1618 #include "HPLLib/HPLEventManager.h"
1719 #include <string>
1820
21+#include <iostream>
22+
1923 #endif
--- marathon/trunk/HPLLib/HPLMapTool.cpp (revision 336)
+++ marathon/trunk/HPLLib/HPLMapTool.cpp (revision 337)
@@ -841,35 +841,35 @@
841841 return index;
842842 }
843843
844-line_data hpl::aleph::map::createLine(int beginPointIndex, int endPointIndex)
844+bool hpl::aleph::map::createLine(int beginPointIndex, int endPointIndex, line_data* line)
845845 {
846846 endpoint_data* begin = get_endpoint_data(beginPointIndex);
847847 endpoint_data* end = get_endpoint_data(endPointIndex);
848848 if(begin == NULL || end == NULL){
849- return NONE;
849+ return false;
850850 }
851- line_data line;
852- line.clockwise_polygon_owner = NONE;
853- line.clockwise_polygon_side_index = NONE;
854- line.counterclockwise_polygon_owner = NONE;
855- line.counterclockwise_polygon_side_index = NONE;
856- line.endpoint_indexes[0] = beginPointIndex;
857- line.endpoint_indexes[1] = endPointIndex;
858- line.flags = 0;
851+ line->clockwise_polygon_owner = NONE;
852+ line->clockwise_polygon_side_index = NONE;
853+ line->counterclockwise_polygon_owner = NONE;
854+ line->counterclockwise_polygon_side_index = NONE;
855+ line->endpoint_indexes[0] = beginPointIndex;
856+ line->endpoint_indexes[1] = endPointIndex;
857+ line->flags = 0;
859858 //TODO 点のうち高い方のフロア高度
860- line.highest_adjacent_floor = 0;
861- return line;
859+ line->highest_adjacent_floor = 0;
860+ return true;
862861 }
863-polygon_data hpl::aleph::map::createPolygon(int pointIndexes[], int n)
862+
863+bool hpl::aleph::map::createPolygon(int pointIndexes[], int n, polygon_data* poly)
864864 {
865865 endpoint_data* ep[MAXIMUM_VERTICES_PER_POLYGON];
866- polygon_data poly;
866+
867867 for(int i = 0; i < n; i ++){
868868 ep[i] = get_endpoint_data(pointIndexes[i]);
869869 if(ep[i] == NULL){
870- return NONE;
870+ return false;
871871 }
872- poly.endpoint_indexes[i] = pointIndexes[i];
872+ poly->endpoint_indexes[i] = pointIndexes[i];
873873 }
874874 for(int i = 0; i < n; i ++){
875875 int next = i + 1;
@@ -878,47 +878,48 @@
878878 }
879879 int lIndex = hpl::aleph::map::getLineIndexFromTwoLPoints(pointIndexes[i], pointIndexes[next]);
880880 if(lIndex == NONE){
881- return NONE;
881+ return false;
882882 }
883- poly.line_indexes[i] = lIndex;
883+ poly->line_indexes[i] = lIndex;
884884 }
885- poly.adjacent_polygon_indexes = NONE;
886- poly.ambient_sound_image_index = NONE;
885+ //TODO
886+ //poly->adjacent_polygon_indexes = NONE;
887+ poly->ambient_sound_image_index = NONE;
887888 //TODO area?
888- poly.area = 0;
889+ poly->area = 0;
889890 //TODO 点のうち一番高い高度
890- poly.ceiling_height = WORLD_ONE;
891- poly.ceiling_lightsource_index = NONE;
891+ poly->ceiling_height = WORLD_ONE;
892+ poly->ceiling_lightsource_index = NONE;
892893 //TODO ?
893- poly.ceiling_origin.x = 0;
894- poly.ceiling_origin.y = 0;
895- poly.ceiling_texture = NONE;
894+ poly->ceiling_origin.x = 0;
895+ poly->ceiling_origin.y = 0;
896+ poly->ceiling_texture = NONE;
896897 //TODO ?
897- poly.ceiling_transfer_mode = 0;
898+ poly->ceiling_transfer_mode = 0;
898899 //TODO center?
899- poly.center.x = 0;
900- poly.center.y = 0;
900+ poly->center.x = 0;
901+ poly->center.y = 0;
901902 //TODO ZONE?
902- poly.first_exclusion_zone_index = NONE;
903- poly.line_exclusion_zone_count = 0;
904- poly.point_exclusion_zone_count = 0;
903+ poly->first_exclusion_zone_index = NONE;
904+ poly->line_exclusion_zone_count = 0;
905+ poly->point_exclusion_zone_count = 0;
905906 //TODO ?
906- poly.first_neighbor_index = NONE;
907- poly.first_object = NONE;
907+ poly->first_neighbor_index = NONE;
908+ poly->first_object = NONE;
908909 //TODO flags?
909- poly.flags = 0;
910- poly.media_index = NONE;
911- poly.media_lightsource_index = NONE;
910+ poly->flags = 0;
911+ poly->media_index = NONE;
912+ poly->media_lightsource_index = NONE;
912913 //TODO count 線の反対側の
913- poly.neighbor_count = 0;
914+ poly->neighbor_count = 0;
914915 //TODO ?
915- poly.permutation = 0;
916- poly.random_sound_image_index = NONE;
917- //poly.side_indexes[0] = NONE;
918- //poly.sound_source_indexes;
919- poly.type = _polygon_is_normal;
920- poly.vertex_count = n;
921- return poly;
916+ poly->permutation = 0;
917+ poly->random_sound_image_index = NONE;
918+ //poly->side_indexes[0] = NONE;
919+ //poly->sound_source_indexes;
920+ poly->type = _polygon_is_normal;
921+ poly->vertex_count = n;
922+ return true;
922923 }
923924
924925 /**
--- marathon/trunk/HPLLib/HPLMapTool.h (revision 336)
+++ marathon/trunk/HPLLib/HPLMapTool.h (revision 337)
@@ -310,8 +310,8 @@
310310 既存の点を用いて線やポリゴンを作成します
311311 <en> create new line and polygon with points already exist
312312 */
313- line_data createLine(int beginPointIndex, int endPointIndex);
314- polygon_data createPolygon(int pointIndexes[], int n);
313+ bool createLine(int beginPointIndex, int endPointIndex, line_data* line);
314+ bool createPolygon(int pointIndexes[], int n, polygon_data* poly);
315315
316316 /**
317317 点情報を削除します
旧リポジトリブラウザで表示