griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Refactor: Renames the zero extension mode to clip

Browse Source 
This commit renames the `ExtensionMode`'s `Zero` case to `Clip`.

Pull Request: https://projects.blender.org/blender/blender/pulls/143354
This commit is contained in:
Benjamin Beilharz
2025-07-28 10:45:12 +02:00
committed by Omar Emara
parent cf5be88e7f
commit fa2062ee96
8 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/blenloader/intern/versioning_500.cc
View File

@@ -1511,15 +1511,15 @@ void blo_do_versions_500(FileData * /*fd*/, Library * /*lib*/, Main *bmain)
/* Map old wrap axis to new extension mode. */
switch (data->wrap_axis) {
case CMP_NODE_TRANSLATE_REPEAT_AXIS_NONE:
data->extension_x = CMP_NODE_EXTENSION_MODE_ZERO;
data->extension_y = CMP_NODE_EXTENSION_MODE_ZERO;
data->extension_x = CMP_NODE_EXTENSION_MODE_CLIP;
data->extension_y = CMP_NODE_EXTENSION_MODE_CLIP;
break;
case CMP_NODE_TRANSLATE_REPEAT_AXIS_X:
data->extension_x = CMP_NODE_EXTENSION_MODE_REPEAT;
data->extension_y = CMP_NODE_EXTENSION_MODE_ZERO;
data->extension_y = CMP_NODE_EXTENSION_MODE_CLIP;
break;
case CMP_NODE_TRANSLATE_REPEAT_AXIS_Y:
data->extension_x = CMP_NODE_EXTENSION_MODE_ZERO;
data->extension_x = CMP_NODE_EXTENSION_MODE_CLIP;
data->extension_y = CMP_NODE_EXTENSION_MODE_REPEAT;
break;
case CMP_NODE_TRANSLATE_REPEAT_AXIS_XY:
@@ -1569,8 +1569,8 @@ void blo_do_versions_500(FileData * /*fd*/, Library * /*lib*/, Main *bmain)
continue;
}
NodeScaleData *data = static_cast<NodeScaleData *>(node->storage);
data->extension_x = CMP_NODE_EXTENSION_MODE_ZERO;
data->extension_y = CMP_NODE_EXTENSION_MODE_ZERO;
data->extension_x = CMP_NODE_EXTENSION_MODE_CLIP;
data->extension_y = CMP_NODE_EXTENSION_MODE_CLIP;
}
FOREACH_NODETREE_END;
}
@@ -1590,8 +1590,8 @@ void blo_do_versions_500(FileData * /*fd*/, Library * /*lib*/, Main *bmain)
}
NodeTransformData *data = MEM_callocN<NodeTransformData>(__func__);
data->interpolation = node->custom1;
data->extension_x = CMP_NODE_EXTENSION_MODE_ZERO;
data->extension_y = CMP_NODE_EXTENSION_MODE_ZERO;
data->extension_x = CMP_NODE_EXTENSION_MODE_CLIP;
data->extension_y = CMP_NODE_EXTENSION_MODE_CLIP;
node->storage = data;
}
FOREACH_NODETREE_END;

6
source/blender/compositor/COM_domain.hh
View File

