svn merge -r 13177:13240 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / blender / src / buttons_object.c
index 1815fdd06f2eee78ba046f9d9ba74dd42ffb26c1..581ff63a98716e8b22adfb10510b2b6a9e622b40 100644 (file)
@@ -47,6 +47,7 @@
 #include "DNA_scene_types.h"
 
 #include "BKE_action.h"
+#include "BKE_cloth.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
 #include "BKE_library.h"
@@ -89,6 +90,7 @@
 #include "DNA_action_types.h"
 #include "DNA_armature_types.h"
 #include "DNA_camera_types.h"
+#include "DNA_cloth_types.h"
 #include "DNA_constraint_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_effect_types.h"
@@ -3040,6 +3042,67 @@ void do_effects_panels(unsigned short event)
                }
                allqueue(REDRAWVIEW3D, 0);
                break;
+       case B_CLOTH_CLEARCACHEALL:
+       {
+               ClothModifierData *clmd = (ClothModifierData *)modifiers_findByType(ob, eModifierType_Cloth);
+               if(clmd)
+               {
+                       CFRA= 1;
+                       update_for_newframe_muted();
+                       DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA); 
+                       cloth_clear_cache(ob, clmd, 2); 
+                       allqueue(REDRAWBUTSOBJECT, 0);
+                       allqueue(REDRAWVIEW3D, 0);
+               }       
+       }
+       break;  
+       case B_CLOTH_CLEARCACHEFRAME:
+       {
+               ClothModifierData *clmd = (ClothModifierData *)modifiers_findByType(ob, eModifierType_Cloth);
+               if(clmd)
+               {
+                       cloth_clear_cache(ob, clmd, MAX2(2.0,G.scene->r.cfra + 1.0));
+                       allqueue(REDRAWBUTSOBJECT, 0);
+               }
+       }
+       break;  
+       case B_CLOTH_CHANGEPREROLL:
+       {
+               ClothModifierData *clmd = (ClothModifierData *)modifiers_findByType(ob, eModifierType_Cloth);
+               if(clmd)
+               {
+                       if(clmd->sim_parms.cache)
+                       {
+                               CFRA= 1;
+                               update_for_newframe_muted();
+                               DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA); 
+                               allqueue(REDRAWBUTSOBJECT, 0);
+                               allqueue(REDRAWVIEW3D, 0);
+                       }
+               }
+       }
+       break;  
+       case B_CLOTH_DEL_VG:
+       {
+               ClothModifierData *clmd = (ClothModifierData *)modifiers_findByType(ob, eModifierType_Cloth);
+               if(clmd)
+               {
+                       clmd->sim_parms.vgroup_mass = 0;
+                       do_object_panels(B_CLOTH_RENEW);
+               }
+               allqueue(REDRAWBUTSOBJECT, 0);
+       }
+       break;  
+       case B_CLOTH_RENEW:
+       {
+               ClothModifierData *clmd = (ClothModifierData *)modifiers_findByType(ob, eModifierType_Cloth);
+               if(clmd)
+               {
+                       do_object_panels(B_CLOTH_CLEARCACHEALL);
+                       cloth_free_modifier (clmd);
+               }
+       }
+       break;
        default:
                if(event>=B_SELEFFECT && event<B_SELEFFECT+MAX_EFFECT) {
                        ob= OBACT;
@@ -3076,10 +3139,31 @@ static void field_testTexture(char *name, ID **idpp)
        }
        *idpp = 0;
 }
