8000 Use EL for model properties in FGD and DEF files · Issue #1440 · TrenchBroom/TrenchBroom · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use EL for model properties in FGD and DEF files #1440

Closed
7 tasks done
kduske opened this issue Sep 15, 2016 · 1 comment
Closed
7 tasks done

Use EL for model properties in FGD and DEF files #1440

kduske opened this issue Sep 15, 2016 · 1 comment
Labels
Prio:1 Highest priority: Crash or crippling bugs, features that enable new ways of working Type:Enhancement New features
Milestone
TrenchBroom 2.0.0

Comments

@kduske
Copy link
Collaborator
kduske commented Sep 15, 2016 •
edited
Loading

When specifying models for entities in FGD or DEF files, TB should use its EL. For this, a new switch / case expression must be added with the following syntax:

SWITCH ::= '{{ CASE { ',' CASE } '}}'
CASE   ::= EXPRESSION '->' EXPRESSION

The case conditions are evaluated in sequence until a match is found, then the case expression is evaluated to determine the value of the entire switch expression. If no case condition matches, then the value of the switch expression is null. Example:

model({{spawnflags == 1 -> { path: ":maps/b_batt1.bsp" }, { path: ":maps/b_batt0.bsp", frame: 3} }})

Thereby, spawnflags is treated as a variable whose value is read from the entity. This allows total flexibility and it also works for entities where the model is determined from a property itself:

The case expressions are maps with the structure

{
    path: "...",
    frame: 3,
    skin: 3
}

Where path, frame, and skin determine the respective values for the model. frame and skin are optional and default to 0.

model({path: path, frame: frame, skin: skin})

Here, there is no switch / case, and the values of the map entries are themselves variables whose values are read from the entity properties of the same names.

If no frame and key need to be specified, a single string can also be given and will be used as the model path, so no map must be created:

model(":maps/b_batt0.bsp")

is therefore also valid. This provides backward compatibility with the old syntax and with FGD and DEF files from other editors. Finally, the name studio can also be used instead of model to provide compatibility with J.A.C.K. and Hammer.

  • Add case expression to EL.
  • Add bitwise operators and bit shift operators for easier specification of spawnflags.
  • Add switch expression to EL.
  • Add documentation for bitwise, case, switch operators.
  • Replace current model syntax with EL expressions.
  • Update FGD and DEF files.
  • Revise documentation for new model syntax.
@kduske kduske added Type:Enhancement New features Platform:All Prio:1 Highest priority: Crash or crippling bugs, features that enable new ways of working labels Sep 15, 2016
@kduske kduske added this to the TrenchBroom 2.0.0 milestone Sep 15, 2016
kduske added a commit that referenced this issue Sep 16, 2016
@kduske
#1440: Add switch and case expressions and start adding test cases fo…
150b2ad 
…r all expressions.
kduske added a commit that referenced this issue Sep 16, 2016
@kduske
#1440: Add tests for variable expression. Undefined variables have va…
4288413 
…lue undefined instead of throwing an exception.
kduske added a commit that referenced this issue Sep 17, 2016
@kduske
#1440: Add test for chained plus expressions.
227ead6
kduske added a commit that referenced this issue Sep 17, 2016
@kduske
#1440: Add tests for minus operator.
c65e417
kduske added a commit that referenced this issue Sep 17, 2016
@kduske
#1440: Add more tests for expressions, add support for parsing the ca…
f8fc01f 
…se operator.
kduske added a commit that referenced this issue Sep 17, 2016
@kduske
#1440: Add tests for case expression.
a48e4da
kduske added a commit that referenced this issue Sep 17, 2016
@kduske
#1440: Add parser support for binary operations, improve error handli…
5a3ed13 
…ng for unhandled operators.
kduske added a commit that referenced this issue Sep 18, 2016
@kduske
#1440: Add bitwise operators.
cfef0c4
kduske added a commit that referenced this issue Sep 18, 2016
@kduske
#1440: Update docs for operator precedence.
aa548d1
kduske added a commit that referenced this issue Sep 18, 2016
@kduske
#1440: Add switch expression.
eab912c
kduske added a commit that referenced this issue Sep 18, 2016
@kduske
#1440: Revise documentation for new case and switch expressions.
a1adc87
kduske added a commit that referenced this issue Sep 18, 2016
@kduske
#1440: Add documentation for switch expression.
3487f8b
kduske added a commit that referenced this issue Sep 18, 2016
@kduske
#1440: Fix some minor errors / problems in EL documentation.
7a852b7
kduske added a commit that referenced this issue Sep 18, 2016
@kduske
#1440: Fix a typo.
b2c23c4
@kduske
Copy link
Collaborator Author
kduske commented Sep 19, 2016 •
edited
Loading

