X-Git-Url: http://users.mur.at/ms/git/gitweb/?a=blobdiff_plain;f=aces_1.0.0%2Fpython%2Faces_ocio%2Faces_config.py;h=0b8a220eb3228fa157cb10b570ad5bb2eb272075;hb=3cabc2f08cb83aef0c5d7a384eabb54da765039a;hp=a955dd85b99c7e80c986f07e08deaddfcec3a641;hpb=259d6c31f1e8fc707642a9da536addc07a77778e;p=OpenColorIO-Configs.git diff --git a/aces_1.0.0/python/aces_ocio/aces_config.py b/aces_1.0.0/python/aces_ocio/aces_config.py index a955dd8..0b8a220 100755 --- a/aces_1.0.0/python/aces_ocio/aces_config.py +++ b/aces_1.0.0/python/aces_ocio/aces_config.py @@ -173,11 +173,6 @@ def generate_OCIO_transform(transforms): Return value description. """ - interpolation_options = { - 'linear': ocio.Constants.INTERP_LINEAR, - 'nearest': ocio.Constants.INTERP_NEAREST, - 'tetrahedral': ocio.Constants.INTERP_TETRAHEDRAL} - direction_options = { 'forward': ocio.Constants.TRANSFORM_DIR_FORWARD, 'inverse': ocio.Constants.TRANSFORM_DIR_INVERSE} @@ -318,7 +313,7 @@ def add_colorspace_aliases(config, if alias_name.lower() == colorspace.name.lower(): print('Skipping alias creation for %s, alias %s, ' 'because lower cased names match' % ( - colorspace.name, alias_name)) + colorspace.name, alias_name)) continue print('Adding alias colorspace space %s, alias to %s' % ( @@ -368,11 +363,9 @@ def add_colorspace_aliases(config, def add_look(config, look, - prefix, custom_lut_dir, reference_name, - config_data, - multiple_displays=False): + config_data): """ Object description. @@ -451,8 +444,7 @@ def add_look(config, print() -def integrate_looks_into_views(config, - looks, +def integrate_looks_into_views(looks, reference_name, config_data, multiple_displays=False): @@ -526,7 +518,7 @@ def integrate_looks_into_views(config, look_names_string = ', '.join(look_names) output_colorspace_c.name = '%s with %s' % ( - output_colorspace.name, look_names_string) + output_colorspace.name, look_names_string) output_colorspace_c.aliases = [ 'out_%s' % compact(output_colorspace_c.name)] @@ -581,10 +573,10 @@ def create_config(config_data, config.setDescription('An ACES config generated from python') # Setting configuration search path. - searchPath = ['luts'] + search_path = ['luts'] if custom_lut_dir: - searchPath.append('custom') - config.setSearchPath(':'.join(searchPath)) + search_path.append('custom') + config.setSearchPath(':'.join(search_path)) # Defining the reference colorspace. reference_data = config_data['referenceColorSpace'] @@ -637,14 +629,12 @@ def create_config(config_data, for look in look_info: add_look(config, look, - prefix, custom_lut_dir, reference_data.name, config_data) # Integrate looks with displays, views - integrate_looks_into_views(config, - look_info, + integrate_looks_into_views(look_info, reference_data.name, config_data, multiple_displays) @@ -893,12 +883,12 @@ def create_config(config_data, if 'with' in view_name: # Integrate looks into view name display_cleaned = '%s with %s' % ( - display_cleaned, look_names) + display_cleaned, look_names) - viewsWithLooksAtEnd = False + views_with_looks_at_end = False # Storing combo of display, view and colorspace name # in a list so we can add them to the end of the list. - if viewsWithLooksAtEnd: + if views_with_looks_at_end: displays_views_colorspaces.append( [single_display_name, display_cleaned, colorspace.name]) @@ -922,7 +912,7 @@ def create_config(config_data, views.append(display_cleaned) # Add to config any display, view combinations that were saved - # for later. This list will be empty unless viewsWithLooksAtEnd is + # for later. This list will be empty unless views_with_looks_at_end is # set to True above. for display_view_colorspace in displays_views_colorspaces: single_display_name, display_cleaned, colorspace_name = ( @@ -1060,9 +1050,9 @@ def generate_LUTs(odt_info, # ------------------------------------------------------------------------- # *ARRI Log-C* to *ACES*. - arri_colorSpaces = arri.create_colorspaces(lut_directory, + arri_colorspaces = arri.create_colorspaces(lut_directory, lut_resolution_1d) - for cs in arri_colorSpaces: + for cs in arri_colorspaces: config_data['colorSpaces'].append(cs) # *Canon-Log* to *ACES*. @@ -1078,9 +1068,9 @@ def generate_LUTs(odt_info, config_data['colorSpaces'].append(cs) # *Panasonic V-Log* to *ACES*. - panasonic_colorSpaces = panasonic.create_colorspaces(lut_directory, + panasonic_colorspaces = panasonic.create_colorspaces(lut_directory, lut_resolution_1d) - for cs in panasonic_colorSpaces: + for cs in panasonic_colorspaces: config_data['colorSpaces'].append(cs) # *RED* colorspaces to *ACES*. @@ -1090,18 +1080,17 @@ def generate_LUTs(odt_info, config_data['colorSpaces'].append(cs) # *S-Log* to *ACES*. - sony_colorSpaces = sony.create_colorspaces(lut_directory, + sony_colorspaces = sony.create_colorspaces(lut_directory, lut_resolution_1d) - for cs in sony_colorSpaces: + for cs in sony_colorspaces: config_data['colorSpaces'].append(cs) # ------------------------------------------------------------------------- # General Color Spaces # ------------------------------------------------------------------------- - general_colorSpaces = general.create_colorspaces(lut_directory, - lut_resolution_1d, - lut_resolution_3d) - for cs in general_colorSpaces: + general_colorspaces = general.create_colorspaces(lut_directory, + lut_resolution_1d) + for cs in general_colorspaces: config_data['colorSpaces'].append(cs) # The *Raw* color space @@ -1121,7 +1110,6 @@ def generate_baked_LUTs(odt_info, shaper_name, baked_directory, config_path, - lut_resolution_1d, lut_resolution_3d, lut_resolution_shaper=1024, prefix=False): @@ -1290,7 +1278,7 @@ def generate_baked_LUTs(odt_info, def create_config_dir(config_directory, - bake_secondary_LUTs=False, + bake_secondary_luts=False, custom_lut_dir=None): """ Object description. @@ -1309,7 +1297,7 @@ def create_config_dir(config_directory, lut_directory = os.path.join(config_directory, 'luts') dirs = [config_directory, lut_directory] - if bake_secondary_LUTs: + if bake_secondary_luts: dirs.extend([os.path.join(config_directory, 'baked'), os.path.join(config_directory, 'baked', 'flame'), os.path.join(config_directory, 'baked', 'photoshop'), @@ -1330,7 +1318,7 @@ def create_ACES_config(aces_ctl_directory, config_directory, lut_resolution_1d=4096, lut_resolution_3d=64, - bake_secondary_LUTs=True, + bake_secondary_luts=True, multiple_displays=False, look_info=None, copy_custom_luts=True, @@ -1359,7 +1347,7 @@ def create_ACES_config(aces_ctl_directory, custom_lut_dir = os.path.join(config_directory, 'custom') lut_directory = create_config_dir(config_directory, - bake_secondary_LUTs, + bake_secondary_luts, custom_lut_dir) odt_info = aces.get_ODTs_info(aces_ctl_directory) @@ -1387,12 +1375,11 @@ def create_ACES_config(aces_ctl_directory, write_config(config, os.path.join(config_directory, 'config.ocio')) - if bake_secondary_LUTs: + if bake_secondary_luts: generate_baked_LUTs(odt_info, shaper_name, os.path.join(config_directory, 'baked'), os.path.join(config_directory, 'config.ocio'), - lut_resolution_1d, lut_resolution_3d, lut_resolution_1d, prefix=prefix_colorspaces_with_family_names)