+
+/* Panel for collision */
+static void object_collision__enabletoggle ( void *ob_v, void *arg2 )
+{
+       Object *ob = ob_v;
+       ModifierData *md = modifiers_findByType ( ob, eModifierType_Collision );
+
+       if ( !md )
+       {
+               md = modifier_new ( eModifierType_Collision );
+               BLI_addhead ( &ob->modifiers, md );
+       }
+       else
+       {
+               BLI_remlink ( &ob->modifiers, md );
+               modifier_free ( md );
+               allqueue(REDRAWBUTSEDIT, 0);
+       }
+}
+
 /* Panels for particle interaction settings */
 static void object_panel_deflection(Object *ob)
 {
        uiBlock *block;
+       uiBut *but;
 
        block= uiNewBlock(&curarea->uiblocks, "object_panel_deflection", UI_EMBOSS, UI_HELV, curarea->win);
        if(uiNewPanel(curarea, block, "Deflection", "Physics", 0, 0, 318, 204)==0) return;
@@ -3099,7 +3183,9 @@ static void object_panel_deflection(Object *ob)
        if(ob->pd && ob->type==OB_MESH) {
                PartDeflect *pd= ob->pd;
                
-               uiDefButBitS(block, TOG, 1, B_REDR, "Deflection",160,160,150,20, &pd->deflect, 0, 0, 0, 0, "Deflects particles based on collision");
+               but = uiDefButBitS(block, TOG, 1, B_REDR, "Deflection",160,160,150,20, &pd->deflect, 0, 0, 0, 0, "Deflects particles based on collision");
+               // uiButSetFunc(but, object_collision__enabletoggle, ob, NULL);
+               
                if(pd->deflect) {
                        uiDefBut(block, LABEL, 0, "Particles",                  160,140,75,20, NULL, 0.0, 0, 0, 0, "");
                        uiDefButBitS(block, TOG, PDEFLE_KILL_PART, B_DIFF, "Kill",235,140,75,20, &pd->flag, 0, 0, 0, 0, "Kill collided particles");
@@ -4799,6 +4885,242 @@ errMessage:
 #endif // DISABLE_ELBEEM
 }
 
+/* Panel for cloth */
+static void object_cloth__enabletoggle(void *ob_v, void *arg2)
+{
+       Object *ob = ob_v;
+       ModifierData *md = modifiers_findByType(ob, eModifierType_Cloth);
+
+       if (!md) {
+               md = modifier_new(eModifierType_Cloth);
+               BLI_addhead(&ob->modifiers, md);
+       }
+       else {
+               BLI_remlink(&ob->modifiers, md);
+               modifier_free(md);
+       }
+
+       allqueue(REDRAWBUTSEDIT, 0);
+}
+
+static void object_panel_cloth(Object *ob)
+{
+       uiBlock *block;
+       static int val, val2;
+       uiBut *but;
+       ClothModifierData *clmd = (ClothModifierData *)modifiers_findByType(ob, eModifierType_Cloth);
+       block= uiNewBlock(&curarea->uiblocks, "object_panel_cloth", UI_EMBOSS, UI_HELV, curarea->win);
+       if(uiNewPanel(curarea, block, "Cloth", "Physics", 640, 0, 318, 204)==0) return;
+
+       if(ob->id.lib) uiSetButLock(1, "Can't edit library data");
+       val = ((clmd)?(1):(0));
+
+       but = uiDefButI(block, TOG, REDRAWBUTSOBJECT, "Cloth Object",   10,200,130,20, &val, 0, 0, 0, 0, "Sets object to become cloth");
+       uiButSetFunc(but, object_cloth__enabletoggle, ob, NULL);
+       uiDefBut(block, LABEL, 0, "",10,10,300,0, NULL, 0.0, 0, 0, 0, ""); /* tell UI we go to 10,10*/
+       
+       if(clmd)
+       {
+               but = uiDefButBitI(block, TOG, CLOTH_SIMSETTINGS_FLAG_COLLOBJ, B_EFFECT_DEP, "Collision Object",        170,200,130,20, &clmd->sim_parms.flags, 0, 0, 0, 0, "Sets object to become a cloth collision object");
+
+               if (!(clmd->sim_parms.flags & CLOTH_SIMSETTINGS_FLAG_COLLOBJ))
+               {
+                       Cloth *cloth = clmd->clothObject;
+                       int defCount;
+                       char *clvg1, *clvg2;
+                       char clmvg [] = "Mass Vertex Group%t|None%x0|";
+       
+                       val2=0;
+       
+       //              uiDefButBitI(block, TOG, CSIMSETT_FLAG_ADVANCED, REDRAWBUTSOBJECT, "Advanced",  180,200,130,20, &clmd->sim_parms.flags, 0, 0, 0, 0, "Enable advanced mode");
+                       
+                       /* GENERAL STUFF */
+                       uiClearButLock();
+                       uiBlockBeginAlign(block);
+                       uiDefButF(block, NUM, B_CLOTH_RENEW, "StructStiff:",       10,170,150,20, &clmd->sim_parms.structural, 1.0, 10000.0, 100, 0, "Overall stiffness of structure");
+                       uiDefButF(block, NUM, B_CLOTH_RENEW, "BendStiff:",         160,170,150,20, &clmd->sim_parms.bending, 0.0, 10000.0, 1000, 0, "Wrinkle possibility");
+                       uiDefButI(block, NUM, B_CLOTH_RENEW, "Steps per Frame:",           10,150,150,20, &clmd->sim_parms.stepsPerFrame, 1.0, 100.0, 5, 0, "Quality of the simulation (higher=better=slower)");
+                       uiBlockEndAlign(block);
+                       uiBlockBeginAlign(block);
+                       uiDefButF(block, NUM, B_CLOTH_RENEW, "Spring Damp:",       160,150,150,20, &clmd->sim_parms.Cdis, 0.0, 10.0, 10, 0, "Spring damping");
+                       uiDefButF(block, NUM, B_DIFF, "Air Damp:",         10,130,150,20, &clmd->sim_parms.Cvi, 0.0, 10.0, 10, 0, "Apply gravitation to point movement");
+                       uiBlockEndAlign(block);                 
+                       
+                       uiClearButLock();
+                       
+                       uiBlockBeginAlign(block);
+                       uiDefBut(block, LABEL, 0, "Gravity:",  10,100,60,20, NULL, 0.0, 0, 0, 0, "");
+                       // uiClearButLock();
+                       
+                       uiDefButF(block, NUM, B_CLOTH_RENEW, "X:",         70,100,80,20, &clmd->sim_parms.gravity[0], -100.0, 100.0, 10, 0, "Apply gravitation to point movement");
+                       uiDefButF(block, NUM, B_CLOTH_RENEW, "Y:",         150,100,80,20, &clmd->sim_parms.gravity[1], -100.0, 100.0, 10, 0, "Apply gravitation to point movement");
+                       uiDefButF(block, NUM, B_CLOTH_RENEW, "Z:",         230,100,80,20, &clmd->sim_parms.gravity[2], -100.0, 100.0, 10, 0, "Apply gravitation to point movement");
+                       uiBlockEndAlign(block);
+                       
+                       /* GOAL STUFF */
+                       uiBlockBeginAlign(block);
+                       uiDefButBitI(block, TOG, CLOTH_SIMSETTINGS_FLAG_GOAL, REDRAWVIEW3D, "Use Goal", 10,70,130,20, &clmd->sim_parms.flags, 0, 0, 0, 0, "Define forces for vertices to stick to animated position");
+                       if (clmd->sim_parms.flags & CLOTH_SIMSETTINGS_FLAG_GOAL)
+                       {
+                               if(ob->type==OB_MESH) 
+                               {
+                                       
+                                       defCount = sizeof (clmvg);
+                                       clvg1 = get_vertexgroup_menustr (ob);
+                                       clvg2 = MEM_callocN (strlen (clvg1) + 1 + defCount, "clothVgMS");
+                                       if (! clvg2) {
+                                               printf ("draw_modifier: error allocating memory for cloth vertex group menu string.\n");
+                                               return;
+                                       }
+                                       defCount = BLI_countlist (&ob->defbase);
+                                       if (defCount == 0) 
+                                       {
+                                               clmd->sim_parms.vgroup_mass = 0;
+                                       }
+                                       sprintf (clvg2, "%s%s", clmvg, clvg1);
+                                       
+                                       uiDefButS(block, MENU, B_CLOTH_RENEW, clvg2,    140,70,20,20, &clmd->sim_parms.vgroup_mass, 0, defCount, 0, 0, "Browses available vertex groups");      
+                                       MEM_freeN (clvg1);
+                                       MEM_freeN (clvg2);
+                                       
+                                       if(clmd->sim_parms.vgroup_mass) 
+                                       {
+                                               bDeformGroup *defGroup = BLI_findlink(&ob->defbase, clmd->sim_parms.vgroup_mass-1);
+                                               if(defGroup)
+                                                       uiDefBut(block, BUT, B_DIFF, defGroup->name,    160,70,130,20, NULL, 0.0, 0.0, 0, 0, "Name of current vertex group");
+                                               else
+                                                       uiDefBut(block, BUT, B_DIFF, "(no group)",      160,70,130,20, NULL, 0.0, 0.0, 0, 0, "Vertex Group doesn't exist anymore");
+                                               
+                                               uiDefIconBut(block, BUT, B_CLOTH_DEL_VG, ICON_X, 290,70,20,20, 0, 0, 0, 0, 0, "Disable use of vertex group");
+                                               
+                                       }
+                                       else
+                                               uiDefButF(block, NUM, B_CLOTH_RENEW, "Goal:",   160,70,150,20, &clmd->sim_parms.defgoal, 0.0, 1.0, 10, 0, "Default Goal (vertex target position) value, when no Vertex Group used");
+                               
+                               }
+                               else 
+                               {
+                                       uiDefButS(block, TOG, B_CLOTH_RENEW, "W",                       140,70,20,20, &clmd->sim_parms.vgroup_mass, 0, 1, 0, 0, "Use control point weight values");
+                                       uiDefButF(block, NUM, B_CLOTH_RENEW, "Goal:",   160,70,150,20, &clmd->sim_parms.defgoal, 0.0, 1.0, 10, 0, "Default Goal (vertex target position) value, when no Vertex Group used");
+                               }
+                               
+                               uiDefButF(block, NUM, B_CLOTH_RENEW, "G Stiff:",        10,50,150,20, &clmd->sim_parms.goalspring, 0.0, 500.0, 10, 0, "Goal (vertex target position) spring stiffness");
+                               uiDefButF(block, NUM, B_CLOTH_RENEW, "G Damp:", 160,50,150,20, &clmd->sim_parms.goalfrict  , 0.0, 50.0, 10, 0, "Goal (vertex target position) friction");
+                               uiDefButF(block, NUM, B_CLOTH_RENEW, "G Min:",          10,30,150,20, &clmd->sim_parms.mingoal, 0.0, 1.0, 10, 0, "Goal minimum, vertex group weights are scaled to match this range");
+                               uiDefButF(block, NUM, B_CLOTH_RENEW, "G Max:",          160,30,150,20, &clmd->sim_parms.maxgoal, 0.0, 1.0, 10, 0, "Goal maximum, vertex group weights are scaled to match this range");
+                       }
+                       uiBlockEndAlign(block); 
+                       
+                       /*
+                       // no tearing supported anymore since modifier stack restrictions 
+                       uiBlockBeginAlign(block);
+                       uiDefButBitI(block, TOG, CSIMSETT_FLAG_TEARING_ENABLED, B_EFFECT_DEP, "Tearing",        10,0,150,20, &clmd->sim_parms.flags, 0, 0, 0, 0, "Sets object to become a cloth collision object");
+                       
+                       if (clmd->sim_parms.flags & CSIMSETT_FLAG_TEARING_ENABLED)
+                       {
+                       uiDefButI(block, NUM, B_DIFF, "Max extent:",       160,0,150,20, &clmd->sim_parms.maxspringlen, 1.0, 1000.0, 10, 0, "Maximum extension before spring gets cut");
+               }
+                       
+                       uiBlockEndAlign(block); 
+                       */
+               }
+       }
+}
+
+
+static void object_panel_cloth_II(Object *ob)
+{
+       uiBlock *block;
+       static int val;
+       uiBut *but;
+       ClothModifierData *clmd = NULL;
+       
+       clmd = (ClothModifierData *)modifiers_findByType(ob, eModifierType_Cloth);
+       if(clmd)
+       {
+               if (!(clmd->sim_parms.flags & CLOTH_SIMSETTINGS_FLAG_COLLOBJ))
+               {
+                       Cloth *cloth = clmd->clothObject;
+                       char str[128];
+                       
+                       block= uiNewBlock(&curarea->uiblocks, "object_panel_cloth_II", UI_EMBOSS, UI_HELV, curarea->win);
+                       uiNewPanelTabbed("Cloth", "Physics");
+                       if(uiNewPanel(curarea, block, "Cloth Cache", "Physics", 651, 0, 318, 204)==0) return;
+               
+                       uiSetButLock(object_data_is_libdata(ob), ERROR_LIBDATA_MESSAGE);
+                       
+                       uiDefButI(block, NUM, B_DIFF, "First Frame:",           10,160,150,20, &clmd->sim_parms.firstframe, 0, MAXFRAME, 1, 0, "Frame on which the simulation starts");
+                       uiDefButI(block, NUM, B_DIFF, "Last Frame:",            160,160,150,20, &clmd->sim_parms.lastframe, 0, MAXFRAME, 10, 0, "Frame on which the simulation stops");
+
+                       if(clmd->sim_parms.cache)
+                       {
+                               int length = BLI_linklist_length(clmd->sim_parms.cache);
+                               
+                               /* correct spelling if only 1 frame cacheed --> only gimmick  */
+                               if(length-clmd->sim_parms.preroll>1)
+                                       sprintf (str, "Frame 1 - %d cached. [%d in preroll, %d in total]", length-clmd->sim_parms.preroll, clmd->sim_parms.preroll, length);
+                               else
+                                       sprintf (str, "Frame %d cached. [%d in preroll, %d in total]", length-clmd->sim_parms.preroll, clmd->sim_parms.preroll, length);
+                               
+                               uiDefBut(block, LABEL, 0, str,  10,140,290,20, NULL, 0.0, 0, 0, 0, "");
+                               uiDefBut(block, LABEL, 0, "Clear cache:",  10,120,290,20, NULL, 0.0, 0, 0, 0, "");
+                               uiBlockBeginAlign (block);
+                               uiDefBut(block, BUT, B_CLOTH_CLEARCACHEALL, "All", 10, 100,145,20, NULL, 0.0, 0.0, 0, 0, "Free cloth cache without preroll");
+                               uiDefBut(block, BUT, B_CLOTH_CLEARCACHEFRAME, "From next frame", 155, 100,145,20, NULL, 0.0, 0.0, 0, 0, "Free cloth cache");    
+                               if(length>1) // B_CLOTH_CHANGEPREROLL
+                                       uiDefButI(block, NUM, B_CLOTH_CHANGEPREROLL, "Preroll:", 10,80,145,20, &clmd->sim_parms.preroll, 0, length-1, 1, 0, "Simulation starts on this frame"); 
+                               else
+                                       uiDefBut(block, LABEL, 0, " ",  10,80,145,20, NULL, 0.0, 0, 0, 0, "");
+                       }
+                       else
+                       {
+                               uiDefBut(block, LABEL, 0, "No frames cached.",  10,120,290,20, NULL, 0.0, 0, 0, 0, "");
+                       }
+                       uiDefButBitI(block, TOG, CLOTH_SIMSETTINGS_FLAG_CCACHE_PROTECT, REDRAWVIEW3D, "Protect Cache",  10,50,145,20, &clmd->sim_parms.flags, 0, 0, 0, 0, "Protect cache from automatic freeing when scene changed");
+                       uiBlockEndAlign(block);
+               }
+       }
+       // uiBlockEndAlign(block);
+}
+
+static void object_panel_cloth_III(Object *ob)
+{
+       uiBlock *block;
+       static int val;
+       uiBut *but;
+       ClothModifierData *clmd = NULL;
+       
+       clmd = (ClothModifierData *)modifiers_findByType(ob, eModifierType_Cloth);
+       if(clmd)
+       {
+               if (!(clmd->sim_parms.flags & CLOTH_SIMSETTINGS_FLAG_COLLOBJ))
+               {
+                       Cloth *cloth = clmd->clothObject;
+                       char str[128];
+                       
+                       block= uiNewBlock(&curarea->uiblocks, "object_panel_cloth_III", UI_EMBOSS, UI_HELV, curarea->win);
+                       uiNewPanelTabbed("Cloth", "Physics");
+                       if(uiNewPanel(curarea, block, "Cloth Collisions", "Physics", 651, 0, 318, 204)==0) return;
+               
+                       uiSetButLock(object_data_is_libdata(ob), ERROR_LIBDATA_MESSAGE);
+                       
+                       uiBlockBeginAlign(block);
+                       uiDefButBitI(block, TOG, CLOTH_COLLISIONSETTINGS_FLAG_ENABLED, REDRAWVIEW3D, "Enable collisions",       10,70,130,20, &clmd->coll_parms.flags, 0, 0, 0, 0, "Enable collisions with this object");
+                       if (clmd->coll_parms.flags & CLOTH_COLLISIONSETTINGS_FLAG_ENABLED)
+                       {
+                               // uiDefBut(block, LABEL, 0, "",10,10,300,20, NULL, 0.0, 0, 0, 0, ""); /* tell UI we go to 10,10*/
+                               uiDefButF(block, NUM, B_CLOTH_RENEW, "Min Distance:",      10,30,150,20, &clmd->coll_parms.epsilon, 0.001f, 1.0, 0.01f, 0, "Minimum distance between collision objects before collision response takes in");
+                               uiDefBut(block, LABEL, 0, "",160,30,150,20, NULL, 0.0, 0, 0, 0, "");
+                       }
+                       else
+                               uiDefBut(block, LABEL, 0, "",140,10,170,20, NULL, 0.0, 0, 0, 0, "");
+                       uiBlockEndAlign(block);
+               }
+       }
+       // uiBlockEndAlign(block);
+}
+
+
 void object_panels()
 {
        Object *ob;
@@ -4827,6 +5149,9 @@ void physics_panels()
                object_panel_fields(ob);
                object_softbodies(ob);
                object_softbodies_II(ob);
+               object_panel_cloth(ob);
+               object_panel_cloth_II(ob);
+               object_panel_cloth_III(ob);
                object_panel_fluidsim(ob);
        }
 }