Janne Karhu
874d38eeb4
- Baked point caches for particles, cloth and softbody can now be edited in particle mode. * This overwrites the old cloth/sb cache editmode editing. * The type of editable system is chosen from a menu. * For particles the current particle system and it's current cache are used. - Currently this only works for caches that are in memory, but some automatic conversion from disk to memory and back can be implemented later. - All tools from hair editing can't be applied to point caches and are hidden in the tool panel and specials menu. Some functionality like subdividing paths can be later implemented in a slightly different way from how it works for hair. - Code is not yet optimized for speed, so editing might be slow sometimes. Known issues: - Cloth doesn't update properly while in particle mode, due to the way cloth modifier currently works. Daniel can you check on this? - As "particle mode" is not only for particles any more some other name would be in place? - Better icons are needed for the path, point, and tip-modes as the current icons from mesh edit mode are quite misleading. - Direct editing of point velocities is not yet implemented, but will be in the future. Other changes: - Hair editing doesn't require a "make editable" button press any more. - Multiple caches in single particle system disables changing emission properties. - Unified ui code for all point cache panels. * Defined in buttons_particle.py and imported for cloth, smoke & softbody. - Proper disabling of properties in ui after baking point caches. (Daniel could you please make needed disable code for smoke panels as their functionality is not familiar to me.) - Hair weight brush has been removed. Once hair dynamics is re-implemented I'll code a more useable alternative to the functionality. Bug fixes: - Unlinking particle settings crashed. - Deleting the active object with particles in the scene crashed. - Softbody didn't write point caches correctly on save.
352 lines
8.4 KiB
C
352 lines
8.4 KiB
C
/*
|
|
* $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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*
|
|
* The Original Code is Copyright (C) 2007 by Janne Karhu.
|
|
* All rights reserved.
|
|
*
|
|
* The Original Code is: all of this file.
|
|
*
|
|
* Contributor(s): none yet.
|
|
*
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
*/
|
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
#include "DNA_scene_types.h"
|
|
#include "DNA_object_force.h"
|
|
#include "DNA_modifier_types.h"
|
|
|
|
#include "BKE_context.h"
|
|
#include "BKE_particle.h"
|
|
#include "BKE_report.h"
|
|
#include "BKE_scene.h"
|
|
#include "BKE_utildefines.h"
|
|
#include "BKE_pointcache.h"
|
|
#include "BKE_global.h"
|
|
#include "BKE_modifier.h"
|
|
|
|
#include "BLI_blenlib.h"
|
|
|
|
#include "ED_screen.h"
|
|
#include "ED_physics.h"
|
|
#include "ED_particle.h"
|
|
|
|
#include "UI_interface.h"
|
|
#include "UI_resources.h"
|
|
|
|
#include "WM_api.h"
|
|
#include "WM_types.h"
|
|
|
|
#include "RNA_access.h"
|
|
#include "RNA_define.h"
|
|
|
|
#include "physics_intern.h"
|
|
|
|
static int cache_break_test(void *cbd) {
|
|
return G.afbreek==1;
|
|
}
|
|
static int ptcache_bake_all_poll(bContext *C)
|
|
{
|
|
Scene *scene= CTX_data_scene(C);
|
|
|
|
if(!scene)
|
|
return 0;
|
|
|
|
return 1;
|
|
}
|
|
|
|
static int ptcache_bake_all_exec(bContext *C, wmOperator *op)
|
|
{
|
|
Scene *scene= CTX_data_scene(C);
|
|
PTCacheBaker baker;
|
|
|
|
|
|
baker.scene = scene;
|
|
baker.pid = NULL;
|
|
baker.bake = RNA_boolean_get(op->ptr, "bake");
|
|
baker.render = 0;
|
|
baker.anim_init = 0;
|
|
baker.quick_step = 1;
|
|
baker.break_test = cache_break_test;
|
|
baker.break_data = NULL;
|
|
baker.progressbar = (void (*)(void *, int))WM_timecursor;
|
|
baker.progresscontext = CTX_wm_window(C);
|
|
|
|
BKE_ptcache_make_cache(&baker);
|
|
|
|
WM_event_add_notifier(C, NC_SCENE|ND_FRAME, scene);
|
|
|
|
return OPERATOR_FINISHED;
|
|
}
|
|
static int ptcache_free_bake_all_exec(bContext *C, wmOperator *op)
|
|
{
|
|
Scene *scene= CTX_data_scene(C);
|
|
Base *base;
|
|
PTCacheID *pid;
|
|
ListBase pidlist;
|
|
|
|
for(base=scene->base.first; base; base= base->next) {
|
|
BKE_ptcache_ids_from_object(&pidlist, base->object);
|
|
|
|
for(pid=pidlist.first; pid; pid=pid->next) {
|
|
pid->cache->flag &= ~PTCACHE_BAKED;
|
|
}
|
|
|
|
BLI_freelistN(&pidlist);
|
|
}
|
|
|
|
WM_event_add_notifier(C, NC_SCENE|ND_FRAME, scene);
|
|
|
|
return OPERATOR_FINISHED;
|
|
}
|
|
|
|
void PTCACHE_OT_bake_all(wmOperatorType *ot)
|
|
{
|
|
/* identifiers */
|
|
ot->name= "Bake All Physics";
|
|
ot->idname= "PTCACHE_OT_bake_all";
|
|
|
|
/* api callbacks */
|
|
ot->exec= ptcache_bake_all_exec;
|
|
ot->poll= ptcache_bake_all_poll;
|
|
|
|
/* flags */
|
|
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
|
|
|
|
RNA_def_boolean(ot->srna, "bake", 1, "Bake", "");
|
|
}
|
|
void PTCACHE_OT_free_bake_all(wmOperatorType *ot)
|
|
{
|
|
/* identifiers */
|
|
ot->name= "Free All Physics Bakes";
|
|
ot->idname= "PTCACHE_OT_free_bake_all";
|
|
|
|
/* api callbacks */
|
|
ot->exec= ptcache_free_bake_all_exec;
|
|
ot->poll= ptcache_bake_all_poll;
|
|
|
|
/* flags */
|
|
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
|
|
}
|
|
static int ptcache_bake_exec(bContext *C, wmOperator *op)
|
|
{
|
|
Scene *scene = CTX_data_scene(C);
|
|
PointerRNA ptr= CTX_data_pointer_get_type(C, "PointCache", &RNA_PointCache);
|
|
Object *ob= ptr.id.data;
|
|
PointCache *cache= ptr.data;
|
|
PTCacheBaker baker;
|
|
PTCacheID *pid;
|
|
ListBase pidlist;
|
|
|
|
BKE_ptcache_ids_from_object(&pidlist, ob);
|
|
|
|
for(pid=pidlist.first; pid; pid=pid->next) {
|
|
if(pid->cache == cache)
|
|
break;
|
|
}
|
|
|
|
baker.scene = scene;
|
|
baker.pid = pid;
|
|
baker.bake = RNA_boolean_get(op->ptr, "bake");
|
|
baker.render = 0;
|
|
baker.anim_init = 0;
|
|
baker.quick_step = 1;
|
|
baker.break_test = cache_break_test;
|
|
baker.break_data = NULL;
|
|
baker.progressbar = (void (*)(void *, int))WM_timecursor;
|
|
baker.progresscontext = CTX_wm_window(C);
|
|
|
|
BKE_ptcache_make_cache(&baker);
|
|
|
|
BLI_freelistN(&pidlist);
|
|
|
|
WM_event_add_notifier(C, NC_SCENE|ND_FRAME, scene);
|
|
|
|
return OPERATOR_FINISHED;
|
|
}
|
|
static int ptcache_free_bake_exec(bContext *C, wmOperator *op)
|
|
{
|
|
PointerRNA ptr= CTX_data_pointer_get_type(C, "PointCache", &RNA_PointCache);
|
|
PointCache *cache= ptr.data;
|
|
|
|
if(cache->edit) {
|
|
if(!cache->edit->edited || 1) {// XXX okee("Lose changes done in particle mode?")) {
|
|
PE_free_ptcache_edit(cache->edit);
|
|
cache->edit = NULL;
|
|
cache->flag &= ~PTCACHE_BAKED;
|
|
}
|
|
}
|
|
else
|
|
cache->flag &= ~PTCACHE_BAKED;
|
|
|
|
return OPERATOR_FINISHED;
|
|
}
|
|
static int ptcache_bake_from_cache_exec(bContext *C, wmOperator *op)
|
|
{
|
|
PointerRNA ptr= CTX_data_pointer_get_type(C, "PointCache", &RNA_PointCache);
|
|
PointCache *cache= ptr.data;
|
|
|
|
cache->flag |= PTCACHE_BAKED;
|
|
|
|
return OPERATOR_FINISHED;
|
|
}
|
|
void PTCACHE_OT_bake(wmOperatorType *ot)
|
|
{
|
|
/* identifiers */
|
|
ot->name= "Bake Physics";
|
|
ot->idname= "PTCACHE_OT_bake";
|
|
|
|
/* api callbacks */
|
|
ot->exec= ptcache_bake_exec;
|
|
ot->poll= ptcache_bake_all_poll;
|
|
|
|
/* flags */
|
|
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
|
|
|
|
RNA_def_boolean(ot->srna, "bake", 1, "Bake", "");
|
|
}
|
|
void PTCACHE_OT_free_bake(wmOperatorType *ot)
|
|
{
|
|
/* identifiers */
|
|
ot->name= "Free Physics Bake";
|
|
ot->idname= "PTCACHE_OT_free_bake";
|
|
|
|
/* api callbacks */
|
|
ot->exec= ptcache_free_bake_exec;
|
|
ot->poll= ptcache_bake_all_poll;
|
|
|
|
/* flags */
|
|
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
|
|
}
|
|
void PTCACHE_OT_bake_from_cache(wmOperatorType *ot)
|
|
{
|
|
/* identifiers */
|
|
ot->name= "Bake From Cache";
|
|
ot->idname= "PTCACHE_OT_bake_from_cache";
|
|
|
|
/* api callbacks */
|
|
ot->exec= ptcache_bake_from_cache_exec;
|
|
ot->poll= ptcache_bake_all_poll;
|
|
|
|
/* flags */
|
|
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
|
|
}
|
|
|
|
static int ptcache_add_new_exec(bContext *C, wmOperator *op)
|
|
{
|
|
Scene *scene = CTX_data_scene(C);
|
|
PointerRNA ptr= CTX_data_pointer_get_type(C, "PointCache", &RNA_PointCache);
|
|
Object *ob= ptr.id.data;
|
|
PointCache *cache= ptr.data;
|
|
PTCacheID *pid;
|
|
ListBase pidlist;
|
|
|
|
BKE_ptcache_ids_from_object(&pidlist, ob);
|
|
|
|
for(pid=pidlist.first; pid; pid=pid->next) {
|
|
if(pid->cache == cache) {
|
|
*(pid->cache_ptr) = BKE_ptcache_add(pid->ptcaches);
|
|
break;
|
|
}
|
|
}
|
|
|
|
BLI_freelistN(&pidlist);
|
|
|
|
WM_event_add_notifier(C, NC_SCENE|ND_FRAME, scene);
|
|
|
|
return OPERATOR_FINISHED;
|
|
}
|
|
static int ptcache_remove_exec(bContext *C, wmOperator *op)
|
|
{
|
|
PointerRNA ptr= CTX_data_pointer_get_type(C, "PointCache", &RNA_PointCache);
|
|
Object *ob= ptr.id.data;
|
|
PointCache *cache= ptr.data;
|
|
PTCacheID *pid;
|
|
ListBase pidlist;
|
|
|
|
BKE_ptcache_ids_from_object(&pidlist, ob);
|
|
|
|
for(pid=pidlist.first; pid; pid=pid->next) {
|
|
if(pid->cache == cache) {
|
|
if(pid->ptcaches->first == pid->ptcaches->last)
|
|
continue; /* don't delete last cache */
|
|
|
|
BLI_remlink(pid->ptcaches, pid->cache);
|
|
BKE_ptcache_free(pid->cache);
|
|
*(pid->cache_ptr) = pid->ptcaches->first;
|
|
|
|
break;
|
|
}
|
|
}
|
|
|
|
BLI_freelistN(&pidlist);
|
|
|
|
return OPERATOR_FINISHED;
|
|
}
|
|
void PTCACHE_OT_add_new(wmOperatorType *ot)
|
|
{
|
|
/* identifiers */
|
|
ot->name= "Add new cache";
|
|
ot->idname= "PTCACHE_OT_add_new";
|
|
|
|
/* api callbacks */
|
|
ot->exec= ptcache_add_new_exec;
|
|
ot->poll= ptcache_bake_all_poll;
|
|
|
|
/* flags */
|
|
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
|
|
}
|
|
void PTCACHE_OT_remove(wmOperatorType *ot)
|
|
{
|
|
/* identifiers */
|
|
ot->name= "Delete current cache";
|
|
ot->idname= "PTCACHE_OT_remove";
|
|
|
|
/* api callbacks */
|
|
ot->exec= ptcache_remove_exec;
|
|
ot->poll= ptcache_bake_all_poll;
|
|
|
|
/* flags */
|
|
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
|
|
}
|
|
/**************************** registration **********************************/
|
|
|
|
void ED_operatortypes_pointcache(void)
|
|
{
|
|
WM_operatortype_append(PTCACHE_OT_bake_all);
|
|
WM_operatortype_append(PTCACHE_OT_free_bake_all);
|
|
WM_operatortype_append(PTCACHE_OT_bake);
|
|
WM_operatortype_append(PTCACHE_OT_free_bake);
|
|
WM_operatortype_append(PTCACHE_OT_bake_from_cache);
|
|
WM_operatortype_append(PTCACHE_OT_add_new);
|
|
WM_operatortype_append(PTCACHE_OT_remove);
|
|
}
|
|
|
|
//void ED_keymap_pointcache(wmWindowManager *wm)
|
|
//{
|
|
// ListBase *keymap= WM_keymap_listbase(wm, "Pointcache", 0, 0);
|
|
//
|
|
// WM_keymap_add_item(keymap, "PHYSICS_OT_bake_all", AKEY, KM_PRESS, 0, 0);
|
|
// WM_keymap_add_item(keymap, "PHYSICS_OT_free_all", PADPLUSKEY, KM_PRESS, KM_CTRL, 0);
|
|
// WM_keymap_add_item(keymap, "PHYSICS_OT_bake_particle_system", PADMINUS, KM_PRESS, KM_CTRL, 0);
|
|
// WM_keymap_add_item(keymap, "PHYSICS_OT_free_particle_system", LKEY, KM_PRESS, 0, 0);
|
|
//}
|
|
|