doxygen: blender/blenkernel tagged.
[blender.git] / source / blender / blenkernel / intern / lattice.c
index 1eb7b5d20215d427b3b7be795784316272130aa4..091c4a2fe5024ccd7325781619dcb6de8b45e7e1 100644 (file)
@@ -1,4 +1,4 @@
-/**
+/*
  * lattice.c
  *
  *
  * lattice.c
  *
  *
  * ***** END GPL LICENSE BLOCK *****
  */
 
  * ***** END GPL LICENSE BLOCK *****
  */
 
+/** \file blender/blenkernel/intern/lattice.c
+ *  \ingroup bke
+ */
+
+
 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -40,6 +45,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
@@ -49,6 +55,7 @@
 #include "DNA_curve_types.h"
 #include "DNA_key_types.h"
 
 #include "DNA_curve_types.h"
 #include "DNA_key_types.h"
 
+#include "BKE_animsys.h"
 #include "BKE_anim.h"
 #include "BKE_cdderivedmesh.h"
 #include "BKE_displist.h"
 #include "BKE_anim.h"
 #include "BKE_cdderivedmesh.h"
 #include "BKE_displist.h"
@@ -59,7 +66,7 @@
 #include "BKE_main.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_main.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
-#include "BKE_utildefines.h"
+
 #include "BKE_deform.h"
 
 //XXX #include "BIF_editdeform.h"
 #include "BKE_deform.h"
 
 //XXX #include "BIF_editdeform.h"
@@ -181,7 +188,7 @@ void resizelattice(Lattice *lt, int uNew, int vNew, int wNew, Object *ltOb)
        MEM_freeN(vertexCos);
 }
 
        MEM_freeN(vertexCos);
 }
 
-Lattice *add_lattice(char *name)
+Lattice *add_lattice(const char *name)
 {
        Lattice *lt;
        
 {
        Lattice *lt;
        
@@ -203,10 +210,6 @@ Lattice *copy_lattice(Lattice *lt)
 
        ltn= copy_libblock(lt);
        ltn->def= MEM_dupallocN(lt->def);
 
        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;
 
        ltn->key= copy_key(ltn->key);
        if(ltn->key) ltn->key->from= (ID *)ltn;
@@ -225,10 +228,20 @@ 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->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);
+               Lattice *editlt= lt->editlatt->latt;
+
+               if(editlt->def) MEM_freeN(editlt->def);
+               if(editlt->dvert) free_dverts(editlt->dvert, lt->pntsu*lt->pntsv*lt->pntsw);
+
+               MEM_freeN(editlt);
                MEM_freeN(lt->editlatt);
        }
                MEM_freeN(lt->editlatt);
        }
+       
+       /* free animation data */
+       if (lt->adt) {
+               BKE_free_animdata(&lt->id);
+               lt->adt= NULL;
+       }
 }
 
 
 }
 
 
@@ -243,11 +256,11 @@ void make_local_lattice(Lattice *lt)
         * - mixed: make copy
         */
        
         * - mixed: make copy
         */
        
-       if(lt->id.lib==0) return;
+       if(lt->id.lib==NULL) return;
        if(lt->id.us==1) {
        if(lt->id.us==1) {
-               lt->id.lib= 0;
+               lt->id.lib= NULL;
                lt->id.flag= LIB_LOCAL;
                lt->id.flag= LIB_LOCAL;
-               new_id(0, (ID *)lt, 0);
+               new_id(NULL, (ID *)lt, NULL);
                return;
        }
        
                return;
        }
        
