Skip to content

Commit 0c3e26d

Browse files
committed
move the table with the other ones and draw columns as columns
1 parent b5998c2 commit 0c3e26d

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
@@ -22,7 +22,7 @@
2222
from .operators.render_tiles_operator import RenderTiles
2323

2424
from .models.palette import palette_colors, palette_colors_details
25-
from .angle_sections.track import sprite_group_names, legacy_group_names
25+
from .angle_sections.track import sprite_group_names, legacy_group_names, legacy_group_display_order
2626

2727
class RepairConfirmOperator(bpy.types.Operator):
2828
"""This action will clear out the default camera and light. Changes made to the rig object, compositor nodes and recolorable materials will be lost."""
@@ -41,22 +41,6 @@ def execute(self, context):
4141
def invoke(self, context, event):
4242
return context.window_manager.invoke_confirm(self, event)
4343

44-
legacy_group_display_order = [
45-
"VEHICLE_SPRITE_FLAG_FLAT",
46-
"VEHICLE_SPRITE_FLAG_FLAT_BANKED",
47-
"VEHICLE_SPRITE_FLAG_GENTLE_SLOPES",
48-
"VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS",
49-
"VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES",
50-
"VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPE_BANKED",
51-
"VEHICLE_SPRITE_FLAG_STEEP_SLOPES",
52-
"VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES",
53-
"VEHICLE_SPRITE_FLAG_INLINE_TWISTS",
54-
"VEHICLE_SPRITE_FLAG_CORKSCREWS",
55-
"VEHICLE_SPRITE_FLAG_ZERO_G_ROLLS",
56-
"VEHICLE_SPRITE_FLAG_CURVED_LIFT_HILL",
57-
"VEHICLE_SPRITE_FLAG_RESTRAINT_ANIMATION"
58-
]
59-
6044
class GraphicsHelperPanel(bpy.types.Panel):
6145
bl_label = "RCT Graphics Helper"
6246
bl_idname = "VIEW3D_PT_rct_graphics_helper"
@@ -243,11 +227,12 @@ def draw_vehicle_panel(self, scene, layout):
243227
columns = [split.column(), split.column()]
244228
i = 0
245229
if properties.sprite_group_mode == "SIMPLE":
246-
for legacy_group_name in self.legacy_group_display_order:
230+
splitpoint = len(legacy_group_display_order) // 2
231+
for legacy_group_name in legacy_group_display_order:
247232
sprite_track_flagset = properties.legacy_spritegroups[legacy_group_name]
248233
index = legacy_group_names.index(legacy_group_name)
249-
columns[i % 2].row().prop(properties, "legacy_flags",
250-
index=index, text=sprite_track_flagset.name)
234+
columns[i > splitpoint].row().prop(properties, "legacy_flags",
235+
index=index, text=sprite_track_flagset.name)
251236
i += 1
252237
else:
253238
columns = [column.split(0.667) for column in columns]

0 commit comments

Comments
 (0)