INSANEMODE/OpenAssetTools
1
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-19 03:07:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make menu and item rect accept expressions as static values

Browse Source
This commit is contained in:
Jan
2021-11-26 17:43:27 +01:00
parent 2a4768e5b0
commit fb70d9538a
5 changed files with 184 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/ObjLoading/Parsing/Menu/Sequence/MenuScopeSequences.cpp
View File

@ -79,10 +79,6 @@ namespace menu::menu_scope_sequences
class SequenceRect final : public MenuFileParser::sequence_t
{
static constexpr auto CAPTURE_X = 1;
static constexpr auto CAPTURE_Y = 2;
static constexpr auto CAPTURE_W = 3;
static constexpr auto CAPTURE_H = 4;
static constexpr auto CAPTURE_ALIGN_HORIZONTAL = 5;
static constexpr auto CAPTURE_ALIGN_VERTICAL = 6;
@ -91,12 +87,13 @@ namespace menu::menu_scope_sequences
{
const MenuMatcherFactory create(this);
AddLabeledMatchers(MenuExpressionMatchers().Expression(this), MenuExpressionMatchers::LABEL_EXPRESSION);
AddMatchers({
create.KeywordIgnoreCase("rect"),
create.Numeric().Capture(CAPTURE_X),
create.Numeric().Capture(CAPTURE_Y),
create.Numeric().Capture(CAPTURE_W),
create.Numeric().Capture(CAPTURE_H),
create.NumericExpression(), // x
create.NumericExpression(), // y
create.NumericExpression(), // w
create.NumericExpression(), // h
create.Optional(create.And({
create.Integer().Capture(CAPTURE_ALIGN_HORIZONTAL),
create.Integer().Capture(CAPTURE_ALIGN_VERTICAL)
@ -109,12 +106,16 @@ namespace menu::menu_scope_sequences
{
assert(state->m_current_menu);
const auto x = MenuMatcherFactory::TokenNumericExpressionValue(result);
const auto y = MenuMatcherFactory::TokenNumericExpressionValue(result);
const auto w = MenuMatcherFactory::TokenNumericExpressionValue(result);
const auto h = MenuMatcherFactory::TokenNumericExpressionValue(result);
CommonRect rect
{
MenuMatcherFactory::TokenNumericFloatingPointValue(result.NextCapture(CAPTURE_X)),
MenuMatcherFactory::TokenNumericFloatingPointValue(result.NextCapture(CAPTURE_Y)),
MenuMatcherFactory::TokenNumericFloatingPointValue(result.NextCapture(CAPTURE_W)),
MenuMatcherFactory::TokenNumericFloatingPointValue(result.NextCapture(CAPTURE_H)),
x,
y,
w,
h,
0, 0
};