finish implementation

Author: spacek531

rct-graphics-helper/angle_sections/track.py

@@ -125,13 +125,13 @@
         [True, 4, -8.0503, -45, 0],
         [True, 4, -8.0503, 45, 0]
     ],
-    'Slopes16Banked22': [
+    'slopes16Banked22': [
         [True, 4, 16.1005, -22.5, 0],
         [True, 4, 16.1005, 22.5, 0],
         [True, 4, -16.1005, -22.5, 0],
         [True, 4, -16.1005, 22.5, 0]
     ],
-    'Slopes16Banked45': [
+    'slopes16Banked45': [
         [True, 4, 16.1005, -45, 0],
         [True, 4, 16.1005, 45, 0],
         [True, 4, -16.1005, -45, 0],
@@ -282,6 +282,7 @@
     "curvedLiftHillDown": [32, "Spiral lifthill down track"]
 }
 
+# All legacy groups. See list in rct_graphics_helper_panel.py for which ones are displayed
 legacy_group_names = [
     "VEHICLE_SPRITE_FLAG_FLAT",
     "VEHICLE_SPRITE_FLAG_GENTLE_SLOPES",
@@ -299,6 +300,16 @@
     "VEHICLE_SPRITE_FLAG_RESTRAINT_ANIMATION",
     "VEHICLE_SPRITE_FLAG_CURVED_LIFT_HILL",
     "VEHICLE_SPRITE_FLAG_ZERO_G_ROLLS",
+    "VEHICLE_SPRITE_FLAG_INVERTED",
+    "VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPE_BANKED"
+]
+
+# Legacy sprite groups that are reset every time the user makes a selection
+legacy_groups_implied = [
+    "VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_BANKED_TRANSITIONS",
+    "VEHICLE_SPRITE_FLAG_DIAGONAL_GENTLE_SLOPE_BANKED_TRANSITIONS",
+    "VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_WHILE_BANKED_TRANSITIONS",
+    "VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TRANSITIONS",
     "VEHICLE_SPRITE_FLAG_INVERTED"
 ]
 
@@ -322,6 +333,7 @@
     "VEHICLE_SPRITE_FLAG_CURVED_LIFT_HILL": ["Spiral Lifthill", "Render sprites for spiral lifthills", False],
     "VEHICLE_SPRITE_FLAG_ZERO_G_ROLLS": ["Zero-G Rolls", "Render sprites for zero-G rolls", False],
     "VEHICLE_SPRITE_FLAG_INVERTED": ["", "", False],
+    "VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPE_BANKED": ["Diagonal Sloped Banked", "Render sprites for diagonal sloped banked track", False],
 }
 
 # What full sprite groups each legacy group maps to
@@ -342,15 +354,19 @@
     'VEHICLE_SPRITE_FLAG_RESTRAINT_ANIMATION': ['restraintAnimation'],
     'VEHICLE_SPRITE_FLAG_CURVED_LIFT_HILL': ['curvedLiftHillUp', 'curvedLiftHillDown'],
     'VEHICLE_SPRITE_FLAG_ZERO_G_ROLLS': ["slopes60Banked22", "slopes42Banked22","slopes42Banked45","slopes42Banked67","slopes42Banked90", "slopes25InlineTwists", "slopes25Banked67","slopes25Banked90"],
-    'VEHICLE_SPRITE_FLAG_INVERTED': ['slopeInverted']
+    'VEHICLE_SPRITE_FLAG_INVERTED': ['slopeInverted'],
+    'VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPE_BANKED': ['slopes8Banked45', 'slopes16Banked22', 'slopes16Banked45']
 }
 
 # What legacy groups are implied by combinations of other legacy sprite groups
