Skip to content

Commit d89c089

Browse files
altalk23altalk23
committed
order some members to please msvc somewhat
1 parent 84bbb8d commit d89c089

28 files changed

+78
-41
lines changed

Diff for: ‎CMakeLists.txt

+35-17
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,43 @@ set(CMAKE_CXX_VISIBILITY_PRESET hidden)
66

77
project(Lavender VERSION 1.0.0)
88

9-
add_library(${PROJECT_NAME} SHARED
10-
src/main.cpp
11-
# Add any extra C++ source files here
12-
)
9+
if (${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_SOURCE_DIR})
1310

14-
target_compile_options(${PROJECT_NAME} PRIVATE
15-
-Wno-reorder-init-list
16-
)
11+
add_library(${PROJECT_NAME} SHARED
12+
src/main.cpp
13+
# Add any extra C++ source files here
14+
)
1715

18-
target_include_directories(${PROJECT_NAME} PUBLIC
19-
include
20-
)
16+
if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
17+
target_compile_options(${PROJECT_NAME} PRIVATE
18+
-Wno-reorder-init-list
19+
)
20+
endif()
2121

22-
if (NOT DEFINED ENV{GEODE_SDK})
23-
message(FATAL_ERROR "Unable to find Geode SDK! Please define GEODE_SDK environment variable to point to Geode")
24-
else()
25-
message(STATUS "Found Geode: $ENV{GEODE_SDK}")
26-
endif()
22+
target_include_directories(${PROJECT_NAME} PRIVATE
23+
include
24+
include/lavender
25+
)
26+
27+
if (NOT DEFINED ENV{GEODE_SDK})
28+
message(FATAL_ERROR "Unable to find Geode SDK! Please define GEODE_SDK environment variable to point to Geode")
29+
else()
30+
message(STATUS "Found Geode: $ENV{GEODE_SDK}")
31+
endif()
2732

28-
add_subdirectory($ENV{GEODE_SDK} ${CMAKE_CURRENT_BINARY_DIR}/geode)
33+
add_subdirectory($ENV{GEODE_SDK} ${CMAKE_CURRENT_BINARY_DIR}/geode)
34+
35+
setup_geode_mod(${PROJECT_NAME})
36+
else()
37+
message(STATUS "Configuring Lavender as a subproject")
38+
add_library(${PROJECT_NAME} INTERFACE)
39+
target_include_directories(${PROJECT_NAME} INTERFACE
40+
include
41+
)
2942

30-
setup_geode_mod(${PROJECT_NAME})
43+
if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
44+
target_compile_options(${PROJECT_NAME} INTERFACE
45+
-Wno-reorder-init-list
46+
)
47+
endif()
48+
endif()

