Skip to content

Jbfl padding changes #122

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

Merged
merged 9 commits into from
Nov 22, 2025
Merged

Jbfl padding changes #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
09ab176
fix emacs jbfl mode
webdevred Nov 20, 2025
c12ae62
added support support multiple node patterns per rule
webdevred Nov 20, 2025
c608c1e
fix
webdevred Nov 20, 2025
6e9c861
added formatting rules for glowMap padding
webdevred Nov 20, 2025
f40e4e5
formatting fix again
webdevred Nov 20, 2025
9da552b
added NoComplexNewLine to nodes
webdevred Nov 20, 2025
e8d4e0e
formatting fix
webdevred Nov 20, 2025
4328116
regenerated examples
webdevred Nov 20, 2025
ff5555f
Ran formatter
webdevred Nov 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion editors/jbfl-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

("\\b\\(true\\|false\\)\\b" . font-lock-constant-face)

("\\(\\.[a-zA-Z0-9*]+\\)+" . font-lock-function-name-face)
("\\(\\.[_a-zA-Z0-9*]+\\)+" . font-lock-function-name-face)

("[{}]" . font-lock-builtin-face)

Expand Down
226 changes: 222 additions & 4 deletions examples/ast/jbfl/minimal.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,42 @@
RuleSet
( fromList
[
( NodePattern
( fromList
[ AnyObjectKey
, Selector
( ObjectKey "glowMap" )
, AnyObjectKey
, Selector
( ObjectKey "off" )
]
)
, fromList
[
( SomeKey PadAmount
, SomeProperty PadAmount 10
)
]
)
,
( NodePattern
( fromList
[ AnyObjectKey
, Selector
( ObjectKey "glowMap" )
, AnyObjectKey
, Selector
( ObjectKey "on" )
]
)
, fromList
[
( SomeKey PadAmount
, SomeProperty PadAmount 10
)
]
)
,
( NodePattern
( fromList
[ AnyObjectKey
Expand All @@ -12,10 +48,6 @@ RuleSet
)
, fromList
[
( SomeKey PadAmount
, SomeProperty PadAmount 8
)
,
( SomeKey PadDecimals
, SomeProperty PadDecimals 3
)
Expand All @@ -37,5 +69,191 @@ RuleSet
)
]
)
,
( NodePattern
( fromList
[ AnyObjectKey
, Selector
( ObjectKey "glowMap" )
, Selector
( ObjectKey "abs" )
]
)
, fromList
[
( SomeKey PadAmount
, SomeProperty PadAmount 20
)
]
)
,
( NodePattern
( fromList
[ AnyObjectKey
, Selector
( ObjectKey "glowMap" )
, Selector
( ObjectKey "battery" )
]
)
, fromList
[
( SomeKey PadAmount
, SomeProperty PadAmount 20
)
]
)
,
( NodePattern
( fromList
[ AnyObjectKey
, Selector
( ObjectKey "glowMap" )
, Selector
( ObjectKey "checkengine" )
]
)
, fromList
[
( SomeKey PadAmount
, SomeProperty PadAmount 20
)
]
)
,
( NodePattern
( fromList
[ AnyObjectKey
, Selector
( ObjectKey "glowMap" )
, Selector
( ObjectKey "hazard" )
]
)
, fromList
[
( SomeKey PadAmount
, SomeProperty PadAmount 20
)
]
)
,
( NodePattern
( fromList
[ AnyObjectKey
, Selector
( ObjectKey "glowMap" )
, Selector
( ObjectKey "highbeam" )
]
)
, fromList
[
( SomeKey PadAmount
, SomeProperty PadAmount 20
)
]
)
,
( NodePattern
( fromList
[ AnyObjectKey
, Selector
( ObjectKey "glowMap" )
, Selector
( ObjectKey "lowfuel" )
]
)
, fromList
[
( SomeKey PadAmount
, SomeProperty PadAmount 20
)
]
)
,
( NodePattern
( fromList
[ AnyObjectKey
, Selector
( ObjectKey "glowMap" )
, Selector
( ObjectKey "lowpressure" )
]
)
, fromList
[
( SomeKey PadAmount
, SomeProperty PadAmount 20
)
]
)
,
( NodePattern
( fromList
[ AnyObjectKey
, Selector
( ObjectKey "glowMap" )
, Selector
( ObjectKey "parkingbrake" )
]
)
, fromList
[
( SomeKey PadAmount
, SomeProperty PadAmount 20
)
]
)
,
( NodePattern
( fromList
[ AnyObjectKey
, Selector
( ObjectKey "glowMap" )
, Selector
( ObjectKey "signal_L" )
]
)
, fromList
[
( SomeKey PadAmount
, SomeProperty PadAmount 20
)
]
)
,
( NodePattern
( fromList
[ AnyObjectKey
, Selector
( ObjectKey "glowMap" )
, Selector
( ObjectKey "signal_R" )
]
)
, fromList
[
( SomeKey PadAmount
, SomeProperty PadAmount 20
)
]
)
,
( NodePattern
( fromList
[ AnyObjectKey
, Selector
( ObjectKey "nodes" )
, AnyArrayIndex
]
)
, fromList
[
( SomeKey NoComplexNewLine
, SomeProperty NoComplexNewLine True
)
]
)
]
)
48 changes: 24 additions & 24 deletions examples/formatted_jbeam/fender-complex-jbfl.jbeam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,39 +12,39 @@

