Merge from trunk -r 23000:23968.
[blender.git] / source / blender / blenkernel / intern / lattice.c
index 81f7eb7a0eb10a5eb11d9cf1a04da94d1f54cb77..a957be4704c20888dfdd61e037775f0352fe47ac 100644 (file)
@@ -4,15 +4,12 @@
  *
  * $Id$
  *
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
+ * ***** 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. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
+ * 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
  *
  * Contributor(s): none yet.
  *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
+ * ***** END GPL LICENSE BLOCK *****
  */
 
+
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
@@ -56,6 +54,8 @@
 #include "BKE_anim.h"
 #include "BKE_armature.h"
 #include "BKE_curve.h"
+#include "BKE_cdderivedmesh.h"
+#include "BKE_DerivedMesh.h"
 #include "BKE_deform.h"
 #include "BKE_displist.h"
 #include "BKE_global.h"
 #include "BKE_lattice.h"
 #include "BKE_library.h"
 #include "BKE_main.h"
+#include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_object.h"
 #include "BKE_screen.h"
 #include "BKE_utildefines.h"
 
-#include "BIF_editdeform.h"
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "blendef.h"
-
-Lattice *editLatt=0;
-static Lattice *deformLatt=0;
-
-static float *latticedata=0, latmat[4][4];
+//XXX #include "BIF_editdeform.h"
 
 void calc_lat_fudu(int flag, int res, float *fu, float *du)
 {
@@ -104,6 +94,12 @@ void resizelattice(Lattice *lt, int uNew, int vNew, int wNew, Object *ltOb)
        float fu, fv, fw, uc, vc, wc, du=0.0, dv=0.0, dw=0.0;
        float *co, (*vertexCos)[3] = NULL;
        
+       /* vertex weight groups are just freed all for now */
+       if(lt->dvert) {
+               free_dverts(lt->dvert, lt->pntsu*lt->pntsv*lt->pntsw);
+               lt->dvert= NULL;
+       }
+       
        while(uNew*vNew*wNew > 32000) {
                if( uNew>=vNew && uNew>=wNew) uNew--;
                else if( vNew>=uNew && vNew>=wNew) vNew--;
@@ -161,7 +157,7 @@ void resizelattice(Lattice *lt, int uNew, int vNew, int wNew, Object *ltOb)
 
                Mat4CpyMat4(mat, ltOb->obmat);
                Mat4One(ltOb->obmat);
-               lattice_deform_verts(ltOb, NULL, vertexCos, uNew*vNew*wNew, NULL);
+               lattice_deform_verts(ltOb, NULL, NULL, vertexCos, uNew*vNew*wNew, NULL);
                Mat4CpyMat4(ltOb->obmat, mat);
 
                lt->typeu = typeu;
@@ -192,11 +188,11 @@ void resizelattice(Lattice *lt, int uNew, int vNew, int wNew, Object *ltOb)
        MEM_freeN(vertexCos);
 }
 
-Lattice *add_lattice()
+Lattice *add_lattice(char *name)
 {
        Lattice *lt;
        
-       lt= alloc_libblock(&G.main->latt, ID_LT, "Lattice");
+       lt= alloc_libblock(&G.main->latt, ID_LT, name);
        
        lt->flag= LT_GRID;
        
@@ -215,17 +211,31 @@ Lattice *copy_lattice(Lattice *lt)
        ltn= copy_libblock(lt);
        ltn->def= MEM_dupallocN(lt->def);
                
+#if 0 // XXX old animation system
        id_us_plus((ID *)ltn->ipo);
+#endif // XXX old animation system
 
        ltn->key= copy_key(ltn->key);
        if(ltn->key) ltn->key->from= (ID *)ltn;
        
+       if(lt->dvert) {
+               int tot= lt->pntsu*lt->pntsv*lt->pntsw;
+               ltn->dvert = MEM_mallocN (sizeof (MDeformVert)*tot, "Lattice MDeformVert");
+               copy_dverts(ltn->dvert, lt->dvert, tot);
+       }
+       
        return ltn;
 }
 
 void free_lattice(Lattice *lt)
 {
        if(lt->def) MEM_freeN(lt->def);
+       if(lt->dvert) free_dverts(lt->dvert, lt->pntsu*lt->pntsv*lt->pntsw);
+       if(lt->editlatt) {
+               if(lt->editlatt->def) MEM_freeN(lt->editlatt->def);
+               if(lt->editlatt->dvert) free_dverts(lt->editlatt->dvert, lt->pntsu*lt->pntsv*lt->pntsw);
+               MEM_freeN(lt->editlatt);
+       }
 }
 
 
@@ -284,31 +294,34 @@ void make_local_lattice(Lattice *lt)
 void init_latt_deform(Object *oblatt, Object *ob)
 {
                /* we make an array with all differences */
-       Lattice *lt = deformLatt = (oblatt==G.obedit)?editLatt:oblatt->data;
-       BPoint *bp = lt->def;
+       Lattice *ltoblatt->data;
+       BPoint *bp;
        DispList *dl = find_displist(&oblatt->disp, DL_VERTS);
        float *co = dl?dl->verts:NULL;
        float *fp, imat[4][4];
        float fu, fv, fw;
        int u, v, w;
 
-       fp= latticedata= MEM_mallocN(sizeof(float)*3*deformLatt->pntsu*deformLatt->pntsv*deformLatt->pntsw, "latticedata");
+       if(lt->editlatt) lt= lt->editlatt;
+       bp = lt->def;
+       
+       fp= lt->latticedata= MEM_mallocN(sizeof(float)*3*lt->pntsu*lt->pntsv*lt->pntsw, "latticedata");
        
                /* for example with a particle system: ob==0 */
-       if(ob==0) {
+       if(ob==NULL) {
                /* in deformspace, calc matrix  */
-               Mat4Invert(latmat, oblatt->obmat);
+               Mat4Invert(lt->latmat, oblatt->obmat);
        
                /* back: put in deform array */
-               Mat4Invert(imat, latmat);
+               Mat4Invert(imat, lt->latmat);
        }
        else {
                /* in deformspace, calc matrix */
                Mat4Invert(imat, oblatt->obmat);
-               Mat4MulMat4(latmat, ob->obmat, imat);
+               Mat4MulMat4(lt->latmat, ob->obmat, imat);
        
                /* back: put in deform array */
-               Mat4Invert(imat, latmat);
+               Mat4Invert(imat, lt->latmat);
        }
        
        for(w=0,fw=lt->fw; w<lt->pntsw; w++,fw+=lt->dw) {
@@ -330,21 +343,20 @@ void init_latt_deform(Object *oblatt, Object *ob)
        }
 }
 
-void calc_latt_deform(float *co, float weight)
+void calc_latt_deform(Object *ob, float *co, float weight)
 {
-       Lattice *lt;
+       Lattice *lt= ob->data;
        float u, v, w, tu[4], tv[4], tw[4];
        float *fpw, *fpv, *fpu, vec[3];
        int ui, vi, wi, uu, vv, ww;
        
-       if(latticedata==0) return;
-       
-       lt= deformLatt; /* just for shorter notation! */
+       if(lt->editlatt) lt= lt->editlatt;
+       if(lt->latticedata==NULL) return;
        
        /* co is in local coords, treat with latmat */
        
        VECCOPY(vec, co);
-       Mat4MulVecfl(latmat, vec);
+       Mat4MulVecfl(lt->latmat, vec);
        
        /* u v w coords */
        
@@ -352,7 +364,7 @@ void calc_latt_deform(float *co, float weight)
                u= (vec[0]-lt->fu)/lt->du;
                ui= (int)floor(u);
                u -= ui;
-               set_four_ipo(u, tu, lt->typeu);
+               key_curve_position_weights(u, tu, lt->typeu);
        }
        else {
                tu[0]= tu[2]= tu[3]= 0.0; tu[1]= 1.0;
@@ -363,7 +375,7 @@ void calc_latt_deform(float *co, float weight)
                v= (vec[1]-lt->fv)/lt->dv;
                vi= (int)floor(v);
                v -= vi;
-               set_four_ipo(v, tv, lt->typev);
+               key_curve_position_weights(v, tv, lt->typev);
        }
        else {
                tv[0]= tv[2]= tv[3]= 0.0; tv[1]= 1.0;
@@ -374,7 +386,7 @@ void calc_latt_deform(float *co, float weight)
                w= (vec[2]-lt->fw)/lt->dw;
                wi= (int)floor(w);
                w -= wi;
-               set_four_ipo(w, tw, lt->typew);
+               key_curve_position_weights(w, tw, lt->typew);
        }
        else {
                tw[0]= tw[2]= tw[3]= 0.0; tw[1]= 1.0;
@@ -386,10 +398,10 @@ void calc_latt_deform(float *co, float weight)
                
                if(w!=0.0) {
                        if(ww>0) {
-                               if(ww<lt->pntsw) fpw= latticedata + 3*ww*lt->pntsu*lt->pntsv;
-                               else fpw= latticedata + 3*(lt->pntsw-1)*lt->pntsu*lt->pntsv;
+                               if(ww<lt->pntsw) fpw= lt->latticedata + 3*ww*lt->pntsu*lt->pntsv;
+                               else fpw= lt->latticedata + 3*(lt->pntsw-1)*lt->pntsu*lt->pntsv;
                        }
-                       else fpw= latticedata;
+                       else fpw= lt->latticedata;
                        
                        for(vv= vi-1; vv<=vi+2; vv++) {
                                v= w*tv[vv-vi+1];
@@ -422,11 +434,15 @@ void calc_latt_deform(float *co, float weight)
        }
 }
 
-void end_latt_deform()
+void end_latt_deform(Object *ob)
 {
-
-       MEM_freeN(latticedata);
-       latticedata= 0;
+       Lattice *lt= ob->data;
+       
+       if(lt->editlatt) lt= lt->editlatt;
+       
+       if(lt->latticedata)
+               MEM_freeN(lt->latticedata);
+       lt->latticedata= NULL;
 }
 
        /* calculations is in local space of deformed object
@@ -434,23 +450,29 @@ void end_latt_deform()
         */
 typedef struct {
        float dmin[3], dmax[3], dsize, dloc[3];
-       float curvespace[4][4], objectspace[4][4];
+       float curvespace[4][4], objectspace[4][4], objectspace3[3][3];
+       int no_rot_axis;
 } CurveDeform;
 
-static void init_curve_deform(Object *par, Object *ob, CurveDeform *cd)
+static void init_curve_deform(Object *par, Object *ob, CurveDeform *cd, int dloc)
 {
        Mat4Invert(ob->imat, ob->obmat);
        Mat4MulMat4(cd->objectspace, par->obmat, ob->imat);
        Mat4Invert(cd->curvespace, cd->objectspace);
-
+       Mat3CpyMat4(cd->objectspace3, cd->objectspace);
+       
        // offset vector for 'no smear'
-       Mat4Invert(par->imat, par->obmat);
-       VecMat4MulVecfl(cd->dloc, par->imat, ob->obmat[3]);
-
+       if(dloc) {
+               Mat4Invert(par->imat, par->obmat);
+               VecMat4MulVecfl(cd->dloc, par->imat, ob->obmat[3]);
+       }
+       else cd->dloc[0]=cd->dloc[1]=cd->dloc[2]= 0.0f;
+       
+       cd->no_rot_axis= 0;
 }
 
 /* this makes sure we can extend for non-cyclic. *vec needs 4 items! */
-static int where_on_path_deform(Object *ob, float ctime, float *vec, float *dir)       /* returns OK */
+static int where_on_path_deform(Object *ob, float ctime, float *vec, float *dir, float *quat, float *radius)   /* returns OK */
 {
        Curve *cu= ob->data;
        BevList *bl;
@@ -459,6 +481,7 @@ static int where_on_path_deform(Object *ob, float ctime, float *vec, float *dir)
        
        /* test for cyclic */
        bl= cu->bev.first;
+       if (!bl->nr) return 0;
        if(bl && bl->poly> -1) cycl= 1;
 
        if(cycl==0) {
@@ -467,21 +490,25 @@ static int where_on_path_deform(Object *ob, float ctime, float *vec, float *dir)
        else ctime1= ctime;
        
        /* vec needs 4 items */
-       if(where_on_path(ob, ctime1, vec, dir)) {
+       if(where_on_path(ob, ctime1, vec, dir, quat, radius)) {
                
                if(cycl==0) {
                        Path *path= cu->path;
                        float dvec[3];
                        
                        if(ctime < 0.0) {
-                               VecSubf(dvec, path->data+4, path->data);
+                               VecSubf(dvec, path->data[1].vec, path->data[0].vec);
                                VecMulf(dvec, ctime*(float)path->len);
                                VECADD(vec, vec, dvec);
+                               if(quat) QUATCOPY(quat, path->data[0].quat);
+                               if(radius) *radius= path->data[0].radius;
                        }
                        else if(ctime > 1.0) {
-                               VecSubf(dvec, path->data+4*path->len-4, path->data+4*path->len-8);
+                               VecSubf(dvec, path->data[path->len-1].vec, path->data[path->len-2].vec);
                                VecMulf(dvec, (ctime-1.0)*(float)path->len);
                                VECADD(vec, vec, dvec);
+                               if(quat) QUATCOPY(quat, path->data[path->len-1].quat);
+                               if(radius) *radius= path->data[path->len-1].radius;
                        }
                }
                return 1;
@@ -492,158 +519,352 @@ static int where_on_path_deform(Object *ob, float ctime, float *vec, float *dir)
        /* for each point, rotate & translate to curve */
        /* use path, since it has constant distances */
        /* co: local coord, result local too */
-static void calc_curve_deform(Object *par, float *co, short axis, CurveDeform *cd)
+       /* returns quaternion for rotation, using cd->no_rot_axis */
+       /* axis is using another define!!! */
+static int calc_curve_deform(Scene *scene, Object *par, float *co, short axis, CurveDeform *cd, float *quatp)
 {
        Curve *cu= par->data;
-       float fac, loc[4], dir[3], *quat, q[4], mat[3][3], cent[3];
-       short upflag, index;
-       
-       if(axis==OB_POSX || axis==OB_NEGX) {
-               upflag= OB_POSZ;
-               cent[0]= 0.0;
-               cent[1]= co[1];
-               cent[2]= co[2];
-               index= 0;
-       }
-       else if(axis==OB_POSY || axis==OB_NEGY) {
-               upflag= OB_POSZ;
-               cent[0]= co[0];
-               cent[1]= 0.0;
-               cent[2]= co[2];
-               index= 1;
-       }
-       else {
-               upflag= OB_POSY;
-               cent[0]= co[0];
-               cent[1]= co[1];
-               cent[2]= 0.0;
-               index= 2;
-       }
+       float fac, loc[4], dir[3], new_quat[4], radius;
+       short /*upflag, */ index;
+
+       index= axis-1;
+       if(index>2)
+               index -= 3; /* negative  */
+
        /* to be sure, mostly after file load */
        if(cu->path==NULL) {
-               makeDispListCurveTypes(par, 0);
-               if(cu->path==NULL) return;      // happens on append...
+               makeDispListCurveTypes(scene, par, 0);
+               if(cu->path==NULL) return 0;    // happens on append...
        }
+       
        /* options */
-       if(cu->flag & CU_STRETCH)
-               fac= (co[index]-cd->dmin[index])/(cd->dmax[index] - cd->dmin[index]);
-       else
-               fac= (cd->dloc[index])/(cu->path->totdist) + (co[index]-cd->dmin[index])/(cu->path->totdist);
+       if(ELEM3(axis, OB_NEGX+1, OB_NEGY+1, OB_NEGZ+1)) { /* OB_NEG# 0-5, MOD_CURVE_POS# 1-6 */
+               if(cu->flag & CU_STRETCH)
+                       fac= (-co[index]-cd->dmax[index])/(cd->dmax[index] - cd->dmin[index]);
+               else
+                       fac= (cd->dloc[index])/(cu->path->totdist) - (co[index]-cd->dmax[index])/(cu->path->totdist);
+       }
+       else {
+               if(cu->flag & CU_STRETCH)
+                       fac= (co[index]-cd->dmin[index])/(cd->dmax[index] - cd->dmin[index]);
+               else
+                       fac= (cd->dloc[index])/(cu->path->totdist) + (co[index]-cd->dmin[index])/(cu->path->totdist);
+       }
+       
+#if 0 // XXX old animation system
+       /* we want the ipo to work on the default 100 frame range, because there's no  
+          actual time involved in path position */
+       // huh? by WHY!!!!???? - Aligorith
+       if(cu->ipo) {
+               fac*= 100.0f;
+               if(calc_ipo_spec(cu->ipo, CU_SPEED, &fac)==0)
+                       fac/= 100.0;
+       }
+#endif // XXX old animation system
        
-       if( where_on_path_deform(par, fac, loc, dir)) { /* returns OK */
+       if( where_on_path_deform(par, fac, loc, dir, new_quat, &radius)) {      /* returns OK */
+               float quat[4], cent[3];
 
-               quat= vectoquat(dir, axis, upflag);
+#if 0  // XXX - 2.4x Z-Up, Now use bevel tilt.
+               if(cd->no_rot_axis)     /* set by caller */
+                       dir[cd->no_rot_axis-1]= 0.0f;
+               
+               /* -1 for compatibility with old track defines */
+               vectoquat(dir, axis-1, upflag, quat);
                
                /* the tilt */
                if(loc[3]!=0.0) {
-                       Normalise(dir);
+                       Normalize(dir);
                        q[0]= (float)cos(0.5*loc[3]);
                        fac= (float)sin(0.5*loc[3]);
                        q[1]= -fac*dir[0];
                        q[2]= -fac*dir[1];
                        q[3]= -fac*dir[2];
                        QuatMul(quat, q, quat);
-               }               
-               QuatToMat3(quat, mat);
-       
-               /* local rotation */
-               Mat3MulVecfl(mat, cent);
+               }
+#endif
+
+
+               static float q_x90d[4] = {0.70710676908493, 0.70710676908493, 0.0, 0.0};        // float rot_axis[3]= {1,0,0}; AxisAngleToQuat(q, rot_axis, 90 * (M_PI / 180));
+               static float q_y90d[4] = {0.70710676908493, 0.0, 0.70710676908493, 0.0};        // float rot_axis[3]= {0,1,0}; AxisAngleToQuat(q, rot_axis, 90 * (M_PI / 180));
+               static float q_z90d[4] = {0.70710676908493, 0.0, 0.0, 0.70710676908493};        // float rot_axis[3]= {0,0,2}; AxisAngleToQuat(q, rot_axis, 90 * (M_PI / 180));
+
+               static float q_nx90d[4] = {0.70710676908493, -0.70710676908493, 0.0, 0.0};      // float rot_axis[3]= {1,0,0}; AxisAngleToQuat(q, rot_axis, -90 * (M_PI / 180));
+               static float q_ny90d[4] = {0.70710676908493, 0.0, -0.70710676908493, 0.0};      // float rot_axis[3]= {0,1,0}; AxisAngleToQuat(q, rot_axis, -90 * (M_PI / 180));
+               static float q_nz90d[4] = {0.70710676908493, 0.0, 0.0, -0.70710676908493};      // float rot_axis[3]= {0,0,2}; AxisAngleToQuat(q, rot_axis, -90 * (M_PI / 180));
+
+
+               if(cd->no_rot_axis) {   /* set by caller */
+
+                       /* this is not exactly the same as 2.4x, since the axis is having rotation removed rather then
+                        * changing the axis before calculating the tilt but serves much the same purpose */
+                       float dir_flat[3]={0,0,0}, q[4];
+                       VECCOPY(dir_flat, dir);
+                       dir_flat[cd->no_rot_axis-1]= 0.0f;
+
+                       Normalize(dir);
+                       Normalize(dir_flat);
+
+                       RotationBetweenVectorsToQuat(q, dir, dir_flat); /* Could this be done faster? */
+
+                       QuatMul(new_quat, q, new_quat);
+               }
+
+
+               /* Logic for 'cent' orientation *
+                *
+                * The way 'co' is copied to 'cent' may seem to have no meaning, but it does.
+                *
+                * Use a curve modifier to stretch a cube out, color each side RGB, positive side light, negative dark.
+                * view with X up (default), from the angle that you can see 3 faces RGB colors (light), anti-clockwise
+                * Notice X,Y,Z Up all have light colors and each ordered CCW.
+                *
+                * Now for Neg Up XYZ, the colors are all dark, and ordered clockwise - Campbell
+                * */
+
+               switch(axis) {
+               case MOD_CURVE_POSX:
+                       QuatMul(quat, new_quat, q_y90d);
+
+                       cent[0]=  0.0;
+                       cent[1]=  co[2];
+                       cent[2]=  co[1];
+                       break;
+               case MOD_CURVE_NEGX:
+                       QuatMul(quat, new_quat, q_ny90d);
+
+                       cent[0]=  0.0;
+                       cent[1]= -co[1];
+                       cent[2]=  co[2];
+
+                       break;
+               case MOD_CURVE_POSY:
+                       QuatMul(quat, new_quat, q_x90d);
+
+                       cent[0]=  co[2];
+                       cent[1]=  0.0;
+                       cent[2]= -co[0];
+                       break;
+               case MOD_CURVE_NEGY:
+                       QuatMul(quat, new_quat, q_nx90d);
+
+                       cent[0]= -co[0];
+                       cent[1]=  0.0;
+                       cent[2]= -co[2];
+                       break;
+               case MOD_CURVE_POSZ:
+                       QuatMul(quat, new_quat, q_z90d);
+
+                       cent[0]=  co[1];
+                       cent[1]= -co[0];
+                       cent[2]=  0.0;
+                       break;
+               case MOD_CURVE_NEGZ:
+                       QuatMul(quat, new_quat, q_nz90d);
+
+                       cent[0]=  co[0];
+                       cent[1]= -co[1];
+                       cent[2]=  0.0;
+                       break;
+               }
+
+               /* scale if enabled */
+               if(cu->flag & CU_PATH_RADIUS)
+                       VecMulf(cent, radius);
                
+               /* local rotation */
+               NormalQuat(quat);
+               QuatMulVecf(quat, cent);
+
                /* translation */
                VECADD(co, cent, loc);
+
+               if(quatp)
+                       QUATCOPY(quatp, quat);
                
+               return 1;
        }
-
+       return 0;
 }
 
-void curve_deform_verts(Object *cuOb, Object *target, float (*vertexCos)[3], int numVerts, char *vgroup)
+void curve_deform_verts(Scene *scene, Object *cuOb, Object *target, DerivedMesh *dm, float (*vertexCos)[3], int numVerts, char *vgroup, short defaxis)
 {
-       Curve *cu = cuOb->data;
-       int a, flag = cu->flag;
+       Curve *cu;
+       int a, flag;
        CurveDeform cd;
-       
+       int use_vgroups;
+
+       if(cuOb->type != OB_CURVE)
+               return;
+
+       cu = cuOb->data;
+       flag = cu->flag;
        cu->flag |= (CU_PATH|CU_FOLLOW); // needed for path & bevlist
 
-       init_curve_deform(cuOb, target, &cd);
-               
-       INIT_MINMAX(cd.dmin, cd.dmax);
+       init_curve_deform(cuOb, target, &cd, (cu->flag & CU_STRETCH)==0);
                
-       for(a=0; a<numVerts; a++) {
-               Mat4MulVecfl(cd.curvespace, vertexCos[a]);
-               DO_MINMAX(vertexCos[a], cd.dmin, cd.dmax);
-       }
+       /* check whether to use vertex groups (only possible if target is a Mesh)
+        * we want either a Mesh with no derived data, or derived data with
+        * deformverts
+        */
+       if(target && target->type==OB_MESH) {
+               /* if there's derived data without deformverts, don't use vgroups */
+               if(dm && !dm->getVertData(dm, 0, CD_MDEFORMVERT))
+                       use_vgroups = 0;
+               else
+                       use_vgroups = 1;
+       } else
+               use_vgroups = 0;
        
-       if(vgroup && vgroup[0] && target->type==OB_MESH) {
+       if(vgroup && vgroup[0] && use_vgroups) {
                bDeformGroup *curdef;
                Mesh *me= target->data;
-               int index= 0;
+               int index;
                
                /* find the group (weak loop-in-loop) */
-               for (curdef = target->defbase.first; curdef; curdef=curdef->next, index++)
+               for(index = 0, curdef = target->defbase.first; curdef;
+                   curdef = curdef->next, index++)
                        if (!strcmp(curdef->name, vgroup))
                                break;
-               /* check for numVerts because old files can have modifier over subsurf still */
-               if(curdef && me->dvert && numVerts==me->totvert) {
-                       MDeformVert *dvert= me->dvert;
+
+               if(curdef && (me->dvert || dm)) {
+                       MDeformVert *dvert = me->dvert;
                        float vec[3];
                        int j;
-                       
-                       for(a=0; a<numVerts; a++, dvert++) {
-                               for(j=0; j<dvert->totweight; j++) {
-                                       if (dvert->dw[j].def_nr == index) {
+
+                       INIT_MINMAX(cd.dmin, cd.dmax);
+
+                       for(a = 0; a < numVerts; a++, dvert++) {
+                               if(dm) dvert = dm->getVertData(dm, a, CD_MDEFORMVERT);
+
+                               for(j = 0; j < dvert->totweight; j++) {
+                                       if(dvert->dw[j].def_nr == index) {
+                                               Mat4MulVecfl(cd.curvespace, vertexCos[a]);
+                                               DO_MINMAX(vertexCos[a], cd.dmin, cd.dmax);
+                                               break;
+                                       }
+                               }
+                       }
+
+                       dvert = me->dvert;
+                       for(a = 0; a < numVerts; a++, dvert++) {
+                               if(dm) dvert = dm->getVertData(dm, a, CD_MDEFORMVERT);
+
+                               for(j = 0; j < dvert->totweight; j++) {
+                                       if(dvert->dw[j].def_nr == index) {
                                                VECCOPY(vec, vertexCos[a]);
-                                               calc_curve_deform(cuOb, vec, target->trackflag, &cd);
-                                               VecLerpf(vertexCos[a], vertexCos[a], vec, dvert->dw[j].weight);
+                                               calc_curve_deform(scene, cuOb, vec, defaxis, &cd, NULL);
+                                               VecLerpf(vertexCos[a], vertexCos[a], vec,
+                                                        dvert->dw[j].weight);
                                                Mat4MulVecfl(cd.objectspace, vertexCos[a]);
+                                               break;
                                        }
                                }
                        }
                }
-       }
-       else {
-               for(a=0; a<numVerts; a++) {
-                       calc_curve_deform(cuOb, vertexCos[a], target->trackflag, &cd);
+       } else {
+               INIT_MINMAX(cd.dmin, cd.dmax);
+                       
+               for(a = 0; a < numVerts; a++) {
+                       Mat4MulVecfl(cd.curvespace, vertexCos[a]);
+                       DO_MINMAX(vertexCos[a], cd.dmin, cd.dmax);
+               }
+
+               for(a = 0; a < numVerts; a++) {
+                       calc_curve_deform(scene, cuOb, vertexCos[a], defaxis, &cd, NULL);
                        Mat4MulVecfl(cd.objectspace, vertexCos[a]);
                }
        }
        cu->flag = flag;
 }
 
-void lattice_deform_verts(Object *laOb, Object *target, float (*vertexCos)[3], int numVerts, char *vgroup)
+/* input vec and orco = local coord in armature space */
+/* orco is original not-animated or deformed reference point */
+/* result written in vec and mat */
+void curve_deform_vector(Scene *scene, Object *cuOb, Object *target, float *orco, float *vec, float mat[][3], int no_rot_axis)
+{
+       CurveDeform cd;
+       float quat[4];
+       
+       if(cuOb->type != OB_CURVE) {
+               Mat3One(mat);
+               return;
+       }
+
+       init_curve_deform(cuOb, target, &cd, 0);        /* 0 no dloc */
+       cd.no_rot_axis= no_rot_axis;                            /* option to only rotate for XY, for example */
+       
+       VECCOPY(cd.dmin, orco);
+       VECCOPY(cd.dmax, orco);
+
+       Mat4MulVecfl(cd.curvespace, vec);
+       
+       if(calc_curve_deform(scene, cuOb, vec, target->trackflag+1, &cd, quat)) {
+               float qmat[3][3];
+               
+               QuatToMat3(quat, qmat);
+               Mat3MulMat3(mat, qmat, cd.objectspace3);
+       }
+       else
+               Mat3One(mat);
+       
+       Mat4MulVecfl(cd.objectspace, vec);
+
+}
+
+void lattice_deform_verts(Object *laOb, Object *target, DerivedMesh *dm,
+                          float (*vertexCos)[3], int numVerts, char *vgroup)
 {
        int a;
+       int use_vgroups;
+
+       if(laOb->type != OB_LATTICE)
+               return;
 
        init_latt_deform(laOb, target);
+
+       /* check whether to use vertex groups (only possible if target is a Mesh)
+        * we want either a Mesh with no derived data, or derived data with
+        * deformverts
+        */
+       if(target && target->type==OB_MESH) {
+               /* if there's derived data without deformverts, don't use vgroups */
+               if(dm && !dm->getVertData(dm, 0, CD_MDEFORMVERT))
+                       use_vgroups = 0;
+               else
+                       use_vgroups = 1;
+       } else
+               use_vgroups = 0;
        
-       if(vgroup && vgroup[0] && target->type==OB_MESH) {
+       if(vgroup && vgroup[0] && use_vgroups) {
                bDeformGroup *curdef;
-               Mesh *me= target->data;
-               int index= 0;
+               Mesh *me = target->data;
+               int index = 0;
                
                /* find the group (weak loop-in-loop) */
-               for (curdef = target->defbase.first; curdef; curdef=curdef->next, index++)
-                       if (!strcmp(curdef->name, vgroup))
-                               break;
-               /* check for numVerts because old files can have modifier over subsurf still */
-               if(curdef && me->dvert && numVerts==me->totvert) {
-                       MDeformVert *dvert= me->dvert;
+               for(curdef = target->defbase.first; curdef;
+                   curdef = curdef->next, index++)
+                       if(!strcmp(curdef->name, vgroup)) break;
+
+               if(curdef && (me->dvert || dm)) {
+                       MDeformVert *dvert = me->dvert;
                        int j;
                        
-                       for(a=0; a<numVerts; a++, dvert++) {
-                               for(j=0; j<dvert->totweight; j++) {
+                       for(a = 0; a < numVerts; a++, dvert++) {
+                               if(dm) dvert = dm->getVertData(dm, a, CD_MDEFORMVERT);
+                               for(j = 0; j < dvert->totweight; j++) {
                                        if (dvert->dw[j].def_nr == index) {
-                                               calc_latt_deform(vertexCos[a], dvert->dw[j].weight);
+                                               calc_latt_deform(laOb, vertexCos[a], dvert->dw[j].weight);
                                        }
                                }
                        }
                }
-       }
-       else {
-               for(a=0; a<numVerts; a++) {
-                       calc_latt_deform(vertexCos[a], 1.0f);
+       } else {
+               for(a = 0; a < numVerts; a++) {
+                       calc_latt_deform(laOb, vertexCos[a], 1.0f);
                }
        }
-       end_latt_deform();
+       end_latt_deform(laOb);
 }
 
 int object_deform_mball(Object *ob)
@@ -652,7 +873,8 @@ int object_deform_mball(Object *ob)
                DispList *dl;
 
                for (dl=ob->disp.first; dl; dl=dl->next) {
-                       lattice_deform_verts(ob->parent, ob, (float(*)[3]) dl->verts, dl->nr, NULL);
+                       lattice_deform_verts(ob->parent, ob, NULL,
+                                            (float(*)[3]) dl->verts, dl->nr, NULL);
                }
 
                return 1;
@@ -672,67 +894,81 @@ void outside_lattice(Lattice *lt)
        int u, v, w;
        float fac1, du=0.0, dv=0.0, dw=0.0;
 
-       bp= lt->def;
+       if(lt->flag & LT_OUTSIDE) {
+               bp= lt->def;
 
-       if(lt->pntsu>1) du= 1.0f/((float)lt->pntsu-1);
-       if(lt->pntsv>1) dv= 1.0f/((float)lt->pntsv-1);
-       if(lt->pntsw>1) dw= 1.0f/((float)lt->pntsw-1);
-               
-       for(w=0; w<lt->pntsw; w++) {
-               
-               for(v=0; v<lt->pntsv; v++) {
-               
-                       for(u=0; u<lt->pntsu; u++, bp++) {
-                               if(u==0 || v==0 || w==0 || u==lt->pntsu-1 || v==lt->pntsv-1 || w==lt->pntsw-1);
-                               else {
-                               
-                                       bp->hide= 1;
-                                       bp->f1 &= ~SELECT;
-                                       
-                                       /* u extrema */
-                                       bp1= latt_bp(lt, 0, v, w);
-                                       bp2= latt_bp(lt, lt->pntsu-1, v, w);
-                                       
-                                       fac1= du*u;
-                                       bp->vec[0]= (1.0f-fac1)*bp1->vec[0] + fac1*bp2->vec[0];
-                                       bp->vec[1]= (1.0f-fac1)*bp1->vec[1] + fac1*bp2->vec[1];
-                                       bp->vec[2]= (1.0f-fac1)*bp1->vec[2] + fac1*bp2->vec[2];
-                                       
-                                       /* v extrema */
-                                       bp1= latt_bp(lt, u, 0, w);
-                                       bp2= latt_bp(lt, u, lt->pntsv-1, w);
-                                       
-                                       fac1= dv*v;
-                                       bp->vec[0]+= (1.0f-fac1)*bp1->vec[0] + fac1*bp2->vec[0];
-                                       bp->vec[1]+= (1.0f-fac1)*bp1->vec[1] + fac1*bp2->vec[1];
-                                       bp->vec[2]+= (1.0f-fac1)*bp1->vec[2] + fac1*bp2->vec[2];
-                                       
-                                       /* w extrema */
-                                       bp1= latt_bp(lt, u, v, 0);
-                                       bp2= latt_bp(lt, u, v, lt->pntsw-1);
-                                       
-                                       fac1= dw*w;
-                                       bp->vec[0]+= (1.0f-fac1)*bp1->vec[0] + fac1*bp2->vec[0];
-                                       bp->vec[1]+= (1.0f-fac1)*bp1->vec[1] + fac1*bp2->vec[1];
-                                       bp->vec[2]+= (1.0f-fac1)*bp1->vec[2] + fac1*bp2->vec[2];
-                                       
-                                       VecMulf(bp->vec, 0.3333333f);
+               if(lt->pntsu>1) du= 1.0f/((float)lt->pntsu-1);
+               if(lt->pntsv>1) dv= 1.0f/((float)lt->pntsv-1);
+               if(lt->pntsw>1) dw= 1.0f/((float)lt->pntsw-1);
+                       
+               for(w=0; w<lt->pntsw; w++) {
+                       
+                       for(v=0; v<lt->pntsv; v++) {
+                       
+                               for(u=0; u<lt->pntsu; u++, bp++) {
+                                       if(u==0 || v==0 || w==0 || u==lt->pntsu-1 || v==lt->pntsv-1 || w==lt->pntsw-1);
+                                       else {
                                        
+                                               bp->hide= 1;
+                                               bp->f1 &= ~SELECT;
+                                               
+                                               /* u extrema */
+                                               bp1= latt_bp(lt, 0, v, w);
+                                               bp2= latt_bp(lt, lt->pntsu-1, v, w);
+                                               
+                                               fac1= du*u;
+                                               bp->vec[0]= (1.0f-fac1)*bp1->vec[0] + fac1*bp2->vec[0];
+                                               bp->vec[1]= (1.0f-fac1)*bp1->vec[1] + fac1*bp2->vec[1];
+                                               bp->vec[2]= (1.0f-fac1)*bp1->vec[2] + fac1*bp2->vec[2];
+                                               
+                                               /* v extrema */
+                                               bp1= latt_bp(lt, u, 0, w);
+                                               bp2= latt_bp(lt, u, lt->pntsv-1, w);
+                                               
+                                               fac1= dv*v;
+                                               bp->vec[0]+= (1.0f-fac1)*bp1->vec[0] + fac1*bp2->vec[0];
+                                               bp->vec[1]+= (1.0f-fac1)*bp1->vec[1] + fac1*bp2->vec[1];
+                                               bp->vec[2]+= (1.0f-fac1)*bp1->vec[2] + fac1*bp2->vec[2];
+                                               
+                                               /* w extrema */
+                                               bp1= latt_bp(lt, u, v, 0);
+                                               bp2= latt_bp(lt, u, v, lt->pntsw-1);
+                                               
+                                               fac1= dw*w;
+                                               bp->vec[0]+= (1.0f-fac1)*bp1->vec[0] + fac1*bp2->vec[0];
+                                               bp->vec[1]+= (1.0f-fac1)*bp1->vec[1] + fac1*bp2->vec[1];
+                                               bp->vec[2]+= (1.0f-fac1)*bp1->vec[2] + fac1*bp2->vec[2];
+                                               
+                                               VecMulf(bp->vec, 0.3333333f);
+                                               
+                                       }
                                }
+                               
                        }
                        
                }
-               
        }
-       
+       else {
+               bp= lt->def;
+
+               for(w=0; w<lt->pntsw; w++)
+                       for(v=0; v<lt->pntsv; v++)
+                               for(u=0; u<lt->pntsu; u++, bp++)
+                                       bp->hide= 0;
+       }
 }
 
 float (*lattice_getVertexCos(struct Object *ob, int *numVerts_r))[3]
 {
-       Lattice *lt = (G.obedit==ob)?editLatt:ob->data;
-       int i, numVerts = *numVerts_r = lt->pntsu*lt->pntsv*lt->pntsw;
-       float (*vertexCos)[3] = MEM_mallocN(sizeof(*vertexCos)*numVerts,"lt_vcos");
+       Lattice *lt = ob->data;
+       int i, numVerts;
+       float (*vertexCos)[3];
 
+       if(lt->editlatt) lt= lt->editlatt;
+       numVerts = *numVerts_r = lt->pntsu*lt->pntsv*lt->pntsw;
+       
+       vertexCos = MEM_mallocN(sizeof(*vertexCos)*numVerts,"lt_vcos");
+       
        for (i=0; i<numVerts; i++) {
                VECCOPY(vertexCos[i], lt->def[i].vec);
        }
@@ -750,31 +986,37 @@ void lattice_applyVertexCos(struct Object *ob, float (*vertexCos)[3])
        }
 }
 
-void lattice_calc_modifiers(Object *ob)
+void lattice_calc_modifiers(Scene *scene, Object *ob)
 {
-       float (*vertexCos)[3] = NULL;
+       Lattice *lt= ob->data;
        ModifierData *md = modifiers_getVirtualModifierList(ob);
-       int numVerts, editmode = G.obedit==ob;
+       float (*vertexCos)[3] = NULL;
+       int numVerts, editmode = (lt->editlatt!=NULL);
 
        freedisplist(&ob->disp);
 
        if (!editmode) {
-               do_ob_key(ob);
+               do_ob_key(scene, ob);
        }
 
        for (; md; md=md->next) {
                ModifierTypeInfo *mti = modifierType_getInfo(md->type);
 
-               if (!(md->mode&(1<<0))) continue;
+               md->scene= scene;
+               
+               if (!(md->mode&eModifierMode_Realtime)) continue;
                if (editmode && !(md->mode&eModifierMode_Editmode)) continue;
                if (mti->isDisabled && mti->isDisabled(md)) continue;
                if (mti->type!=eModifierTypeType_OnlyDeform) continue;
 
                if (!vertexCos) vertexCos = lattice_getVertexCos(ob, &numVerts);
-               mti->deformVerts(md, ob, NULL, vertexCos, numVerts);
+               mti->deformVerts(md, ob, NULL, vertexCos, numVerts, 0, 0);
        }
 
-       if (vertexCos) {
+       /* always displist to make this work like derivedmesh */
+       if (!vertexCos) vertexCos = lattice_getVertexCos(ob, &numVerts);
+       
+       {
                DispList *dl = MEM_callocN(sizeof(*dl), "lt_dl");
                dl->type = DL_VERTS;
                dl->parts = 1;
@@ -784,3 +1026,16 @@ void lattice_calc_modifiers(Object *ob)
                BLI_addtail(&ob->disp, dl);
        }
 }
+
+struct MDeformVert* lattice_get_deform_verts(struct Object *oblatt)
+{
+       if(oblatt->type == OB_LATTICE)
+       {
+               Lattice *lt = (Lattice*)oblatt->data;
+               if(lt->editlatt) lt= lt->editlatt;
+               return lt->dvert;
+       }
+
+       return NULL;    
+}
+