Revision: 38862
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38862
Author: nicholasbishop
Date: 2011-07-31 02:03:28 +0000 (Sun, 31 Jul 2011)
Log Message:
-----------
Added DNA and RNA for skin modifier, stubbed in skin modifier functions
Modified Paths:
--------------
trunk/blender/source/blender/makesdna/DNA_modifier_types.h
trunk/blender/source/blender/makesrna/intern/rna_modifier.c
trunk/blender/source/blender/modifiers/CMakeLists.txt
trunk/blender/source/blender/modifiers/MOD_modifiertypes.h
trunk/blender/source/blender/modifiers/intern/MOD_util.c
Added Paths:
-----------
trunk/blender/source/blender/modifiers/intern/MOD_skin.c
Modified: trunk/blender/source/blender/makesdna/DNA_modifier_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_modifier_types.h 2011-07-31
02:03:21 UTC (rev 38861)
+++ trunk/blender/source/blender/makesdna/DNA_modifier_types.h 2011-07-31
02:03:28 UTC (rev 38862)
@@ -71,6 +71,7 @@
eModifierType_Solidify,
eModifierType_Screw,
eModifierType_Warp,
+ eModifierType_Skin,
NUM_MODIFIER_TYPES
} ModifierType;
@@ -785,4 +786,17 @@
/* PROP_RANDOM not used */
} WarpModifierFalloff;
+typedef enum SkinModifierFlags {
+ MOD_SKIN_DRAW_SKIN = (1<<0),
+ MOD_SKIN_DRAW_NODES = (1<<1),
+} SkinModifierFlags;
+
+typedef struct SkinModifierData {
+ ModifierData modifier;
+ float threshold;
+ int subdiv;
+ int flag;
+ int pad;
+} SkinModifierData;
+
#endif
Modified: trunk/blender/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_modifier.c 2011-07-31
02:03:21 UTC (rev 38861)
+++ trunk/blender/source/blender/makesrna/intern/rna_modifier.c 2011-07-31
02:03:28 UTC (rev 38862)
@@ -68,6 +68,7 @@
{eModifierType_Solidify, "SOLIDIFY", ICON_MOD_SOLIDIFY, "Solidify", ""},
{eModifierType_Subsurf, "SUBSURF", ICON_MOD_SUBSURF, "Subdivision
Surface", ""},
{eModifierType_UVProject, "UV_PROJECT", ICON_MOD_UVPROJECT, "UV
Project", ""},
+ {eModifierType_Skin, "SKIN", ICON_MOD_ARMATURE, "Skin", ""},
{0, "", 0, "Deform", ""},
{eModifierType_Armature, "ARMATURE", ICON_MOD_ARMATURE, "Armature", ""},
{eModifierType_Cast, "CAST", ICON_MOD_CAST, "Cast", ""},
@@ -183,6 +184,8 @@
return &RNA_ScrewModifier;
case eModifierType_Warp:
return &RNA_WarpModifier;
+ case eModifierType_Skin:
+ return &RNA_SkinModifier;
default:
return &RNA_Modifier;
}
@@ -2412,6 +2415,17 @@
RNA_def_property_update(prop, 0, "rna_Modifier_update");*/
}
+static void rna_def_modifier_skin(BlenderRNA *brna)
+{
+ StructRNA *srna;
+ PropertyRNA *prop;
+
+ srna= RNA_def_struct(brna, "SkinModifier", "Modifier");
+ RNA_def_struct_ui_text(srna, "Skin Modifier", "Generate Skin");
+ RNA_def_struct_sdna(srna, "SkinModifierData");
+ RNA_def_struct_ui_icon(srna, ICON_MOD_ARMATURE);
+}
+
void RNA_def_modifier(BlenderRNA *brna)
{
StructRNA *srna;
@@ -2509,6 +2523,7 @@
rna_def_modifier_smoke(brna);
rna_def_modifier_solidify(brna);
rna_def_modifier_screw(brna);
+ rna_def_modifier_skin(brna);
}
#endif
Modified: trunk/blender/source/blender/modifiers/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/modifiers/CMakeLists.txt 2011-07-31
02:03:21 UTC (rev 38861)
+++ trunk/blender/source/blender/modifiers/CMakeLists.txt 2011-07-31
02:03:28 UTC (rev 38862)
@@ -70,6 +70,7 @@
intern/MOD_shapekey.c
intern/MOD_shrinkwrap.c
intern/MOD_simpledeform.c
+ intern/MOD_skin.c
intern/MOD_smoke.c
intern/MOD_smooth.c
intern/MOD_softbody.c
Modified: trunk/blender/source/blender/modifiers/MOD_modifiertypes.h
===================================================================
--- trunk/blender/source/blender/modifiers/MOD_modifiertypes.h 2011-07-31
02:03:21 UTC (rev 38861)
+++ trunk/blender/source/blender/modifiers/MOD_modifiertypes.h 2011-07-31
02:03:28 UTC (rev 38862)
@@ -72,6 +72,7 @@
extern ModifierTypeInfo modifierType_Solidify;
extern ModifierTypeInfo modifierType_Screw;
extern ModifierTypeInfo modifierType_Warp;
+extern ModifierTypeInfo modifierType_Skin;
/* MOD_util.c */
void modifier_type_init(ModifierTypeInfo *types[]);
Added: trunk/blender/source/blender/modifiers/intern/MOD_skin.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_skin.c
(rev 0)
+++ trunk/blender/source/blender/modifiers/intern/MOD_skin.c 2011-07-31
02:03:28 UTC (rev 38862)
@@ -0,0 +1,88 @@
+/*
+* $Id$
+*
+* ***** 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.
+*
+* ***** END GPL LICENSE BLOCK *****
+*
+*/
+
+/** \file blender/modifiers/intern/MOD_skin.c
+ * \ingroup modifiers
+ */
+
+
+#include <stddef.h>
+
+#include "BKE_cdderivedmesh.h"
+#include "BKE_modifier.h"
+
+#include "DNA_mesh_types.h"
+#include "DNA_object_types.h"
+
+#include "MOD_util.h"
+
+static void initData(ModifierData *md)
+{
+ SkinModifierData *smd = (SkinModifierData*)md;
+
+ smd->threshold = 0;
+ smd->subdiv = 1;
+ smd->flag = MOD_SKIN_DRAW_NODES;
+}
+
+static void copyData(ModifierData *md, ModifierData *target)
+{
+ SkinModifierData *smd = (SkinModifierData*) md;
+ SkinModifierData *tsmd = (SkinModifierData*) target;
+
+ tsmd->threshold = smd->threshold;
+ tsmd->subdiv = smd->subdiv;
+ tsmd->flag = smd->flag;
+}
+
+static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh
*dm,
+ int useRenderParams, int
isFinalCalc)
+{
+ return dm;
+}
+
+
+ModifierTypeInfo modifierType_Skin = {
+ /* name */ "Skin",
+ /* structName */ "SkinModifierData",
+ /* structSize */ sizeof(SkinModifierData),
+ /* type */ eModifierTypeType_Constructive,
+ /* flags */ eModifierTypeFlag_AcceptsMesh,
+
+ /* copyData */ copyData,
+ /* deformVerts */ NULL,
+ /* deformMatrices */ NULL,
+ /* deformVertsEM */ NULL,
+ /* deformMatricesEM */ NULL,
+ /* applyModifier */ applyModifier,
+ /* applyModifierEM */ NULL,
+ /* initData */ initData,
+ /* requiredDataMask */ NULL,
+ /* freeData */ NULL,
+ /* isDisabled */ NULL,
+ /* updateDepgraph */ NULL,
+ /* dependsOnTime */ NULL,
+ /* dependsOnNormals */ NULL,
+ /* foreachObjectLink */ NULL,
+ /* foreachIDLink */ NULL,
+};
Modified: trunk/blender/source/blender/modifiers/intern/MOD_util.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_util.c 2011-07-31
02:03:21 UTC (rev 38861)
+++ trunk/blender/source/blender/modifiers/intern/MOD_util.c 2011-07-31
02:03:28 UTC (rev 38862)
@@ -295,5 +295,6 @@
INIT_TYPE(Solidify);
INIT_TYPE(Screw);
INIT_TYPE(Warp);
+ INIT_TYPE(Skin);
#undef INIT_TYPE
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