// Left side
{"group" : "cot_fender_l"},
[ "bfl0", 0.959, -1.762, 0.576],
[ "bfl1", 0.855, -1.788, 0.707],
[ "bfl2", 0.739, -1.845, 0.716],
[ "bfl3", 0.948, -1.435, 0.730],
[ "bfl4", 0.756, -1.413, 0.843],
[ "bfl5", 0.963, -1.024, 0.112],
[ "bfl6", 0.964, -1.072, 0.507],
[ "bfl7", 0.778, -1.008, 0.873],
[ "bfl8", 0.987, -0.743, 0.109],
[ "bfl9", 0.987, -0.744, 0.494],
[ "bfl10", 0.812, -0.759, 0.896],
["bfl0", 0.959, -1.762, 0.576],
["bfl1", 0.855, -1.788, 0.707],
["bfl2", 0.739, -1.845, 0.716],
["bfl3", 0.948, -1.435, 0.730],
["bfl4", 0.756, -1.413, 0.843],
["bfl5", 0.963, -1.024, 0.112],
["bfl6", 0.964, -1.072, 0.507],
["bfl7", 0.778, -1.008, 0.873],
["bfl8", 0.987, -0.743, 0.109],
["bfl9", 0.987, -0.744, 0.494],
["bfl10", 0.812, -0.759, 0.896],

// Right side
{"group" : "cot_fender_r"},
[ "bfr0", -0.906, -1.737, 0.578],
[ "bfr1", -0.807, -1.769, 0.707],
[ "bfr2", -0.691, -1.829, 0.716],
[ "bfr3", -0.890, -1.409, 0.729],
[ "bfr4", -0.700, -1.397, 0.843],
[ "bfr5", -0.899, -1.005, 0.112],
[ "bfr6", -0.900, -1.053, 0.508],
[ "bfr7", -0.715, -0.991, 0.873],
[ "bfr8", -0.916, -0.742, 0.112],
[ "bfr9", -0.917, -0.746, 0.494],
[ "bfr10", -0.734, -0.746, 0.888],
["bfr0", -0.906, -1.737, 0.578],
["bfr1", -0.807, -1.769, 0.707],
["bfr2", -0.691, -1.829, 0.716],
["bfr3", -0.890, -1.409, 0.729],
["bfr4", -0.700, -1.397, 0.843],
["bfr5", -0.899, -1.005, 0.112],
["bfr6", -0.900, -1.053, 0.508],
["bfr7", -0.715, -0.991, 0.873],
["bfr8", -0.916, -0.742, 0.112],
["bfr9", -0.917, -0.746, 0.494],
["bfr10", -0.734, -0.746, 0.888],