Sub tasks for introducing the new model syntax:

  • Store EL::Expressions instead of ModelDefinitions within the EntityDefinitions.
  • Factor out code to parse old model expressions in a sub parser.
  • Add code to convert old model expressions to the appropriate EL::Expressions.
  • Add support for parsing the new syntax using the ELParser. Find a general method for nesting tokenizers.

kduske added a commit that referenced this issue Sep 21, 2016
@kduske
#1440: Minor refactoring in preparation of nested parsers.
e298451
kduske added a commit that referenced this issue Sep 22, 2016
@kduske
#1440: Remove support for push / pop token.
658a0f0
kduske added a commit that referenced this issue Sep 22, 2016
@kduske
#1440: Minor changes.
a01937e
kduske added a commit that referenced this issue Sep 25, 2016
@kduske
#1440: Show subset properties of entity selections in gray, too.
825a58e
kduske added a commit that referenced this issue Sep 26, 2016
@kduske
#1440: Formatting
5fbd757
kduske added a commit that referenced this issue Sep 26, 2016
@kduske
#1440: Refactor model definition et al. to support expressions as mod…
171c0a5 
…el definitions.
kduske added a commit that referenced this issue Sep 26, 2016
@kduske
#1440: Adapt entity definitions.
63d6bf4
kduske added a commit that referenced this issue Sep 28, 2016
@kduske
#1440: Adapt to new model definition.
bebdf73
kduske added a commit that referenced this issue Sep 28, 2016
@kduske
#1440: Factor out the legacy model parser.
b0ff8e6
kduske added a commit that referenced this issue Sep 28, 2016
@kduske
#1440: Finish factoring out model parsing code from FGD and DEF parse…
9a1a997 
…rs. Use EL expressions to store model information.
kduske added a commit that referenced this issue Sep 28, 2016
@kduske
#1440: Strip leading ':' from legacy model paths.
17e1fe9
kduske added a commit that referenced this issue Oct 1, 2016
@kduske
#1440: Add support for parsing EL expressions for models.
6a19ee5
kduske added a commit that referenced this issue Oct 1, 2016
@kduske
#1440: Minor fixes.
f1173e6
kduske added a commit that referenced this issue Oct 1, 2016
@kduske
#1440: Add model parser and fallbacks.
c523fe5
kduske added a commit that referenced this issue Oct 1, 2016
@kduske
#1440: Disable error logging when ParserStatus is given.
b9e64c4
kduske added a commit that referenced this issue Oct 1, 2016
@kduske
#1440: Update to new model syntax.
8844caa
kduske added a commit that referenced this issue Oct 1, 2016
@kduske
#1440: Adapt Quake 2 FGD to new model syntax.
03477ec
kduske added a commit that referenced this issue Oct 1, 2016
@kduske
#1440: Properly serialize integer numbers.
4ece1a8
8000
kduske added a commit that referenced this issue Oct 1, 2016
@kduske
#1440: Adapted to new model syntax.
27f5d5c
kduske added a commit that referenced this issue Oct 1, 2016
@kduske
#1440: Return entity attributes as references when using them as vari…
82d756e 
…ables in EL expressions.
kduske added a commit that referenced this issue Oct 2, 2016
@kduske
#1440: Allow 'studioprop' attribute in FGD files.
897364e
kduske added a commit that referenced this issue Oct 2, 2016
@kduske
#1440: Update manual for new model syntax.
68f83a2
kduske added a commit that referenced this issue Oct 2, 2016
@kduske
#1440: Better error handling for unset path, skin, and frame values.
728df88
@kduske kduske closed this as completed Oct 2, 2016
kduske added a commit that referenced this issue Oct 3, 2016
@kduske
#1440: Better error handling when parsing legacy model definitions.
f44690f
kduske added a commit that referenced this issue Oct 3, 2016
@kduske
#1440: Add some test cases for legacy and EL model expressions.
fcf1f1f
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
Prio:1 Highest priority: Crash or crippling bugs, features that enable new ways of working Type:Enhancement New features
Projects
None yet
Milestone
TrenchBroom 2.0.0
Development

No branches or pull requests
1 participant
@kduske
0