Commit: 039be9e3c9d7724797731ee1092398ce0f30a3ba
Author: Martin Felke
Date: Sat Dec 31 00:33:57 2016 +0100
Branches: fracture_modifier
https://developer.blender.org/rB039be9e3c9d7724797731ee1092398ce0f30a3ba
fracture modifier RNA refactor, outsourced FM RNA code and python API code to
separate files
===================================================================
M source/blender/makesrna/intern/CMakeLists.txt
M source/blender/makesrna/intern/makesrna.c
A source/blender/makesrna/intern/rna_fracture.c
A source/blender/makesrna/intern/rna_fracture_api.c
M source/blender/makesrna/intern/rna_internal.h
M source/blender/makesrna/intern/rna_modifier.c
===================================================================
diff --git a/source/blender/makesrna/intern/CMakeLists.txt
b/source/blender/makesrna/intern/CMakeLists.txt
index 0f3ea27..ef17c9d 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -49,6 +49,7 @@ set(DEFSRC
rna_depsgraph.c
rna_dynamicpaint.c
rna_fcurve.c
+ rna_fracture.c
rna_fluidsim.c
rna_gpencil.c
rna_group.c
@@ -106,6 +107,7 @@ set(APISRC
rna_controller_api.c
rna_curve_api.c
rna_fcurve_api.c
+ rna_fracture_api.c
rna_image_api.c
rna_lattice_api.c
rna_main_api.c
diff --git a/source/blender/makesrna/intern/makesrna.c
b/source/blender/makesrna/intern/makesrna.c
index 569c1ee..15be483 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -3325,6 +3325,7 @@ static RNAProcessItem PROCESS_ITEMS[] = {
{"rna_mesh.c", "rna_mesh_api.c", RNA_def_mesh},
{"rna_meta.c", "rna_meta_api.c", RNA_def_meta},
{"rna_modifier.c", NULL, RNA_def_modifier},
+ {"rna_fracture.c", "rna_fracture_api.c", RNA_def_fracture},
{"rna_nla.c", NULL, RNA_def_nla},
{"rna_nodetree.c", NULL, RNA_def_nodetree},
{"rna_object.c", "rna_object_api.c", RNA_def_object},
diff --git a/source/blender/makesrna/intern/rna_fracture.c
b/source/blender/makesrna/intern/rna_fracture.c
new file mode 100644
index 0000000..ebe959f
--- /dev/null
+++ b/source/blender/makesrna/intern/rna_fracture.c
@@ -0,0 +1,1219 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor(s): Blender Foundation (2008), Martin Felke
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/makesrna/intern/rna_fracture.c
+ * \ingroup RNA
+ */
+
+#include <stdlib.h>
+
+#include "DNA_mesh_types.h"
+#include "DNA_meta_types.h"
+#include "DNA_fracture_types.h"
+#include "DNA_modifier_types.h"
+#include "DNA_rigidbody_types.h"
+
+#include "BLI_math.h"
+#include "BLI_utildefines.h"
+#include "BKE_rigidbody.h"
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+#include "RNA_enum_types.h"
+
+#include "rna_internal.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#ifdef RNA_RUNTIME
+
+#include "BKE_depsgraph.h"
+#include "BKE_fracture.h"
+#include "BKE_DerivedMesh.h"
+#include "BKE_modifier.h"
+
+#ifdef WITH_BULLET
+# include "RBI_api.h"
+#endif
+
+static char *rna_Modifier_path(PointerRNA *ptr)
+{
+ ModifierData *md = ptr->data;
+ char name_esc[sizeof(md->name) * 2];
+
+ BLI_strescape(name_esc, md->name, sizeof(name_esc));
+ return BLI_sprintfN("modifiers[\"%s\"]", name_esc);
+}
+
+static StructRNA *rna_Modifier_refine(struct PointerRNA *ptr)
+{
+ ModifierData *md = (ModifierData *)ptr->data;
+
+ switch ((ModifierType)md->type) {
+ case eModifierType_Subsurf:
+ return &RNA_SubsurfModifier;
+ case eModifierType_Lattice:
+ return &RNA_LatticeModifier;
+ case eModifierType_Curve:
+ return &RNA_CurveModifier;
+ case eModifierType_Build:
+ return &RNA_BuildModifier;
+ case eModifierType_Mirror:
+ return &RNA_MirrorModifier;
+ case eModifierType_Decimate:
+ return &RNA_DecimateModifier;
+ case eModifierType_Wave:
+ return &RNA_WaveModifier;
+ case eModifierType_Armature:
+ return &RNA_ArmatureModifier;
+ case eModifierType_Hook:
+ return &RNA_HookModifier;
+ case eModifierType_Softbody:
+ return &RNA_SoftBodyModifier;
+ case eModifierType_Boolean:
+ return &RNA_BooleanModifier;
+ case eModifierType_Array:
+ return &RNA_ArrayModifier;
+ case eModifierType_EdgeSplit:
+ return &RNA_EdgeSplitModifier;
+ case eModifierType_Displace:
+ return &RNA_DisplaceModifier;
+ case eModifierType_UVProject:
+ return &RNA_UVProjectModifier;
+ case eModifierType_Smooth:
+ return &RNA_SmoothModifier;
+ case eModifierType_Cast:
+ return &RNA_CastModifier;
+ case eModifierType_MeshDeform:
+ return &RNA_MeshDeformModifier;
+ case eModifierType_ParticleSystem:
+ return &RNA_ParticleSystemModifier;
+ case eModifierType_ParticleInstance:
+ return &RNA_ParticleInstanceModifier;
+ case eModifierType_Explode:
+ return &RNA_ExplodeModifier;
+ case eModifierType_Cloth:
+ return &RNA_ClothModifier;
+ case eModifierType_Collision:
+ return &RNA_CollisionModifier;
+ case eModifierType_Bevel:
+ return &RNA_BevelModifier;
+ case eModifierType_Shrinkwrap:
+ return &RNA_ShrinkwrapModifier;
+ case eModifierType_Fluidsim:
+ return &RNA_FluidSimulationModifier;
+ case eModifierType_Mask:
+ return &RNA_MaskModifier;
+ case eModifierType_SimpleDeform:
+ return &RNA_SimpleDeformModifier;
+ case eModifierType_Multires:
+ return &RNA_MultiresModifier;
+ case eModifierType_Surface:
+ return &RNA_SurfaceModifier;
+ case eModifierType_Smoke:
+ return &RNA_SmokeModifier;
+ case eModifierType_Solidify:
+ return &RNA_SolidifyModifier;
+ case eModifierType_Screw:
+ return &RNA_ScrewModifier;
+ case eModifierType_Ocean:
+ return &RNA_OceanModifier;
+ case eModifierType_Warp:
+ return &RNA_WarpModifier;
+ case eModifierType_WeightVGEdit:
+ return &RNA_VertexWeightEditModifier;
+ case eModifierType_WeightVGMix:
+ return &RNA_VertexWeightMixModifier;
+ case eModifierType_WeightVGProximity:
+ return &RNA_VertexWeightProximityModifier;
+ case eModifierType_DynamicPaint:
+ return &RNA_DynamicPaintModifier;
+ case eModifierType_Remesh:
+ return &RNA_RemeshModifier;
+ case eModifierType_Skin:
+ return &RNA_SkinModifier;
+ case eModifierType_LaplacianSmooth:
+ return &RNA_LaplacianSmoothModifier;
+ case eModifierType_Triangulate:
+ return &RNA_TriangulateModifier;
+ case eModifierType_UVWarp:
+ return &RNA_UVWarpModifier;
+ case eModifierType_MeshCache:
+ return &RNA_MeshCacheModifier;
+ case eModifierType_LaplacianDeform:
+ return &RNA_LaplacianDeformModifier;
+ case eModifierType_Wireframe:
+ return &RNA_WireframeModifier;
+ case eModifierType_DataTransfer:
+ return &RNA_DataTransferModifier;
+ case eModifierType_NormalEdit:
+ return &RNA_NormalEditModifier;
+ case eModifierType_CorrectiveSmooth:
+ return &RNA_CorrectiveSmoothModifier;
+ case eModifierType_MeshSequenceCache:
+ return &RNA_MeshSequenceCacheModifier;
+ case eModifierType_Fracture:
+ return &RNA_FractureModifier;
+ /* Default */
+ case eModifierType_None:
+ case eModifierType_ShapeKey:
+ case NUM_MODIFIER_TYPES:
+ return &RNA_Modifier;
+ }
+
+ return &RNA_Modifier;
+}
+
+/* Vertex Groups */
+
+#define RNA_MOD_VGROUP_NAME_SET(_type, _prop)
\
+static void rna_##_type##Modifier_##_prop##_set(PointerRNA *ptr, const char
*value) \
+{
\
+ _type##ModifierData *tmd = (_type##ModifierData *)ptr->data;
\
+ rna_object_vgroup_name_set(ptr, value, tmd->_prop, sizeof(tmd->_prop));
\
+}
+
+RNA_MOD_VGROUP_NAME_SET(Fracture, thresh_defgrp_name);
+RNA_MOD_VGROUP_NAME_SET(Fracture, ground_defgrp_name);
+RNA_MOD_VGROUP_NAME_SET(Fracture, inner_defgrp_name);
+
+#undef RNA_MOD_VGROUP_NAME_SET
+
+/* UV layers */
+
+#define RNA_MOD_UVLAYER_NAME_SET(_type, _prop)
\
+static void rna_##_type##Modifier_##_prop##_set(PointerRNA *ptr, const char
*value) \
+{
\
+ _type##ModifierData *tmd = (_type##ModifierData *)ptr->data;
\
+ rna_object_uvlayer_name_set(ptr, value, tmd->_prop,
sizeof(tmd->_prop)); \
+}
+
+RNA_MOD_UVLAYER_NAME_SET(Fracture, uvlayer_name);
+
+#undef RNA_MOD_UVLAYER_NAME_SET
+
+
+static void rna_FractureModifier_threshold_set(PointerRNA *ptr, float value)
+{
+ FractureModifierData *rmd = (FractureModifierData*)ptr->data;
+ rmd->breaking_threshold = value;
+ rmd->refresh_constraints = true;
+}
+
+static void rna_FractureModifier_contact_dist_set(PointerRNA *ptr, float value)
+{
+ FractureModifierData *rmd = (FractureModifierData*)ptr->data;
+ rmd->contact_dist = value;
+ rmd->refresh_constraints = true;
+}
+
+static void rna_FractureModifier_use_constraints_set(PointerRNA* ptr, int
value)
+{
+ FractureModifierData *rmd = (FractureModifierData *)ptr->data;
+ rmd->use_constraints = value;
+ rmd->refresh_constraints = true;
+}
+
+static void rna_FractureModifier_use_constraint_collision_set(PointerRNA* ptr,
int value)
+{
+ FractureModifierData *rmd = (FractureModifierData *)ptr->data;
+ rmd->use_constraint_collision = value;
+ rmd->refresh_constraints = true;
+}
+
+static void rna_FractureModifier_use_compounds_set(PointerRNA* ptr, int value)
+{
+ FractureModifierData *rmd = (FractureModifierData *)ptr->data;
+ rmd->use_compounds = value;
+ rmd->refresh_constraints = true;
+}
+
+static void rna_FractureModifier_mass_dependent_thresholds_set(PointerRNA*
ptr, int value)
+{
+ FractureModifierData *rmd = (FractureModifierData *)ptr->data;
+ rmd->use_mass_dependent_thresholds = value;
+ rmd->refresh_constraints = true;
+}
+
+static void rna_FractureModifier_constraint_limit_set(PointerRNA *ptr, int
value)
+{
+ FractureModifierData *rmd = (FractureModifierData*)ptr->data;
+ rmd->constraint_limit = value;
+ rmd->refresh_constraints = true;
+}
+
+static void rna_FractureModifier_breaking_percentage_set(PointerRNA *ptr, int
value)
+{
+ FractureModifierData *rmd = (FractureModifierData*)ptr->data;
+ rmd->breaking_percentage = value;
+ rmd->refresh_constraints = true;
+}
+
+static void rna_FractureModifier_breaking_angle_set(PointerRNA *ptr, float v
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
