Skip to content

Commit 2fbddc4

Browse files
Xottab-DUTYXottab-DUTY
committed
ParticleEditor: fixed includes and formatted code
1 parent 8506993 commit 2fbddc4

31 files changed

+5184
-4186
lines changed

‎src/editors/ParticleEditor/BottomBar.cpp

Lines changed: 260 additions & 199 deletions
Large diffs are not rendered by default.

‎src/editors/ParticleEditor/BottomBar.h

Lines changed: 77 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -14,87 +14,95 @@
1414
#include "CGAUGES.h"
1515
#include <ExtCtrls.hpp>
1616
#include <Menus.hpp>
17+
1718
//---------------------------------------------------------------------------
1819
class ECORE_API TfraBottomBar : public TFrame
1920
{
20-
__published: // IDE-managed Components
21-
TFormStorage *fsStorage;
22-
TMxPopupMenu *pmOptions;
21+
__published: // IDE-managed Components
22+
TFormStorage*fsStorage;
23+
TMxPopupMenu *pmOptions;
2324
TMenuItem *Quality1;
24-
TMenuItem *N25;
25-
TMenuItem *N50;
26-
TMenuItem *N75;
27-
TMenuItem *N100;
28-
TMenuItem *N125;
29-
TMenuItem *N150;
30-
TMenuItem *N200;
25+
TMenuItem *N25;
26+
TMenuItem *N50;
27+
TMenuItem *N75;
28+
TMenuItem *N100;
29+
TMenuItem *N125;
30+
TMenuItem *N150;
31+
TMenuItem *N200;
3132
TMenuItem *N2;
3233
TMenuItem *miDrawGrid;
33-
TMenuItem *Render1;
34-
TMenuItem *FillMode1;
35-
TMenuItem *miRenderFillSolid;
36-
TMenuItem *miRenderFillWireframe;
37-
TMenuItem *miRenderFillPoint;
38-
TMenuItem *ShadeMode1;
39-
TMenuItem *miRenderShadeGouraud;
40-
TMenuItem *miRenderShadeFlat;
41-
TMenuItem *miRenderEdgedFaces;
42-
TMenuItem *miRenderHWTransform;
43-
TMenuItem *miRenderLinearFilter;
44-
TMenuItem *miRenderWithTextures;
45-
TMenuItem *N7;
46-
TMenuItem *N8;
47-
TMenuItem *miLightScene;
48-
TMenuItem *miFog;
49-
TMenuItem *miRealTime;
34+
TMenuItem *Render1;
35+
TMenuItem *FillMode1;
36+
TMenuItem *miRenderFillSolid;
37+
TMenuItem *miRenderFillWireframe;
38+
TMenuItem *miRenderFillPoint;
39+
TMenuItem *ShadeMode1;
40+
TMenuItem *miRenderShadeGouraud;
41+
TMenuItem *miRenderShadeFlat;
42+
TMenuItem *miRenderEdgedFaces;
43+
TMenuItem *miRenderHWTransform;
44+
TMenuItem *miRenderLinearFilter;
45+
TMenuItem *miRenderWithTextures;
46+
TMenuItem *N7;
47+
TMenuItem *N8;
48+
TMenuItem *miLightScene;
49+
TMenuItem *miFog;
50+
TMenuItem *miRealTime;
5051
TMenuItem *N1;
51-
TPanel *paBottomBar;
52-
TPanel *paInfo;
53-
TPanel *paStatusBar;
54-
TPanel *paTools;
55-
TExtBtn *ebOptions;
56-
TExtBtn *ebLog;
57-
TExtBtn *ebStat;
58-
TExtBtn *ebStop;
59-
TPanel *paStatusLabel;
60-
TPanel *paStatus;
61-
TCGauge *cgProgress;
62-
TPanel *paSel;
63-
TPanel *paGridSquareSize;
64-
TPanel *paUICursor;
65-
TPanel *paCamera;
66-
TMenuItem *miDrawSafeRect;
67-
TMenuItem *miMuteSounds;
68-
TMenuItem *N5;
69-
TMenuItem *miWeather;
70-
TMenuItem *miWeatherNone;
71-
TMenuItem *N6;
72-
TExtBtn *ebMacro;
73-
TMxPopupMenu *pmMacro;
52+
TPanel *paBottomBar;
53+
TPanel *paInfo;
54+
TPanel *paStatusBar;
55+
TPanel *paTools;
56+
TExtBtn *ebOptions;
57+
TExtBtn *ebLog;
58+
TExtBtn *ebStat;
59+
TExtBtn *ebStop;
60+
TPanel *paStatusLabel;
61+
TPanel *paStatus;
62+
TCGauge *cgProgress;
63+
TPanel *paSel;
64+
TPanel *paGridSquareSize;
65+
TPanel *paUICursor;
66+
TPanel *paCamera;
67+
TMenuItem *miDrawSafeRect;
68+
TMenuItem *miMuteSounds;
69+
TMenuItem *N5;
70+
TMenuItem *miWeather;
71+
TMenuItem *miWeatherNone;
72+
TMenuItem *N6;
73+
TExtBtn *ebMacro;
74+
TMxPopupMenu *pmMacro;
7475
void __fastcall ClickOptionsMenuItem(TObject *Sender);
7576
void __fastcall QualityClick(TObject *Sender);
7677
void __fastcall fsStorageRestorePlacement(TObject *Sender);
77-
void __fastcall ebLogClick(TObject *Sender);
78-
void __fastcall ebStopClick(TObject *Sender);
79-
void __fastcall ebStatClick(TObject *Sender);
80-
void __fastcall ebOptionsMouseDown(TObject *Sender, TMouseButton Button,
81-
TShiftState Shift, int X, int Y);
82-
void __fastcall pmOptionsPopup(TObject *Sender);
83-
void __fastcall miWeatherClick(TObject *Sender);
84-
void __fastcall ebMacroMouseDown(TObject *Sender, TMouseButton Button,
85-
TShiftState Shift, int X, int Y);
86-
private: // User declarations
87-
void __fastcall MacroAssignClick(TObject *Sender);
88-
void __fastcall MacroClearClick(TObject *Sender);
89-
void __fastcall MacroExecuteClick(TObject *Sender);
90-
void __fastcall MacroLogCommandsClick(TObject *Sender);
91-
void __fastcall MacroEditCommandListClick(TObject *Sender);
92-
public: // User declarations
93-
__fastcall TfraBottomBar(TComponent* Owner);
94-
void RefreshBar(){;}
78+
void __fastcall ebLogClick(TObject *Sender);
79+
void __fastcall ebStopClick(TObject *Sender);
80+
void __fastcall ebStatClick(TObject *Sender);
81+
void __fastcall ebOptionsMouseDown(TObject *Sender, TMouseButton Button,
82+
TShiftState Shift, int X, int Y);
83+
void __fastcall pmOptionsPopup(TObject *Sender);
84+
void __fastcall miWeatherClick(TObject *Sender);
85+
void __fastcall ebMacroMouseDown(TObject *Sender, TMouseButton Button,
86+
TShiftState Shift, int X, int Y);
87+
private: // User declarations
88+
void __fastcall MacroAssignClick(TObject *Sender);
89+
void __fastcall MacroClearClick(TObject *Sender);
90+
void __fastcall MacroExecuteClick(TObject *Sender);
91+
void __fastcall MacroLogCommandsClick(TObject *Sender);
92+
void __fastcall MacroEditCommandListClick(TObject *Sender);
93+
public: // User declarations
94+
__fastcall TfraBottomBar(TComponent *Owner);
95+
96+
void RefreshBar()
97+
{
98+
;
99+
}
100+
95101
void RedrawBar();
96102
};
103+
97104
//---------------------------------------------------------------------------
98-
extern PACKAGE TfraBottomBar *fraBottomBar;
105+
extern PACKAGE TfraBottomBar * fraBottomBar;
99106
//---------------------------------------------------------------------------
100107
#endif
108+

