Skip to content

Commit 9a4ef98

Browse files
KelSolaarKelSolaar
authored
PR: "ACES" Computer Graphics Config Generator (#23)
* Implement full-dict config data representation and serialization support. Signed-off-by: Thomas Mansencal <[email protected]> * Implement initial support for "CG" config. Signed-off-by: Thomas Mansencal <[email protected]> * Fix deprecated call in "conf.py" file. Signed-off-by: Thomas Mansencal <[email protected]> * Fix incorrect "opencolorio_config_aces.config.reference.discover.classify.CTLTransformPair.__str__" method output. Signed-off-by: Thomas Mansencal <[email protected]> * Remove unused "opencolorio_config_aces.config.reference.discover.classify.CTLTransform" class attributes. Signed-off-by: Thomas Mansencal <[email protected]> * Update various docstrings. Signed-off-by: Thomas Mansencal <[email protected]> * Implement initial support for "CLF" generation. Signed-off-by: Thomas Mansencal <[email protected]> * Add "Colour" to optional requirements. Signed-off-by: Thomas Mansencal <[email protected]> * Add "jsonpickle" to requirements. Signed-off-by: Thomas Mansencal <[email protected]> * Update "requirements.txt" file. Signed-off-by: Thomas Mansencal <[email protected]> * Use "jsonpickle" for serialisation. Signed-off-by: Thomas Mansencal <[email protected]> * Implement support for "CG" config generation via mapping file. Signed-off-by: Thomas Mansencal <[email protected]>
1 parent 1c7c13e commit 9a4ef98

39 files changed

+3005
-298
lines changed

‎docs/conf.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,5 +356,5 @@ def _autodoc_process_docstring(app, what, name, obj, options, lines):
356356

357357

358358
def setup(app):
359-
app.add_stylesheet('custom.css')
359+
app.add_css_file('custom.css')
360360
app.connect('autodoc-process-docstring', _autodoc_process_docstring)

‎docs/opencolorio_config_aces.clf.rst‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
..
2+
SPDX-License-Identifier: CC-BY-4.0
3+
Copyright Contributors to the OpenColorIO Project.
4+
5+
Common LUT Format Discovery
6+
~~~~~~~~~~~~~~~~~~~~~~~~~~~
7+
8+
``opencolorio_config_aces``
9+
10+
.. currentmodule:: opencolorio_config_aces
11+
12+
.. autosummary::
13+
:toctree: generated/
14+
15+
classify_clf_transforms
16+
discover_clf_transforms,
17+
filter_clf_transforms
18+
print_clf_taxonomy,
19+
unclassify_clf_transforms
20+
21+
Common LUT Format Generation
22+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
23+
24+
``opencolorio_config_aces``
25+
26+
.. currentmodule:: opencolorio_config_aces
27+
28+
.. autosummary::
29+
:toctree: generated/
30+
31+
generate_clf

‎docs/opencolorio_config_aces.config.rst‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,15 @@ Config Generation Common Objects
1717
.. autosummary::
1818
:toctree: generated/
1919

20+
produce_transform
21+
transform_factory
22+
group_transform_factory
2023
colorspace_factory
2124
view_transform_factory
2225
look_factory
2326
ConfigData
27+
deserialize_config_data
28+
serialize_config_data
2429
validate_config
2530
generate_config
2631

@@ -73,3 +78,25 @@ Reference Configuration
7378

7479
ColorspaceDescriptionStyle
7580
generate_config_aces
81+
82+
*ACES* Computer Graphics (CG) Config Generator
83+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
84+
85+
``opencolorio_config_aces``
86+
87+
.. currentmodule:: opencolorio_config_aces
88+
89+
.. autosummary::
90+
:toctree: generated/
91+
92+
generate_config_cg
93+
94+
*ACES* Studio Config Generator
95+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
96+
97+
``opencolorio_config_aces``
98+
99+
.. currentmodule:: opencolorio_config_aces
100+
101+
.. autosummary::
102+
:toctree: generated/

‎docs/opencolorio_config_aces.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@ OpenColorIO Configuration for ACES
88
.. toctree::
99
:maxdepth: 3
1010

11+
opencolorio_config_aces.clf
1112
opencolorio_config_aces.config
1213
opencolorio_config_aces.utilities

‎docs/opencolorio_config_aces.utilities.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ Common
2424
vivification
2525
vivified_to_dict
2626
message_box
27+
is_colour_installed
28+
is_networkx_installed
2729
is_opencolorio_installed
2830
REQUIREMENTS_TO_CALLABLE
2931
required

‎opencolorio_config_aces/__init__.py‎

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,23 @@
1515
1616
Sub-packages
1717
------------
18+
- clf: Objects implementing support for *CLF* transforms generation.
1819
- config: Objects implementing support for the *OCIO* config generation.
1920
- utilities: Various utilities and data structures.
2021
"""
2122

2223
from .config import (
2324
ConfigData, build_aces_conversion_graph, classify_aces_ctl_transforms,
2425
colorspace_factory, conversion_path, ctl_transform_to_node,
25-
discover_aces_ctl_transforms, filter_ctl_transforms, filter_nodes,
26-
generate_config, generate_config_aces, node_to_ctl_transform,
27-
plot_aces_conversion_graph, print_aces_taxonomy, unclassify_ctl_transforms,
28-
validate_config, view_transform_factory)
26+
deserialize_config_data, discover_aces_ctl_transforms,
27+
filter_ctl_transforms, filter_nodes, generate_config, generate_config_aces,
28+
generate_config_cg, group_transform_factory, look_factory,
29+
produce_transform, node_to_ctl_transform, plot_aces_conversion_graph,
30+
print_aces_taxonomy, serialize_config_data, transform_factory,
31+
unclassify_ctl_transforms, validate_config, view_transform_factory)
32+
from .clf import (classify_clf_transforms, discover_clf_transforms,
33+
filter_clf_transforms, generate_clf, print_clf_taxonomy,
34+
unclassify_clf_transforms)
2935

3036
__author__ = 'OpenColorIO Contributors'
3137
__copyright__ = 'Copyright Contributors to the OpenColorIO Project.'
@@ -37,12 +43,19 @@
3743
__all__ = [
3844
'ConfigData', 'build_aces_conversion_graph',
3945
'classify_aces_ctl_transforms', 'colorspace_factory', 'conversion_path',
40-
'ctl_transform_to_node', 'discover_aces_ctl_transforms',
41-
'filter_ctl_transforms', 'filter_nodes', 'generate_config',
42-
'generate_config_aces', 'node_to_ctl_transform',
43-
'plot_aces_conversion_graph', 'print_aces_taxonomy',
46+
'ctl_transform_to_node', 'deserialize_config_data',
47+
'discover_aces_ctl_transforms', 'filter_ctl_transforms', 'filter_nodes',
48+
'generate_config', 'generate_config_aces', 'generate_config_cg',
49+
'group_transform_factory', 'look_factory', 'produce_transform',
50+
'node_to_ctl_transform', 'plot_aces_conversion_graph',
51+
'print_aces_taxonomy', 'serialize_config_data', 'transform_factory',
4452
'unclassify_ctl_transforms', 'validate_config', 'view_transform_factory'
4553
]
54+
__all__ += [
55+
'classify_clf_transforms', 'discover_clf_transforms',
56+
'filter_clf_transforms', 'generate_clf', 'print_clf_taxonomy',
57+
'unclassify_clf_transforms'
58+
]
4659

4760
__application_name__ = 'OpenColorIO Configuration for ACES'
4861

‎opencolorio_config_aces/clf/__init__.py‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# SPDX-License-Identifier: BSD-3-Clause
2+
# Copyright Contributors to the OpenColorIO Project.
3+
4+
from .discover import (discover_clf_transforms, classify_clf_transforms,
5+
unclassify_clf_transforms, filter_clf_transforms,
6+
print_clf_taxonomy)
7+
8+
from .transforms import matrix_3x3_to_4x4, generate_clf
9+
10+
__all__ = [
11+
'discover_clf_transforms', 'classify_clf_transforms',
12+
'unclassify_clf_transforms', 'filter_clf_transforms', 'print_clf_taxonomy'
13+
]
14+
__all__ += ['matrix_3x3_to_4x4', 'generate_clf']

‎opencolorio_config_aces/clf/discover/__init__.py‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# SPDX-License-Identifier: BSD-3-Clause
2+
# Copyright Contributors to the OpenColorIO Project.
3+
4+
from .classify import (discover_clf_transforms, classify_clf_transforms,
5+
unclassify_clf_transforms, filter_clf_transforms,
6+
print_clf_taxonomy)
7+
8+
__all__ = [
9+
'discover_clf_transforms', 'classify_clf_transforms',
10+
'unclassify_clf_transforms', 'filter_clf_transforms', 'print_clf_taxonomy'
11+
]

0 commit comments

Comments
 (0)