Skip to content

Commit a376366

Browse files
HeliumAntHeliumAnt
committed
add primitive depth
1 parent a8622de commit a376366

File tree

5 files changed

+92
-35
lines changed

5 files changed

+92
-35
lines changed

‎Source/Lua/LuaBindingRegisterDefinitions.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,5 +302,6 @@ namespace RTE {
302302
LuaBindingRegisterFunctionDeclarationForType(AlarmEvent);
303303
LuaBindingRegisterFunctionDeclarationForType(Directions);
304304
LuaBindingRegisterFunctionDeclarationForType(DrawBlendMode);
305+
LuaBindingRegisterFunctionDeclarationForType(DrawDepth);
305306
};
306307
} // namespace RTE

‎Source/Lua/LuaBindingsMisc.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,14 @@ LuaBindingRegisterFunctionDefinitionForType(MiscLuaBindings, DrawBlendMode) {
4343
luabind::value("Transparency", DrawBlendMode::BlendTransparency),
4444
luabind::value("BlendModeCount", DrawBlendMode::BlendModeCount)];
4545
}
46+
47+
LuaBindingRegisterFunctionDefinitionForType(MiscLuaBindings, DrawDepth) {
48+
return luabind::class_<draw_depths>("DrawDepth")
49+
.enum_("DrawDepth")[
50+
luabind::value("Default", c_DefaultDrawDepth),
51+
luabind::value("GUI", c_GuiDepth),
52+
luabind::value("Primitive", c_PrimitiveDepth),
53+
luabind::value("TerrainBackground", c_TerrainBGDepth),
54+
luabind::value("Background", c_BackgroundDepth)
55+
];
56+
}

‎Source/Lua/LuaBindingsPrimitives.cpp

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,90 +12,106 @@ LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, LinePrimitive)
1212
return luabind::class_<LinePrimitive, GraphicalPrimitive>("LinePrimitive")
1313

1414
.def(luabind::constructor<int, const Vector&, const Vector&, unsigned char>())
15-
.def(luabind::constructor<int, const Vector&, const Vector&, float, unsigned char>());
15+
.def(luabind::constructor<int, const Vector&, const Vector&, float, unsigned char>())
16+
.def(luabind::constructor<int, const Vector&, const Vector&, float, unsigned char, float>());
1617
}
1718

1819
LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, ArcPrimitive) {
1920
return luabind::class_<ArcPrimitive, GraphicalPrimitive>("ArcPrimitive")
2021

21-
.def(luabind::constructor<int, const Vector&, float, float, int, int, unsigned char>());
22+
.def(luabind::constructor<int, const Vector&, float, float, int, int, unsigned char>())
23+
.def(luabind::constructor<int, const Vector&, float, float, int, int, unsigned char, float>());
2224
}
2325

2426
LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, SplinePrimitive) {
2527
return luabind::class_<SplinePrimitive, GraphicalPrimitive>("SplinePrimitive")
2628

27-
.def(luabind::constructor<int, const Vector&, const Vector&, const Vector&, const Vector&, unsigned char>());
29+
.def(luabind::constructor<int, const Vector&, const Vector&, const Vector&, const Vector&, unsigned char>())
30+
.def(luabind::constructor<int, const Vector&, const Vector&, const Vector&, const Vector&, unsigned char, float>());
2831
}
2932

3033
LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, BoxPrimitive) {
3134
return luabind::class_<BoxPrimitive, GraphicalPrimitive>("BoxPrimitive")
3235

33-
.def(luabind::constructor<int, const Vector&, const Vector&, unsigned char>());
36+
.def(luabind::constructor<int, const Vector&, const Vector&, unsigned char>())
37+
.def(luabind::constructor<int, const Vector&, const Vector&, unsigned char, float>());
3438
}
3539

3640
LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, BoxFillPrimitive) {
3741
return luabind::class_<BoxFillPrimitive, GraphicalPrimitive>("BoxFillPrimitive")
3842

39-
.def(luabind::constructor<int, const Vector&, const Vector&, unsigned char>());
43+
.def(luabind::constructor<int, const Vector&, const Vector&, unsigned char>())
44+
.def(luabind::constructor<int, const Vector&, const Vector&, unsigned char, float>());
4045
}
4146

4247
LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, RoundedBoxPrimitive) {
4348
return luabind::class_<RoundedBoxPrimitive, GraphicalPrimitive>("RoundedBoxPrimitive")
4449

45-
.def(luabind::constructor<int, const Vector&, const Vector&, int, unsigned char>());
50+
.def(luabind::constructor<int, const Vector&, const Vector&, int, unsigned char>())
51+
.def(luabind::constructor<int, const Vector&, const Vector&, int, unsigned char, float>());
4652
}
4753