// Support nodes
{"collision" : false},
{"selfCollision" : false},
{"nodeWeight" : 1.2},
{"group" : ""},
[ "bfsl", 0.684, -1.079, 0.507],
[ "bfsr", -0.623, -1.064, 0.507]
["bfsl", 0.684, -1.079, 0.507],
["bfsr", -0.623, -1.064, 0.507]
],
"beams" : [
["id1:", "id2:"],
Expand Down
50 changes: 25 additions & 25 deletions examples/formatted_jbeam/fender-minimal-jbfl.jbeam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"information" : {"authors" : "gittarrgy01", "name" : "Fenders"},
"slotType" : "cot_fender",
"nodes" : [
[ "id", "posX", "posY", "posZ"],
["id", "posX", "posY", "posZ"],
{"nodeWeight" : 0.65},
{"frictionCoef" : 0.7},
{"nodeMaterial" : "|NM_METAL"},
Expand All @@ -12,39 +12,39 @@

// Left side
{"group" : "cot_fender_l"},
[ "bfl0", 0.959, -1.762, 0.576],
[ "bfl1", 0.855, -1.788, 0.707],
[ "bfl2", 0.739, -1.845, 0.716],
[ "bfl3", 0.948, -1.435, 0.730],
[ "bfl4", 0.756, -1.413, 0.843],
[ "bfl5", 0.963, -1.024, 0.112],
[ "bfl6", 0.964, -1.072, 0.507],
[ "bfl7", 0.778, -1.008, 0.873],
[ "bfl8", 0.987, -0.743, 0.109],
[ "bfl9", 0.987, -0.744, 0.494],
[ "bfl10", 0.812, -0.759, 0.896],
["bfl0", 0.959, -1.762, 0.576],
["bfl1", 0.855, -1.788, 0.707],
["bfl2", 0.739, -1.845, 0.716],
["bfl3", 0.948, -1.435, 0.730],
["bfl4", 0.756, -1.413, 0.843],
["bfl5", 0.963, -1.024, 0.112],
["bfl6", 0.964, -1.072, 0.507],
["bfl7", 0.778, -1.008, 0.873],
["bfl8", 0.987, -0.743, 0.109],
["bfl9", 0.987, -0.744, 0.494],
["bfl10", 0.812, -0.759, 0.896],

// Right side
{"group" : "cot_fender_r"},
[ "bfr0", -0.906, -1.737, 0.578],
[ "bfr1", -0.807, -1.769, 0.707],
[ "bfr2", -0.691, -1.829, 0.716],
[ "bfr3", -0.890, -1.409, 0.729],
[ "bfr4", -0.700, -1.397, 0.843],
[ "bfr5", -0.899, -1.005, 0.112],
[ "bfr6", -0.900, -1.053, 0.508],
[ "bfr7", -0.715, -0.991, 0.873],
[ "bfr8", -0.916, -0.742, 0.112],
[ "bfr9", -0.917, -0.746, 0.494],
[ "bfr10", -0.734, -0.746, 0.888],
["bfr0", -0.906, -1.737, 0.578],
["bfr1", -0.807, -1.769, 0.707],
["bfr2", -0.691, -1.829, 0.716],
["bfr3", -0.890, -1.409, 0.729],
["bfr4", -0.700, -1.397, 0.843],
["bfr5", -0.899, -1.005, 0.112],
["bfr6", -0.900, -1.053, 0.508],
["bfr7", -0.715, -0.991, 0.873],
["bfr8", -0.916, -0.742, 0.112],
["bfr9", -0.917, -0.746, 0.494],
["bfr10", -0.734, -0.746, 0.888],

// Support nodes
{"collision" : false},
{"selfCollision" : false},
{"nodeWeight" : 1.2},
{"group" : ""},
[ "bfsl", 0.684, -1.079, 0.507],
[ "bfsr", -0.623, -1.064, 0.507]
["bfsl", 0.684, -1.079, 0.507],
["bfsr", -0.623, -1.064, 0.507]
],
"beams" : [
["id1:", "id2:"],
Expand Down
Loading