Skip to content

Commit f5ca104

Browse files
cozdasdoug-walker
cozdas
and
doug-walker
authored
Adsk Contrib - Adding built-in ACES 2.0 configs (#2193)
* - Adding the latest WIP built-in configs (https://github.com/AcademySoftwareFoundation/OpenColorIO-Config-ACES/actions/runs/17850187967) Signed-off-by: cuneyt.ozdas <cuneyt.ozdas@autodesk.com> * - Removing the getDefaultBuiltinConfigName() function which was marked as deprecated in v2.3. Similar functionality is now offered by ResolveConfigPath("ocio://default"). - Updated the python binding and the tests accordingly. Signed-off-by: cuneyt.ozdas <cuneyt.ozdas@autodesk.com> * - New configs fresh from the oven. Signed-off-by: cuneyt.ozdas <cuneyt.ozdas@autodesk.com> * - Updating the built-in configs from the PR's latest CI run, #420 ( https://github.com/AcademySoftwareFoundation/OpenColorIO-Config-ACES/actions/runs/18078552508 ) Signed-off-by: cuneyt.ozdas <cuneyt.ozdas@autodesk.com> * - Fix a copy-paste typo in the comments Signed-off-by: cuneyt.ozdas <cuneyt.ozdas@autodesk.com> --------- Signed-off-by: cuneyt.ozdas <cuneyt.ozdas@autodesk.com> Co-authored-by: Doug Walker <doug.walker@autodesk.com>
1 parent 23d0179 commit f5ca104

File tree

14 files changed

+2346
-103
lines changed

14 files changed

+2346
-103
lines changed

‎include/OpenColorIO/OpenColorIO.h‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,8 @@ extern OCIOEXPORT void SetCurrentConfig(const ConstConfigRcPtr & config);
219219
* "ocio://studio-config-latest" will point to newer versions of those configs. Therefore, it is
220220
* recommended that application developers not save those strings and instead save the string that
221221
* refers to the current version of that config. That way, it's guaranteed that there will be no
222-
* change of behavior in the future. For example, as of OCIO 2.4, "ocio://default" should be saved
223-
* as "ocio://cg-config-v2.2.0_aces-v1.3_ocio-v2.4".
222+
* change of behavior in the future. For example, as of OCIO 2.5, "ocio://default" should be saved
223+
* as "ocio://cg-config-v4.0.0_aces-v2.0_ocio-v2.5".
224224
*
225225
* Note that there is no validation done on the path. That is left to the application since
226226
* typically the application will load the config before attempting to save its path
@@ -378,11 +378,13 @@ class OCIOEXPORT Config
378378
* "studio-config-v1.0.0_aces-v1.3_ocio-v2.1"
379379
* "studio-config-v2.1.0_aces-v1.3_ocio-v2.3"
380380
* "studio-config-v2.2.0_aces-v1.3_ocio-v2.4"
381+
* "studio-config-v4.0.0_aces-v2.0_ocio-v2.5"
381382
*
382383
* ACES CG config, basic color spaces for computer graphics apps:
383384
* "cg-config-v1.0.0_aces-v1.3_ocio-v2.1"
384385
* "cg-config-v2.1.0_aces-v1.3_ocio-v2.3"
385386
* "cg-config-v2.2.0_aces-v1.3_ocio-v2.4"
387+
* "cg-config-v4.0.0_aces-v2.0_ocio-v2.5"
386388
*
387389
* More information is available at:
388390
* %https://github.com/AcademySoftwareFoundation/OpenColorIO-Config-ACES
@@ -4014,9 +4016,6 @@ class OCIOEXPORT BuiltinConfigRegistry
40144016
*/
40154017
virtual bool isBuiltinConfigRecommended(size_t configIndex) const = 0;
40164018

4017-
// Return the full forward-compatible name of the default built-in config.
4018-
OCIO_DEPRECATED("This was marked as deprecated starting in v2.3, please use ResolveConfigPath(\"ocio://default\").")
4019-
virtual const char * getDefaultBuiltinConfigName() const = 0;
40204019
protected:
40214020
BuiltinConfigRegistry() = default;
40224021
virtual ~BuiltinConfigRegistry() = default;

‎src/OpenColorIO/builtinconfigs/BuiltinConfigRegistry.cpp‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,11 @@
1818

1919
static constexpr char OUT_OF_RANGE_EXCEPTION_TEXT[] = "Config index is out of range.";
2020

21-
// TODO: Remove once getDefaultBuiltinConfigName is removed.
22-
static constexpr char DEFAULT_BUILTIN_CONFIG[] = "cg-config-v2.2.0_aces-v1.3_ocio-v2.4";
23-
2421
// These are used for ResolveConfigPath function and we need to return a variable that still exists
2522
// once the function finishes since we are returning a const char *.
26-
static constexpr char DEFAULT_BUILTIN_CONFIG_URI[] = "ocio://cg-config-v2.2.0_aces-v1.3_ocio-v2.4";
27-
static constexpr char LATEST_CG_BUILTIN_CONFIG_URI[] = "ocio://cg-config-v2.2.0_aces-v1.3_ocio-v2.4";
28-
static constexpr char LATEST_STUDIO_BUILTIN_CONFIG_URI[] = "ocio://studio-config-v2.2.0_aces-v1.3_ocio-v2.4";
23+
static constexpr char DEFAULT_BUILTIN_CONFIG_URI[] = "ocio://cg-config-v4.0.0_aces-v2.0_ocio-v2.5";
24+
static constexpr char LATEST_CG_BUILTIN_CONFIG_URI[] = "ocio://cg-config-v4.0.0_aces-v2.0_ocio-v2.5";
25+
static constexpr char LATEST_STUDIO_BUILTIN_CONFIG_URI[] = "ocio://studio-config-v4.0.0_aces-v2.0_ocio-v2.5";
2926

3027
static constexpr char BUILTIN_DEFAULT_NAME[] = "default";
3128
static constexpr char BUILTIN_LATEST_CG_NAME[] = "cg-config-latest";
@@ -168,9 +165,4 @@ bool BuiltinConfigRegistryImpl::isBuiltinConfigRecommended(size_t configIndex) c
168165
return m_builtinConfigs[configIndex].m_isRecommended;
169166
}
170167

171-
const char * BuiltinConfigRegistryImpl::getDefaultBuiltinConfigName() const
172-
{
173-
return DEFAULT_BUILTIN_CONFIG;
174-
}
175-
176168
} // namespace OCIO_NAMESPACE

