Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OpenColorIO Properties #103

Merged
merged 35 commits into from
Jul 21, 2024
Merged

OpenColorIO Properties #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
2a7543f
OCIO Properties
john-paulsmith Dec 5, 2022
7e8c002
Made all OCIO properties read only
john-paulsmith Dec 5, 2022
e1beee2
Extended OCIO properties
john-paulsmith Feb 7, 2023
e2800d3
Revised Preferred Colourspace + doc improvement
john-paulsmith Feb 7, 2023
8cbc93e
Reworked the OCIO extension to support ACES
john-paulsmith Feb 8, 2023
b07f15f
Moved the colourspace API to its own header
john-paulsmith Mar 3, 2023
3a8e7ee
Colourspace defs based on OCIO ACES Studio config
john-paulsmith Apr 30, 2023
559e0ba
Improve the readability of roles
john-paulsmith Apr 30, 2023
caf96af
Allow a list of preferred colourspaces
john-paulsmith Apr 30, 2023
132d027
Added missing colourspace name definitions
john-paulsmith May 2, 2023
f69bfec
Added the concept of core colourspaces and display names
john-paulsmith Apr 13, 2024
ff9b225
Workaround for missing srgb_tx encoding
john-paulsmith Apr 14, 2024
122c534
Fix core colourspace labelling logic
john-paulsmith Apr 14, 2024
e0cca3c
Multiple improvements from code review
john-paulsmith May 9, 2024
0c8339c
Reorganised core/non-core colourspaces
john-paulsmith May 10, 2024
8e06771
Colourspace cross-referencing
john-paulsmith Jun 4, 2024
ce4acf1
Full, Basic and Core colour management styles
john-paulsmith Jun 4, 2024
a768098
Corrections from code review
john-paulsmith Jun 4, 2024
01a3ca8
Added basic colourspaces instead of roles
john-paulsmith Jul 1, 2024
88f35d0
Output colourspace negotiation action
john-paulsmith Jul 2, 2024
af85e80
Improvements to the docs and OCIO config
john-paulsmith Jul 10, 2024
9f0533b
Support versioning native styles
john-paulsmith Jul 11, 2024
b3caf78
Allow use of basic colourspaces in OCIO mode
john-paulsmith Jul 12, 2024
be3de0e
Minor doc fix
john-paulsmith Jul 12, 2024
9a7eec4
Doc clarifications for OCIO mode
john-paulsmith Jul 12, 2024
3316c2e
Add Colourspace example
garyo Apr 30, 2024
7f5598f
WIP: colorspace example updates
garyo May 7, 2024
396fe61
WIP: colourspace example now draws text with image info & colourspaces
garyo May 9, 2024
edce85d
Add params to set preferred colourspaces
garyo May 9, 2024
9a9748c
Update colorspace example: fixes from Phil Barrett
garyo May 16, 2024
c3ecca0
Rename ColorSpace to ColourSpace for consistency
garyo May 16, 2024
e23ef6f
Fix a couple of Info.plist CFBundleExecutable strings
garyo May 16, 2024
6e95184
Add Emacs .dir-locals.el to set our C/C++ indentation standard
garyo May 16, 2024
63d3227
Update to latest spec
garyo Jul 12, 2024
52a0ac5
Automatically include the latest config
john-paulsmith Jul 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .dir-locals.el
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
;;; Directory Local Variables -*- no-byte-compile: t -*-
;;; For more information see (info "(emacs) Directory Variables")

;; for C and C++, we use 2 space offset, no tabs
((prog-mode . ((c-basic-offset . 2)
(indent-tabs-mode . nil)))
5 changes: 4 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ else()
LANGUAGES CXX) # no CUDA
endif()
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_STATIC_LIBRARY_PREFIX "lib")
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
add_definitions(-D_HAS_AUTO_PTR_ETC)
if(APPLE)
set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")
Expand Down Expand Up @@ -62,6 +63,8 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake ${CMAKE_BINARY_DIR})
# Conan packages
find_package(EXPAT)
find_package(opengl_system REQUIRED)
find_package(cimg REQUIRED)
find_package(spdlog REQUIRED)

# Macros
include(OpenFX)
Expand Down
3 changes: 3 additions & 0 deletions Examples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ set(OFX_SUPPORT_HEADER_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../Support/include")
set(PLUGINS
Basic
ChoiceParams
ColourSpace
Custom
DepthConverter
Invert
Expand All @@ -27,3 +28,5 @@ endforeach()

target_link_libraries(example-OpenGL PRIVATE opengl::opengl)
target_link_libraries(example-Custom PRIVATE opengl::opengl)
target_link_libraries(example-ColourSpace PRIVATE cimg::cimg)
target_link_libraries(example-ColourSpace PRIVATE spdlog::spdlog_header_only)
20 changes: 20 additions & 0 deletions Examples/ColourSpace/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>colourspace.ofx</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>0.0.1d1</string>
<key>CSResourcesFileMapped</key>
<true/>
</dict>
</plist>
Loading
Loading