projects / OpenColorIO-Configs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d5c4b36)
Improve case consistency on various definitions.
authorThomas Mansencal <thomas.mansencal@gmail.com>
Fri, 31 Jul 2015 09:20:42 +0000 (21:20 +1200)
committerThomas Mansencal <thomas.mansencal@gmail.com>
Fri, 31 Jul 2015 09:20:42 +0000 (21:20 +1200)
aces_1.0.0/python/aces_ocio/aces_config.py patch | blob | history
aces_1.0.0/python/aces_ocio/colorspaces/red.py patch | blob | history
aces_1.0.0/python/aces_ocio/colorspaces/sony.py patch | blob | history

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 380cdfb..0565ac8 100755 (executable)
--- a/aces_1.0.0/python/aces_ocio/aces_config.py
+++ b/aces_1.0.0/python/aces_ocio/aces_config.py
@@ -41,7 +41,7 @@ __all__ = ['ACES_OCIO_CTL_DIRECTORY_ENVIRON',
            'ACES_OCIO_CONFIGURATION_DIRECTORY_ENVIRON',
            'set_config_default_roles',
            'write_config',
-           'generate_OCIO_transform',
+           'generate_ocio_transform',
            'add_colorspace_aliases',
            'add_look',
            'integrate_looks_into_views',
@@ -160,7 +160,7 @@ def write_config(config, config_path, sanity_check=True):
         fp.write(config.serialize())
 
 
-def generate_OCIO_transform(transforms):
+def generate_ocio_transform(transforms):
     """
     Object description.
 
@@ -339,7 +339,7 @@ def add_colorspace_aliases(config,
 
         if colorspace.to_reference_transforms:
             print('\tGenerating To-Reference transforms')
-            ocio_transform = generate_OCIO_transform(
+            ocio_transform = generate_ocio_transform(
                 [{'type': 'colorspace',
                   'src': colorspace.name,
                   'dst': reference_colorspace.name,
@@ -350,7 +350,7 @@ def add_colorspace_aliases(config,
 
         if colorspace.from_reference_transforms:
             print('\tGenerating From-Reference transforms')
-            ocio_transform = generate_OCIO_transform(
+            ocio_transform = generate_ocio_transform(
                 [{'type': 'colorspace',
                   'src': reference_colorspace.name,
                   'dst': colorspace.name,
@@ -405,7 +405,7 @@ def add_look(config,
     if look_cccid:
         keys['cccid'] = look_cccid
 
-    ocio_transform = generate_OCIO_transform([keys])
+    ocio_transform = generate_ocio_transform([keys])
     ocio_look.setTransform(ocio_transform)
 
     config.addLook(ocio_look)
@@ -644,7 +644,7 @@ def create_config(config_data,
 
         if colorspace.to_reference_transforms:
             print('\tGenerating To-Reference transforms')
-            ocio_transform = generate_OCIO_transform(
+            ocio_transform = generate_ocio_transform(
                 colorspace.to_reference_transforms)
             ocio_colorspace.setTransform(
                 ocio_transform,
@@ -652,7 +652,7 @@ def create_config(config_data,
 
         if colorspace.from_reference_transforms:
             print('\tGenerating From-Reference transforms')
-            ocio_transform = generate_OCIO_transform(
+            ocio_transform = generate_ocio_transform(
                 colorspace.from_reference_transforms)
             ocio_colorspace.setTransform(
                 ocio_transform,
diff --git a/aces_1.0.0/python/aces_ocio/colorspaces/red.py b/aces_1.0.0/python/aces_ocio/colorspaces/red.py
index ef274a1..f93153c 100644 (file)
--- a/aces_1.0.0/python/aces_ocio/colorspaces/red.py
+++ b/aces_1.0.0/python/aces_ocio/colorspaces/red.py
@@ -22,11 +22,11 @@ __maintainer__ = 'ACES Developers'
 __email__ = 'aces@oscars.org'
 __status__ = 'Production'
 
-__all__ = ['create_RED_log_film',
+__all__ = ['create_red_log_film',
            'create_colorspaces']
 
 
-def create_RED_log_film(gamut,
+def create_red_log_film(gamut,
                         transfer_function,
                         lut_directory,
                         lut_resolution_1d,
@@ -168,65 +168,65 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
     colorspaces = []
 
     # Full conversion
-    RED_log_film_dragon = create_RED_log_film(
+    red_log_film_dragon = create_red_log_film(
         'DRAGONcolor',
         'REDlogFilm',
         lut_directory,
         lut_resolution_1d,
         ['rlf_dgn'])
-    colorspaces.append(RED_log_film_dragon)
+    colorspaces.append(red_log_film_dragon)
 
-    RED_log_film_dragon2 = create_RED_log_film(
+    red_log_film_dragon2 = create_red_log_film(
         'DRAGONcolor2',
         'REDlogFilm',
         lut_directory,
         lut_resolution_1d,
         ['rlf_dgn2'])
-    colorspaces.append(RED_log_film_dragon2)
+    colorspaces.append(red_log_film_dragon2)
 
-    RED_log_film_color = create_RED_log_film(
+    red_log_film_color = create_red_log_film(
         'REDcolor',
         'REDlogFilm',
         lut_directory,
         lut_resolution_1d,
         ['rlf_rc'])
-    colorspaces.append(RED_log_film_color)
+    colorspaces.append(red_log_film_color)
 
-    RED_log_film_color2 = create_RED_log_film(
+    red_log_film_color2 = create_red_log_film(
         'REDcolor2',
         'REDlogFilm',
         lut_directory,
         lut_resolution_1d,
         ['rlf_rc2'])
-    colorspaces.append(RED_log_film_color2)
+    colorspaces.append(red_log_film_color2)
 
-    RED_log_film_color3 = create_RED_log_film(
+    red_log_film_color3 = create_red_log_film(
         'REDcolor3',
         'REDlogFilm',
         lut_directory,
         lut_resolution_1d,
         ['rlf_rc3'])
-    colorspaces.append(RED_log_film_color3)
+    colorspaces.append(red_log_film_color3)
 
-    RED_log_film_color4 = create_RED_log_film(
+    red_log_film_color4 = create_red_log_film(
         'REDcolor4',
         'REDlogFilm',
         lut_directory,
         lut_resolution_1d,
         ['rlf_rc4'])
-    colorspaces.append(RED_log_film_color4)
+    colorspaces.append(red_log_film_color4)
 
     # Linearization only
-    RED_log_film = create_RED_log_film(
+    red_log_film = create_red_log_film(
         '',
         'REDlogFilm',
         lut_directory,
         lut_resolution_1d,
         ['crv_rlf'])
-    colorspaces.append(RED_log_film)
+    colorspaces.append(red_log_film)
 
     # Primaries only
-    RED_dragon = create_RED_log_film(
+    RED_dragon = create_red_log_film(
         'DRAGONcolor',
         '',
         lut_directory,
@@ -234,7 +234,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
         ['lin_dgn'])
     colorspaces.append(RED_dragon)
 
-    RED_dragon2 = create_RED_log_film(
+    RED_dragon2 = create_red_log_film(
         'DRAGONcolor2',
         '',
         lut_directory,
@@ -242,7 +242,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
         ['lin_dgn2'])
     colorspaces.append(RED_dragon2)
 
-    RED_color = create_RED_log_film(
+    RED_color = create_red_log_film(
         'REDcolor',
         '',
         lut_directory,
@@ -250,7 +250,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
         ['lin_rc'])
     colorspaces.append(RED_color)
 
-    RED_color2 = create_RED_log_film(
+    RED_color2 = create_red_log_film(
         'REDcolor2',
         '',
         lut_directory,
@@ -258,7 +258,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
         ['lin_rc2'])
     colorspaces.append(RED_color2)
 
-    RED_color3 = create_RED_log_film(
+    RED_color3 = create_red_log_film(
         'REDcolor3',
         '',
         lut_directory,
@@ -266,7 +266,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
         ['lin_rc3'])
     colorspaces.append(RED_color3)
 
-    RED_color4 = create_RED_log_film(
+    RED_color4 = create_red_log_film(
         'REDcolor4',
         '',
         lut_directory,
diff --git a/aces_1.0.0/python/aces_ocio/colorspaces/sony.py b/aces_1.0.0/python/aces_ocio/colorspaces/sony.py
index a3990c3..a19d2e5 100644 (file)
--- a/aces_1.0.0/python/aces_ocio/colorspaces/sony.py
+++ b/aces_1.0.0/python/aces_ocio/colorspaces/sony.py
@@ -22,11 +22,11 @@ __maintainer__ = 'ACES Developers'
 __email__ = 'aces@oscars.org'
 __status__ = 'Production'
 
-__all__ = ['create_S_Log',
+__all__ = ['create_s_log',
            'create_colorspaces']
 
 
-def create_S_Log(gamut,
+def create_s_log(gamut,
                  transfer_function,
                  lut_directory,
                  lut_resolution_1d,
@@ -232,7 +232,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
     colorspaces = []
 
     # *S-Log1*
-    s_log1_s_gamut = create_S_Log(
+    s_log1_s_gamut = create_s_log(
         'S-Gamut',
         'S-Log1',
         lut_directory,
@@ -241,7 +241,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
     colorspaces.append(s_log1_s_gamut)
 
     # *S-Log2*
-    s_log2_s_gamut = create_S_Log(
+    s_log2_s_gamut = create_s_log(
         'S-Gamut',
         'S-Log2',
         lut_directory,
@@ -249,7 +249,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
         ['slog2_sgamut'])
     colorspaces.append(s_log2_s_gamut)
 
-    s_log2_s_gamut_daylight = create_S_Log(
+    s_log2_s_gamut_daylight = create_s_log(
         'S-Gamut Daylight',
         'S-Log2',
         lut_directory,
@@ -257,7 +257,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
         ['slog2_sgamutday'])
     colorspaces.append(s_log2_s_gamut_daylight)
 
-    s_log2_s_gamut_tungsten = create_S_Log(
+    s_log2_s_gamut_tungsten = create_s_log(
         'S-Gamut Tungsten',
         'S-Log2',
         lut_directory,
@@ -266,7 +266,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
     colorspaces.append(s_log2_s_gamut_tungsten)
 
     # *S-Log3*
-    s_log3_s_gamut3Cine = create_S_Log(
+    s_log3_s_gamut3Cine = create_s_log(
         'S-Gamut3.Cine',
         'S-Log3',
         lut_directory,
@@ -274,7 +274,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
         ['slog3_sgamutcine'])
     colorspaces.append(s_log3_s_gamut3Cine)
 
-    s_log3_s_gamut3 = create_S_Log(
+    s_log3_s_gamut3 = create_s_log(
         'S-Gamut3',
         'S-Log3',
         lut_directory,
@@ -283,7 +283,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
     colorspaces.append(s_log3_s_gamut3)
 
     # Linearization Only
-    s_log1 = create_S_Log(
+    s_log1 = create_s_log(
         '',
         'S-Log1',
         lut_directory,
@@ -291,7 +291,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
         ['crv_slog1'])
     colorspaces.append(s_log1)
 
-    s_log2 = create_S_Log(
+    s_log2 = create_s_log(
         '',
         'S-Log2',
         lut_directory,
@@ -299,7 +299,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
         ['crv_slog2'])
     colorspaces.append(s_log2)
 
-    s_log3 = create_S_Log(
+    s_log3 = create_s_log(
         '',
         'S-Log3',
         lut_directory,
@@ -308,7 +308,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
     colorspaces.append(s_log3)
 
     # Primaries Only
-    s_gamut = create_S_Log(
+    s_gamut = create_s_log(
         'S-Gamut',
         '',
         lut_directory,
@@ -316,7 +316,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
         ['lin_sgamut'])
     colorspaces.append(s_gamut)
 
-    s_gamut_daylight = create_S_Log(
+    s_gamut_daylight = create_s_log(
         'S-Gamut Daylight',
         '',
         lut_directory,
@@ -324,7 +324,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
         ['lin_sgamutday'])
     colorspaces.append(s_gamut_daylight)
 
-    s_gamut_tungsten = create_S_Log(
+    s_gamut_tungsten = create_s_log(
         'S-Gamut Tungsten',
         '',
         lut_directory,
@@ -332,7 +332,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
         ['lin_sgamuttung'])
     colorspaces.append(s_gamut_tungsten)
 
-    s_gamut3Cine = create_S_Log(
+    s_gamut3Cine = create_s_log(
         'S-Gamut3.Cine',
         '',
         lut_directory,
@@ -340,7 +340,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
         ['lin_sgamut3cine'])
     colorspaces.append(s_gamut3Cine)
 
-    s_gamut3 = create_S_Log(
+    s_gamut3 = create_s_log(
         'S-Gamut3',
         '',
         lut_directory,
ACES support for GH4 (based on: https://github.com/hpd/OpenColorIO-Configs.git)