‎src/editors/ParticleEditor/ItemPropFormUnit.cpp

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,25 @@
99
#pragma link "mxPlacemnt"
1010
#pragma resource "*.dfm"
1111
TfmItemProp *fmItemProp;
12+
1213
//---------------------------------------------------------------------------
13-
__fastcall TfmItemProp::TfmItemProp(TComponent* Owner)
14-
: TForm(Owner)
15-
{
16-
}
14+
__fastcall TfmItemProp::TfmItemProp(TComponent *Owner)
15+
: TForm(Owner) {}
16+
1717
//---------------------------------------------------------------------------
1818
void __fastcall TfmItemProp::FormCloseQuery(TObject *Sender,
19-
bool &CanClose)
19+
bool &CanClose)
2020
{
21-
CanClose = false;
21+
CanClose = false;
2222
}
23+
2324
//---------------------------------------------------------------------------
2425
void __fastcall TfmItemProp::FormClose(TObject *Sender,
25-
TCloseAction &Action)
26+
TCloseAction &Action)
2627
{
27-
Action = caMinimize;
28+
Action = caMinimize;
2829
}
30+
2931
//---------------------------------------------------------------------------
32+
33+

‎src/editors/ParticleEditor/ItemPropFormUnit.h

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,21 @@
88
#include <StdCtrls.hpp>
99
#include <Forms.hpp>
1010
#include "mxPlacemnt.hpp"
11+
1112
//---------------------------------------------------------------------------
1213
class TfmItemProp : public TForm
1314
{
14-
__published: // IDE-managed Components
15-
TFormStorage *fsStorage;
16-
void __fastcall FormCloseQuery(TObject *Sender, bool &CanClose);
17-
void __fastcall FormClose(TObject *Sender, TCloseAction &Action);
18-
private: // User declarations
19-
public: // User declarations
20-
__fastcall TfmItemProp(TComponent* Owner);
15+
__published: // IDE-managed Components
16+
TFormStorage*fsStorage;
17+
void __fastcall FormCloseQuery(TObject *Sender, bool &CanClose);
18+
void __fastcall FormClose(TObject *Sender, TCloseAction &Action);
19+
private: // User declarations
20+
public: // User declarations
21+
__fastcall TfmItemProp(TComponent *Owner);
2122
};
23+
2224
//---------------------------------------------------------------------------
2325
extern TfmItemProp *fmItemProp;
2426
//---------------------------------------------------------------------------
2527
#endif
28+

0 commit comments

Comments
 (0)