@@ -261,9 +274,9 @@ void make_local_lattice(Lattice *lt)
        }
        
        if(local && lib==0) {
        }
        
        if(local && lib==0) {
-               lt->id.lib= 0;
+               lt->id.lib= NULL;
                lt->id.flag= LIB_LOCAL;
                lt->id.flag= LIB_LOCAL;
-               new_id(0, (ID *)lt, 0);
+               new_id(NULL, (ID *)lt, NULL);
        }
        else if(local && lib) {
                ltn= copy_lattice(lt);
        }
        else if(local && lib) {
                ltn= copy_lattice(lt);
@@ -273,7 +286,7 @@ void make_local_lattice(Lattice *lt)
                while(ob) {
                        if(ob->data==lt) {
                                
                while(ob) {
                        if(ob->data==lt) {
                                
-                               if(ob->id.lib==0) {
+                               if(ob->id.lib==NULL) {
                                        ob->data= ltn;
                                        ltn->id.us++;
                                        lt->id.us--;
                                        ob->data= ltn;
                                        ltn->id.us++;
                                        lt->id.us--;
@@ -295,7 +308,7 @@ void init_latt_deform(Object *oblatt, Object *ob)
        float fu, fv, fw;
        int u, v, w;
 
        float fu, fv, fw;
        int u, v, w;
 
-       if(lt->editlatt) lt= lt->editlatt;
+       if(lt->editlatt) lt= lt->editlatt->latt;
        bp = lt->def;
        
        fp= lt->latticedata= MEM_mallocN(sizeof(float)*3*lt->pntsu*lt->pntsv*lt->pntsw, "latticedata");
        bp = lt->def;
        
        fp= lt->latticedata= MEM_mallocN(sizeof(float)*3*lt->pntsu*lt->pntsv*lt->pntsw, "latticedata");
@@ -350,7 +363,7 @@ void calc_latt_deform(Object *ob, float *co, float weight)
        MDeformVert *dvert= lattice_get_deform_verts(ob);
 
 
        MDeformVert *dvert= lattice_get_deform_verts(ob);
 
 
-       if(lt->editlatt) lt= lt->editlatt;
+       if(lt->editlatt) lt= lt->editlatt->latt;
        if(lt->latticedata==NULL) return;
 
        if(lt->vgroup[0] && dvert) {
        if(lt->latticedata==NULL) return;
 
        if(lt->vgroup[0] && dvert) {
@@ -446,7 +459,7 @@ void end_latt_deform(Object *ob)
 {
        Lattice *lt= ob->data;
        
 {
        Lattice *lt= ob->data;
        
-       if(lt->editlatt) lt= lt->editlatt;
+       if(lt->editlatt) lt= lt->editlatt->latt;
        
        if(lt->latticedata)
                MEM_freeN(lt->latticedata);
        
        if(lt->latticedata)
                MEM_freeN(lt->latticedata);
@@ -595,16 +608,6 @@ static int calc_curve_deform(Scene *scene, Object *par, float *co, short axis, C
                }
 #endif
 
                }
 #endif
 
-
-               static float q_x90d[4] = {0.70710676908493, 0.70710676908493, 0.0, 0.0};        // float rot_axis[3]= {1,0,0}; axis_angle_to_quat(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}; axis_angle_to_quat(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}; axis_angle_to_quat(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}; axis_angle_to_quat(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}; axis_angle_to_quat(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}; axis_angle_to_quat(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
                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
@@ -631,53 +634,18 @@ static int calc_curve_deform(Scene *scene, Object *par, float *co, short axis, C
                 * 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
                 * 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
+                *
+                * note: moved functions into quat_apply_track/vec_apply_track
                 * */
                 * */
+               copy_qt_qt(quat, new_quat);
+               copy_v3_v3(cent, co);
+
+               /* zero the axis which is not used,
+                * the big block of text above now applies to these 3 lines */
+               quat_apply_track(quat, axis-1, (axis==1 || axis==3) ? 1:0); /* up flag is a dummy, set so no rotation is done */
+               vec_apply_track(cent, axis-1);
+               cent[axis < 4 ? axis-1 : axis-4]= 0.0f;
 
 
-               switch(axis) {
-               case MOD_CURVE_POSX:
-                       mul_qt_qtqt(quat, new_quat, q_y90d);
-
-                       cent[0]=  0.0;
-                       cent[1]=  co[2];
-                       cent[2]=  co[1];
-                       break;
-               case MOD_CURVE_NEGX:
-                       mul_qt_qtqt(quat, new_quat, q_ny90d);
-
-                       cent[0]=  0.0;
-                       cent[1]= -co[1];
-                       cent[2]=  co[2];
-
-                       break;
-               case MOD_CURVE_POSY:
-                       mul_qt_qtqt(quat, new_quat, q_x90d);
-
-                       cent[0]=  co[2];
-                       cent[1]=  0.0;
-                       cent[2]= -co[0];
-                       break;
-               case MOD_CURVE_NEGY:
-                       mul_qt_qtqt(quat, new_quat, q_nx90d);
-
-                       cent[0]= -co[0];
-                       cent[1]=  0.0;
-                       cent[2]= -co[2];
-                       break;
-               case MOD_CURVE_POSZ:
-                       mul_qt_qtqt(quat, new_quat, q_z90d);
-
-                       cent[0]=  co[1];
-                       cent[1]= -co[0];
-                       cent[2]=  0.0;
-                       break;
-               case MOD_CURVE_NEGZ:
-                       mul_qt_qtqt(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)
 
                /* scale if enabled */
                if(cu->flag & CU_PATH_RADIUS)
@@ -1002,7 +970,7 @@ float (*lattice_getVertexCos(struct Object *ob, int *numVerts_r))[3]
        int i, numVerts;
        float (*vertexCos)[3];
 
        int i, numVerts;
        float (*vertexCos)[3];
 
-       if(lt->editlatt) lt= lt->editlatt;
+       if(lt->editlatt) lt= lt->editlatt->latt;
        numVerts = *numVerts_r = lt->pntsu*lt->pntsv*lt->pntsw;
        
        vertexCos = MEM_mallocN(sizeof(*vertexCos)*numVerts,"lt_vcos");
        numVerts = *numVerts_r = lt->pntsu*lt->pntsv*lt->pntsw;
        
        vertexCos = MEM_mallocN(sizeof(*vertexCos)*numVerts,"lt_vcos");
@@ -1066,7 +1034,7 @@ struct MDeformVert* lattice_get_deform_verts(struct Object *oblatt)
        if(oblatt->type == OB_LATTICE)
        {
                Lattice *lt = (Lattice*)oblatt->data;
        if(oblatt->type == OB_LATTICE)
        {
                Lattice *lt = (Lattice*)oblatt->data;
-               if(lt->editlatt) lt= lt->editlatt;
+               if(lt->editlatt) lt= lt->editlatt->latt;
                return lt->dvert;
        }
 
                return lt->dvert;
        }