Diff for: ‎include/Action.hpp renamed to ‎include/lavender/Action.hpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@
1010
namespace ui {
1111
struct Action : public BaseInitializer<Action> {
1212
LAVENDER_ADD_ID();
13-
LAVENDER_ADD_CHILD();
1413

1514
cocos2d::CCAction* action = nullptr;
15+
16+
LAVENDER_ADD_CHILD();
1617

1718
cocos2d::CCNode* construct() const {
1819
auto node = cocos2d::CCNode::create();

Diff for: ‎include/Align.hpp renamed to ‎include/lavender/Align.hpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,11 @@ namespace ui {
5151

5252
struct Align : public BaseInitializer<Align> {
5353
LAVENDER_ADD_ID();
54-
LAVENDER_ADD_CHILD();
5554

5655
Alignment alignment = Alignment::Center;
5756

57+
LAVENDER_ADD_CHILD();
58+
5859
cocos2d::CCNode* construct() const {
5960
auto node = cocos2d::CCNode::create();
6061

Diff for: ‎include/Axis.hpp renamed to ‎include/lavender/Axis.hpp

+6-4
Original file line numberDiff line numberDiff line change
@@ -272,13 +272,14 @@ namespace ui {
272272

273273
struct Column : public BaseInitializer<Column> {
274274
LAVENDER_ADD_ID();
275-
LAVENDER_ADD_CHILDREN();
276-
LAVENDER_ADD_CHILDREN_BUILDER();
277275

278276
MainAxisAlignment mainAxis = MainAxisAlignment::Start;
279277
CrossAxisAlignment crossAxis = CrossAxisAlignment::Center;
280278
VerticalDirection direction = VerticalDirection::TopToBottom;
281279

280+
LAVENDER_ADD_CHILDREN();
281+
LAVENDER_ADD_CHILDREN_BUILDER();
282+
282283
cocos2d::CCNode* construct() const {
283284
auto node = cocos2d::CCNode::create();
284285

@@ -299,13 +300,14 @@ namespace ui {
299300

300301
struct Row : public BaseInitializer<Row> {
301302
LAVENDER_ADD_ID();
302-
LAVENDER_ADD_CHILDREN();
303-
LAVENDER_ADD_CHILDREN_BUILDER();
304303

305304
MainAxisAlignment mainAxis = MainAxisAlignment::Start;
306305
CrossAxisAlignment crossAxis = CrossAxisAlignment::Center;
307306
HorizontalDirection direction = HorizontalDirection::LeftToRight;
308307

308+
LAVENDER_ADD_CHILDREN();
309+
LAVENDER_ADD_CHILDREN_BUILDER();
310+
309311
cocos2d::CCNode* construct() const {
310312
auto node = cocos2d::CCNode::create();
311313

Diff for: ‎include/Base.hpp renamed to ‎include/lavender/Base.hpp

File renamed without changes.

Diff for: ‎include/ConstrainedLayout.hpp renamed to ‎include/lavender/ConstrainedLayout.hpp

File renamed without changes.

Diff for: ‎include/ConstrainedObject.hpp renamed to ‎include/lavender/ConstrainedObject.hpp

File renamed without changes.

Diff for: ‎include/Container.hpp renamed to ‎include/lavender/Container.hpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,14 @@ namespace ui {
100100

101101
struct Container : BaseInitializer<Container> {
102102
LAVENDER_ADD_ID();
103-
LAVENDER_ADD_CHILD();
104103
LAVENDER_ADD_SIZE();
105104

106105
EdgeInsets padding;
107106
bool hidden = false;
108107
cocos2d::CCAction* action = nullptr;
109108

109+
LAVENDER_ADD_CHILD();
110+
110111
cocos2d::CCNode* construct() const {
111112
auto node = cocos2d::CCNode::create();
112113

Diff for: ‎include/Expanded.hpp renamed to ‎include/lavender/Expanded.hpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,11 @@ namespace ui {
9999

100100
struct Expanded : BaseInitializer<Expanded> {
101101
LAVENDER_ADD_ID();
102-
LAVENDER_ADD_CHILD();
103102

104103
size_t flex = 1;
105104

105+
LAVENDER_ADD_CHILD();
106+
106107
cocos2d::CCNode* construct() const {
107108
if (this->flex < 1) {
108109
delete this;

Diff for: ‎include/FittedBox.hpp renamed to ‎include/lavender/FittedBox.hpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,12 @@ namespace ui {
138138

139139
struct FittedBox : BaseInitializer<FittedBox> {
140140
LAVENDER_ADD_ID();
141-
LAVENDER_ADD_CHILD();
141+
142142
BoxFit fit = BoxFit::Contain;
143143
Alignment alignment = Alignment::Center;
144144

145+
LAVENDER_ADD_CHILD();
146+
145147
cocos2d::CCNode* construct() const {
146148
auto node = cocos2d::CCNode::create();
147149

Diff for: ‎include/Flexible.hpp renamed to ‎include/lavender/Flexible.hpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
namespace ui {
1010
struct Flexible : public BaseInitializer<Flexible> {
1111
LAVENDER_ADD_ID();
12-
LAVENDER_ADD_CHILD();
1312

1413
size_t flex = 1;
1514

15+
LAVENDER_ADD_CHILD();
16+
1617
cocos2d::CCNode* construct() const {
1718
if (this->flex < 1) {
1819
delete this;

Diff for: ‎include/Grid.hpp renamed to ‎include/lavender/Grid.hpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,6 @@ namespace ui {
211211

212212
struct Grid : public BaseInitializer<Grid> {
213213
LAVENDER_ADD_ID();
214-
LAVENDER_ADD_CHILDREN();
215-
LAVENDER_ADD_CHILDREN_BUILDER();
216214

217215
float mainAxisSpacing = 0.f;
218216
float crossAxisSpacing = 0.f;
@@ -222,6 +220,9 @@ namespace ui {
222220
size_t crossAxisCount = 2;
223221
float childAspectRatio = 1.f;
224222

223+
LAVENDER_ADD_CHILDREN();
224+
LAVENDER_ADD_CHILDREN_BUILDER();
225+
225226
cocos2d::CCNode* construct() const {
226227
if (crossAxisCount < 1) {
227228
delete this;

Diff for: ‎include/Hidden.hpp renamed to ‎include/lavender/Hidden.hpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@
1010
namespace ui {
1111
struct Hidden : public BaseInitializer<Hidden> {
1212
LAVENDER_ADD_ID();
13-
LAVENDER_ADD_CHILD();
1413

1514
bool hidden = true;
15+
16+
LAVENDER_ADD_CHILD();
1617

1718
cocos2d::CCNode* construct() const {
1819
auto node = cocos2d::CCNode::create();

Diff for: ‎include/Lavender.hpp renamed to ‎include/lavender/Lavender.hpp

File renamed without changes.

Diff for: ‎include/LayerColor.hpp renamed to ‎include/lavender/LayerColor.hpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ namespace ui {
104104

105105
struct LayerColor : public BaseInitializer<LayerColor> {
106106
LAVENDER_ADD_ID();
107-
LAVENDER_ADD_CHILD();
108107
LAVENDER_ADD_SIZE();
109108

110109
cocos2d::ccColor4B color;
@@ -119,6 +118,8 @@ namespace ui {
119118
std::function<void(cocos2d::enumKeyCodes)> keyDown;
120119
std::function<void(cocos2d::enumKeyCodes)> keyUp;
121120

121+
LAVENDER_ADD_CHILD();
122+
122123
cocos2d::CCNode* construct() const {
123124
auto node = impl::LayerColorWrapper::create(this->color, 0.f, 0.f);
124125

Diff for: ‎include/Menu.hpp renamed to ‎include/lavender/Menu.hpp

File renamed without changes.

Diff for: ‎include/MenuItemSpriteExtra.hpp renamed to ‎include/lavender/MenuItemSpriteExtra.hpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
namespace ui {
1010
struct MenuItemSpriteExtra : public BaseInitializer<MenuItemSpriteExtra> {
1111
LAVENDER_ADD_ID();
12-
LAVENDER_ADD_CHILD();
1312

1413
std::function<void(cocos2d::CCObject*)> callback;
1514

15+
LAVENDER_ADD_CHILD();
16+
1617
cocos2d::CCNode* construct() const {
1718
if (this->child == nullptr) {
1819
delete this;

Diff for: ‎include/Node.hpp renamed to ‎include/lavender/Node.hpp

File renamed without changes.

Diff for: ‎include/RotatedBox.hpp renamed to ‎include/lavender/RotatedBox.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ namespace ui {
5555

5656
struct RotatedBox : BaseInitializer<RotatedBox> {
5757
LAVENDER_ADD_ID();
58-
LAVENDER_ADD_CHILD();
5958
int quarterTurns = 0;
59+
LAVENDER_ADD_CHILD();
6060

6161
cocos2d::CCNode* construct() const {
6262
auto node = cocos2d::CCNode::create();

Diff for: ‎include/Scale9Sprite.hpp renamed to ‎include/lavender/Scale9Sprite.hpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@
99
namespace ui {
1010
struct Scale9Sprite : BaseInitializer<Scale9Sprite> {
1111
LAVENDER_ADD_ID();
12-
LAVENDER_ADD_CHILD();
1312
LAVENDER_ADD_SCALE();
1413
LAVENDER_ADD_SIZE();
1514
LAVENDER_ADD_COLOR();
1615

1716
std::optional<std::string> fileName;
1817
std::optional<std::string> frameName;
1918

19+
LAVENDER_ADD_CHILD();
20+
2021
cocos2d::CCNode* construct() const {
2122
cocos2d::extension::CCScale9Sprite* node;
2223

Diff for: ‎include/Scene.hpp renamed to ‎include/lavender/Scene.hpp

File renamed without changes.

Diff for: ‎include/ScrollLayer.hpp renamed to ‎include/lavender/ScrollLayer.hpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,14 @@ namespace ui {
6969

7070
struct ScrollLayer : public BaseInitializer<ScrollLayer> {
7171
LAVENDER_ADD_ID();
72-
LAVENDER_ADD_CHILDREN();
73-
LAVENDER_ADD_CHILDREN_BUILDER();
7472

7573
Axis axis = Axis::Vertical;
7674

7775
VerticalDirection verticalDirection = VerticalDirection::TopToBottom;
7876
HorizontalDirection horizontalDirection = HorizontalDirection::LeftToRight;
77+
78+
LAVENDER_ADD_CHILDREN();
79+
LAVENDER_ADD_CHILDREN_BUILDER();
7980

8081
cocos2d::CCNode* construct() const {
8182
auto node = geode::ScrollLayer::create(ccp(0, 0), true, this->axis == Axis::Vertical);

Diff for: ‎include/Sprite.hpp renamed to ‎include/lavender/Sprite.hpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@
88
namespace ui {
99
struct Sprite : public BaseInitializer<Sprite> {
1010
LAVENDER_ADD_ID();
11-
LAVENDER_ADD_CHILD();
1211
LAVENDER_ADD_SCALE();
1312
LAVENDER_ADD_ROTATION();
1413

1514
std::optional<std::string> fileName;
1615
std::optional<std::string> frameName;
1716

17+
LAVENDER_ADD_CHILD();
18+
1819
cocos2d::CCNode* construct() const {
1920
cocos2d::CCSprite* node;
2021

Diff for: ‎include/Stack.hpp renamed to ‎include/lavender/Stack.hpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,11 @@ namespace ui {
6565

6666
struct Stack : BaseInitializer<Stack> {
6767
LAVENDER_ADD_ID();
68-
LAVENDER_ADD_CHILDREN();
6968
Alignment alignment = Alignment::Center;
7069
StackFit fit = StackFit::Loose;
7170

71+
LAVENDER_ADD_CHILDREN();
72+
7273
cocos2d::CCNode* construct() const {
7374
auto node = cocos2d::CCNode::create();
7475
utils::applyChildren(this, node);

Diff for: ‎include/TextArea.hpp renamed to ‎include/lavender/TextArea.hpp

File renamed without changes.

Diff for: ‎include/TextInput.hpp renamed to ‎include/lavender/TextInput.hpp

File renamed without changes.

Diff for: ‎include/Transform.hpp renamed to ‎include/lavender/Transform.hpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@
1010
namespace ui {
1111
struct Transform : public BaseInitializer<Transform> {
1212
LAVENDER_ADD_ID();
13-
LAVENDER_ADD_CHILD();
1413

1514
LAVENDER_ADD_ROTATION();
1615
LAVENDER_ADD_SCALE();
1716

1817
std::optional<float> offsetX;
1918
std::optional<float> offsetY;
2019
std::optional<cocos2d::CCPoint> offset;
20+
21+
LAVENDER_ADD_CHILD();
2122

2223
cocos2d::CCNode* construct() const {
2324
auto node = cocos2d::CCNode::create();

Diff for: ‎include/Utils.hpp renamed to ‎include/lavender/Utils.hpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ namespace ui::utils {
2929
}
3030

3131
#define LAVENDER_ADD_CHILDREN_BUILDER() \
32-
std::function<Base*(size_t)> builder; \
33-
size_t count = 0
32+
size_t count = 0; \
33+
std::function<Base*(size_t)> builder
34+
3435

3536
bool applyChildrenBuilder(auto const* data, cocos2d::CCNode* node) {
3637
if (data->builder) {

0 commit comments

Comments
 (0)