Skip to content

Commit e71d924

Browse files
KelSolaarKelSolaar
authored
PR: "aces-dev" Reference Config Generator (#5)
* Fix various tasks. Signed-off-by: Thomas Mansencal <[email protected]> * Ensure that graph node source and target attributes are predictable. Signed-off-by: Thomas Mansencal <[email protected]> * Improve "CTL" transform description parsing. Signed-off-by: Thomas Mansencal <[email protected]> * Add basic config generator objects. Signed-off-by: Thomas Mansencal <[email protected]> * Add initial "aces-dev" reference config generator. Signed-off-by: Thomas Mansencal <[email protected]> * Ensure that "ColorSpace" names for ACES look LMTs have sensible names. Signed-off-by: Thomas Mansencal <[email protected]> * Add "opencolorio_config_aces.conversion_path" definition. Signed-off-by: Thomas Mansencal <[email protected]> * Update various docstrings. Signed-off-by: Thomas Mansencal <[email protected]> * Rename various objects using "transformation" to "transform". Signed-off-by: Thomas Mansencal <[email protected]> * Implement support for "BuiltinTransform". Signed-off-by: Thomas Mansencal <[email protected]> * Fix issue with "ACEScc" not receiving a "BuiltinTransform". Signed-off-by: Thomas Mansencal <[email protected]>
1 parent 05ea1be commit e71d924

File tree

17 files changed

+1749
-70
lines changed

17 files changed

+1749
-70
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,8 @@ build
99
dist
1010
docs/_build
1111
docs/generated
12+
opencolorio_config_aces/config/generation/config-v1.ocio
13+
opencolorio_config_aces/config/generation/config-v2.ocio
1214
opencolorio_config_aces/config/reference/discover/aces_conversion_graph.png
15+
opencolorio_config_aces/config/reference/generate/config-aces-v2.ocio
1316
poetry.lock

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ repos:
88
rev: v0.23.0
99
hooks:
1010
- id: yapf
11-
exclude: aces/config/reference/aces-dev
11+
exclude: opencolorio_config_aces/config/reference/aces-dev

‎docs/opencolorio_config_aces.config.rst‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,21 @@ Generation
77

88
.. contents:: :local:
99

10+
Config Generation Common Objects
11+
--------------------------------
12+
13+
``opencolorio_config_aces``
14+
15+
.. currentmodule:: opencolorio_config_aces
16+
17+
.. autosummary::
18+
:toctree: generated/
19+
20+
colorspace_factory
21+
ConfigData
22+
validate_config
23+
generate_config
24+
1025
Reference Configuration
1126
-----------------------
1227

@@ -37,7 +52,22 @@ Reference Configuration
3752
:toctree: generated/
3853

3954
build_aces_conversion_graph
55+
node_to_builtin_transform
4056
node_to_ctl_transform
4157
ctl_transform_to_node
4258
filter_nodes
59+
conversion_path
4360
plot_aces_conversion_graph
61+
62+
*aces-dev* Reference Config Generator
63+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
64+
65+
``opencolorio_config_aces``
66+
67+
.. currentmodule:: opencolorio_config_aces
68+
69+
.. autosummary::
70+
:toctree: generated/
71+
72+
classify_aces_ctl_transforms
73+
generate_config_aces

‎docs/opencolorio_config_aces.utilities.rst‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,15 @@ Common
1717
.. autosummary::
1818
:toctree: generated/
1919

20+
DocstringDict
2021
first_item
2122
common_ancestor
2223
paths_common_ancestor
2324
vivification
2425
vivified_to_dict
2526
message_box
27+
is_opencolorio_installed
28+
REQUIREMENTS_TO_CALLABLE
29+
required
30+
is_string
31+
is_iterable

‎opencolorio_config_aces/__init__.py‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,13 @@
2020
"""
2121

2222
from .config import (
23-
discover_aces_ctl_transforms, classify_aces_ctl_transforms,
24-
unclassify_ctl_transforms, filter_ctl_transforms, print_aces_taxonomy,
25-
build_aces_conversion_graph, node_to_ctl_transform, ctl_transform_to_node,
26-
filter_nodes, plot_aces_conversion_graph)
23+
ConfigData, build_aces_conversion_graph, classify_aces_ctl_transforms,
24+
ctl_transform_to_colorspace, colorspace_factory, conversion_path,
25+
ctl_transform_to_node, discover_aces_ctl_transforms, filter_ctl_transforms,
26+
filter_nodes, generate_config, generate_config_aces,
27+
node_to_builtin_transform, node_to_colorspace, node_to_ctl_transform,
28+
plot_aces_conversion_graph, print_aces_taxonomy, unclassify_ctl_transforms,
29+
validate_config)
2730

2831
__author__ = 'OpenColorIO Contributors'
2932
__copyright__ = 'Copyright Contributors to the OpenColorIO Project.'
@@ -33,11 +36,14 @@
3336
__status__ = 'Production'
3437

3538
__all__ = [
36-
'discover_aces_ctl_transforms', 'classify_aces_ctl_transforms',
37-
'unclassify_ctl_transforms', 'filter_ctl_transforms',
38-
'print_aces_taxonomy', 'build_aces_conversion_graph',
39-
'node_to_ctl_transform', 'ctl_transform_to_node', 'filter_nodes',
40-
'plot_aces_conversion_graph'
39+
'ConfigData', 'build_aces_conversion_graph',
40+
'classify_aces_ctl_transforms', 'colorspace_factory', 'conversion_path',
41+
'ctl_transform_to_colorspace', 'ctl_transform_to_node',
42+
'discover_aces_ctl_transforms', 'filter_ctl_transforms', 'filter_nodes',
43+
'generate_config', 'generate_config_aces', 'node_to_builtin_transform',
44+
'node_to_colorspace', 'node_to_ctl_transform',
45+
'plot_aces_conversion_graph', 'print_aces_taxonomy',
46+
'unclassify_ctl_transforms', 'validate_config'
4147
]
4248

4349
__application_name__ = 'OpenColorIO Configuration for ACES'

‎opencolorio_config_aces/config/__init__.py‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,24 @@
11
# SPDX-License-Identifier: BSD-3-Clause
22
# Copyright Contributors to the OpenColorIO Project.
33

4+
from .generation import (ConfigData, colorspace_factory, generate_config,
5+
validate_config)
46
from .reference import (
5-
discover_aces_ctl_transforms, classify_aces_ctl_transforms,
6-
unclassify_ctl_transforms, filter_ctl_transforms, print_aces_taxonomy,
7-
build_aces_conversion_graph, node_to_ctl_transform, ctl_transform_to_node,
8-
filter_nodes, plot_aces_conversion_graph)
7+
build_aces_conversion_graph, classify_aces_ctl_transforms, conversion_path,
8+
ctl_transform_to_colorspace, ctl_transform_to_node,
9+
discover_aces_ctl_transforms, filter_ctl_transforms, filter_nodes,
10+
generate_config_aces, node_to_builtin_transform, node_to_colorspace,
11+
node_to_ctl_transform, plot_aces_conversion_graph, print_aces_taxonomy,
12+
unclassify_ctl_transforms)
913

1014
__all__ = [
11-
'discover_aces_ctl_transforms', 'classify_aces_ctl_transforms',
12-
'unclassify_ctl_transforms', 'filter_ctl_transforms',
13-
'print_aces_taxonomy', 'build_aces_conversion_graph',
14-
'node_to_ctl_transform', 'ctl_transform_to_node', 'filter_nodes',
15-
'plot_aces_conversion_graph'
15+
'ConfigData', 'colorspace_factory', 'generate_config', 'validate_config'
16+
]
17+
__all__ += [
18+
'build_aces_conversion_graph', 'classify_aces_ctl_transforms',
19+
'conversion_path', 'ctl_transform_to_colorspace', 'ctl_transform_to_node',
20+
'discover_aces_ctl_transforms', 'filter_ctl_transforms', 'filter_nodes',
21+
'generate_config_aces', 'node_to_builtin_transform', 'node_to_colorspace',
22+
'node_to_ctl_transform', 'plot_aces_conversion_graph',
23+
'print_aces_taxonomy', 'unclassify_ctl_transforms'
1624
]

‎opencolorio_config_aces/config/generation/__init__.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# SPDX-License-Identifier: BSD-3-Clause
2+
# Copyright Contributors to the OpenColorIO Project.
3+
4+
from .common import (colorspace_factory, ConfigData, validate_config,
5+
generate_config)
6+
7+
__all__ = [
8+
'colorspace_factory', 'ConfigData', 'validate_config', 'generate_config'
9+
]

0 commit comments

Comments
 (0)