Implement better ordering support.

Signed-off-by: Thomas Mansencal <[email protected]>

Author: KelSolaar

opencolorio_config_aces/config/cg/generate/config.py

@@ -983,6 +983,7 @@ def yield_from_config_mapping():
     data.description = config_description_cg(build_configuration, describe)
 
     # Colorspaces, Looks and View Transforms Filtering
+    # ================================================
     transforms = data.colorspaces + data.view_transforms
     implicit_transforms = [
         a["name"] for a in transforms if a.get("transforms_data") is None
@@ -1024,6 +1025,7 @@ def filter_all(array, filterers):
         return filtered
 
     # "Colorspaces" Filtering
+    # =======================
     any_colorspace_filterers = [
         implicit_transform_filterer,
         transform_filterer,
@@ -1040,6 +1042,7 @@ def filter_all(array, filterers):
     )
 
     # "Looks" Filtering
+    # =================
     any_look_filterers = [
         implicit_transform_filterer,
         transform_filterer,
@@ -1051,6 +1054,7 @@ def filter_all(array, filterers):
     LOGGER.info('Filtered "Look" transforms: %s ', [a["name"] for a in data.looks])
 
     # "View Transform" Filtering
+    # ==========================
     any_view_transform_filterers = [
         implicit_transform_filterer,
         transform_filterer,
@@ -1071,6 +1075,7 @@ def filter_all(array, filterers):
     )
 
     # "Views & Shared Views" Filtering
+    # ================================
     display_names = [
         a["name"] for a in data.colorspaces if a.get("family") == "Display"
     ]
@@ -1098,6 +1103,7 @@ def view_filterer(transform):
         return False
 
     # "Shared Views" Filtering
+    # ========================
     any_shared_view_filterers = [
         implicit_view_filterer,
         view_filterer,
@@ -1124,15 +1130,18 @@ def view_filterer(transform):
     LOGGER.info('Filtered "View(s)": %s.', [a["view"] for a in data.views])
 
     # "Active Displays" Filtering
+    # ===========================
     data.active_displays = [a for a in data.active_displays if a in display_names]
     LOGGER.info("Filtered active displays: %s.", data.active_displays)
 
     # "Active Views" Filtering
+    # ========================
     views = [view["view"] for view in data.views]
     data.active_views = [view for view in data.active_views if view in views]
     LOGGER.info("Filtered active views: %s.", data.active_views)
 
     # CLF Transforms & BuiltinTransform Creation
+    # ==========================================
     for transform_data in yield_from_config_mapping():
         # Inherited from the "Reference" config.
         if (
@@ -1217,14 +1226,8 @@ def view_filterer(transform):
                 colorspace["transforms_data"] = [transform_data]
                 data.colorspaces.append(colorspace)
 
-    # Reordering the "Raw" colorspace for aesthetics.
-    data.colorspaces.extend(
-        data.colorspaces.pop(i)
-        for i, a in enumerate(data.colorspaces[:])
-        if a["name"] == "Raw"
-    )
-
     # Inactive Colorspaces Filtering
+    # ==============================
     colorspace_named_transform_names = [a["name"] for a in data.colorspaces]
     inactive_colorspaces = []
     for colorspace in data.inactive_colorspaces:
@@ -1243,6 +1246,7 @@ def view_filterer(transform):
     ]
 
     # Roles Filtering & Update
+    # ========================
     for role in (
         # A config contains multiple possible "Rendering" color spaces.
         ocio.ROLE_RENDERING,
@@ -1269,6 +1273,25 @@ def view_filterer(transform):
         }
     )
 
+    # Ordering
+    # ========
+    def ordering(element):
+        """Return the ordering key for given element."""
+
+        return int(
+            next(iter(element.get("transforms_data", [{"ordering": 0}])))["ordering"]
+        )
+
+    data.colorspaces = sorted(data.colorspaces, key=lambda x: ordering(x))
+    data.colorspaces.extend(
+        data.colorspaces.pop(i)
+        for i, a in enumerate(data.colorspaces[:])
+        if a["name"] == "Raw"
+    )
+    data.named_transforms = sorted(data.named_transforms, key=lambda x: ordering(x))
+    data.view_transforms = sorted(data.view_transforms, key=lambda x: ordering(x))
+    data.looks = sorted(data.looks, key=lambda x: ordering(x))
+
     data.profile_version = build_configuration.ocio
 
     config = generate_config(data, config_name, validate)

opencolorio_config_aces/config/cg/generate/resources/OpenColorIO-Config-ACES CG and Studio Transforms - v3 - CG Config - Mapping.csv

@@ -3,15 +3,15 @@ Ordering,Colorspace,Legacy,ACEStransformID,CLFtransformID,Interface,BuiltinTrans
 100,ACEScct,TRUE,urn:ampas:aces:transformId:v2.0:CSC.Academy.ACEScct_to_ACES.a2.v1,,ColorSpace,ACEScct_to_ACES2065-1,"acescct,acescct_ap1,ACES - ACEScct",log,"file-io,working-space"
 100,ACEScg,TRUE,urn:ampas:aces:transformId:v2.0:CSC.Academy.ACEScg_to_ACES.a2.v1,,ColorSpace,ACEScg_to_ACES2065-1,"acescg,lin_ap1,lin_ap1_scene,ACES - ACEScg",scene-linear,"file-io,working-space,texture"
 300,ACES 1.3 Reference Gamut Compression,FALSE,urn:ampas:aces:transformId:v2.0:Look.Academy.ReferenceGamutCompress.a2.v1,,Look,,,scene-linear,
-400,P3-D65_48nit_in_P3-D65_Gamma2pt6,FALSE,urn:ampas:aces:transformId:v2.0:Output.Academy.P3-D65_48nit_in_P3-D65_Gamma2pt6.a2.v1,,ViewTransform,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-100nit-P3-D65_2.0,,sdr-video,file-io
-415,Rec709-D65_100nit_in_Rec709-D65_sRGB-Piecewise,FALSE,urn:ampas:aces:transformId:v2.0:Output.Academy.Rec709-D65_100nit_in_Rec709-D65_sRGB-Piecewise.a2.v1,,ViewTransform,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-100nit-REC709_2.0,,sdr-video,file-io
-420,P3-D65_1000nit_in_Rec2100-D65_ST2084,FALSE,urn:ampas:aces:transformId:v2.0:Output.Academy.P3-D65_1000nit_in_Rec2100-D65_ST2084.a2.v1,,ViewTransform,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - HDR-1000nit-P3-D65_2.0,,hdr-video,file-io
-420,Rec2100-D65_1000nit_in_Rec2100-D65_ST2084,FALSE,urn:ampas:aces:transformId:v2.0:Output.Academy.Rec2100-D65_1000nit_in_Rec2100-D65_ST2084.a2.v1,,ViewTransform,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - HDR-1000nit-REC2020_2.0,,hdr-video,file-io
-425,P3-D65_1000nit_in_P3-D65_sRGB-Piecewise,FALSE,urn:ampas:aces:transformId:v2.0:Output.Academy.P3-D65_1000nit_in_P3-D65_sRGB-Piecewise.a2.v1,,ViewTransform,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - HDR-1000nit-P3-D65_2.0,,hdr-video,file-io
-425,P3-D65_100nit_in_P3-D65_sRGB-Piecewise,FALSE,urn:ampas:aces:transformId:v2.0:Output.Academy.P3-D65_100nit_in_P3-D65_sRGB-Piecewise.a2.v1,,ViewTransform,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-100nit-P3-D65_2.0,,sdr-video,file-io
+400,Rec709-D65_100nit_in_Rec709-D65_sRGB-Piecewise,FALSE,urn:ampas:aces:transformId:v2.0:Output.Academy.Rec709-D65_100nit_in_Rec709-D65_sRGB-Piecewise.a2.v1,,ViewTransform,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-100nit-REC709_2.0,,sdr-video,file-io
+410,P3-D65_100nit_in_P3-D65_sRGB-Piecewise,FALSE,urn:ampas:aces:transformId:v2.0:Output.Academy.P3-D65_100nit_in_P3-D65_sRGB-Piecewise.a2.v1,,ViewTransform,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-100nit-P3-D65_2.0,,sdr-video,file-io
+412,P3-D65_1000nit_in_P3-D65_sRGB-Piecewise,FALSE,urn:ampas:aces:transformId:v2.0:Output.Academy.P3-D65_1000nit_in_P3-D65_sRGB-Piecewise.a2.v1,,ViewTransform,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - HDR-1000nit-P3-D65_2.0,,hdr-video,file-io
+420,P3-D65_48nit_in_P3-D65_Gamma2pt6,FALSE,urn:ampas:aces:transformId:v2.0:Output.Academy.P3-D65_48nit_in_P3-D65_Gamma2pt6.a2.v1,,ViewTransform,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-100nit-P3-D65_2.0,,sdr-video,file-io
 430,Rec709-D65_100nit_in_Rec709-D65_BT1886,FALSE,urn:ampas:aces:transformId:v2.0:Output.Academy.Rec709-D65_100nit_in_Rec709-D65_BT1886.a2.v1,,ViewTransform,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-100nit-REC709_2.0,,sdr-video,file-io
 440,sRGB - Curve,TRUE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:Linear_to_sRGB-Curve:1.0,NamedTransform,,"crv_srgb,Utility - Curve - sRGB",sdr-video,file-io
+441,P3-D65_1000nit_in_Rec2100-D65_ST2084,FALSE,urn:ampas:aces:transformId:v2.0:Output.Academy.P3-D65_1000nit_in_Rec2100-D65_ST2084.a2.v1,,ViewTransform,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - HDR-1000nit-P3-D65_2.0,,hdr-video,file-io
 441,Rec.1886 - Curve,TRUE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:Linear_to_Rec1886-Curve:1.0,NamedTransform,,"crv_rec1886,Utility - Curve - Rec.1886",sdr-video,file-io
+451,Rec2100-D65_1000nit_in_Rec2100-D65_ST2084,FALSE,urn:ampas:aces:transformId:v2.0:Output.Academy.Rec2100-D65_1000nit_in_Rec2100-D65_ST2084.a2.v1,,ViewTransform,ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - HDR-1000nit-REC2020_2.0,,hdr-video,file-io
 500,sRGB Encoded Rec.709 (sRGB),TRUE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_sRGB-Encoded-Rec709:1.0,ColorSpace,,"srgb_texture,srgb_rec709_scene,Utility - sRGB - Texture,Input - Generic - sRGB - Texture,sRGB - Texture,srgb_tx",sdr-video,"file-io,texture"
 501,Gamma 1.8 Encoded Rec.709,TRUE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma1.8_Encoded_Rec709:1.0,ColorSpace,,"g18_rec709,Utility - Gamma 1.8 - Rec.709 - Texture,Gamma 1.8 Rec.709 - Texture,g18_rec709_tx,g18_rec709_scene",sdr-video,"file-io,texture"
 502,Gamma 2.2 Encoded Rec.709,TRUE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.2_Encoded_Rec709:1.0,ColorSpace,,"g22_rec709,Utility - Gamma 2.2 - Rec.709 - Texture,Gamma 2.2 Rec.709 - Texture,g22_rec709_tx,g22_rec709_scene",sdr-video,"file-io,texture"

opencolorio_config_aces/config/reference/generate/config.py

@@ -1253,6 +1253,18 @@ def generate_config_aces(
                     if colorspace not in colorspaces:
                         colorspaces.append(colorspace)
 
+    # Ordering displays, "sRGB" first and then shared views.
+    display_names = sorted(display_names)
+    for i, display_name in enumerate(display_names[:]):
+        if display_name.startswith("sRGB"):
+            display_names.insert(0, display_names.pop(i))
+
+    shared_views, unordered_shared_views = [], shared_views
+    for display_name in display_names:
+        for shared_view in unordered_shared_views:
+            if shared_view["display"] == display_name:
+                shared_views.append(shared_view)
+
     untonemapped_view_transform = {
         "name": "Un-tone-mapped",
         "from_reference": {
@@ -1271,16 +1283,17 @@ def generate_config_aces(
             untonemapped_shared_view["view"],
             display_name,
         )
+
         if untonemapped_shared_view not in shared_views:
             shared_views.append(untonemapped_shared_view)
 
-    for display_name in display_names:
         raw_view = {
             "display": display_name,
             "view": "Raw",
             "colorspace": raw_colorspace["name"],
         }
         LOGGER.info('Adding "%s" view to "%s" display.', raw_view["view"], display_name)
+
         if raw_view not in views:
             views.append(raw_view)