-legacy_group_implications = {
+legacy_group_dependencies = {
     frozenset({'VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS'}): frozenset({'VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TRANSITIONS','VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_WHILE_BANKED_TRANSITIONS','VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_BANKED_TRANSITIONS'}),
     frozenset({'VEHICLE_SPRITE_FLAG_FLAT_BANKED','VEHICLE_SPRITE_FLAG_GENTLE_SLOPES'}): frozenset({'VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_BANKED_TRANSITIONS'}),
     frozenset({'VEHICLE_SPRITE_FLAG_FLAT_BANKED','VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES'}): frozenset({'VEHICLE_SPRITE_FLAG_DIAGONAL_GENTLE_SLOPE_BANKED_TRANSITIONS'}),
     frozenset({'VEHICLE_SPRITE_FLAG_INLINE_TWISTS'}): frozenset({'VEHICLE_SPRITE_FLAG_FLAT_BANKED', 'VEHICLE_SPRITE_FLAG_INVERTED'}),
-    frozenset({'VEHICLE_SPRITE_FLAG_CORKSCREWS'}): frozenset({'VEHICLE_SPRITE_FLAG_INVERTED_SLOPES'}),
-    frozenset({'VEHICLE_SPRITE_FLAG_ZERO_G_ROLLS'}): frozenset({'VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS', 'VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TRANSITIONS', 'VEHICLE_SPRITE_FLAG_GENTLE_SLOPES', 'VEHICLE_SPRITE_FLAG_INVERTED'})
+    frozenset({'VEHICLE_SPRITE_FLAG_CORKSCREWS'}): frozenset({'VEHICLE_SPRITE_FLAG_INVERTED'}),
+    frozenset({'VEHICLE_SPRITE_FLAG_ZERO_G_ROLLS'}): frozenset({'VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS', 'VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TRANSITIONS', 'VEHICLE_SPRITE_FLAG_GENTLE_SLOPES', 'VEHICLE_SPRITE_FLAG_INVERTED'}),
+    frozenset({'VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPE_BANKED'}): frozenset({'VEHICLE_SPRITE_FLAG_DIAGONAL_GENTLE_SLOPE_BANKED_TRANSITIONS'})
 }
+
+

rct-graphics-helper/properties/vehicle_properties.py

@@ -12,7 +12,7 @@
 import os
 
 from ..operators.render_operator import RCTRender
-from ..angle_sections.track import sprite_group_metadata, legacy_group_names, legacy_group_metadata
+from ..angle_sections.track import sprite_group_metadata, legacy_group_names, legacy_group_metadata, legacy_groups_implied, legacy_group_dependencies, legacy_group_map
 
 class SpriteTrackFlag(object):
     name = ""
@@ -29,19 +29,44 @@ def __init__(self, section_id, name, description, default_value):
 
 def CreateSpriteEnum(defaultValue):
     return (
-        ("0", "Disabled" + (defaultValue == 0 and " (Default)" or ""), "No sprites rendered", 0),
+        ("0", "None" + (defaultValue == 0 and " (Default)" or ""), "No sprites rendered", 0),
         ("1", "1" + (defaultValue == 1 and " (Default)" or ""), "1 sprite", 1),
         ("2", "2" + (defaultValue == 2 and " (Default)" or ""), "2 sprites", 2),
         ("4", "4" + (defaultValue == 4 and " (Default)" or ""), "4 sprites (recommended minimum)", 4),
         ("8", "8" + (defaultValue == 8 and " (Default)" or ""), "8 sprites", 8),
-        ("16", "16" + (defaultValue == 16 and " (Default)" or ""), "16 sprites (RCT1 default)", 16),
+        ("16", "16" + (defaultValue == 16 and " (Default)" or ""), "16 sprites", 16),
         ("32", "32" + (defaultValue == 32 and " (Default)" or ""), "32 sprites (RCT2 default)", 32),
-        ("64", "64" + (defaultValue == 64 and " (Default)" or ""), "64 sprites (OpenRCT2 not yet implemented)", 64)
+        ("64", "64" + (defaultValue == 64 and " (Default)" or ""), "64 sprites  ", 64)
     )
 
+def set_groups_by_legacy_set(self, set):
+    for groupname, newgroups in legacy_group_map.items():
+        for group in newgroups:
+            self[group] = sprite_group_metadata[group][0] * (groupname in set)
+
 # this is called with self as VehicleProperties
-def legacy_groups_to_set(self, value):
-    difference = [(self.sprite_track_flags[i] != value[i]) * (value[i] and 1 or -1) for i in range(len(self.sprite_track_flags))]
+def legacy_groups_set(self, value):
+    new_with_implied = { legacy_group_names[i] for i in range(len(value)) if value[i] or (legacy_group_names[i] in legacy_groups_implied) }
+    new = { legacy_group_names[i] for i in range(len(value)) if value[i] and not legacy_group_names[i] in legacy_groups_implied }
+    for implied, dependencies in legacy_group_dependencies.items():
+        if implied.issubset(new_with_implied):
+            for group in dependencies:
+                new.add(group)
+        if not implied.issubset(new_with_implied) and len(implied) == 1:
+            for group in implied:
+                new.discard(group)
+    set_groups_by_legacy_set(self, new)
+    value = [group in new for group in legacy_group_names]
+    for i in range(len(value)):
+        self.sprite_track_flags[i] = value[i]
+
+def legacy_flags_get(self):
+    return [x for x in self.sprite_track_flags]
+
+# When the user switches from full to simple mode, force the groups to match the simple mode
+def sprite_group_mode_updated(self, context):
+    if self.sprite_group_mode == "SIMPLE":
+        set_groups_by_legacy_set(self, self.get_legacy_set())
 
 class VehicleProperties(bpy.types.PropertyGroup):
     # Create legacy sprite groups
@@ -53,11 +78,19 @@ class VehicleProperties(bpy.types.PropertyGroup):
         legacy_defaults.append(config[2])
 
     sprite_track_flags = bpy.props.BoolVectorProperty(
+        name="Track Pieces",
+        default=legacy_defaults,
+        description="Which track pieces to render sprites for",
+        size=len(legacy_spritegroups)
+    )
+    
+    legacy_flags = bpy.props.BoolVectorProperty(
         name="Track Pieces",
         default=legacy_defaults,
         description="Which track pieces to render sprites for",
         size=len(legacy_spritegroups),
-        set = legacy_groups_to_set
+        set = legacy_groups_set,
+        get = legacy_flags_get
     )
 
     # Create modern sprite groups
@@ -80,9 +113,14 @@ class VehicleProperties(bpy.types.PropertyGroup):
              "Combines several sprite groups and sets their sprite precisions automatically", 1),
             ("FULL", "Full sprite groups",
              "Set all sprite group precisions manually", 2),