@@ -26,7 +26,7 @@ enum class Interpolation : uint8_t {
/* Possible extension modes when computing samples in the domain's exterior. */
enum class ExtensionMode : uint8_t {
/* Areas outside of the image are filled with zero. */
Zero,
Clip,
/* Areas outside of the image are filled with the closest boundary pixel in the image. */
Extend,
/* Areas outside of the image are filled with repetitions of the image. */
@@ -46,9 +46,9 @@ struct RealizationOptions {
* value at those arbitrary locations. */
Interpolation interpolation = Interpolation::Bilinear;
/* The extend mode for the x-axis. Defaults to Zero padding. */
ExtensionMode extension_x = ExtensionMode::Zero;
ExtensionMode extension_x = ExtensionMode::Clip;
/* The extend mode for the y-axis. Defaults to Zero padding. */
ExtensionMode extension_y = ExtensionMode::Zero;
ExtensionMode extension_y = ExtensionMode::Clip;
};
/* ------------------------------------------------------------------------------------------------

4
source/blender/compositor/intern/domain.cc
View File

@@ -49,7 +49,7 @@ bool operator!=(const Domain &a, const Domain &b)
math::InterpWrapMode map_extension_mode_to_wrap_mode(const ExtensionMode &mode)
{
switch (mode) {
case ExtensionMode::Zero:
case ExtensionMode::Clip:
return math::InterpWrapMode::Border;
case ExtensionMode::Repeat:
return math::InterpWrapMode::Repeat;
@@ -63,7 +63,7 @@ math::InterpWrapMode map_extension_mode_to_wrap_mode(const ExtensionMode &mode)
GPUSamplerExtendMode map_extension_mode_to_extend_mode(const ExtensionMode &mode)
{
switch (mode) {
case blender::compositor::ExtensionMode::Zero:
case blender::compositor::ExtensionMode::Clip:
return GPU_SAMPLER_EXTEND_MODE_CLAMP_TO_BORDER;
case blender::compositor::ExtensionMode::Extend:

2
source/blender/makesdna/DNA_node_types.h
View File

@@ -2896,7 +2896,7 @@ typedef enum CMPNodeTranslateRepeatAxis {
} CMPNodeTranslateRepeatAxis;
typedef enum CMPExtensionMode {
CMP_NODE_EXTENSION_MODE_ZERO = 0,
CMP_NODE_EXTENSION_MODE_CLIP = 0,
CMP_NODE_EXTENSION_MODE_EXTEND = 1,
CMP_NODE_EXTENSION_MODE_REPEAT = 2,
} CMPNodeBorderCondition;

6
source/blender/makesrna/intern/rna_nodetree.cc
View File

@@ -571,10 +571,10 @@ const EnumPropertyItem rna_enum_geometry_nodes_linear_gizmo_draw_style_items[] =
#ifndef RNA_RUNTIME
static const EnumPropertyItem cmp_extension_mode_items[] = {
{CMP_NODE_EXTENSION_MODE_ZERO,
"ZERO",
{CMP_NODE_EXTENSION_MODE_CLIP,
"CLIP",
0,
"Zero",
"Clip",
"Areas outside of the image are filled with zero"},
{CMP_NODE_EXTENSION_MODE_EXTEND,
"EXTEND",

16
source/blender/nodes/composite/nodes/node_composite_scale.cc
View File

@@ -62,8 +62,8 @@ static void node_composit_init_scale(bNodeTree * /*ntree*/, bNode *node)
{
NodeScaleData *data = MEM_callocN<NodeScaleData>(__func__);
data->interpolation = CMP_NODE_INTERPOLATION_BILINEAR;
data->extension_x = CMP_NODE_EXTENSION_MODE_ZERO;
data->extension_y = CMP_NODE_EXTENSION_MODE_ZERO;
data->extension_x = CMP_NODE_EXTENSION_MODE_CLIP;
data->extension_y = CMP_NODE_EXTENSION_MODE_CLIP;
node->storage = data;
}
@@ -222,8 +222,8 @@ class ScaleOperation : public NodeOperation {
ExtensionMode get_extension_mode_x()
{
switch (static_cast<CMPExtensionMode>(node_storage(bnode()).extension_x)) {
case CMP_NODE_EXTENSION_MODE_ZERO:
return ExtensionMode::Zero;
case CMP_NODE_EXTENSION_MODE_CLIP:
return ExtensionMode::Clip;
case CMP_NODE_EXTENSION_MODE_REPEAT:
return ExtensionMode::Repeat;
case CMP_NODE_EXTENSION_MODE_EXTEND:
@@ -231,14 +231,14 @@ class ScaleOperation : public NodeOperation {
}
BLI_assert_unreachable();
return ExtensionMode::Zero;
return ExtensionMode::Clip;
}
ExtensionMode get_extension_mode_y()
{
switch (static_cast<CMPExtensionMode>(node_storage(bnode()).extension_y)) {
case CMP_NODE_EXTENSION_MODE_ZERO:
return ExtensionMode::Zero;
case CMP_NODE_EXTENSION_MODE_CLIP:
return ExtensionMode::Clip;
case CMP_NODE_EXTENSION_MODE_REPEAT:
return ExtensionMode::Repeat;
case CMP_NODE_EXTENSION_MODE_EXTEND:
@@ -246,7 +246,7 @@ class ScaleOperation : public NodeOperation {
}
BLI_assert_unreachable();
return ExtensionMode::Zero;
return ExtensionMode::Clip;
}
Interpolation get_interpolation() const

16
source/blender/nodes/composite/nodes/node_composite_transform.cc
View File

@@ -33,8 +33,8 @@ static void cmp_node_init_transform(bNodeTree * /*ntree*/, bNode *node)
{
NodeTransformData *data = MEM_callocN<NodeTransformData>(__func__);
data->interpolation = CMP_NODE_INTERPOLATION_NEAREST;
data->extension_x = CMP_NODE_EXTENSION_MODE_ZERO;
data->extension_y = CMP_NODE_EXTENSION_MODE_ZERO;
data->extension_x = CMP_NODE_EXTENSION_MODE_CLIP;
data->extension_y = CMP_NODE_EXTENSION_MODE_CLIP;
node->storage = data;
}
@@ -88,8 +88,8 @@ class TransformOperation : public NodeOperation {
ExtensionMode get_extension_mode_x()
{
switch (static_cast<CMPExtensionMode>(node_storage(bnode()).extension_x)) {
case CMP_NODE_EXTENSION_MODE_ZERO:
return ExtensionMode::Zero;
case CMP_NODE_EXTENSION_MODE_CLIP:
return ExtensionMode::Clip;
case CMP_NODE_EXTENSION_MODE_REPEAT:
return ExtensionMode::Repeat;
case CMP_NODE_EXTENSION_MODE_EXTEND:
@@ -97,14 +97,14 @@ class TransformOperation : public NodeOperation {
}
BLI_assert_unreachable();
return ExtensionMode::Zero;
return ExtensionMode::Clip;
}
ExtensionMode get_extension_mode_y()
{
switch (static_cast<CMPExtensionMode>(node_storage(bnode()).extension_y)) {
case CMP_NODE_EXTENSION_MODE_ZERO:
return ExtensionMode::Zero;
case CMP_NODE_EXTENSION_MODE_CLIP:
return ExtensionMode::Clip;
case CMP_NODE_EXTENSION_MODE_REPEAT:
return ExtensionMode::Repeat;
case CMP_NODE_EXTENSION_MODE_EXTEND:
@@ -112,7 +112,7 @@ class TransformOperation : public NodeOperation {
}
BLI_assert_unreachable();
return ExtensionMode::Zero;
return ExtensionMode::Clip;
}
Interpolation get_interpolation()

12
source/blender/nodes/composite/nodes/node_composite_translate.cc
View File

@@ -93,8 +93,8 @@ class TranslateOperation : public NodeOperation {
ExtensionMode get_extension_mode_x()
{
switch (static_cast<CMPExtensionMode>(node_storage(bnode()).extension_x)) {
case CMP_NODE_EXTENSION_MODE_ZERO:
return ExtensionMode::Zero;
case CMP_NODE_EXTENSION_MODE_CLIP:
return ExtensionMode::Clip;
case CMP_NODE_EXTENSION_MODE_REPEAT:
return ExtensionMode::Repeat;
case CMP_NODE_EXTENSION_MODE_EXTEND:
@@ -102,14 +102,14 @@ class TranslateOperation : public NodeOperation {
}
BLI_assert_unreachable();
return ExtensionMode::Zero;
return ExtensionMode::Clip;
}
ExtensionMode get_extension_mode_y()
{
switch (static_cast<CMPExtensionMode>(node_storage(bnode()).extension_y)) {
case CMP_NODE_EXTENSION_MODE_ZERO:
return ExtensionMode::Zero;
case CMP_NODE_EXTENSION_MODE_CLIP:
return ExtensionMode::Clip;
case CMP_NODE_EXTENSION_MODE_REPEAT:
return ExtensionMode::Repeat;
case CMP_NODE_EXTENSION_MODE_EXTEND:
@@ -117,7 +117,7 @@ class TranslateOperation : public NodeOperation {
}
BLI_assert_unreachable();
return ExtensionMode::Zero;
return ExtensionMode::Clip;
}
};