Skip to content

Commit 382539c

Browse files
committed
C++ SDK 2026.0.0
1 parent 91b1982 commit 382539c

File tree

133 files changed

+2852
-3401
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+2852
-3401
lines changed

plugins/example.assets/source/asset_api_examples/examples_assets.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ maxon::Result<maxon::AssetDescription> CreateNodeTemplateAsset(
142142
// Store the group node as an asset and replace that group node by its asset and commit.
143143
maxon::AssetDescription assetDescription;
144144
maxon::Id assetId = maxon::AssetInterface::MakeUuid("node", false) iferr_return;
145-
assetDescription = graph.MoveToAsset(groupNode, repository, assetId, {}) iferr_return;
145+
assetDescription = graph.MoveToAsset(groupNode, repository, assetId, false, {}) iferr_return;
146146
transaction.Commit() iferr_return;
147147

148148
// Set the name and category of the asset.

plugins/example.assets/source/dots_preset_asset_impl/examples_dots.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "maxon/asset_metaproperties.h"
1818
#include "maxon/imageurlcache.h"
1919
#include "maxon/lib_math.h"
20+
#include "maxon/progress.h"
2021

2122
#include "dots_datatype.h"
2223
#include "dots_preset_asset.h"
@@ -173,7 +174,7 @@ maxon::Result<void> UpdatePreviewThumbnail(
173174
{
174175
assetDescription.StoreUrlMetaData(maxon::ASSETMETADATA::ASSET_PREVIEWIMAGEURL,
175176
maxon::Url(), maxon::AssetMetaData::KIND::PERSISTENT) iferr_return;
176-
maxon::ImageUrlCacheInterface::InvalidateCache(oldPreviewUrl) iferr_return;
177+
maxon::AsyncResourceCacheTypes::ImageBaseRefCache().InvalidateCache(oldPreviewUrl) iferr_return;
177178
}
178179

179180
// Update the asset metadata for the new preview url.

plugins/example.image/source/example_image_layers_area.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ static const cinema::Int32 g_buffer_line_size = g_buffer_width * g_buffer_channe
4646
static const cinema::Int32 g_buffer_size = g_buffer_line_size * g_buffer_height;
4747

4848
// The title used by the dialog and command, as well as the IDs of the dialog gadgets.
49-
#define CMD_TITLE "C++ SDK: Image Layers Area"_s
50-
#define ID_GRP_BUTTONS 1000
51-
#define ID_UA_IMAGE_LAYERS 2000
52-
#define ID_BTN_ADD 2001
53-
#define ID_BTN_REMOVE 2002
54-
#define ID_BTN_SAVE 2003
49+
static constexpr const cinema::Char* CMD_TITLE = "C++ SDK: Image Layers Area";
50+
static constexpr const cinema::Int32 ID_GRP_BUTTONS = 1000;
51+
static constexpr const cinema::Int32 ID_UA_IMAGE_LAYERS = 2000;
52+
static constexpr const cinema::Int32 ID_BTN_ADD = 2001;
53+
static constexpr const cinema::Int32 ID_BTN_REMOVE = 2002;
54+
static constexpr const cinema::Int32 ID_BTN_SAVE = 2003;
5555

5656
/// We need this because IMAGEINTERPOLATIONMODE is currently not exposed in the public API, I
5757
/// will fix this in a future release.
@@ -397,7 +397,7 @@ class ImageLayersAreaDialog : public GeDialog
397397

398398
// Set the title and the margin between the group and the border and between items in the
399399
// group. We are defining here the implicitly existing outmost group.
400-
SetTitle(CMD_TITLE);
400+
SetTitle(String(CMD_TITLE));
401401
result &= GroupBorderSpace(margin, margin, margin, margin);
402402
result &= GroupSpace(margin, margin);
403403

@@ -524,7 +524,7 @@ cinema::Bool RegisterImageLayersAreaExample();
524524
cinema::Bool RegisterImageLayersAreaExample()
525525
{
526526
return cinema::RegisterCommandPlugin(
527-
g_image_layers_command, CMD_TITLE, 0, nullptr,
528-
"Opens a dialog holding a custom UI element that stacks multiple bitmaps with transparencies."_s,
527+
g_image_layers_command, maxon::String(CMD_TITLE), 0, nullptr,
528+
"Opens a dialog holding a custom UI element that stacks multiple bitmaps with transparencies."_s,
529529
cinema::ImageLayersAreaCommand::Alloc());
530-
}
530+
}

plugins/example.image/source/examples_ocio.cpp

Lines changed: 60 additions & 78 deletions
Large diffs are not rendered by default.

plugins/example.main/res/c4d_symbols.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#ifndef __C4D_SYMBOLS__
2+
#define __C4D_SYMBOLS__
3+
14
enum
25
{
36
// string table definitions
@@ -154,6 +157,7 @@ enum
154157
IDS_OBJECTDATA_GETSETDPARAMETEREXAMPLE,
155158
IDS_OBJECTDATA_HYPERFILEEXAMPLE,
156159

160+
IDS_OBJECTDATA_CIRCLESHAPE,
157161
IDS_OBJECTDATA_GREEKTEMPLE,
158162
IDS_OBJECTDATA_HEARTSHAPE,
159163
IDS_OBJECTDATA_LATTICEPLANE,
@@ -167,6 +171,11 @@ enum
167171

168172
IDS_MAKECUBE,
169173

174+
// Display control tool.
175+
IDS_DISPLAY_CONTROL_TOOL,
176+
170177
// End of symbol definition
171178
_DUMMY_ELEMENT_
172179
};
180+
181+
#endif // __C4D_SYMBOLS__
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#ifndef OCIRCLESHAPE_H__
2+
#define OCIRCLESHAPE_H__
3+
4+
enum
5+
{
6+
SDK_EXAMPLE_CIRCLESHAPE_RADIUS = 1000,
7+
SDK_EXAMPLE_CIRCLESHAPE_VCOUNT = 1001,
8+
SDK_EXAMPLE_CIRCLESHAPE = 2000
9+
};
10+
11+
#endif // OCIRCLESHAPE_H__
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
CONTAINER ocircleshape
2+
{
3+
NAME ocircleshape;
4+
INCLUDE Obase;
5+
6+
GROUP ID_OBJECTPROPERTIES
7+
{
8+
REAL SDK_EXAMPLE_CIRCLESHAPE_RADIUS { UNIT METER; MIN 0.0; }
9+
LONG SDK_EXAMPLE_CIRCLESHAPE_VCOUNT { MIN 4; MAX 1000; }
10+
}
11+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#ifndef TOOLDISPLAYCONTROL_H__
2+
#define TOOLDISPLAYCONTROL_H__
3+
4+
enum
5+
{
6+
DISPLAYCONTROLTOOL_MODE = 2000,
7+
PER_OBJECT = 0,
8+
PER_VERTEX = 2,
9+
PER_VERTEX_PER_POLYGON = 3
10+
};
11+
12+
#endif // TOOLDISPLAYCONTROL_H__
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
CONTAINER ToolDisplaycontrol
2+
{
3+
NAME ToolDisplaycontrol;
4+
INCLUDE ToolBase;
5+
6+
GROUP MDATA_MAINGROUP
7+
{
8+
GROUP
9+
{
10+
LONG DISPLAYCONTROLTOOL_MODE
11+
{
12+
CYCLE
13+
{
14+
PER_OBJECT;
15+
PER_VERTEX;
16+
PER_VERTEX_PER_POLYGON;
17+
}
18+
}
19+
}
20+
}
21+
}

plugins/example.main/res/nodes/net.maxonexample.nodes_corenodes.module.db.ru-RU.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)