-        )
+        ),
+        update = sprite_group_mode_updated
     )
 
+    def get_legacy_set(self):
+        return { legacy_group_names[i] for i in range(len(self.sprite_track_flags)) if self.sprite_track_flags[i] }
+
+
 
 def register_vehicles_properties():
     bpy.types.Scene.rct_graphics_helper_vehicle_properties = bpy.props.PointerProperty(

rct-graphics-helper/rct_graphics_helper_panel.py

@@ -173,11 +173,12 @@ def draw_walls_panel(self, scene, layout):
 
     legacy_group_display_order = [
         "VEHICLE_SPRITE_FLAG_FLAT",
-        "VEHICLE_SPRITE_FLAG_GENTLE_SLOPES",
-        "VEHICLE_SPRITE_FLAG_STEEP_SLOPES",
-        "VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES",
         "VEHICLE_SPRITE_FLAG_FLAT_BANKED",
+        "VEHICLE_SPRITE_FLAG_GENTLE_SLOPES",
         "VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS",
+        "VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES",
+        "VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPE_BANKED",
+        "VEHICLE_SPRITE_FLAG_STEEP_SLOPES",
         "VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES",
         "VEHICLE_SPRITE_FLAG_INLINE_TWISTS",
         "VEHICLE_SPRITE_FLAG_CORKSCREWS",
@@ -201,7 +202,7 @@ def draw_vehicle_panel(self, scene, layout):
             for legacy_group_name in self.legacy_group_display_order:
                 sprite_track_flagset = properties.legacy_spritegroups[legacy_group_name]
                 index = legacy_group_names.index(legacy_group_name)
-                columns[i % 2].row().prop(properties, "sprite_track_flags",
+                columns[i % 2].row().prop(properties, "legacy_flags",
                                           index=index, text=sprite_track_flagset.name)
                 i += 1
         else: