style cleanup, brackets in else/if, some indentation.
[blender.git] / source / blender / modifiers / intern / MOD_cloth.c
index a2f5fdc..f236904 100644 (file)
@@ -1,91 +1,56 @@
 /*
-* $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.
-*
-* The Original Code is Copyright (C) 2005 by the Blender Foundation.
-* All rights reserved.
-*
-* Contributor(s): Daniel Dunbar
-*                 Ton Roosendaal,
-*                 Ben Batt,
-*                 Brecht Van Lommel,
-*                 Campbell Barton
-*
-* ***** END GPL LICENSE BLOCK *****
-*
-*/
-
-#include "stddef.h"
-#include "string.h"
-#include "stdarg.h"
-#include "math.h"
-#include "float.h"
-
-#include "BLI_kdtree.h"
-#include "BLI_rand.h"
-#include "BLI_uvproject.h"
+ * ***** 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.
+ *
+ * The Original Code is Copyright (C) 2005 by the Blender Foundation.
+ * All rights reserved.
+ *
+ * Contributor(s): Daniel Dunbar
+ *                 Ton Roosendaal,
+ *                 Ben Batt,
+ *                 Brecht Van Lommel,
+ *                 Campbell Barton
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ *
+ */
+
+/** \file blender/modifiers/intern/MOD_cloth.c
+ *  \ingroup modifiers
+ */
+
+
+#include "DNA_cloth_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_object_types.h"
 
 #include "MEM_guardedalloc.h"
 
-#include "DNA_armature_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_key_types.h"
-#include "DNA_material_types.h"
-#include "DNA_object_fluidsim.h"
+#include "BLI_utildefines.h"
 
 
-#include "BKE_action.h"
-#include "BKE_bmesh.h"
-#include "BKE_booleanops.h"
 #include "BKE_cloth.h"
 #include "BKE_cdderivedmesh.h"
-#include "BKE_displist.h"
-#include "BKE_fluidsim.h"
 #include "BKE_global.h"
-#include "BKE_multires.h"
-#include "BKE_key.h"
-#include "BKE_lattice.h"
-#include "BKE_material.h"
-#include "BKE_mesh.h"
 #include "BKE_modifier.h"
-#include "BKE_object.h"
-#include "BKE_paint.h"
-#include "BKE_particle.h"
 #include "BKE_pointcache.h"
-#include "BKE_scene.h"
-#include "BKE_smoke.h"
-#include "BKE_softbody.h"
-#include "BKE_subsurf.h"
-#include "BKE_texture.h"
 
 #include "depsgraph_private.h"
-#include "BKE_deform.h"
-#include "BKE_shrinkwrap.h"
-
-#include "LOD_decimation.h"
-
-#include "CCGSubSurf.h"
-
-#include "RE_shader_ext.h"
-
-#include "MOD_modifiertypes.h"
 
+#include "MOD_util.h"
 
 static void initData(ModifierData *md) 
 {
@@ -102,49 +67,51 @@ static void initData(ModifierData *md)
        cloth_init (clmd);
 }
 
