kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

EditMesh-based skin node drawing

Browse Source
This commit is contained in:
Nicholas Bishop 2011-07-31 02:03:48 +00:00
parent cff57b14a1
commit 6c3bb8b903
12 changed files with 6 additions and 1326 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
release/scripts/startup/bl_ui/properties_data_modifier.py
View File

@ -736,8 +736,5 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel):
col.prop(md, "width", slider=True)
col.prop(md, "narrowness", slider=True)
def SKIN(self, layout, ob, md):
pass
if __name__ == "__main__": # only for live edit.
bpy.utils.register_module(__name__)

1
source/blender/blenkernel/CMakeLists.txt
View File

@ -81,7 +81,6 @@ set(SRC
intern/boids.c
intern/booleanops_mesh.c
intern/brush.c
intern/bsphere.c
intern/bullet.c
intern/bvhutils.c
intern/cdderivedmesh.c

1178
source/blender/blenkernel/intern/bsphere.c
View File

File diff suppressed because it is too large Load Diff

21
source/blender/blenkernel/intern/customdata.c
View File

@ -805,15 +805,7 @@ static void layerDefault_mcol(void *data, int count)
mcol[i] = default_mcol;
}
static void layerDefault_skin(void *data, int count)
{
SkinNode *n = data;
int i;
for(i = 0; i < count; i++) {
n[i].radius = 0.25;
}
}
static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
{sizeof(MVert), "MVert", 1, NULL, NULL, NULL, NULL, NULL, NULL},
@ -851,8 +843,7 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
layerSwap_mcol, layerDefault_mcol},
{sizeof(MCol)*4, "MCol", 4, "TexturedCol", NULL, NULL, layerInterp_mcol,
layerSwap_mcol, layerDefault_mcol},
{sizeof(float)*3, "", 0, NULL, NULL, NULL, NULL, NULL, NULL},
{sizeof(SkinNode), "SkinNode", 1, "Skin", NULL, NULL, NULL, NULL, layerDefault_skin}
{sizeof(float)*3, "", 0, NULL, NULL, NULL, NULL, NULL, NULL}
};
static const char *LAYERTYPENAMES[CD_NUMTYPES] = {
@ -860,7 +851,7 @@ static const char *LAYERTYPENAMES[CD_NUMTYPES] = {
/* 5-9 */ "CDMTFace", "CDMCol", "CDOrigIndex", "CDNormal", "CDFlags",
/* 10-14 */ "CDMFloatProperty", "CDMIntProperty","CDMStringProperty", "CDOrigSpace", "CDOrco",
/* 15-19 */ "CDMTexPoly", "CDMLoopUV", "CDMloopCol", "CDTangent", "CDMDisps",
/* 20-24 */ "CDWeightMCol", "CDIDMCol", "CDTextureMCol", "CDClothOrco", "CDSkinNode"
/* 20-23 */"CDWeightMCol", "CDIDMCol", "CDTextureMCol", "CDClothOrco"
};
const CustomDataMask CD_MASK_BAREMESH =
@ -868,12 +859,10 @@ const CustomDataMask CD_MASK_BAREMESH =
const CustomDataMask CD_MASK_MESH =
CD_MASK_MVERT | CD_MASK_MEDGE | CD_MASK_MFACE |
CD_MASK_MSTICKY | CD_MASK_MDEFORMVERT | CD_MASK_MTFACE | CD_MASK_MCOL |
CD_MASK_PROP_FLT | CD_MASK_PROP_INT | CD_MASK_PROP_STR | CD_MASK_MDISPS |
CD_MASK_SKIN_NODE;
CD_MASK_PROP_FLT | CD_MASK_PROP_INT | CD_MASK_PROP_STR | CD_MASK_MDISPS;
const CustomDataMask CD_MASK_EDITMESH =
CD_MASK_MSTICKY | CD_MASK_MDEFORMVERT | CD_MASK_MTFACE |
CD_MASK_MCOL|CD_MASK_PROP_FLT | CD_MASK_PROP_INT | CD_MASK_PROP_STR | CD_MASK_MDISPS |
CD_MASK_SKIN_NODE;
CD_MASK_MCOL|CD_MASK_PROP_FLT | CD_MASK_PROP_INT | CD_MASK_PROP_STR | CD_MASK_MDISPS;
const CustomDataMask CD_MASK_DERIVEDMESH =
CD_MASK_MSTICKY | CD_MASK_MDEFORMVERT | CD_MASK_MTFACE |
CD_MASK_MCOL | CD_MASK_ORIGINDEX | CD_MASK_PROP_FLT | CD_MASK_PROP_INT | CD_MASK_CLOTH_ORCO |

4
source/blender/makesdna/DNA_customdata_types.h
View File

@ -92,8 +92,7 @@ typedef struct CustomData {
#define CD_ID_MCOL 21
#define CD_TEXTURE_MCOL 22
#define CD_CLOTH_ORCO 23
#define CD_SKIN_NODE 24
#define CD_NUMTYPES 25
#define CD_NUMTYPES 24
/* Bits for CustomDataMask */
#define CD_MASK_MVERT (1 << CD_MVERT)
@ -118,7 +117,6 @@ typedef struct CustomData {
#define CD_MASK_MDISPS (1 << CD_MDISPS)
#define CD_MASK_WEIGHT_MCOL (1 << CD_WEIGHT_MCOL)
#define CD_MASK_CLOTH_ORCO (1 << CD_CLOTH_ORCO)
#define CD_MASK_SKIN_NODE (1 << CD_SKIN_NODE)
/* CustomData.flag */

5
source/blender/makesdna/DNA_meshdata_types.h
View File

@ -184,11 +184,6 @@ typedef struct PartialVisibility {
unsigned int totface, totedge, totvert, pad;
} PartialVisibility;
typedef struct SkinNode {
float radius;
int pad;
} SkinNode;
/* mvert->flag (1=SELECT) */
#define ME_SPHERETEST 2
#define ME_VERT_TMP_TAG 4

14
source/blender/makesdna/DNA_modifier_types.h
View File

@ -71,7 +71,6 @@ typedef enum ModifierType {
eModifierType_Solidify,
eModifierType_Screw,
eModifierType_Warp,
eModifierType_Skin,
NUM_MODIFIER_TYPES
} ModifierType;
@ -786,17 +785,4 @@ typedef enum {
/* 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

15
source/blender/makesrna/intern/rna_modifier.c
View File

@ -68,7 +68,6 @@ EnumPropertyItem modifier_type_items[] ={
{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", ""},
@ -184,8 +183,6 @@ static StructRNA* rna_Modifier_refine(struct PointerRNA *ptr)
return &RNA_ScrewModifier;
case eModifierType_Warp:
return &RNA_WarpModifier;
case eModifierType_Skin:
return &RNA_SkinModifier;
default:
return &RNA_Modifier;
}
@ -2415,17 +2412,6 @@ static void rna_def_modifier_screw(BlenderRNA *brna)
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;
@ -2523,7 +2509,6 @@ void RNA_def_modifier(BlenderRNA *brna)
rna_def_modifier_smoke(brna);
rna_def_modifier_solidify(brna);
rna_def_modifier_screw(brna);
rna_def_modifier_skin(brna);
}
#endif

1
source/blender/modifiers/CMakeLists.txt
View File

@ -70,7 +70,6 @@ set(SRC
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

1
source/blender/modifiers/MOD_modifiertypes.h
View File

@ -72,7 +72,6 @@ extern ModifierTypeInfo modifierType_ShapeKey;
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[]);

88
source/blender/modifiers/intern/MOD_skin.c
View File

@ -1,88 +0,0 @@
/*
* $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,
};

1
source/blender/modifiers/intern/MOD_util.c
View File

@ -295,6 +295,5 @@ void modifier_type_init(ModifierTypeInfo *types[])
INIT_TYPE(Solidify);
INIT_TYPE(Screw);
INIT_TYPE(Warp);
INIT_TYPE(Skin);
#undef INIT_TYPE
}