[Bf-blender-cvs] [7a0683cf057] soc-2021-adaptive-cloth: adaptive_cloth: parameter name from `size_min` to `edge_length_min`
ishbosamiya
noreply at git.blender.org
Mon Sep 6 11:47:41 CEST 2021
Commit: 7a0683cf0575f4a04ce2b33acdc916d7f7d849c9
Author: ishbosamiya
Date: Sun Sep 5 20:35:07 2021 +0530
Branches: soc-2021-adaptive-cloth
https://developer.blender.org/rB7a0683cf0575f4a04ce2b33acdc916d7f7d849c9
adaptive_cloth: parameter name from `size_min` to `edge_length_min`
===================================================================
M release/datafiles/locale
M release/scripts/addons
M release/scripts/addons_contrib
M release/scripts/startup/bl_ui/properties_physics_cloth.py
M source/blender/blenkernel/BKE_cloth_remesh.hh
M source/blender/blenkernel/intern/cloth_remesh.cc
M source/blender/makesdna/DNA_cloth_types.h
M source/blender/makesdna/DNA_modifier_defaults.h
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/makesrna/intern/rna_cloth.c
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/modifiers/intern/MOD_adaptive_remesh.cc
M source/tools
===================================================================
diff --git a/release/datafiles/locale b/release/datafiles/locale
index 2cef4877edc..326997b913d 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 2cef4877edc40875978c4e95322bb5193f5815bf
+Subproject commit 326997b913d04bc5bc4656973d1e1a819f860dd2
diff --git a/release/scripts/addons b/release/scripts/addons
index 27fe7f3a4f9..eecf14222b0 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 27fe7f3a4f964b53af436c4da4ddea337eff0c7e
+Subproject commit eecf14222b0338d0d193648e1ede17bf48517e23
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 5a82baad9f9..98f6085e9d7 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 5a82baad9f986722104280e8354a4427d8e9eab1
+Subproject commit 98f6085e9d71ba35d41e5aafbcb7981bd7c48275
diff --git a/release/scripts/startup/bl_ui/properties_physics_cloth.py b/release/scripts/startup/bl_ui/properties_physics_cloth.py
index ce12f0baf60..192e22527a4 100644
--- a/release/scripts/startup/bl_ui/properties_physics_cloth.py
+++ b/release/scripts/startup/bl_ui/properties_physics_cloth.py
@@ -335,7 +335,7 @@ class PHYSICS_PT_cloth_remesh(PhysicButtonsPanel, Panel):
# TODO(ish): setup better ui
col = flow.column(align=True)
- col.prop(cloth, "remeshing_size_min", text="Remeshing Sizing Min")
+ col.prop(cloth, "remeshing_edge_length_min", text="Remeshing Minimum Edge Length")
class PHYSICS_PT_cloth_collision(PhysicButtonsPanel, Panel):
diff --git a/source/blender/blenkernel/BKE_cloth_remesh.hh b/source/blender/blenkernel/BKE_cloth_remesh.hh
index 1db91f425a8..772f3286dbf 100644
--- a/source/blender/blenkernel/BKE_cloth_remesh.hh
+++ b/source/blender/blenkernel/BKE_cloth_remesh.hh
@@ -114,7 +114,7 @@ namespace blender::bke {
* "Element" Data`
*/
template<typename END, typename ExtraData> struct AdaptiveRemeshParams {
- float size_min;
+ float edge_length_min;
/* AdaptiveRemeshParamsFlags */
uint32_t flags;
/* AdaptiveRemeshParamsType */
@@ -3576,7 +3576,7 @@ template<typename END, typename EVD, typename EED, typename EFD> class MeshDiff
namespace blender::bke {
struct TempEmptyAdaptiveRemeshParams {
- float size_min;
+ float edge_length_min;
/* AdaptiveRemeshParamsFlags */
uint32_t flags;
/* AdaptiveRemeshParamsType */
diff --git a/source/blender/blenkernel/intern/cloth_remesh.cc b/source/blender/blenkernel/intern/cloth_remesh.cc
index 333c9bd58de..d09c8c4c639 100644
--- a/source/blender/blenkernel/intern/cloth_remesh.cc
+++ b/source/blender/blenkernel/intern/cloth_remesh.cc
@@ -1942,7 +1942,7 @@ Mesh *adaptive_remesh(const AdaptiveRemeshParams<END, ExtraData> ¶ms,
/* Actual Remeshing Part */
if (params.type == ADAPTIVE_REMESH_PARAMS_STATIC_REMESH) {
- float size_min = params.size_min;
+ float size_min = params.edge_length_min;
auto m = float2x2::identity();
m = m * (1.0 / size_min);
internal::Sizing vert_sizing(std::move(m));
@@ -2034,7 +2034,7 @@ void BKE_cloth_serialize_adaptive_mesh(Object *ob,
const char *location)
{
AdaptiveRemeshParams<internal::ClothNodeData, Cloth> params;
- params.size_min = clmd->sim_parms->remeshing_size_min;
+ params.edge_length_min = clmd->sim_parms->remeshing_edge_length_min;
params.extra_data_to_end = [](const Cloth &cloth, size_t index) {
BLI_assert(index < cloth.mvert_num);
BLI_assert(cloth.verts);
@@ -2108,7 +2108,7 @@ Mesh *BKE_cloth_remesh(Object *ob, ClothModifierData *clmd, Mesh *mesh)
#endif
AdaptiveRemeshParams<internal::ClothNodeData, Cloth> params;
- params.size_min = clmd->sim_parms->remeshing_size_min;
+ params.edge_length_min = clmd->sim_parms->remeshing_edge_length_min;
params.flags = 0;
if (clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_SEW) {
params.flags |= ADAPTIVE_REMESH_PARAMS_SEWING;
@@ -2174,7 +2174,7 @@ Mesh *__temp_empty_adaptive_remesh(const TempEmptyAdaptiveRemeshParams &input_pa
EmptyData empty_data;
AdaptiveRemeshParams<EmptyData, EmptyData> params;
- params.size_min = input_params.size_min;
+ params.edge_length_min = input_params.edge_length_min;
params.flags = input_params.flags;
params.type = input_params.type;
params.extra_data_to_end = [](const EmptyData &UNUSED(data), size_t UNUSED(index)) {
diff --git a/source/blender/makesdna/DNA_cloth_types.h b/source/blender/makesdna/DNA_cloth_types.h
index c596bed8794..cc6178d05b6 100644
--- a/source/blender/makesdna/DNA_cloth_types.h
+++ b/source/blender/makesdna/DNA_cloth_types.h
@@ -186,7 +186,7 @@ typedef struct ClothSimSettings {
/** ClothRemeshingType */
uint32_t remeshing_type;
/* TODO(ish): need to write docs for this */
- float remeshing_size_min;
+ float remeshing_edge_length_min;
char _pad2[4];
} ClothSimSettings;
diff --git a/source/blender/makesdna/DNA_modifier_defaults.h b/source/blender/makesdna/DNA_modifier_defaults.h
index 2758dc7ab84..a36a366756e 100644
--- a/source/blender/makesdna/DNA_modifier_defaults.h
+++ b/source/blender/makesdna/DNA_modifier_defaults.h
@@ -28,7 +28,7 @@
.edge_index = 0, \
.flag = 0, \
.mode = 0, \
- .size_min = 0.05 \
+ .edge_length_min = 0.05 \
}
#define _DNA_DEFAULT_ArmatureModifierData \
@@ -175,7 +175,7 @@
.max_internal_compression = 15.0f, \
/* TODO(ish): setup better remeshing defaults */ \
.remeshing_type = CLOTH_REMESHING_STATIC, \
- .remeshing_size_min = 0.01f, \
+ .remeshing_edge_length_min = 0.01f, \
}
#define _DNA_DEFAULT_ClothCollSettings \
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 38201cb8527..b85229b3944 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -2358,7 +2358,7 @@ typedef struct AdaptiveRemeshModifierData {
/* Needed for static remeshing and in the future dynamic remeshing
* as well */
- float size_min;
+ float edge_length_min;
} AdaptiveRemeshModifierData;
typedef enum AdaptiveRemeshFlag {
diff --git a/source/blender/makesrna/intern/rna_cloth.c b/source/blender/makesrna/intern/rna_cloth.c
index f4987a43d77..9a4643a3a6c 100644
--- a/source/blender/makesrna/intern/rna_cloth.c
+++ b/source/blender/makesrna/intern/rna_cloth.c
@@ -1074,10 +1074,10 @@ static void rna_def_cloth_sim_settings(BlenderRNA *brna)
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
/* TODO(ish): remeshing paramters need proper text and doc */
- prop = RNA_def_property(srna, "remeshing_size_min", PROP_FLOAT, PROP_NONE);
- RNA_def_property_float_sdna(prop, NULL, "remeshing_size_min");
+ prop = RNA_def_property(srna, "remeshing_edge_length_min", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_sdna(prop, NULL, "remeshing_edge_length_min");
RNA_def_property_ui_range(prop, 0.0f, 2.0f, 0.005f, 4);
- RNA_def_property_ui_text(prop, "Remeshing Size Min", "");
+ RNA_def_property_ui_text(prop, "Remeshing Minimum Edge Length", "");
RNA_def_property_update(prop, 0, "rna_cloth_update");
/* unused */
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 87b839b62c5..8b7455f1308 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -7291,10 +7291,10 @@ static void rna_def_modifier_adaptive_remesh(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Force Split for Sewing", "Force splitting of edge for sewing");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
- prop = RNA_def_property(srna, "size_min", PROP_FLOAT, PROP_NONE);
- RNA_def_property_float_sdna(prop, NULL, "size_min");
+ prop = RNA_def_property(srna, "edge_length_min", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_sdna(prop, NULL, "edge_length_min");
RNA_def_property_ui_range(prop, 0.0001f, 2.0f, 0.005f, 4);
- RNA_def_property_ui_text(prop, "Remeshing Size Min", "");
+ RNA_def_property_ui_text(prop, "Remeshing Minimum Edge Length", "");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
RNA_define_lib_overridable(false);
diff --git a/source/blender/modifiers/intern/MOD_adaptive_remesh.cc b/source/blender/modifiers/intern/MOD_adaptive_remesh.cc
index c05f6c025ca..6cf37291743 100644
--- a/source/blender/modifiers/intern/MOD_adaptive_remesh.cc
+++ b/source/blender/modifiers/intern/MOD_adaptive_remesh.cc
@@ -61,10 +61,10 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *UNUSED(ctx)
auto mode = armd->mode;
if (mode == ADAPTIVE_REMESH_STATIC_REMESHING || mode == ADAPTIVE_REMESH_DYNAMIC_REMESHING) {
- auto size_min = armd->size_min;
+ auto size_min = armd->edge_length_min;
TempEmptyAdaptiveRemeshParams params;
- params.size_min = size_min;
+ params.edge_length_min = size_min;
params.flags = 0;
if (armd->flag & ADAPTIVE_REMESH_SEWING) {
params.flags |= ADAPTIVE_REMESH_PARAMS_SEWING;
@@ -190,7 +190,7 @@ static void panel_draw(const bContext *UNUSED(C), Panel *panel)
}
else if (armd->mode == ADAPTIVE_REMESH_STATIC_REMESHING ||
armd->mode == ADAPTIVE_REMESH_DYNAMIC_REMESHING) {
- uiItemR(layout, ptr, "size_min", 0, nullptr, ICON_NONE);
+ uiItemR(layout, ptr, "edge_length_min", 0, nullptr, ICON_NONE);
uiItemR(layout, ptr, "enable_sewing", 0, nullptr, ICON_NONE);
uiItemR(layout, ptr, "force_split_for_sewing", 0, nullptr, ICON_NONE);
}
diff --git a/source/tools b/source/tools
index 01f51a0e551..548055f4021 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 01f51a0e551ab730f0934dc6488613690ac4bf8f
+Subproject commit 548055f40213c775a6b77025525c91e8466e70d6
More information about the Bf-blender-cvs
mailing list