Skip to content

Commit

Permalink
Adsk Contrib - RB-2.0 release (#1289)
Browse files Browse the repository at this point in the history
* Adsk Contrib - Shader textures now available via Python (#1268) 7110425

Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>

* Add roles to API and fixes (#1267) Bernard Lefebvre 8cf0211

Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>

* Adsk Contrib - Python repr and LogCameraTransform fixes (#1270) c033d11

Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>

* Fix issue #1262 (#1271) d51962a

Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>

* Use OIIO-provided CMake find module (#1266) Michael Dolan <michdolan@gmail.com> 8774ebf

Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>

* Transform Python Binding Fix (#1277) Frankie Eder <frankaeder@gmail.com> c324ba5

Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>

* Adsk Contrib - Avoid NaN values in certain Lut1D arrays (#1272) 50e5d8b

Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>

* Adsk Contrib - More python tests and bindings fixes (#1274) 574ccd8

Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>

* Restructure PyOpenColorIO, complete PyGpuShaderDesc (#1275) Michael Dolan <michdolan@gmail.com> 081b8de

Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>

* Add UNIFORM_FLOAT3, setStrictParsingEnabled to PyOpenColorIO (#1280) Michael Dolan <michdolan@gmail.com> 73be29a

Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>

* Adsk Contrib - Add new ACES builtin transforms (#1281) doug-walker <43830961+doug-walker@users.noreply.github.com> 8339210

Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>

* Release v2 (#1279)  6d46d84

Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>

* Test forgot to declare logger and fails if numpy is missing (#1290) 87f09ec

Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>

* Fix applyRGB (#1291)  bc88857

Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>
  • Loading branch information
BernardLefebvre authored Jan 28, 2021
1 parent d71748b commit cb5e319
Show file tree
Hide file tree
Showing 250 changed files with 5,769 additions and 2,214 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ project(OpenColorIO
LANGUAGES CXX C)

# "dev", "beta1", rc1", etc or "" for an official release.
set(OpenColorIO_VERSION_RELEASE_TYPE "rc1")
set(OpenColorIO_VERSION_RELEASE_TYPE "")

enable_testing()

Expand Down
21 changes: 21 additions & 0 deletions docs/api/constants.rst
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,27 @@ External Plugins (currently known)::
this is a 1D HDR to LDR allocation. It is normally combined with
another display transform in the host app for preview.

.. data:: PyOpenColorIO.ROLE_RENDERING

The rendering role may be used to identify a specific color space to be
used by CGI renderers. This is typically a scene-linear space but the
primaries also matter since they influence the resulting color, especially
in areas of indirect illumination.

.. data:: PyOpenColorIO.ROLE_INTERCHANGE_SCENE

The aces_interchange role is used to specify which color space in the
config implements the standard ACES2065-1 color space (SMPTE ST2065-1).
This may be used when converting scene-referred colors from one config
to another.

.. data:: PyOpenColorIO.ROLE_INTERCHANGE_DISPLAY

The cie_xyz_d65_interchange role is used to specify which color space in
the config implements CIE XYZ colorimetry with the neutral axis at D65.
This may be used when converting display-referred colors from one config
to another.

.. group-tab:: C++

.. doxygengroup:: VarsRoles
Expand Down
5 changes: 5 additions & 0 deletions docs/api/python/frozen/pyopencolorio_allocation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,8 @@
:module: PyOpenColorIO
:value: <Allocation.ALLOCATION_UNKNOWN: 0>


.. py:method:: Allocation.value
:module: PyOpenColorIO
:property:

4 changes: 3 additions & 1 deletion docs/api/python/frozen/pyopencolorio_allocationtransform.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@
2. __init__(self: PyOpenColorIO.AllocationTransform, allocation: PyOpenColorIO.Allocation = <Allocation.ALLOCATION_UNIFORM: 1>, vars: List[float] = [], direction: PyOpenColorIO.TransformDirection = <TransformDirection.TRANSFORM_DIR_FORWARD: 0>) -> None


.. py:method:: AllocationTransform.__str__(self: PyOpenColorIO.AllocationTransform) -> str
.. py:method:: AllocationTransform.__str__()
:module: PyOpenColorIO

Return str(self).


.. py:method:: AllocationTransform.getAllocation(self: PyOpenColorIO.AllocationTransform) -> PyOpenColorIO.Allocation
:module: PyOpenColorIO
Expand Down
4 changes: 4 additions & 0 deletions docs/api/python/frozen/pyopencolorio_baker.rst
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,10 @@
.. py:class:: FormatIterator
:module: PyOpenColorIO.Baker

Iterator on LUT baker Formats.

Each item is a tuple containing format name and format extension.


.. py:method:: FormatIterator.__getitem__(self: PyOpenColorIO.Baker.FormatIterator, arg0: int) -> tuple
:module: PyOpenColorIO.Baker
Expand Down
5 changes: 5 additions & 0 deletions docs/api/python/frozen/pyopencolorio_bitdepth.rst
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,8 @@
:module: PyOpenColorIO
:value: <BitDepth.BIT_DEPTH_UNKNOWN: 0>


.. py:method:: BitDepth.value
:module: PyOpenColorIO
:property:

4 changes: 3 additions & 1 deletion docs/api/python/frozen/pyopencolorio_builtintransform.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@
2. __init__(self: PyOpenColorIO.BuiltinTransform, style: str = 'IDENTITY', direction: PyOpenColorIO.TransformDirection = <TransformDirection.TRANSFORM_DIR_FORWARD: 0>) -> None


.. py:method:: BuiltinTransform.__str__(self: PyOpenColorIO.BuiltinTransform) -> str
.. py:method:: BuiltinTransform.__str__()
:module: PyOpenColorIO

Return str(self).


.. py:method:: BuiltinTransform.getDescription(self: PyOpenColorIO.BuiltinTransform) -> str
:module: PyOpenColorIO
Expand Down
5 changes: 5 additions & 0 deletions docs/api/python/frozen/pyopencolorio_cdlstyle.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,8 @@
:module: PyOpenColorIO
:value: <CDLStyle.CDL_NO_CLAMP: 1>


.. py:method:: CDLStyle.value
:module: PyOpenColorIO
:property:

8 changes: 6 additions & 2 deletions docs/api/python/frozen/pyopencolorio_cdltransform.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,18 @@

Load the CDL from the src .cdl, .cc, or .ccc file.


.. note::
The cccid can be the ID of a CDL or the index of the CDL (as string). If cccid is NULL or empty the first CDL is returned. The cccid is case-sensitive. The src must be an absolute path reference, no relative directory or envvar resolution is performed. Throws if file does not contain any CDL or if the specified cccid is not found.


.. py:method:: CDLTransform.CreateGroupFromFile(src: str) -> OpenColorIO_v2_0rc1::GroupTransform
.. py:method:: CDLTransform.CreateGroupFromFile(src: str) -> PyOpenColorIO.GroupTransform
:module: PyOpenColorIO
:staticmethod:

Load all of the CDLs in a .cdl or .ccc file into a single :ref:`GroupTransform`.


.. note::
This may be useful as a quicker way for applications to check the contents of each of the CDLs. The src must be an absolute path reference, no relative directory or envvar resolution is performed.

Expand All @@ -44,9 +46,11 @@
3. __init__(self: PyOpenColorIO.CDLTransform, slope: List[float[3]] = [1.0, 1.0, 1.0], offset: List[float[3]] = [0.0, 0.0, 0.0], power: List[float[3]] = [1.0, 1.0, 1.0], sat: float = 1.0, id: str = '', description: str = '', direction: PyOpenColorIO.TransformDirection = <TransformDirection.TRANSFORM_DIR_FORWARD: 0>) -> None


.. py:method:: CDLTransform.__str__(self: PyOpenColorIO.CDLTransform) -> str
.. py:method:: CDLTransform.__str__()
:module: PyOpenColorIO

Return str(self).


.. py:method:: CDLTransform.equals(self: PyOpenColorIO.CDLTransform, other: PyOpenColorIO.CDLTransform) -> bool
:module: PyOpenColorIO
Expand Down
5 changes: 5 additions & 0 deletions docs/api/python/frozen/pyopencolorio_channelordering.rst
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,8 @@
:module: PyOpenColorIO
:value: <ChannelOrdering.CHANNEL_ORDERING_RGBA: 0>


.. py:method:: ChannelOrdering.value
:module: PyOpenColorIO
:property:

36 changes: 22 additions & 14 deletions docs/api/python/frozen/pyopencolorio_colorspace.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,6 @@
:module: PyOpenColorIO


.. py:class:: ColorSpace.ColorSpaceAliasIterator
:module: PyOpenColorIO


.. py:method:: ColorSpace.ColorSpaceAliasIterator.__init__(*args, **kwargs)
:module: PyOpenColorIO

Initialize self. See help(type(self)) for accurate signature.


.. py:method:: ColorSpace.__init__(*args, **kwargs)
:module: PyOpenColorIO

Expand All @@ -29,10 +19,6 @@
3. __init__(self: PyOpenColorIO.ColorSpace, referenceSpace: PyOpenColorIO.ReferenceSpaceType = <ReferenceSpaceType.REFERENCE_SPACE_SCENE: 0>, name: str = '', aliases: List[str] = [], family: str = '', encoding: str = '', equalityGroup: str = '', description: str = '', bitDepth: PyOpenColorIO.BitDepth = <BitDepth.BIT_DEPTH_UNKNOWN: 0>, isData: bool = False, allocation: PyOpenColorIO.Allocation = <Allocation.ALLOCATION_UNIFORM: 1>, allocationVars: List[float] = [], toReference: PyOpenColorIO.Transform = None, fromReference: PyOpenColorIO.Transform = None, categories: List[str] = []) -> None


.. py:method:: ColorSpace.__str__(self: PyOpenColorIO.ColorSpace) -> str
:module: PyOpenColorIO


.. py:method:: ColorSpace.addAlias(self: PyOpenColorIO.ColorSpace, alias: str) -> None
:module: PyOpenColorIO

Expand All @@ -44,6 +30,7 @@

Add a single category.


.. note::
Will do nothing if the category already exists.

Expand Down Expand Up @@ -135,6 +122,7 @@

Remove a category.


.. note::
Will do nothing if the category is missing.

Expand Down Expand Up @@ -204,3 +192,23 @@
.. py:method:: ColorSpaceCategoryIterator.__next__(self: PyOpenColorIO.ColorSpace.ColorSpaceCategoryIterator) -> str
:module: PyOpenColorIO.ColorSpace


.. py:class:: ColorSpaceAliasIterator
:module: PyOpenColorIO.ColorSpace


.. py:method:: ColorSpaceAliasIterator.__getitem__(self: PyOpenColorIO.ColorSpace.ColorSpaceAliasIterator, arg0: int) -> str
:module: PyOpenColorIO.ColorSpace


.. py:method:: ColorSpaceAliasIterator.__iter__(self: PyOpenColorIO.ColorSpace.ColorSpaceAliasIterator) -> PyOpenColorIO.ColorSpace.ColorSpaceAliasIterator
:module: PyOpenColorIO.ColorSpace


.. py:method:: ColorSpaceAliasIterator.__len__(self: PyOpenColorIO.ColorSpace.ColorSpaceAliasIterator) -> int
:module: PyOpenColorIO.ColorSpace


.. py:method:: ColorSpaceAliasIterator.__next__(self: PyOpenColorIO.ColorSpace.ColorSpaceAliasIterator) -> str
:module: PyOpenColorIO.ColorSpace

5 changes: 5 additions & 0 deletions docs/api/python/frozen/pyopencolorio_colorspacedirection.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,8 @@
:module: PyOpenColorIO
:value: <ColorSpaceDirection.COLORSPACE_DIR_TO_REFERENCE: 0>


.. py:method:: ColorSpaceDirection.value
:module: PyOpenColorIO
:property:

Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@
:module: PyOpenColorIO


.. py:method:: ColorSpaceMenuHelper.__str__(self: PyOpenColorIO.ColorSpaceMenuHelper) -> str
:module: PyOpenColorIO


.. py:method:: ColorSpaceMenuHelper.getDescription(self: PyOpenColorIO.ColorSpaceMenuHelper, index: int) -> str
:module: PyOpenColorIO

Expand All @@ -31,7 +27,7 @@
:module: PyOpenColorIO


.. py:method:: ColorSpaceMenuHelper.getHierarchyLevels(self: PyOpenColorIO.ColorSpaceMenuHelper, index: int) -> OpenColorIO_v2_0rc1::PyIterator<std::shared_ptr<OpenColorIO_v2_0rc1::ColorSpaceMenuHelper>,0,unsigned __int64>
.. py:method:: ColorSpaceMenuHelper.getHierarchyLevels(self: PyOpenColorIO.ColorSpaceMenuHelper, index: int) -> PyOpenColorIO.ColorSpaceMenuHelper.ColorSpaceLevelIterator
:module: PyOpenColorIO


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,6 @@
5) If AddColorSpace has been used to add any additional items, these are appended to the final list.


.. py:class:: ColorSpaceMenuParameters.AddedColorSpaceIterator
:module: PyOpenColorIO


.. py:method:: ColorSpaceMenuParameters.AddedColorSpaceIterator.__init__(*args, **kwargs)
:module: PyOpenColorIO

Initialize self. See help(type(self)) for accurate signature.


.. py:method:: ColorSpaceMenuParameters.__init__(*args, **kwargs)
:module: PyOpenColorIO

Expand All @@ -66,10 +56,6 @@
2. __init__(self: PyOpenColorIO.ColorSpaceMenuParameters, config: PyOpenColorIO.Config, role: str = '', includeColorSpaces: bool = True, searchReferenceSpaceType: PyOpenColorIO.SearchReferenceSpaceType = <SearchReferenceSpaceType.SEARCH_REFERENCE_SPACE_ALL: 2>, includeNamedTransforms: bool = False, appCategories: str = '', encodings: str = '', userCategories: str = '', includeRoles: bool = False) -> None


.. py:method:: ColorSpaceMenuParameters.__str__(self: PyOpenColorIO.ColorSpaceMenuParameters) -> str
:module: PyOpenColorIO


.. py:method:: ColorSpaceMenuParameters.addColorSpace(self: PyOpenColorIO.ColorSpaceMenuParameters, colorSpace: str) -> None
:module: PyOpenColorIO

Expand All @@ -85,7 +71,7 @@
:module: PyOpenColorIO


.. py:method:: ColorSpaceMenuParameters.getAddedColorSpaces(self: PyOpenColorIO.ColorSpaceMenuParameters) -> OpenColorIO_v2_0rc1::PyIterator<std::shared_ptr<OpenColorIO_v2_0rc1::ColorSpaceMenuParameters>,0>
.. py:method:: ColorSpaceMenuParameters.getAddedColorSpaces(self: PyOpenColorIO.ColorSpaceMenuParameters) -> PyOpenColorIO.ColorSpaceMenuParameters.AddedColorSpaceIterator
:module: PyOpenColorIO


Expand Down
4 changes: 3 additions & 1 deletion docs/api/python/frozen/pyopencolorio_colorspacetransform.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@
2. __init__(self: PyOpenColorIO.ColorSpaceTransform, src: str = '', dst: str = '', direction: PyOpenColorIO.TransformDirection = <TransformDirection.TRANSFORM_DIR_FORWARD: 0>, dataBypass: bool = True) -> None


.. py:method:: ColorSpaceTransform.__str__(self: PyOpenColorIO.ColorSpaceTransform) -> str
.. py:method:: ColorSpaceTransform.__str__()
:module: PyOpenColorIO

Return str(self).


.. py:method:: ColorSpaceTransform.getDataBypass(self: PyOpenColorIO.ColorSpaceTransform) -> bool
:module: PyOpenColorIO
Expand Down
5 changes: 5 additions & 0 deletions docs/api/python/frozen/pyopencolorio_colorspacevisibility.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,8 @@
:module: PyOpenColorIO
:value: <ColorSpaceVisibility.COLORSPACE_INACTIVE: 1>


.. py:method:: ColorSpaceVisibility.value
:module: PyOpenColorIO
:property:

Loading

0 comments on commit cb5e319

Please sign in to comment.