‎src/OpenColorIO/builtinconfigs/BuiltinConfigRegistry.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ using BuiltinConfigs = std::vector<BuiltinConfigData>;
9393
/// Throws for illegal index.
9494
bool isBuiltinConfigRecommended(size_t configIndex) const override;
9595

96-
/// Get the default recommended built-in config.
97-
const char * getDefaultBuiltinConfigName() const override;
9896
private:
9997
BuiltinConfigs m_builtinConfigs;
10098
};

‎src/OpenColorIO/builtinconfigs/CG.cpp.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@
1111
constexpr char CG_CONFIG_V100_ACES_V13_OCIO_V21[] = { @cg-config-v1.0.0_aces-v1.3_ocio-v2.1@ };
1212
constexpr char CG_CONFIG_V210_ACES_V13_OCIO_V23[] = { @cg-config-v2.1.0_aces-v1.3_ocio-v2.3@ };
1313
constexpr char CG_CONFIG_V220_ACES_V13_OCIO_V24[] = { @cg-config-v2.2.0_aces-v1.3_ocio-v2.4@ };
14+
constexpr char CG_CONFIG_V400_ACES_V20_OCIO_V25[] = { @cg-config-v4.0.0_aces-v2.0_ocio-v2.5@ };

‎src/OpenColorIO/builtinconfigs/CGConfig.cpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,13 @@ void Register(BuiltinConfigRegistryImpl & registry) noexcept
3838
"cg-config-v2.2.0_aces-v1.3_ocio-v2.4",
3939
"Academy Color Encoding System - CG Config [COLORSPACES v2.2.0] [ACES v1.3] [OCIO v2.4]",
4040
CG_CONFIG_V220_ACES_V13_OCIO_V24,
41+
false
42+
);
43+
44+
registry.addBuiltin(
45+
"cg-config-v4.0.0_aces-v2.0_ocio-v2.5",
46+
"Academy Color Encoding System - CG Config [COLORSPACES v4.0.0] [ACES v2.0] [OCIO v2.5]",
47+
CG_CONFIG_V400_ACES_V20_OCIO_V25,
4148
true
4249
);
4350
}

‎src/OpenColorIO/builtinconfigs/Studio.cpp.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,7 @@ constexpr char STUDIO_CONFIG_V210_ACES_V13_OCIO_V23[] = {
1515
constexpr char STUDIO_CONFIG_V220_ACES_V13_OCIO_V24[] = {
1616
@studio-config-v2.2.0_aces-v1.3_ocio-v2.4@
1717
};
18+
19+
constexpr char STUDIO_CONFIG_V400_ACES_V20_OCIO_V25[] = {
20+
@studio-config-v4.0.0_aces-v2.0_ocio-v2.5@
21+
};

‎src/OpenColorIO/builtinconfigs/StudioConfig.cpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,13 @@ void Register(BuiltinConfigRegistryImpl & registry) noexcept
3838
"studio-config-v2.2.0_aces-v1.3_ocio-v2.4",
3939
"Academy Color Encoding System - Studio Config [COLORSPACES v2.2.0] [ACES v1.3] [OCIO v2.4]",
4040
STUDIO_CONFIG_V220_ACES_V13_OCIO_V24,
41+
false
42+
);
43+
44+
registry.addBuiltin(
45+
"studio-config-v4.0.0_aces-v2.0_ocio-v2.5",
46+
"Academy Color Encoding System - Studio Config [COLORSPACES v4.0.0] [ACES v2.0] [OCIO v2.5]",
47+
STUDIO_CONFIG_V400_ACES_V20_OCIO_V25,
4148
true
4249
);
4350
}

0 commit comments

Comments
 (0)