4854
LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, RoundedBoxFillPrimitive) {
4955
return luabind::class_<RoundedBoxFillPrimitive, GraphicalPrimitive>("RoundedBoxFillPrimitive")
5056

51-
.def(luabind::constructor<int, const Vector&, const Vector&, int, unsigned char>());
57+
.def(luabind::constructor<int, const Vector&, const Vector&, int, unsigned char>())
58+
.def(luabind::constructor<int, const Vector&, const Vector&, int, unsigned char, float>());
5259
}
5360

5461
LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, CirclePrimitive) {
5562
return luabind::class_<CirclePrimitive, GraphicalPrimitive>("CirclePrimitive")
5663

57-
.def(luabind::constructor<int, const Vector&, int, unsigned char>());
64+
.def(luabind::constructor<int, const Vector&, int, unsigned char>())
65+
.def(luabind::constructor<int, const Vector&, int, unsigned char, float>());
5866
}
5967

6068
LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, CircleFillPrimitive) {
6169
return luabind::class_<CircleFillPrimitive, GraphicalPrimitive>("CircleFillPrimitive")
6270

63-
.def(luabind::constructor<int, const Vector&, int, unsigned char>());
71+
.def(luabind::constructor<int, const Vector&, int, unsigned char>())
72+
.def(luabind::constructor<int, const Vector&, int, unsigned char, float>());
6473
}
6574

6675
LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, EllipsePrimitive) {
6776
return luabind::class_<EllipsePrimitive, GraphicalPrimitive>("EllipsePrimitive")
6877

69-
.def(luabind::constructor<int, const Vector&, int, int, unsigned char>());
78+
.def(luabind::constructor<int, const Vector&, int, int, unsigned char>())
79+
.def(luabind::constructor<int, const Vector&, int, int, unsigned char, float>());
7080
}
7181

7282
LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, EllipseFillPrimitive) {
7383
return luabind::class_<EllipseFillPrimitive, GraphicalPrimitive>("EllipseFillPrimitive")
7484

75-
.def(luabind::constructor<int, const Vector&, int, int, unsigned char>());
85+
.def(luabind::constructor<int, const Vector&, int, int, unsigned char>())
86+
.def(luabind::constructor<int, const Vector&, int, int, unsigned char, float>());
7687
}
7788

7889
LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, TrianglePrimitive) {
7990
return luabind::class_<TrianglePrimitive, GraphicalPrimitive>("TrianglePrimitive")
8091

81-
.def(luabind::constructor<int, const Vector&, const Vector&, const Vector&, unsigned char>());
92+
.def(luabind::constructor<int, const Vector&, const Vector&, const Vector&, unsigned char>())
93+
.def(luabind::constructor<int, const Vector&, const Vector&, const Vector&, unsigned char, float>());
8294
}
8395

8496
LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, TriangleFillPrimitive) {
8597
return luabind::class_<TriangleFillPrimitive, GraphicalPrimitive>("TriangleFillPrimitive")
8698

87-
.def(luabind::constructor<int, const Vector&, const Vector&, const Vector&, unsigned char>());
99+
.def(luabind::constructor<int, const Vector&, const Vector&, const Vector&, unsigned char>())
100+
.def(luabind::constructor<int, const Vector&, const Vector&, const Vector&, unsigned char, float>());
88101
}
89102

90103
LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, TextPrimitive) {
91104
return luabind::class_<TextPrimitive, GraphicalPrimitive>("TextPrimitive")
92105

93-
.def(luabind::constructor<int, const Vector&, const std::string&, bool, int, float>());
106+
.def(luabind::constructor<int, const Vector&, const std::string&, bool, int, float>())
107+
.def(luabind::constructor<int, const Vector&, const std::string&, bool, int, float, float>());
94108
}
95109

96110
LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, BitmapPrimitive) {
97111
return luabind::class_<BitmapPrimitive, GraphicalPrimitive>("BitmapPrimitive")
98112

99113
.def(luabind::constructor<int, const Vector&, const MOSprite*, float, unsigned int, bool, bool>())
100-
.def(luabind::constructor<int, const Vector&, const std::string&, float, bool, bool>());
114+
.def(luabind::constructor<int, const Vector&, const MOSprite*, float, unsigned int, bool, bool, float>())
115+
.def(luabind::constructor<int, const Vector&, const std::string&, float, bool, bool>())
116+
.def(luabind::constructor<int, const Vector&, const std::string&, float, bool, bool, float>());
101117
}

‎Source/Lua/LuabindDefinitions.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ namespace RTE {
4242
struct gamepad_axis : public luabind::enum_wrapper {};
4343
struct directions : public luabind::enum_wrapper {};
4444
struct blend_modes : public luabind::enum_wrapper {};
45+
struct draw_depths : public luabind::enum_wrapper {};
4546

4647
/// Special callback function for adding file name and line number to error messages when calling functions incorrectly.
4748
/// @param luaState The Lua master state.

0 commit comments

Comments
 (0)