[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38861] trunk/blender/source/blender: Added SkinNode DNA and customdata.

Nicholas Bishop nicholasbishop at gmail.com
Sun Jul 31 04:04:45 CEST 2011


Gah, accidentally committed stuff from my git repository. Sorry about
that, reverting now...

-Nicholas

On Sat, Jul 30, 2011 at 10:03 PM, Nicholas Bishop
<nicholasbishop at gmail.com> wrote:
> Revision: 38861
>          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38861
> Author:   nicholasbishop
> Date:     2011-07-31 02:03:21 +0000 (Sun, 31 Jul 2011)
> Log Message:
> -----------
> Added SkinNode DNA and customdata.
>
> Modified Paths:
> --------------
>    trunk/blender/source/blender/blenkernel/intern/customdata.c
>    trunk/blender/source/blender/makesdna/DNA_customdata_types.h
>    trunk/blender/source/blender/makesdna/DNA_meshdata_types.h
>
> Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
> ===================================================================
> --- trunk/blender/source/blender/blenkernel/intern/customdata.c 2011-07-30 23:16:22 UTC (rev 38860)
> +++ trunk/blender/source/blender/blenkernel/intern/customdata.c 2011-07-31 02:03:21 UTC (rev 38861)
> @@ -805,8 +805,16 @@
>                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 = 1;
> +       }
> +}
>
> -
>  static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
>        {sizeof(MVert), "MVert", 1, NULL, NULL, NULL, NULL, NULL, NULL},
>        {sizeof(MSticky), "MSticky", 1, NULL, NULL, NULL, layerInterp_msticky, NULL,
> @@ -843,7 +851,8 @@
>         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(float)*3, "", 0, NULL, NULL, NULL, NULL, NULL, NULL},
> +       {sizeof(SkinNode), "SkinNode", 1, "Skin", NULL, NULL, NULL, NULL, layerDefault_skin}
>  };
>
>  static const char *LAYERTYPENAMES[CD_NUMTYPES] = {
> @@ -851,7 +860,7 @@
>        /*   5-9 */ "CDMTFace", "CDMCol", "CDOrigIndex", "CDNormal", "CDFlags",
>        /* 10-14 */ "CDMFloatProperty", "CDMIntProperty","CDMStringProperty", "CDOrigSpace", "CDOrco",
>        /* 15-19 */ "CDMTexPoly", "CDMLoopUV", "CDMloopCol", "CDTangent", "CDMDisps",
> -       /* 20-23 */"CDWeightMCol", "CDIDMCol", "CDTextureMCol", "CDClothOrco"
> +       /* 20-24 */ "CDWeightMCol", "CDIDMCol", "CDTextureMCol", "CDClothOrco", "CDSkinNode"
>  };
>
>  const CustomDataMask CD_MASK_BAREMESH =
> @@ -859,10 +868,12 @@
>  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_PROP_FLT | CD_MASK_PROP_INT | CD_MASK_PROP_STR | CD_MASK_MDISPS |
> +       CD_MASK_SKIN_NODE;
>  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_MCOL|CD_MASK_PROP_FLT | CD_MASK_PROP_INT | CD_MASK_PROP_STR | CD_MASK_MDISPS |
> +       CD_MASK_SKIN_NODE;
>  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 |
>
> Modified: trunk/blender/source/blender/makesdna/DNA_customdata_types.h
> ===================================================================
> --- trunk/blender/source/blender/makesdna/DNA_customdata_types.h        2011-07-30 23:16:22 UTC (rev 38860)
> +++ trunk/blender/source/blender/makesdna/DNA_customdata_types.h        2011-07-31 02:03:21 UTC (rev 38861)
> @@ -92,7 +92,8 @@
>  #define CD_ID_MCOL             21
>  #define CD_TEXTURE_MCOL        22
>  #define CD_CLOTH_ORCO  23
> -#define CD_NUMTYPES            24
> +#define CD_SKIN_NODE           24
> +#define CD_NUMTYPES            25
>
>  /* Bits for CustomDataMask */
>  #define CD_MASK_MVERT          (1 << CD_MVERT)
> @@ -117,6 +118,7 @@
>  #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 */
>
>
> Modified: trunk/blender/source/blender/makesdna/DNA_meshdata_types.h
> ===================================================================
> --- trunk/blender/source/blender/makesdna/DNA_meshdata_types.h  2011-07-30 23:16:22 UTC (rev 38860)
> +++ trunk/blender/source/blender/makesdna/DNA_meshdata_types.h  2011-07-31 02:03:21 UTC (rev 38861)
> @@ -184,6 +184,11 @@
>        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
>
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
>



More information about the Bf-blender-cvs mailing list