-static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
-               DerivedMesh *derivedData, int useRenderParams, int isFinalCalc)
+static void deformVerts(ModifierData *md, Object *ob, DerivedMesh *derivedData, float (*vertexCos)[3],
+                       int UNUSED(numVerts), int UNUSED(useRenderParams), int UNUSED(isFinalCalc))
 {
+       DerivedMesh *dm;
        ClothModifierData *clmd = (ClothModifierData*) md;
        DerivedMesh *result=NULL;
        
        /* check for alloc failing */
-       if(!clmd->sim_parms || !clmd->coll_parms)
-       {
+       if (!clmd->sim_parms || !clmd->coll_parms) {
                initData(md);
-               
+
                if(!clmd->sim_parms || !clmd->coll_parms)
-                       return derivedData;
+                       return;
        }
 
-       result = clothModifier_do(clmd, md->scene, ob, derivedData, useRenderParams, isFinalCalc);
+       dm = get_dm(ob, NULL, derivedData, NULL, 0);
+       if(dm == derivedData)
+               dm = CDDM_copy(dm);
 
-       if(result)
-       {
-               CDDM_calc_normals(result);
-               return result;
+       CDDM_apply_vert_coords(dm, vertexCos);
+
+       DM_ensure_tessface(dm); /* BMESH - UNTIL MODIFIER IS UPDATED FOR MPoly */
+
+       clothModifier_do(clmd, md->scene, ob, dm, vertexCos);
+
+       if(result) {
+               result->getVertCos(result, vertexCos);
+               result->release(result);
        }
-       return derivedData;
+
+       dm->release(dm);
 }
 
-static void updateDepgraph(
-                                        ModifierData *md, DagForest *forest, Scene *scene, Object *ob,
-         DagNode *obNode)
+static void updateDepgraph(ModifierData *md, DagForest *forest, Scene *scene, Object *ob, DagNode *obNode)
 {
        ClothModifierData *clmd = (ClothModifierData*) md;
        
        Base *base;
        
-       if(clmd)
-       {
-               for(base = scene->base.first; base; base= base->next) 
-               {
+       if(clmd) {
+               for(base = scene->base.first; base; base= base->next) {
                        Object *ob1= base->object;
-                       if(ob1 != ob)
-                       {
+                       if (ob1 != ob) {
                                CollisionModifierData *coll_clmd = (CollisionModifierData *)modifiers_findByType(ob1, eModifierType_Collision);
-                               if(coll_clmd)
-                               {
+                               if (coll_clmd) {
                                        DagNode *curNode = dag_get_node(forest, ob1);
                                        dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA|DAG_RL_OB_DATA, "Cloth Collision");
                                }
@@ -153,16 +120,16 @@ static void updateDepgraph(
        }
 }
 
-static CustomDataMask requiredDataMask(Object *ob, ModifierData *md)
+static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
 {
        CustomDataMask dataMask = 0;
        ClothModifierData *clmd = (ClothModifierData*)md;
 
        if(cloth_uses_vgroup(clmd))
-               dataMask |= (1 << CD_MDEFORMVERT);
+               dataMask |= CD_MASK_MDEFORMVERT;
 
        if(clmd->sim_parms->shapekey_rest != 0)
-               dataMask |= (1 << CD_CLOTH_ORCO);
+               dataMask |= CD_MASK_CLOTH_ORCO;
 
        return dataMask;
 }
@@ -171,15 +138,19 @@ static void copyData(ModifierData *md, ModifierData *target)
 {
        ClothModifierData *clmd = (ClothModifierData*) md;
        ClothModifierData *tclmd = (ClothModifierData*) target;
-       
-       if(tclmd->sim_parms)
+
+       if(tclmd->sim_parms) {
+               if(tclmd->sim_parms->effector_weights)
+                       MEM_freeN(tclmd->sim_parms->effector_weights);
                MEM_freeN(tclmd->sim_parms);
+       }
+
        if(tclmd->coll_parms)
                MEM_freeN(tclmd->coll_parms);
        
        BKE_ptcache_free_list(&tclmd->ptcaches);
        tclmd->point_cache = NULL;
-       
+
        tclmd->sim_parms = MEM_dupallocN(clmd->sim_parms);
        if(clmd->sim_parms->effector_weights)
                tclmd->sim_parms->effector_weights = MEM_dupallocN(clmd->sim_parms->effector_weights);
@@ -188,7 +159,7 @@ static void copyData(ModifierData *md, ModifierData *target)
        tclmd->clothObject = NULL;
 }
 
-static int dependsOnTime(ModifierData *md)
+static int dependsOnTime(ModifierData *UNUSED(md))
 {
        return 1;
 }
@@ -197,8 +168,7 @@ static void freeData(ModifierData *md)
 {
        ClothModifierData *clmd = (ClothModifierData*) md;
        
-       if (clmd) 
-       {
+       if (clmd) {
                if(G.rt > 0)
                        printf("clothModifier_freeData\n");
                
@@ -217,28 +187,44 @@ static void freeData(ModifierData *md)
        }
 }
 
+static void foreachIDLink(ModifierData *md, Object *ob,
+                                          IDWalkFunc walk, void *userData)
+{
+       ClothModifierData *clmd = (ClothModifierData*) md;
+
+       if(clmd->coll_parms) {
+               walk(userData, ob, (ID **)&clmd->coll_parms->group);
+       }
+
+       if(clmd->sim_parms && clmd->sim_parms->effector_weights) {
+               walk(userData, ob, (ID **)&clmd->sim_parms->effector_weights->group);
+       }
+}
 
 ModifierTypeInfo modifierType_Cloth = {
        /* name */              "Cloth",
        /* structName */        "ClothModifierData",
        /* structSize */        sizeof(ClothModifierData),
-       /* type */              eModifierTypeType_Nonconstructive,
-       /* flags */             eModifierTypeFlag_AcceptsMesh |
-                                                       eModifierTypeFlag_UsesPointCache |
-                                                       eModifierTypeFlag_Single,
+       /* type */              eModifierTypeType_OnlyDeform,
+       /* flags */             eModifierTypeFlag_AcceptsMesh
+                                                       | eModifierTypeFlag_UsesPointCache
+                                                       eModifierTypeFlag_Single,
 
        /* copyData */          copyData,
-       /* deformVerts */       0,
-       /* deformVertsEM */     0,
-       /* deformMatricesEM */  0,
-       /* applyModifier */     applyModifier,
-       /* applyModifierEM */   0,
-       /* initData */          0,
+       /* deformVerts */       deformVerts,
+       /* deformMatrices */    NULL,
+       /* deformVertsEM */     NULL,
+       /* deformMatricesEM */  NULL,
+       /* applyModifier */     NULL,
+       /* applyModifierEM */   NULL,
+       /* initData */          initData,
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          freeData,
-       /* isDisabled */        0,
+       /* isDisabled */        NULL,
        /* updateDepgraph */    updateDepgraph,
        /* dependsOnTime */     dependsOnTime,
-       /* foreachObjectLink */ 0,
-       /* foreachIDLink */     0,
+       /* dependsOnNormals */  NULL,
+       /* foreachObjectLink */ NULL,
+       /* foreachIDLink */     foreachIDLink,
+       /* foreachTexLink */    NULL,
 };