• R/O
  • SSH
  • HTTPS

marathon: コミット


コミットメタ情報

リビジョン460 (tree)
日時2007-08-29 00:59:07
作者hogepiyo

ログメッセージ

*** empty log message ***

変更サマリ

差分

--- marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/MonsterPanel.cpp (revision 459)
+++ marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/MonsterPanel.cpp (revision 460)
@@ -1,4 +1,5 @@
11 #include "MonsterPanel.h"
2+#include "../PhysicsEditorOneWX.h"
23
34 enum{
45 ID_TYPE,
@@ -28,6 +29,10 @@
2829
2930 //設定
3031 monsterTypeListBox->SetMinSize(wxSize(-1, 300));
32+ // モンスターリスト追加
33+ for(int i = 0; i < NUMBER_OF_MONSTER_TYPES; i ++){
34+ monsterTypeListBox->Insert(wxConvertMB2WX(wxGetApp().monsterInfo[i].jname.c_str()), i);
35+ }
3136
3237 //配置
3338 wxFlexGridSizer* sizerBase = new wxFlexGridSizer(2);
--- marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/MonsterAppearancePanel.cpp (revision 459)
+++ marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/MonsterAppearancePanel.cpp (revision 460)
@@ -1,9 +1,169 @@
11 #include "MonsterAppearancePanel.h"
22 #include "../PhysicsEditorOneWX.h"
33
4+enum{
5+ ID_COLLECTION,
6+ ID_PALETTE,
7+ ID_VITALITY,
8+ ID_CLASS,
9+ ID_RADIUS,
10+ ID_HEIGHT,
11+ ID_HOVER,
12+ ID_MIN_LEDGE,
13+ ID_MAX_LEDGE,
14+ ID_EXT_VEL_SCALE,
15+ ID_CARRY_ITEM,
16+ ID_HALF_VISUAL_ARC,
17+ ID_VERT_VISUAL_ARC,
18+ ID_INTELLIGENCE,
19+ ID_SPEED_TEXT,
20+ ID_SPEED_CHOICE,
21+ ID_GRAVITY,
22+
23+ ID_STATIONALY,
24+ ID_MOVING,
25+ ID_HITTING,
26+ ID_SOFT_DYING,
27+ ID_SOFT_DEAD,
28+ ID_HARD_DYING,
29+ ID_HARD_DEAD,
30+ ID_TELEPORT_IN,
31+ ID_TELEPORT_OUT,
32+
33+ ID_SHRAPNEL_RADIUS,
34+ ID_SHRAPNEL_BASE,
35+ ID_SHRAPNEL_RND,
36+ ID_SHRAPNEL_SCALE,
37+ ID_SHRAPNEL_TYPE,
38+ ID_SHRAPNEL_IS_ALIEN,
39+
40+ ID_COPY_FROM,
41+
42+ ID_PITCH,
43+ ID_ACTIVATION,
44+ ID_FRIEND_ACT,
45+ ID_CLEAR,
46+ ID_KILL,
47+ ID_APOLYGY,
48+ ID_FRIEND_FIRE,
49+ ID_FLAMING,
50+ ID_RANDOM,
51+ ID_RANDOM_MASK,
52+
53+ ID_EFFECT,
54+ ID_EFFECT_MELEE,
55+ ID_EFFECT_CONTRAIL,
56+
57+ ID_RESET,
58+};
59+
460 MonsterAppearancePanel::MonsterAppearancePanel(wxWindow* parent, wxWindowID id)
561 :wxPanel(parent, id)
662 {
63+ //create
64+ this->collectionChoice = new wxChoice(this, ID_COLLECTION);
65+ this->paletteText = new wxTextCtrl(this, ID_PALETTE);
66+ this->vitalityText = new wxTextCtrl(this, ID_VITALITY);
67+ this->classChoice = new wxChoice(this, ID_CLASS);
68+ this->radiusText = new wxTextCtrl(this, ID_RADIUS);
69+ this->heightText = new wxTextCtrl(this, ID_HEIGHT);
70+ this->hoverText = new wxTextCtrl(this, ID_HOVER);
71+ this->minLedgeText = new wxTextCtrl(this, ID_MIN_LEDGE);
72+ this->maxLedgeText = new wxTextCtrl(this, ID_MAX_LEDGE);
73+ this->extVelScaleText = new wxTextCtrl(this, ID_EXT_VEL_SCALE);
74+ this->carryItemChoice = new wxChoice(this, ID_CARRY_ITEM);
75+ this->halfVisualArcText = new wxTextCtrl(this, ID_HALF_VISUAL_ARC);
76+ this->vertVisualArcText = new wxTextCtrl(this, ID_VERT_VISUAL_ARC);
77+ this->intelligenceChoice = new wxChoice(this, ID_INTELLIGENCE);
78+ this->speedText = new wxTextCtrl(this, ID_SPEED_TEXT);
79+ this->speedChoice = new wxChoice(this, ID_SPEED_CHOICE);
80+ this->gravityText = new wxTextCtrl(this, ID_GRAVITY);
81+
82+ wxStaticBox* appearanceStaticBox = new wxStaticBox(this, wxID_ANY, _T("Apeearance"));
83+ wxStaticBox* shrapnelStaticBox = new wxStaticBox(this, wxID_ANY, _T("Shrapnel damages"));
84+ wxStaticBox* soundStaticBox = new wxStaticBox(this, wxID_ANY, _T("Sounds"));
85+ wxStaticBox* effectStaticBox = new wxStaticBox(this, wxID_ANY, _T("Effects"));
86+
87+ //set
88+ // collection
89+ for(int i = 0; i < NUMBER_OF_COLLECTIONS; i ++){
90+ collectionChoice->Insert(wxConvertMB2WX(wxGetApp().collectionInfo[i].jname.c_str()), i);
91+ }
92+ // class
93+ for(int i = 0; i < NUMBER_OF_CLASS_INFORMATIONS; i ++){
94+ classChoice->Insert(wxConvertMB2WX(wxGetApp().monsterClassBind[i].jname.c_str()), i);
95+ }
96+ // item
97+ for(int i = 0; i < NUMBER_OF_DEFINED_ITEMS; i ++){
98+ classChoice->Insert(wxConvertMB2WX(wxGetApp().itemInfo[i].jname.c_str()), i);
99+ }
100+ // intelligence
101+ for(int i = 0; i < NUMBER_OF_MONSTER_INTELLIGENCE_INFORMATIONS; i ++){
102+ intelligenceChoice->Insert(wxConvertMB2WX(wxGetApp().monsterIntelligenceBind[i].jname.c_str()), i);
103+ }
104+ // speed
105+ for(int i = 0; i < NUMBER_OF_SPEED_INFORMATIONS; i ++){
106+ intelligenceChoice->Insert(wxConvertMB2WX(wxGetApp().speedBind[i].jname.c_str()), i);
107+ }
108+ // shrapnel type
109+ // sounds
110+ // effects
111+
112+ //layout
113+ wxBoxSizer* baseSizer = new wxBoxSizer(wxHORIZONTAL);
114+
115+ // left column
116+ wxFlexGridSizer* infoSizer = new wxFlexGridSizer(17, 2, 0,0);
117+ infoSizer->Add(new wxStaticText(this, wxID_ANY, _T("Collection")));
118+ infoSizer->Add(this->collectionChoice);
119+ infoSizer->Add(new wxStaticText(this, wxID_ANY, _T("Palette")));
120+ infoSizer->Add(this->paletteText);
121+ infoSizer->Add(new wxStaticText(this, wxID_ANY, _T("Vitality")));
122+ infoSizer->Add(this->vitalityText);
123+ infoSizer->Add(new wxStaticText(this, wxID_ANY, _T("Class")));
124+ infoSizer->Add(this->classChoice);
125+ infoSizer->Add(new wxStaticText(this, wxID_ANY, _T("Radius")));
126+ infoSizer->Add(this->radiusText);
127+ infoSizer->Add(new wxStaticText(this, wxID_ANY, _T("Height")));
128+ infoSizer->Add(this->heightText);
129+ infoSizer->Add(new wxStaticText(this, wxID_ANY, _T("Hover")));
130+ infoSizer->Add(this->hoverText);
131+ infoSizer->Add(new wxStaticText(this, wxID_ANY, _T("Min Ledge")));
132+ infoSizer->Add(this->minLedgeText);
133+ infoSizer->Add(new wxStaticText(this, wxID_ANY, _T("Max Ledge")));
134+ infoSizer->Add(this->maxLedgeText);
135+ infoSizer->Add(new wxStaticText(this, wxID_ANY, _T("External Velocity Scale")));
136+ infoSizer->Add(this->extVelScaleText);
137+ infoSizer->Add(new wxStaticText(this, wxID_ANY, _T("Carry Item")));
138+ infoSizer->Add(this->carryItemChoice);
139+ infoSizer->Add(new wxStaticText(this, wxID_ANY, _T("Half Visual Arc")));
140+ infoSizer->Add(this->halfVisualArcText);
141+ infoSizer->Add(new wxStaticText(this, wxID_ANY, _T("Vertical Visual Arc")));
142+ infoSizer->Add(this->vertVisualArcText);
143+ infoSizer->Add(new wxStaticText(this, wxID_ANY, _T("Intelligence")));
144+ infoSizer->Add(this->intelligenceChoice);
145+ infoSizer->Add(new wxStaticText(this, wxID_ANY, _T("Speed")));
146+ infoSizer->Add(this->speedText);
147+ infoSizer->Add(new wxPanel(this, wxID_ANY), 0,wxEXPAND);
148+ infoSizer->Add(this->speedChoice);
149+ infoSizer->Add(new wxStaticText(this, wxID_ANY, _T("Gravity")));
150+ infoSizer->Add(this->gravityText);
151+
152+ // center column
153+ wxFlexGridSizer* appearanceAndShrapnelSizer = new wxFlexGridSizer(3, 1,0,0);
154+ wxStaticBoxSizer* appearanceStaticSizer = new wxStaticBoxSizer(appearanceStaticBox, wxVERTICAL);
155+ appearanceAndShrapnelSizer->Add(appearanceStaticSizer);
156+ wxStaticBoxSizer* shrapnelStaticSizer = new wxStaticBoxSizer(shrapnelStaticBox, wxVERTICAL);
157+ appearanceAndShrapnelSizer->Add(shrapnelStaticSizer);
158+ // button
159+
160+ baseSizer->Add(infoSizer);
161+ baseSizer->Add(appearanceAndShrapnelSizer);
162+
163+ this->SetSizer(baseSizer);
164+ baseSizer->Fit(this);
165+ this->Layout();
166+
7167 }
8168 MonsterAppearancePanel::~MonsterAppearancePanel()
9169 {
--- marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/MonsterAppearancePanel.h (revision 459)
+++ marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/MonsterAppearancePanel.h (revision 460)
@@ -9,6 +9,66 @@
99 */
1010 class MonsterAppearancePanel: public wxPanel{
1111 private:
12+ wxChoice* collectionChoice;
13+ wxTextCtrl* paletteText;
14+ wxTextCtrl* vitalityText;
15+ wxChoice* classChoice;
16+ wxTextCtrl* radiusText;
17+ wxTextCtrl* heightText;
18+ wxTextCtrl* hoverText;
19+ wxTextCtrl* minLedgeText;
20+ wxTextCtrl* maxLedgeText;
21+ wxTextCtrl* extVelScaleText;
22+ wxChoice* carryItemChoice;
23+ wxTextCtrl* halfVisualArcText;
24+ wxTextCtrl* vertVisualArcText;
25+ wxChoice* intelligenceChoice;
26+ wxTextCtrl* speedText;
27+ wxChoice* speedChoice;
28+ wxTextCtrl* gravityText;
29+
30+ //シーケンス
31+ wxTextCtrl* stationalyText;
32+ wxTextCtrl* movingText;
33+ wxTextCtrl* hittingText;
34+ wxTextCtrl* softDyingText;
35+ wxTextCtrl* softDeadText;
36+ wxTextCtrl* hardDyingText;
37+ wxTextCtrl* hardDeadText;
38+ wxTextCtrl* teleportInText;
39+ wxTextCtrl* teleportOutText;
40+
41+ //shrapnel自爆ダメージ
42+ wxTextCtrl* shrapnelRadiusText;
43+ wxTextCtrl* shrapnelBaseText;
44+ wxTextCtrl* shrapnelRndText;
45+ wxTextCtrl* shrapnelScaleText;
46+ wxChoice* shrapnelTypeChoice;
47+ wxCheckBox* shrapnelIsAlienCheckbox;
48+
49+ //copy from
50+ wxButton* copyFromButton;
51+
52+ //sound
53+ wxTextCtrl* soundPitchText;
54+ wxChoice* soundActivationChoice;
55+ wxChoice* soundFriendActChoice;
56+ wxChoice* soundClearChoice;
57+ wxChoice* soundKillChoice;
58+ wxChoice* soundApologyChoice;
59+ wxChoice* soundFriendFireChoice;
60+ wxChoice* soundFlamingChoice;
61+ wxChoice* soundRandomChoice;
62+ wxTextCtrl* soundRandomMask;
63+
64+ //effect
65+ wxChoice* effectChoice;
66+ wxChoice* effectMeleeChoice;
67+ wxChoice* effectContrailChoice;
68+
69+ //button
70+ wxButton* resetButton;
71+
1272 MonsterAppearancePanel(){}
1373 public:
1474 MonsterAppearancePanel(wxWindow* parent, wxWindowID id);
--- marathon/trunk/EditorOnes/PhysicsEditorOneWX/data/MonsterTypes.txt (revision 459)
+++ marathon/trunk/EditorOnes/PhysicsEditorOneWX/data/MonsterTypes.txt (revision 460)
@@ -14,11 +14,11 @@
1414 science
1515 security
1616 assimilated
17-hummer minor // slow hummer
18-hummer major // fast hummer
19-hummer big minor // big hummer
20-hummer big major // angry hummer
21-hummer possessed // hummer from durandal
17+hummer minor
18+hummer major
19+hummer big minor
20+hummer big major
21+hummer possessed
2222 cyborg minor
2323 cyborg major
2424 cyborg flame minor
旧リポジトリブラウザで表示