18 Commits
Author SHA1 Message Date
Rémi AchardandPatrick Hodoul 8bf3773f9e Add Gamut Compress implementation (#1404)
* Initial Gamut Compress implementation

Signed-off-by: Rémi Achard <remiachard@gmail.com>

* Add NaN checks back and refactor GPU shader

Signed-off-by: Rémi Achard <remiachard@gmail.com>

* Precompute y intersect for CPU Op

Signed-off-by: Rémi Achard <remiachard@gmail.com>

* Refactor parameter bound check

Signed-off-by: Rémi Achard <remiachard@gmail.com>

* Fix ocioperf GPU shader creation issue

Raising "Dynamic property already here" exception

Signed-off-by: Rémi Achard <remiachard@gmail.com>

* Code cleanup, address reviews

Signed-off-by: Rémi Achard <remiachard@gmail.com>

* Rename BuiltIn and FixedFunction transforms

Signed-off-by: Rémi Achard <remiachard@gmail.com>

* Refactor CPU renderer

Signed-off-by: Rémi Achard <remiachard@gmail.com>

* Improve tests

Signed-off-by: Rémi Achard <remiachard@gmail.com>

* Add link to testing dataset generation code

Signed-off-by: Rémi Achard <remiachard@gmail.com>

* Remove wrong comment

Signed-off-by: Rémi Achard <remiachard@gmail.com>

* Remove 1 / power precompute and use std::powf

Signed-off-by: Rémi Achard <remiachard@gmail.com>

* Adjust comment and formating

Signed-off-by: Rémi Achard <remiachard@gmail.com>

* Refactor GPU op

Signed-off-by: Rémi Achard <remiachard@gmail.com>

* Fix std::pow usage

Signed-off-by: Rémi Achard <remiachard@gmail.com>

* Add clamp to limit parameter and remove code duplication in GPU Op

Signed-off-by: Rémi Achard <remiachard@gmail.com>

* Extend parameters limits and move clamp to validate

Signed-off-by: Rémi Achard <remiachard@gmail.com>

Co-authored-by: Patrick Hodoul <patrick.hodoul@autodesk.com>
2021-07-12 15:29:38 -04:00
Patrick Hodoul 8ba05b3989 Adsk Contrib - Add 'deprecated' C++ mechanism & cleanup code (#1372)
* Adsk Contrib - Flag deprecated methods

Signed-off-by: Patrick Hodoul <Patrick.Hodoul@autodesk.com>

* Adjust the documentation

Signed-off-by: Patrick Hodoul <Patrick.Hodoul@autodesk.com>
2021-05-01 08:07:31 -04:00
zachlewisandPatrick Hodoul d9a2a5fa80 Convert public headers to doxygen style (#1315)
* // WIP convert header docs to doxygen style

Signed-off-by: Zach Lewis <zachcanbereached@gmail.com>

* Adjust reference syntax

From ":cpp:func:`Foo::bar`" to "\ref Foo::bar". This seems to pacify some build warnings and clean up the C++ docs a little, but it doesn't seem to improve issue #1265

Signed-off-by: Zach Lewis <zachcanbereached@gmail.com>

* Expose documentation for FileRules, Config, MatrixTransform::setOffset

Signed-off-by: Zach Lewis <zachcanbereached@gmail.com>

* Expose more documentation: Looks, Context Variables

Minor cleanup and adjustments

Signed-off-by: Zach Lewis <zachcanbereached@gmail.com>

* Expose GpuShaderCreator usage example

Promote usage example up to the class-wide documentation
Change numbered list to simple bullets -- there seems to be a problem with orderedlists...?

Signed-off-by: Zach Lewis <zachcanbereached@gmail.com>

* Missed a change

Signed-off-by: Patrick Hodoul <Patrick.Hodoul@autodesk.com>
Signed-off-by: Zach Lewis <zachcanbereached@gmail.com>

* Expose `GpuShaderDesc` fragment shader example code

Not sure why the topmost "border" forward slashes are not rendering...

Signed-off-by: Zach Lewis <zachcanbereached@gmail.com>

* Tidy up conversion to doxygen style

Specify language for code demonstrations

Improve readability of header comments

Clean up "TODO" comments re: moving to rst

Convert remaining comments to RST syntax

Signed-off-by: Zach Lewis <zachcanbereached@gmail.com>

* Rebuild frozen docs

Signed-off-by: Zach Lewis <zachcanbereached@gmail.com>

* Adjust line wrapping in one particularly egregious instance

Signed-off-by: Zach Lewis <zachcanbereached@gmail.com>

Co-authored-by: Patrick Hodoul <Patrick.Hodoul@autodesk.com>
2021-03-27 08:38:30 -04:00
Michael Dolan 73be29a4ba Add UNIFORM_FLOAT3, setStrictParsingEnabled to PyOpenColorIO (#1280)
Signed-off-by: Michael Dolan <michdolan@gmail.com>
2021-01-24 13:45:06 -05:00
Michael Dolan 081b8de4d2 Restructure PyOpenColorIO, complete PyGpuShaderDesc (#1275)
* Restructure Python bindings, Complete PyGpuShaderDesc

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Update frozen docs

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Hide PySystemMonitors symbols

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Fix Python 2 CI failure

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Remove extra sys import

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Fix issue 1278, GroupTransform docs

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Update GroupTransform frozen docs

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Clean up PyGroupTransform class

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Update PyGroupTransform.write, PyConfig.__repr__

Signed-off-by: Michael Dolan <michdolan@gmail.com>
2021-01-22 15:20:49 -05:00
Bernard Lefebvreanddoug-walker 574ccd856e Adsk Contrib - More python tests and bindings fixes (#1274)
* More python tests and fixes:
- re-add commented tests.
- add new tests for FileRules.
- Fix issues outlined by tests.

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

* Adjust baker test to account for small differences

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

* Forgot to remove the complete string test

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

* GroupTranform::write(), new enums, Lut1DTransform python tests

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

* Forgot files

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

Co-authored-by: doug-walker <43830961+doug-walker@users.noreply.github.com>
2021-01-22 12:10:17 -05:00
Bernard LefebvreandPatrick Hodoul d51962acf0 Fix issue #1262 (#1271)
Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>

Co-authored-by: Patrick Hodoul <patrick.hodoul@autodesk.com>
2021-01-21 07:24:05 -05:00
Bernard LefebvreandPatrick Hodoul c033d11ee3 Adsk Contrib - Python repr and LogCameraTransform fixes (#1270)
* Fix issues 1255 & 1256

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

* Revert unwanted rst changes

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

Co-authored-by: Patrick Hodoul <patrick.hodoul@autodesk.com>
2021-01-20 22:07:54 -05:00
Bernard Lefebvre 7110425732 Adsk Contrib - Shader textures now available via Python (#1268)
* Issue 1263

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

* Update python frozen rst file.

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

* Fix python test

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

* Adjust python test

Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>
2021-01-20 12:26:00 -05:00
Bernard Lefebvre d71748bf79 Switch to rc1 (#1253)
Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>
2021-01-07 11:56:54 -05:00
cfc206886d Adsk Contrib - Fix grading inversion (#1245)
* Fix grading op inversion

Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>

* Fix dyn prop equality

Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>

* RGB curve inverse

Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>

* Add curve slopes

Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>

* Add serialization test

Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>

* Add frozen python docs

Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>

* Adjust tests after merge from master (v2 is using from_scene_reference instead of from_reference)

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

Co-authored-by: Patrick Hodoul <patrick.hodoul@autodesk.com>
Co-authored-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>
Co-authored-by: Bernard Lefebvre <37628108+BernardLefebvre@users.noreply.github.com>
2021-01-06 12:31:58 -05:00
Michael DolanandPatrick Hodoul 2655e3e064 Improve PyCPUProcessor NumPy support (#1249)
* Refactor PyCPUProcessor buffer handling

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Install/require NumPy for Python tests

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Document NumPy dependency, fix installation link

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Fix CMake include, Update frozen docs

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Make NumPy optional, improve docs

Signed-off-by: Michael Dolan <michdolan@gmail.com>

Co-authored-by: Patrick Hodoul <patrick.hodoul@autodesk.com>
2021-01-05 18:12:46 -05:00
Bernard LefebvreandPatrick Hodoul 9a05ba1180 Adsk Contrib - Issues 1236 & 1243 (#1244)
* Issue 1243

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

* Update API documentation

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

* Revert most frozen rst files. Delete 2 src rst  files for removed functions

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

* Remove reference to deleted functions from API documentation

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

* Adjust merged files (from_reference did change to from_scene_reference)

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

* Add support for default_view_transform and improve config version handling

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

* Change function parameter name

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

Co-authored-by: Patrick Hodoul <patrick.hodoul@autodesk.com>
2021-01-05 16:39:48 -05:00
Bernard Lefebvre 80aeb723ac Adsk Contrib - Add color space aliases (#1241)
* Get aliases

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

* Add missing cast

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

* Fix other cast

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

* Cast issue continued

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

* Add aliases for named transforms

Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>
2021-01-05 10:00:51 -05:00
Bernard Lefebvreanddoug-walker 298d707a8e Adsk Contrib - Move AppHelpers to core (#1220)
* Move AppHelpers to core

Following up on the request from a recent TSC meeting, this PR moves the App Helpers code into the core library.  This adds no new third-party dependencies.  (The App Helpers code is intended to simplify the work of integrating OCIO into a real-world DCC application.)  Also, following up on another suggestion, the ViewingPipeline class was renamed LegacyViewingPipeline.

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

* Forgot to remove function declaration

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

* Add python exposure

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

* Fixing the build with DOC. Still have to update the rst doc files.

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

* Add filtering options to app helpers as described in issue 1222

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

* Fix merge issue

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

* Add missing destructor

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

* cast issue

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

Co-authored-by: doug-walker <43830961+doug-walker@users.noreply.github.com>
2021-01-04 17:01:19 -05:00
Michael Dolan 1d36d5b70e Fix AutoStride autodoc build (#1246)
Signed-off-by: Michael Dolan <michdolan@gmail.com>
2020-12-26 22:30:31 -05:00
Bernard Lefebvre 844978bbae Adsk Contrib - CDLTransform cleanup (#1221)
* CDLTransform cleanup

Rework CDLTranform interface to implement the proposal made in issue #1155.
CDLTransform can be created from a file and an id.
Files containing several CDL (such as ccc and cdl) can be loaded as GroupTransform to give a way to check the content of such CDLs.
Functions to get/set ID should be replaced by calls on the transform's formatMetadata.
Functions to get/set description have been renamed and documention has been added to explain how formatMetadata can be used.
FormatMetadata has helper functions to get/set common attributes 'name' and 'id'.
Write related functions have been moved to GroupTransform so that a processor does not have to be create to write a transform.

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

* Missing override keyword

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

* FormatMetadata::addChildElement does not return a value, call to back() should have been removed with the return statement.

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

* Update RST files

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

* Revert rst files that have only white space changes or windows related changes

Signed-off-by: Bernard Lefebvre <bernard.lefebvre@autodesk.com>
2020-12-16 19:08:59 -05:00
Michael Dolan 647b3e68b8 API Docs Implementation (#1197)
* Rework API docs and dependencies

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Refine doc generation

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Add frozendoc module for freezing autodoc RST

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Split Python docs between src and frozen

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Add expandvars extension for namespace handling

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Add frozen RST comparison tools

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Improve frozen docs error msg

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Update frozen docs and implement CI test

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Update frozen RST

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Add file diff debug output to diagnose CI failures

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Refine diff debug code

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Add handling for error tolerances when comparing RST

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Include diff in logs, support windoes paths

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Move diff to log, conform path slashes

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Fix warnings, debug windows Python path

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Debug Windows configure file

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Move conf.py configure_file to own statement

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Move path setup to cmake module, print debug messages

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Prevent overwiring configured conf.py

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Debug frozen doc comparison

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Debug RST freeze on Windows

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Debug all RST lines on Windows

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Raise exceptions caught in freeze extension

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Debug windows frozendoc steps

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Fix frozendoc encoding on windows

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Clean up doc configuration

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Disable frozen docs test on macOS and Windows

Signed-off-by: Michael Dolan <michdolan@gmail.com>

* Update frozen API docs

Signed-off-by: Michael Dolan <michdolan@gmail.com>
2020-12-09 00:28:25 -05:00