Skip to content

Commit bd8adfa

Browse files
committed
move the table with the other ones and draw columns as columns
1 parent 5de7fe2 commit bd8adfa

File tree

2 files changed

+21
-20
lines changed

2 files changed

+21
-20
lines changed

rct-graphics-helper/angle_sections/track.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,22 @@
304304
"VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPE_BANKED"
305305
]
306306

307+
legacy_group_display_order = [
308+
"VEHICLE_SPRITE_FLAG_FLAT",
309+
"VEHICLE_SPRITE_FLAG_GENTLE_SLOPES",
310+
"VEHICLE_SPRITE_FLAG_STEEP_SLOPES",
311+
"VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES",
312+
"VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES",
313+
"VEHICLE_SPRITE_FLAG_INLINE_TWISTS",
314+
"VEHICLE_SPRITE_FLAG_CORKSCREWS",
315+
"VEHICLE_SPRITE_FLAG_ZERO_G_ROLLS",
316+
"VEHICLE_SPRITE_FLAG_FLAT_BANKED",
317+
"VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPE_BANKED",
318+
"VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS",
319+
"VEHICLE_SPRITE_FLAG_CURVED_LIFT_HILL",
320+
"VEHICLE_SPRITE_FLAG_RESTRAINT_ANIMATION"
321+
]
322+
307323
# Legacy sprite groups that are reset every time the user makes a selection
308324
legacy_groups_implied = [
309325
"VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_BANKED_TRANSITIONS",

rct-graphics-helper/rct_graphics_helper_panel.py

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from .operators.render_switch_operator import RenderRCTSwitch
1717

1818
from .models.palette import palette_colors, palette_colors_details
19-
from .angle_sections.track import sprite_group_names, legacy_group_names
19+
from .angle_sections.track import sprite_group_names, legacy_group_names, legacy_group_display_order
2020

2121
class RepairConfirmOperator(bpy.types.Operator):
2222
"""This action will clear out the default camera and light. Changes made to the rig object, compositor nodes and recolorable materials will be lost."""
@@ -42,22 +42,6 @@ def addRenderButton(layout, hasFailed = False):
4242
text = "Render failed"
4343
row.operator("render.rct_switch", text=text)
4444

45-
legacy_group_display_order = [
46-
"VEHICLE_SPRITE_FLAG_FLAT",
47-
"VEHICLE_SPRITE_FLAG_FLAT_BANKED",
48-
"VEHICLE_SPRITE_FLAG_GENTLE_SLOPES",
49-
"VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS",
50-
"VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES",
51-
"VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPE_BANKED",
52-
"VEHICLE_SPRITE_FLAG_STEEP_SLOPES",
53-
"VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES",
54-
"VEHICLE_SPRITE_FLAG_INLINE_TWISTS",
55-
"VEHICLE_SPRITE_FLAG_CORKSCREWS",
56-
"VEHICLE_SPRITE_FLAG_ZERO_G_ROLLS",
57-
"VEHICLE_SPRITE_FLAG_CURVED_LIFT_HILL",
58-
"VEHICLE_SPRITE_FLAG_RESTRAINT_ANIMATION"
59-
]
60-
6145
class GraphicsHelperPanel(bpy.types.Panel):
6246
bl_label = "RCT Graphics Helper"
6347
bl_idname = "VIEW3D_PT_rct_graphics_helper"
@@ -236,11 +220,12 @@ def draw_vehicle_panel(self, scene, layout):
236220
columns = [split.column(), split.column()]
237221
i = 0
238222
if properties.sprite_group_mode == "SIMPLE":
239-
for legacy_group_name in self.legacy_group_display_order:
223+
splitpoint = len(legacy_group_display_order) // 2
224+
for legacy_group_name in legacy_group_display_order:
240225
sprite_track_flagset = properties.legacy_spritegroups[legacy_group_name]
241226
index = legacy_group_names.index(legacy_group_name)
242-
columns[i % 2].row().prop(properties, "legacy_flags",
243-
index=index, text=sprite_track_flagset.name)
227+
columns[i > splitpoint].row().prop(properties, "legacy_flags",
228+
index=index, text=sprite_track_flagset.name)
244229
i += 1
245230
else:
246231
columns = [column.split(0.667) for column in columns]

0 commit comments

Comments
 (0)