diff --git a/opencolorio_config_aces/clf/transforms/ocio/generate.py b/opencolorio_config_aces/clf/transforms/ocio/generate.py index 6ca7bee..edcb36b 100644 --- a/opencolorio_config_aces/clf/transforms/ocio/generate.py +++ b/opencolorio_config_aces/clf/transforms/ocio/generate.py @@ -100,7 +100,7 @@ def generate_clf_transforms_ocio(output_directory): style=style, ) - name = "AP0_to_CIE-XYZ-D65-Scene-referred" + name = "AP0_to_CIE_XYZ-D65-Scene-referred" clf_transform_id = format_clf_transform_id(FAMILY, GENUS, name, VERSION) filename = output_directory / clf_basename(clf_transform_id) M_ACES = colour.RGB_COLOURSPACES["ACES2065-1"].matrix_RGB_to_XYZ @@ -118,7 +118,7 @@ def generate_clf_transforms_ocio(output_directory): filename, [matrix_transform(M_XYZ)], clf_transform_id, - "AP0 to CIE-XYZ-D65", + "AP0 to CIE XYZ-D65", "ACES2065-1", "CIE XYZ, D65 white point", ) diff --git a/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_CIE-XYZ-D65-Scene-referred.clf b/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_CIE_XYZ-D65-Scene-referred.clf similarity index 86% rename from opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_CIE-XYZ-D65-Scene-referred.clf rename to opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_CIE_XYZ-D65-Scene-referred.clf index 87720a5..d2405c2 100644 --- a/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_CIE-XYZ-D65-Scene-referred.clf +++ b/opencolorio_config_aces/clf/transforms/ocio/utility/OCIO.Utility.AP0_to_CIE_XYZ-D65-Scene-referred.clf @@ -1,5 +1,5 @@ - + ACES2065-1 CIE XYZ, D65 white point diff --git a/opencolorio_config_aces/config/cg/generate/config.py b/opencolorio_config_aces/config/cg/generate/config.py index 8439f59..d9e33f9 100644 --- a/opencolorio_config_aces/config/cg/generate/config.py +++ b/opencolorio_config_aces/config/cg/generate/config.py @@ -1163,7 +1163,7 @@ def view_filterer(transform): data.inactive_colorspaces = [ *inactive_colorspaces, - "CIE-XYZ-D65 - Display-referred", + "CIE XYZ-D65 - Display-referred", ] # Roles Filtering & Update @@ -1183,7 +1183,7 @@ def view_filterer(transform): "ACEScct", "ACES", scheme ), ocio.ROLE_DATA: "Raw", - ocio.ROLE_INTERCHANGE_DISPLAY: "CIE-XYZ-D65 - Display-referred", + ocio.ROLE_INTERCHANGE_DISPLAY: "CIE XYZ-D65 - Display-referred", ocio.ROLE_INTERCHANGE_SCENE: format_optional_prefix( "ACES2065-1", "ACES", scheme ), diff --git a/opencolorio_config_aces/config/cg/generate/resources/OpenColorIO-Config-ACES CG and Studio Transforms - v2 - CG Config - Mapping.csv b/opencolorio_config_aces/config/cg/generate/resources/OpenColorIO-Config-ACES CG and Studio Transforms - v2 - CG Config - Mapping.csv index c6fb2b0..b02ca9c 100644 --- a/opencolorio_config_aces/config/cg/generate/resources/OpenColorIO-Config-ACES CG and Studio Transforms - v2 - CG Config - Mapping.csv +++ b/opencolorio_config_aces/config/cg/generate/resources/OpenColorIO-Config-ACES CG and Studio Transforms - v2 - CG Config - Mapping.csv @@ -13,7 +13,7 @@ Ordering,Colorspace,Legacy,ACEStransformID,CLFtransformID,Interface,BuiltinTrans 410,Utility - Linear - P3-D65,TRUE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Linear_P3-D65:1.0,ColorSpace,,"lin_p3d65,lin_displayp3,lin_displayp3_scene,Linear Display P3",scene-linear,"file-io,working-space,texture" 410,Utility - Linear - Rec.2020,TRUE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Linear_Rec2020:1.0,ColorSpace,,"lin_rec2020,lin_rec2020_scene",scene-linear,"file-io,texture" 410,Utility - Linear - Rec.709,TRUE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Linear_Rec709:1.0,ColorSpace,,"lin_rec709,lin_rec709_scene,lin_srgb,Utility - Linear - sRGB",scene-linear,"file-io,working-space,texture" -420,CIE XYZ-D65 - Scene-referred,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_CIE-XYZ-D65-Scene-referred:1.0,ColorSpace,,"lin_ciexyzd65_scene,CIE-XYZ-D65 - Scene-referred",scene-linear,file-io +420,CIE XYZ-D65 - Scene-referred,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_CIE_XYZ-D65-Scene-referred:1.0,ColorSpace,,lin_ciexyzd65_scene,scene-linear,file-io 420,Gamma 2.2 Encoded AdobeRGB,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.2_Encoded_AdobeRGB:1.0,ColorSpace,,"adobergb,g22_adobergb_scene",sdr-video,"file-io,texture" 420,Gamma 2.2 Encoded AP1,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.2_Encoded_AP1:1.0,ColorSpace,,"g22_ap1,Gamma 2.2 AP1 - Texture,g22_ap1_tx",sdr-video,"file-io,texture" 420,Gamma 2.4 Encoded Rec.709,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.4_Encoded_Rec709:1.0,ColorSpace,,"g24_rec709,rec709_display,Utility - Rec.709 - Display,Gamma 2.4 Rec.709 - Texture,g24_rec709_tx",sdr-video,"file-io,texture" diff --git a/opencolorio_config_aces/config/generation/beautifiers.py b/opencolorio_config_aces/config/generation/beautifiers.py index 54c7938..651fe86 100644 --- a/opencolorio_config_aces/config/generation/beautifiers.py +++ b/opencolorio_config_aces/config/generation/beautifiers.py @@ -72,7 +72,7 @@ "\\b(\\d+)nits\\b": "(\\1 nits)", "RGBmonitor": "sRGB", "\\bP3 D": "P3-D", - "CIE XYZ D65": "CIE-XYZ-D65", + "CIE XYZ D65": "CIE XYZ-D65", "Gamma1": "Gamma 1", "Gamma2": "Gamma 2", "Rec1886": "Rec.1886", diff --git a/opencolorio_config_aces/config/reference/generate/config.py b/opencolorio_config_aces/config/reference/generate/config.py index 003400a..219c989 100644 --- a/opencolorio_config_aces/config/reference/generate/config.py +++ b/opencolorio_config_aces/config/reference/generate/config.py @@ -1151,9 +1151,8 @@ def generate_config_aces( "encoding": "display-linear", } display_reference_colorspace["aliases"] = [ - beautify_alias(display_reference_colorspace["name"]), - "CIE-XYZ-D65", - "CIE-XYZ-D65 - Display-referred", + "cie_xyz_d65_display", + "lin_ciexyzd65_display", ] raw_colorspace = { diff --git a/opencolorio_config_aces/config/studio/generate/config.py b/opencolorio_config_aces/config/studio/generate/config.py index b575339..57bebdf 100644 --- a/opencolorio_config_aces/config/studio/generate/config.py +++ b/opencolorio_config_aces/config/studio/generate/config.py @@ -14,6 +14,8 @@ import re from pathlib import Path +import PyOpenColorIO as ocio + from opencolorio_config_aces.config.cg import ( generate_config_cg, ) @@ -298,3 +300,16 @@ def generate_config_studio( ) except TypeError as error: logging.critical(error) + + if dependency_versions.ocio.minor <= 3: + config = ocio.Config.CreateFromFile( # pyright:ignore + str(build_directory / config_basename) + ) + view_transforms = list(config.getViewTransforms()) + view_transforms = [view_transforms[-1], *view_transforms[:-1]] + config.clearViewTransforms() + for view_transform in view_transforms: + config.addViewTransform(view_transform) + + with open(build_directory / config_basename, "w") as file: + file.write(config.serialize()) diff --git a/opencolorio_config_aces/config/studio/generate/resources/OpenColorIO-Config-ACES CG and Studio Transforms - v2 - Studio Config - Mapping.csv b/opencolorio_config_aces/config/studio/generate/resources/OpenColorIO-Config-ACES CG and Studio Transforms - v2 - Studio Config - Mapping.csv index 0284a93..f4abe0d 100644 --- a/opencolorio_config_aces/config/studio/generate/resources/OpenColorIO-Config-ACES CG and Studio Transforms - v2 - Studio Config - Mapping.csv +++ b/opencolorio_config_aces/config/studio/generate/resources/OpenColorIO-Config-ACES CG and Studio Transforms - v2 - Studio Config - Mapping.csv @@ -70,7 +70,7 @@ Ordering,Colorspace,Legacy,ACEStransformID,CLFtransformID,Interface,BuiltinTrans 410,Utility - Linear - Rec.2020,TRUE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Linear_Rec2020:1.0,ColorSpace,,"lin_rec2020,lin_rec2020_scene",scene-linear,"file-io,texture" 410,Utility - Linear - Rec.709,TRUE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Linear_Rec709:1.0,ColorSpace,,"lin_rec709,lin_rec709_scene,lin_srgb,Utility - Linear - sRGB",scene-linear,"file-io,working-space,texture" 410,Utility - Linear - RIMM ROMM (ProPhoto),TRUE,,,ColorSpace,,"lin_prophoto,lin_rimm",scene-linear,file-io -420,CIE XYZ-D65 - Scene-referred,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_CIE-XYZ-D65-Scene-referred:1.0,ColorSpace,,"lin_ciexyzd65_scene,CIE-XYZ-D65 - Scene-referred",scene-linear,file-io +420,CIE XYZ-D65 - Scene-referred,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_CIE_XYZ-D65-Scene-referred:1.0,ColorSpace,,lin_ciexyzd65_scene,scene-linear,file-io 420,Gamma 2.2 Encoded AdobeRGB,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.2_Encoded_AdobeRGB:1.0,ColorSpace,,"adobergb,g22_adobergb_scene",sdr-video,"file-io,texture" 420,Gamma 2.2 Encoded AP1,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.2_Encoded_AP1:1.0,ColorSpace,,"g22_ap1,Gamma 2.2 AP1 - Texture,g22_ap1_tx",sdr-video,"file-io,texture" 420,Gamma 2.4 Encoded Rec.709,FALSE,,urn:aswf:ocio:transformId:1.0:OCIO:Utility:AP0_to_Gamma2.4_Encoded_Rec709:1.0,ColorSpace,,"g24_rec709,rec709_display,Utility - Rec.709 - Display,Gamma 2.4 Rec.709 - Texture,g24_rec709_tx",sdr-video,"file-io,texture"