Skip to content

Commit 4c9dfd0

Browse files
authored
Merge pull request #123 from Legacy-LuaSTG-Engine/fix/lua-to-cpp-blend-mode-unknown
lua binding: fix lua to cpp blend mode unknown value
2 parents 6e3d940 + 8aa33ff commit 4c9dfd0

2 files changed

Lines changed: 2 additions & 4 deletions

File tree

LuaSTG/LuaSTG/GameResource/ResourceBase.hpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace luastg {
1818

1919
// 混合模式
2020
enum class BlendMode : uint8_t {
21-
__RESERVE__ = 0,
21+
Unknown = 0,
2222

2323
MulAlpha = 1, //顶点色和纹理色相乘 混合模式:正常(透明度混合)
2424
MulAdd = 2, //顶点色和纹理色相乘 混合模式:线性减淡(加法)
@@ -41,8 +41,6 @@ namespace luastg {
4141
AddScreen = 17, //顶点色和纹理色相加 混合模式:滤色(相加减去相乘)
4242

4343
One = 18, //无混合,直接覆盖
44-
45-
_KEY_NOT_FOUND = 0x7f,
4644
};
4745
static_assert(sizeof(BlendMode) == sizeof(uint8_t));
4846

LuaSTG/LuaSTG/LuaBinding/LuaWrapperMisc.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ namespace luastg
8080
return BlendMode::MulAlpha;
8181
}
8282
BlendMode mode = static_cast<BlendMode>(LuaSTG::MapBlendModeX(key, len));
83-
if (mode == BlendMode::_KEY_NOT_FOUND) {
83+
if (mode == BlendMode::Unknown) {
8484
luaL_error(L, "invalid blend mode '%s'.", key);
8585
return BlendMode::MulAlpha;
8686
}

0 commit comments

Comments
 (0)