|
22 | 22 |
|
23 | 23 | namespace Supernova{ |
24 | 24 |
|
25 | | - class SUPERNOVA_API UISystem : public SubSystem { |
| 25 | + class SUPERNOVA_API UISystem : public SubSystem { |
26 | 26 |
|
27 | 27 | private: |
28 | 28 |
|
29 | | - std::string eventId; |
30 | | - Entity lastUIFromPointer; |
31 | | - Entity lastPanelFromPointer; |
32 | | - Vector2 lastPointerPos; |
33 | | - Vector2 panelSizeAcc; // to add accumulation from float to int |
| 29 | + std::string eventId; |
| 30 | + Entity lastUIFromPointer; |
| 31 | + Entity lastPanelFromPointer; |
| 32 | + Vector2 lastPointerPos; |
| 33 | + Vector2 panelSizeAcc; // to add accumulation from float to int |
34 | 34 |
|
35 | | - void createOrUpdateUiComponent(double dt, UILayoutComponent& layout, Entity entity, Signature signature); |
36 | | - void getPanelEdges(const PanelComponent& panel, const UILayoutComponent& layout, const Transform& transform, const UILayoutComponent& headerlayout, Rect& edgeRight, Rect& edgeRightBottom, Rect& edgeBottom, Rect& edgeLeftBottom, Rect& edgeLeft); |
37 | | - Rect fitOnPanel(Rect uiRect, Entity parentPanel); |
38 | | - void calculateUIAABB(UIComponent& ui); |
| 35 | + void createOrUpdateUiComponent(double dt, UILayoutComponent& layout, Entity entity, Signature signature); |
| 36 | + void getPanelEdges(const PanelComponent& panel, const UILayoutComponent& layout, const Transform& transform, const UILayoutComponent& headerlayout, Rect& edgeRight, Rect& edgeRightBottom, Rect& edgeBottom, Rect& edgeLeftBottom, Rect& edgeLeft); |
| 37 | + Rect fitOnPanel(Rect uiRect, Entity parentPanel); |
| 38 | + void calculateUIAABB(UIComponent& ui); |
39 | 39 |
|
40 | | - //Image |
41 | | - bool createImagePatches(ImageComponent& img, UIComponent& ui, UILayoutComponent& layout); |
| 40 | + //Image |
| 41 | + bool createImagePatches(ImageComponent& img, UIComponent& ui, UILayoutComponent& layout); |
42 | 42 |
|
43 | | - // Text |
44 | | - bool loadFontAtlas(TextComponent& text, UIComponent& ui, UILayoutComponent& layout); |
45 | | - void createText(TextComponent& text, UIComponent& ui, UILayoutComponent& layout); |
| 43 | + // Text |
| 44 | + bool loadFontAtlas(TextComponent& text, UIComponent& ui, UILayoutComponent& layout); |
| 45 | + void createText(TextComponent& text, UIComponent& ui, UILayoutComponent& layout); |
46 | 46 |
|
47 | | - //Button |
48 | | - void updateButton(Entity entity, ButtonComponent& button, ImageComponent& img, UIComponent& ui, UILayoutComponent& layout); |
| 47 | + //Button |
| 48 | + void updateButton(Entity entity, ButtonComponent& button, ImageComponent& img, UIComponent& ui, UILayoutComponent& layout); |
49 | 49 |
|
50 | | - //Panel |
51 | | - void updatePanel(Entity entity, PanelComponent& panel, ImageComponent& img, UIComponent& ui, UILayoutComponent& layout); |
| 50 | + //Panel |
| 51 | + void updatePanel(Entity entity, PanelComponent& panel, ImageComponent& img, UIComponent& ui, UILayoutComponent& layout); |
52 | 52 |
|
53 | | - //Scrollbar |
54 | | - void updateScrollbar(Entity entity, ScrollbarComponent& scrollbar, ImageComponent& img, UIComponent& ui, UILayoutComponent& layout); |
| 53 | + //Scrollbar |
| 54 | + void updateScrollbar(Entity entity, ScrollbarComponent& scrollbar, ImageComponent& img, UIComponent& ui, UILayoutComponent& layout); |
55 | 55 |
|
56 | | - //TextEdit |
57 | | - void updateTextEdit(Entity entity, TextEditComponent& textedit, ImageComponent& img, UIComponent& ui, UILayoutComponent& layout); |
58 | | - void blinkCursorTextEdit(double dt, TextEditComponent& textedit, UIComponent& ui); |
| 56 | + //TextEdit |
| 57 | + void updateTextEdit(Entity entity, TextEditComponent& textedit, ImageComponent& img, UIComponent& ui, UILayoutComponent& layout); |
| 58 | + void blinkCursorTextEdit(double dt, TextEditComponent& textedit, UIComponent& ui); |
59 | 59 |
|
60 | | - //UI Polygon |
61 | | - void createUIPolygon(PolygonComponent& polygon, UIComponent& ui, UILayoutComponent& layout); |
| 60 | + //UI Polygon |
| 61 | + void createUIPolygon(PolygonComponent& polygon, UIComponent& ui, UILayoutComponent& layout); |
62 | 62 |
|
63 | | - bool isCoordInside(float x, float y, Transform& transform, UILayoutComponent& layout); |
64 | | - bool isCoordInside(float x, float y, Transform& transform, UILayoutComponent& layout, Vector2 center); |
| 63 | + bool isCoordInside(float x, float y, Transform& transform, UILayoutComponent& layout); |
| 64 | + bool isCoordInside(float x, float y, Transform& transform, UILayoutComponent& layout, Vector2 center); |
65 | 65 |
|
66 | | - void applyAnchorPreset(UILayoutComponent& layout); |
67 | | - void changeFlipY(UIComponent& ui, CameraComponent& camera); |
| 66 | + void applyAnchorPreset(UILayoutComponent& layout); |
| 67 | + void changeFlipY(UIComponent& ui, CameraComponent& camera); |
68 | 68 |
|
69 | | - void destroyText(TextComponent& text); |
70 | | - void destroyButton(ButtonComponent& button); |
71 | | - void destroyPanel(PanelComponent& panel); |
72 | | - void destroyScrollbar(ScrollbarComponent& scrollbar); |
73 | | - void destroyTextEdit(TextEditComponent& textedit); |
| 69 | + void destroyText(TextComponent& text); |
| 70 | + void destroyButton(ButtonComponent& button); |
| 71 | + void destroyPanel(PanelComponent& panel); |
| 72 | + void destroyScrollbar(ScrollbarComponent& scrollbar); |
| 73 | + void destroyTextEdit(TextEditComponent& textedit); |
74 | 74 |
|
75 | | - public: |
76 | | - UISystem(Scene* scene); |
77 | | - virtual ~UISystem(); |
| 75 | + public: |
| 76 | + UISystem(Scene* scene); |
| 77 | + virtual ~UISystem(); |
78 | 78 |
|
79 | | - bool isTextEditFocused(); |
| 79 | + bool isTextEditFocused(); |
80 | 80 |
|
81 | | - Vector2 getTextMinSize(TextComponent& text); |
| 81 | + Vector2 getTextMinSize(TextComponent& text); |
82 | 82 |
|
83 | | - bool eventOnCharInput(wchar_t codepoint); |
84 | | - bool eventOnPointerDown(float x, float y); |
85 | | - bool eventOnPointerUp(float x, float y); |
86 | | - bool eventOnPointerMove(float x, float y); |
| 83 | + bool eventOnCharInput(wchar_t codepoint); |
| 84 | + bool eventOnPointerDown(float x, float y); |
| 85 | + bool eventOnPointerUp(float x, float y); |
| 86 | + bool eventOnPointerMove(float x, float y); |
87 | 87 |
|
88 | | - // basic UIs |
89 | | - bool createOrUpdatePolygon(PolygonComponent& polygon, UIComponent& ui, UILayoutComponent& layout); |
90 | | - bool createOrUpdateImage(ImageComponent& img, UIComponent& ui, UILayoutComponent& layout); |
91 | | - bool createOrUpdateText(TextComponent& text, UIComponent& ui, UILayoutComponent& layout); |
| 88 | + // basic UIs |
| 89 | + bool createOrUpdatePolygon(PolygonComponent& polygon, UIComponent& ui, UILayoutComponent& layout); |
| 90 | + bool createOrUpdateImage(ImageComponent& img, UIComponent& ui, UILayoutComponent& layout); |
| 91 | + bool createOrUpdateText(TextComponent& text, UIComponent& ui, UILayoutComponent& layout); |
92 | 92 |
|
93 | | - // advanced UIs |
94 | | - void createButtonObjects(Entity entity, ButtonComponent& button); |
95 | | - void createPanelObjects(Entity entity, PanelComponent& panel); |
96 | | - void createScrollbarObjects(Entity entity, ScrollbarComponent& scrollbar); |
97 | | - void createTextEditObjects(Entity entity, TextEditComponent& textedit); |
| 93 | + // advanced UIs |
| 94 | + void createButtonObjects(Entity entity, ButtonComponent& button); |
| 95 | + void createPanelObjects(Entity entity, PanelComponent& panel); |
| 96 | + void createScrollbarObjects(Entity entity, ScrollbarComponent& scrollbar); |
| 97 | + void createTextEditObjects(Entity entity, TextEditComponent& textedit); |
98 | 98 |
|
99 | | - void load() override; |
100 | | - void draw() override; |
101 | | - void destroy() override; |
102 | | - void update(double dt) override; |
| 99 | + void load() override; |
| 100 | + void draw() override; |
| 101 | + void destroy() override; |
| 102 | + void update(double dt) override; |
103 | 103 |
|
104 | | - void onComponentAdded(Entity entity, ComponentId componentId) override; |
105 | | - void onComponentRemoved(Entity entity, ComponentId componentId) override; |
106 | | - }; |
| 104 | + void onComponentAdded(Entity entity, ComponentId componentId) override; |
| 105 | + void onComponentRemoved(Entity entity, ComponentId componentId) override; |
| 106 | + }; |
107 | 107 |
|
108 | 108 | } |
109 | 109 |
|
|
0 commit comments