Skip to content

Adsk Contrib - Adding the new cg and studio configs (issue #1999) #2039

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

Merged
doug-walker merged 5 commits into from
Sep 26, 2024
Merged

Adsk Contrib - Adding the new cg and studio configs (issue #1999) #2039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
525e6c1
For issue #1999 adding the new cg and studio configs.
cozdas Sep 17, 2024
5724398
- minor white-space fixes.
cozdas Sep 17, 2024
3b974f2
renaming P3 display scene referred aliases:
cozdas Sep 19, 2024
96daf2a
Make CIE-XYZ Scene-referred inactive
doug-walker Sep 24, 2024
963cf91
Merge branch 'main' into ozdasc/main/BuiltInConfigsFor_v2.4
doug-walker Sep 26, 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: 4 additions & 2 deletions include/OpenColorIO/OpenColorIO.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,8 @@ extern OCIOEXPORT void SetCurrentConfig(const ConstConfigRcPtr & config);
* "ocio://studio-config-latest" will point to newer versions of those configs. Therefore, it is
* recommended that application developers not save those strings and instead save the string that
* refers to the current version of that config. That way, it's guaranteed that there will be no
* change of behavior in the future. For example, as of OCIO 2.3, "ocio://default" should be saved
* as "ocio://cg-config-v2.1.0_aces-v1.3_ocio-v2.3".
* change of behavior in the future. For example, as of OCIO 2.4, "ocio://default" should be saved
* as "ocio://cg-config-v2.2.0_aces-v1.3_ocio-v2.4".
*
* Note that there is no validation done on the path. That is left to the application since
* typically the application will load the config before attempting to save its path
Expand Down Expand Up @@ -376,10 +376,12 @@ class OCIOEXPORT Config
* ACES Studio config, contains a more complete collection of color spaces and displays:
* "studio-config-v1.0.0_aces-v1.3_ocio-v2.1"
* "studio-config-v2.1.0_aces-v1.3_ocio-v2.3"
* "studio-config-v2.2.0_aces-v1.3_ocio-v2.4"
*
* ACES CG config, basic color spaces for computer graphics apps:
* "cg-config-v1.0.0_aces-v1.3_ocio-v2.1"
* "cg-config-v2.1.0_aces-v1.3_ocio-v2.3"
* "cg-config-v2.2.0_aces-v1.3_ocio-v2.4"
*
* More information is available at:
* %https://github.com/AcademySoftwareFoundation/OpenColorIO-Config-ACES
Expand Down
8 changes: 4 additions & 4 deletions src/OpenColorIO/builtinconfigs/BuiltinConfigRegistry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
static constexpr char OUT_OF_RANGE_EXCEPTION_TEXT[] = "Config index is out of range.";

// TODO: Remove once getDefaultBuiltinConfigName is removed.
static constexpr char DEFAULT_BUILTIN_CONFIG[] = "cg-config-v2.1.0_aces-v1.3_ocio-v2.3";
static constexpr char DEFAULT_BUILTIN_CONFIG[] = "cg-config-v2.2.0_aces-v1.3_ocio-v2.4";

// These are used for ResolveConfigPath function and we need to return a variable that still exists
// once the function finishes since we are returning a const char *.
static constexpr char DEFAULT_BUILTIN_CONFIG_URI[] = "ocio://cg-config-v2.1.0_aces-v1.3_ocio-v2.3";
static constexpr char LATEST_CG_BUILTIN_CONFIG_URI[] = "ocio://cg-config-v2.1.0_aces-v1.3_ocio-v2.3";
static constexpr char LATEST_STUDIO_BUILTIN_CONFIG_URI[] = "ocio://studio-config-v2.1.0_aces-v1.3_ocio-v2.3";
static constexpr char DEFAULT_BUILTIN_CONFIG_URI[] = "ocio://cg-config-v2.2.0_aces-v1.3_ocio-v2.4";
static constexpr char LATEST_CG_BUILTIN_CONFIG_URI[] = "ocio://cg-config-v2.2.0_aces-v1.3_ocio-v2.4";
static constexpr char LATEST_STUDIO_BUILTIN_CONFIG_URI[] = "ocio://studio-config-v2.2.0_aces-v1.3_ocio-v2.4";

static constexpr char BUILTIN_DEFAULT_NAME[] = "default";
static constexpr char BUILTIN_LATEST_CG_NAME[] = "cg-config-latest";
Expand Down
1 change: 1 addition & 0 deletions src/OpenColorIO/builtinconfigs/CG.cpp.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@

constexpr char CG_CONFIG_V100_ACES_V13_OCIO_V21[] = { @cg-config-v1.0.0_aces-v1.3_ocio-v2.1@ };
constexpr char CG_CONFIG_V210_ACES_V13_OCIO_V23[] = { @cg-config-v2.1.0_aces-v1.3_ocio-v2.3@ };
constexpr char CG_CONFIG_V220_ACES_V13_OCIO_V24[] = { @cg-config-v2.2.0_aces-v1.3_ocio-v2.4@ };
7 changes: 7 additions & 0 deletions src/OpenColorIO/builtinconfigs/CGConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ void Register(BuiltinConfigRegistryImpl & registry) noexcept
"cg-config-v2.1.0_aces-v1.3_ocio-v2.3",
"Academy Color Encoding System - CG Config [COLORSPACES v2.0.0] [ACES v1.3] [OCIO v2.3]",
CG_CONFIG_V210_ACES_V13_OCIO_V23,
false
);

registry.addBuiltin(
"cg-config-v2.2.0_aces-v1.3_ocio-v2.4",
"Academy Color Encoding System - CG Config [COLORSPACES v2.2.0] [ACES v1.3] [OCIO v2.4]",
CG_CONFIG_V220_ACES_V13_OCIO_V24,
true
);
}
Expand Down
3 changes: 3 additions & 0 deletions src/OpenColorIO/builtinconfigs/Studio.cpp.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@ constexpr char STUDIO_CONFIG_V210_ACES_V13_OCIO_V23[] = {
@studio-config-v2.1.0_aces-v1.3_ocio-v2.3@
};

constexpr char STUDIO_CONFIG_V220_ACES_V13_OCIO_V24[] = {
@studio-config-v2.2.0_aces-v1.3_ocio-v2.4@
};
7 changes: 7 additions & 0 deletions src/OpenColorIO/builtinconfigs/StudioConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ void Register(BuiltinConfigRegistryImpl & registry) noexcept
"studio-config-v2.1.0_aces-v1.3_ocio-v2.3",
"Academy Color Encoding System - Studio Config [COLORSPACES v2.0.0] [ACES v1.3] [OCIO v2.3]",
STUDIO_CONFIG_V210_ACES_V13_OCIO_V23,
false
);

registry.addBuiltin(
"studio-config-v2.2.0_aces-v1.3_ocio-v2.4",
"Academy Color Encoding System - Studio Config [COLORSPACES v2.2.0] [ACES v1.3] [OCIO v2.4]",
STUDIO_CONFIG_V220_ACES_V13_OCIO_V24,
true
);
}
Expand Down
Loading