2009-02-20 20:39:27 +00:00
|
|
|
/*
|
2009-01-24 13:45:24 +00:00
|
|
|
* ***** 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,
|
2010-02-12 13:34:04 +00:00
|
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
2009-01-24 13:45:24 +00:00
|
|
|
*
|
|
|
|
* 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 *****
|
|
|
|
*/
|
|
|
|
|
2011-02-27 20:29:51 +00:00
|
|
|
/** \file blender/editors/physics/particle_edit.c
|
|
|
|
* \ingroup edphys
|
|
|
|
*/
|
|
|
|
|
2009-01-24 13:45:24 +00:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <math.h>
|
|
|
|
#include <string.h>
|
2010-11-26 12:57:35 +00:00
|
|
|
#include <assert.h>
|
2009-01-24 13:45:24 +00:00
|
|
|
|
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
|
|
|
|
#include "DNA_scene_types.h"
|
|
|
|
#include "DNA_mesh_types.h"
|
|
|
|
#include "DNA_meshdata_types.h"
|
|
|
|
#include "DNA_view3d_types.h"
|
|
|
|
#include "DNA_screen_types.h"
|
|
|
|
#include "DNA_space_types.h"
|
|
|
|
|
2011-01-07 18:36:47 +00:00
|
|
|
#include "BLI_math.h"
|
2018-02-18 21:27:33 +11:00
|
|
|
#include "BLI_lasso_2d.h"
|
2012-04-27 07:26:28 +00:00
|
|
|
#include "BLI_listbase.h"
|
2011-01-07 18:36:47 +00:00
|
|
|
#include "BLI_kdtree.h"
|
|
|
|
#include "BLI_rand.h"
|
|
|
|
#include "BLI_utildefines.h"
|
|
|
|
|
2009-01-24 13:45:24 +00:00
|
|
|
#include "BKE_context.h"
|
2012-12-14 15:09:59 +00:00
|
|
|
#include "BKE_depsgraph.h"
|
|
|
|
#include "BKE_DerivedMesh.h"
|
2009-01-24 13:45:24 +00:00
|
|
|
#include "BKE_global.h"
|
|
|
|
#include "BKE_object.h"
|
2018-06-13 14:26:26 +02:00
|
|
|
#include "BKE_main.h"
|
2009-01-24 13:45:24 +00:00
|
|
|
#include "BKE_mesh.h"
|
|
|
|
#include "BKE_modifier.h"
|
|
|
|
#include "BKE_particle.h"
|
2009-02-20 20:39:27 +00:00
|
|
|
#include "BKE_report.h"
|
2014-10-22 16:36:23 +02:00
|
|
|
#include "BKE_bvhutils.h"
|
2009-08-29 15:20:36 +00:00
|
|
|
#include "BKE_pointcache.h"
|
2009-01-24 13:45:24 +00:00
|
|
|
|
|
|
|
#include "BIF_gl.h"
|
|
|
|
#include "BIF_glutil.h"
|
|
|
|
|
2013-08-29 10:34:09 +00:00
|
|
|
#include "ED_object.h"
|
2011-02-14 17:55:27 +00:00
|
|
|
#include "ED_physics.h"
|
2009-02-25 19:29:58 +00:00
|
|
|
#include "ED_mesh.h"
|
2009-02-20 20:39:27 +00:00
|
|
|
#include "ED_particle.h"
|
2009-01-24 13:45:24 +00:00
|
|
|
#include "ED_view3d.h"
|
|
|
|
|
|
|
|
#include "UI_resources.h"
|
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
#include "WM_api.h"
|
|
|
|
#include "WM_types.h"
|
|
|
|
|
|
|
|
#include "RNA_access.h"
|
|
|
|
#include "RNA_define.h"
|
|
|
|
|
2009-01-24 13:45:24 +00:00
|
|
|
#include "physics_intern.h"
|
|
|
|
|
2018-03-19 17:46:49 +01:00
|
|
|
#include "particle_edit_utildefines.h"
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
/**************************** utilities *******************************/
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool PE_poll(bContext *C)
|
2009-02-20 20:39:27 +00:00
|
|
|
{
|
2018-06-13 14:26:26 +02:00
|
|
|
Main *bmain = CTX_data_main(C);
|
2009-02-20 20:39:27 +00:00
|
|
|
Scene *scene= CTX_data_scene(C);
|
|
|
|
Object *ob= CTX_data_active_object(C);
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!scene || !ob || !(ob->mode & OB_MODE_PARTICLE_EDIT))
|
2009-09-16 17:43:09 +00:00
|
|
|
return 0;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2018-06-13 14:26:26 +02:00
|
|
|
return (PE_get_current(bmain, scene, ob) != NULL);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool PE_hair_poll(bContext *C)
|
2009-09-16 17:43:09 +00:00
|
|
|
{
|
2018-06-13 14:26:26 +02:00
|
|
|
Main *bmain = CTX_data_main(C);
|
2009-09-16 17:43:09 +00:00
|
|
|
Scene *scene= CTX_data_scene(C);
|
|
|
|
Object *ob= CTX_data_active_object(C);
|
|
|
|
PTCacheEdit *edit;
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!scene || !ob || !(ob->mode & OB_MODE_PARTICLE_EDIT))
|
2009-02-20 20:39:27 +00:00
|
|
|
return 0;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2018-06-13 14:26:26 +02:00
|
|
|
edit= PE_get_current(bmain, scene, ob);
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2009-10-22 23:22:05 +00:00
|
|
|
return (edit && edit->psys);
|
2009-02-20 20:39:27 +00:00
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
bool PE_poll_view3d(bContext *C)
|
2009-02-20 20:39:27 +00:00
|
|
|
{
|
2013-04-08 10:03:51 +00:00
|
|
|
ScrArea *sa = CTX_wm_area(C);
|
|
|
|
ARegion *ar = CTX_wm_region(C);
|
|
|
|
|
|
|
|
return (PE_poll(C) &&
|
|
|
|
(sa && sa->spacetype == SPACE_VIEW3D) &&
|
|
|
|
(ar && ar->regiontype == RGN_TYPE_WINDOW));
|
2009-02-20 20:39:27 +00:00
|
|
|
}
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
void PE_free_ptcache_edit(PTCacheEdit *edit)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2009-09-16 17:43:09 +00:00
|
|
|
POINT_P;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit==0) return;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit->points) {
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_POINTS {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (point->keys)
|
2009-09-16 17:43:09 +00:00
|
|
|
MEM_freeN(point->keys);
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
MEM_freeN(edit->points);
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit->mirror_cache)
|
2009-01-24 13:45:24 +00:00
|
|
|
MEM_freeN(edit->mirror_cache);
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit->emitter_cosnos) {
|
2009-01-24 13:45:24 +00:00
|
|
|
MEM_freeN(edit->emitter_cosnos);
|
2009-02-20 20:39:27 +00:00
|
|
|
edit->emitter_cosnos= 0;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit->emitter_field) {
|
2009-01-24 13:45:24 +00:00
|
|
|
BLI_kdtree_free(edit->emitter_field);
|
2009-02-20 20:39:27 +00:00
|
|
|
edit->emitter_field= 0;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2010-05-30 14:53:26 +00:00
|
|
|
psys_free_path_cache(edit->psys, edit);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
MEM_freeN(edit);
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2009-01-24 13:45:24 +00:00
|
|
|
/************************************************/
|
|
|
|
/* Edit Mode Helpers */
|
|
|
|
/************************************************/
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
int PE_start_edit(PTCacheEdit *edit)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit) {
|
2009-09-16 17:43:09 +00:00
|
|
|
edit->edited = 1;
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit->psys)
|
2009-09-16 17:43:09 +00:00
|
|
|
edit->psys->flag |= PSYS_EDITED;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
ParticleEditSettings *PE_settings(Scene *scene)
|
|
|
|
{
|
2010-02-09 20:03:05 +00:00
|
|
|
return scene->toolsettings ? &scene->toolsettings->particle : NULL;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2012-12-14 15:09:59 +00:00
|
|
|
static float pe_brush_size_get(const Scene *UNUSED(scene), ParticleBrushData *brush)
|
|
|
|
{
|
|
|
|
// here we can enable unified brush size, needs more work...
|
|
|
|
// UnifiedPaintSettings *ups = &scene->toolsettings->unified_paint_settings;
|
|
|
|
// float size = (ups->flag & UNIFIED_PAINT_SIZE) ? ups->size : brush->size;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-12-14 15:09:59 +00:00
|
|
|
return brush->size * U.pixelsize;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-03-04 04:35:12 +00:00
|
|
|
/* always gets at least the first particlesystem even if PSYS_CURRENT flag is not set
|
2010-01-12 13:40:29 +00:00
|
|
|
*
|
|
|
|
* note: this function runs on poll, therefor it can runs many times a second
|
|
|
|
* keep it fast! */
|
2018-06-13 14:26:26 +02:00
|
|
|
static PTCacheEdit *pe_get_current(Main *bmain, Scene *scene, Object *ob, int create)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2009-09-16 17:43:09 +00:00
|
|
|
ParticleEditSettings *pset= PE_settings(scene);
|
|
|
|
PTCacheEdit *edit = NULL;
|
|
|
|
ListBase pidlist;
|
|
|
|
PTCacheID *pid;
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (pset==NULL || ob==NULL)
|
2010-02-09 20:03:05 +00:00
|
|
|
return NULL;
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
pset->scene = scene;
|
|
|
|
pset->object = ob;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2018-06-13 14:26:26 +02:00
|
|
|
BKE_ptcache_ids_from_object(bmain, &pidlist, ob, NULL, 0);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/* in the case of only one editable thing, set pset->edittype accordingly */
|
2014-02-08 06:07:10 +11:00
|
|
|
if (BLI_listbase_is_single(&pidlist)) {
|
2009-09-16 17:43:09 +00:00
|
|
|
pid = pidlist.first;
|
2012-04-28 06:31:57 +00:00
|
|
|
switch (pid->type) {
|
2009-09-16 17:43:09 +00:00
|
|
|
case PTCACHE_TYPE_PARTICLES:
|
|
|
|
pset->edittype = PE_TYPE_PARTICLES;
|
|
|
|
break;
|
|
|
|
case PTCACHE_TYPE_SOFTBODY:
|
|
|
|
pset->edittype = PE_TYPE_SOFTBODY;
|
|
|
|
break;
|
|
|
|
case PTCACHE_TYPE_CLOTH:
|
|
|
|
pset->edittype = PE_TYPE_CLOTH;
|
|
|
|
break;
|
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
for (pid=pidlist.first; pid; pid=pid->next) {
|
|
|
|
if (pset->edittype == PE_TYPE_PARTICLES && pid->type == PTCACHE_TYPE_PARTICLES) {
|
2009-09-16 17:43:09 +00:00
|
|
|
ParticleSystem *psys = pid->calldata;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (psys->flag & PSYS_CURRENT) {
|
|
|
|
if (psys->part && psys->part->type == PART_HAIR) {
|
|
|
|
if (psys->flag & PSYS_HAIR_DYNAMICS && psys->pointcache->flag & PTCACHE_BAKED) {
|
|
|
|
if (create && !psys->pointcache->edit)
|
2018-06-13 14:26:26 +02:00
|
|
|
PE_create_particle_edit(bmain, scene, ob, pid->cache, NULL);
|
2009-09-16 17:43:09 +00:00
|
|
|
edit = pid->cache->edit;
|
|
|
|
}
|
|
|
|
else {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (create && !psys->edit && psys->flag & PSYS_HAIR_DONE)
|
2018-06-13 14:26:26 +02:00
|
|
|
PE_create_particle_edit(bmain, scene, ob, NULL, psys);
|
2009-09-16 17:43:09 +00:00
|
|
|
edit = psys->edit;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (create && pid->cache->flag & PTCACHE_BAKED && !pid->cache->edit)
|
2018-06-13 14:26:26 +02:00
|
|
|
PE_create_particle_edit(bmain, scene, ob, pid->cache, psys);
|
2009-09-16 17:43:09 +00:00
|
|
|
edit = pid->cache->edit;
|
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2012-03-06 18:40:15 +00:00
|
|
|
else if (pset->edittype == PE_TYPE_SOFTBODY && pid->type == PTCACHE_TYPE_SOFTBODY) {
|
|
|
|
if (create && pid->cache->flag & PTCACHE_BAKED && !pid->cache->edit) {
|
2012-01-13 15:14:08 +00:00
|
|
|
pset->flag |= PE_FADE_TIME;
|
|
|
|
// NICE TO HAVE but doesn't work: pset->brushtype = PE_BRUSH_COMB;
|
2018-06-13 14:26:26 +02:00
|
|
|
PE_create_particle_edit(bmain, scene, ob, pid->cache, NULL);
|
2012-01-13 15:14:08 +00:00
|
|
|
}
|
2009-09-16 17:43:09 +00:00
|
|
|
edit = pid->cache->edit;
|
|
|
|
break;
|
|
|
|
}
|
2012-03-06 18:40:15 +00:00
|
|
|
else if (pset->edittype == PE_TYPE_CLOTH && pid->type == PTCACHE_TYPE_CLOTH) {
|
|
|
|
if (create && pid->cache->flag & PTCACHE_BAKED && !pid->cache->edit) {
|
2012-01-13 15:14:08 +00:00
|
|
|
pset->flag |= PE_FADE_TIME;
|
|
|
|
// NICE TO HAVE but doesn't work: pset->brushtype = PE_BRUSH_COMB;
|
2018-06-13 14:26:26 +02:00
|
|
|
PE_create_particle_edit(bmain, scene, ob, pid->cache, NULL);
|
2012-01-13 15:14:08 +00:00
|
|
|
}
|
2009-09-16 17:43:09 +00:00
|
|
|
edit = pid->cache->edit;
|
|
|
|
break;
|
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit)
|
2009-09-16 17:43:09 +00:00
|
|
|
edit->pid = *pid;
|
|
|
|
|
|
|
|
BLI_freelistN(&pidlist);
|
|
|
|
|
|
|
|
return edit;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2018-06-13 14:26:26 +02:00
|
|
|
PTCacheEdit *PE_get_current(Main *bmain, Scene *scene, Object *ob)
|
2009-10-22 23:22:05 +00:00
|
|
|
{
|
2018-06-13 14:26:26 +02:00
|
|
|
return pe_get_current(bmain, scene, ob, 0);
|
2009-10-22 23:22:05 +00:00
|
|
|
}
|
|
|
|
|
2018-06-13 14:26:26 +02:00
|
|
|
PTCacheEdit *PE_create_current(Main *bmain, Scene *scene, Object *ob)
|
2009-10-22 23:22:05 +00:00
|
|
|
{
|
2018-06-13 14:26:26 +02:00
|
|
|
return pe_get_current(bmain, scene, ob, 1);
|
2009-10-22 23:22:05 +00:00
|
|
|
}
|
|
|
|
|
2018-06-13 14:26:26 +02:00
|
|
|
void PE_current_changed(Main *bmain, Scene *scene, Object *ob)
|
2009-10-22 23:22:05 +00:00
|
|
|
{
|
2012-03-24 06:38:07 +00:00
|
|
|
if (ob->mode == OB_MODE_PARTICLE_EDIT)
|
2018-06-13 14:26:26 +02:00
|
|
|
PE_create_current(bmain, scene, ob);
|
2009-10-22 23:22:05 +00:00
|
|
|
}
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
void PE_hide_keys_time(Scene *scene, PTCacheEdit *edit, float cfra)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
|
|
|
ParticleEditSettings *pset=PE_settings(scene);
|
2009-09-16 17:43:09 +00:00
|
|
|
POINT_P; KEY_K;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (pset->flag & PE_FADE_TIME && pset->selectmode==SCE_SELECT_POINT) {
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_POINTS {
|
|
|
|
LOOP_KEYS {
|
2014-09-17 14:11:37 +10:00
|
|
|
if (fabsf(cfra - *key->time) < pset->fade_frames)
|
2009-01-24 13:45:24 +00:00
|
|
|
key->flag &= ~PEK_HIDE;
|
2009-02-20 20:39:27 +00:00
|
|
|
else {
|
2009-01-24 13:45:24 +00:00
|
|
|
key->flag |= PEK_HIDE;
|
2009-09-16 17:43:09 +00:00
|
|
|
//key->flag &= ~PEK_SELECT;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2009-02-20 20:39:27 +00:00
|
|
|
else {
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_POINTS {
|
|
|
|
LOOP_KEYS {
|
2009-01-24 13:45:24 +00:00
|
|
|
key->flag &= ~PEK_HIDE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-01-05 15:23:09 +00:00
|
|
|
static int pe_x_mirror(Object *ob)
|
|
|
|
{
|
2012-03-24 06:38:07 +00:00
|
|
|
if (ob->type == OB_MESH)
|
2012-09-30 06:12:47 +00:00
|
|
|
return (((Mesh *)ob->data)->editflag & ME_EDIT_MIRROR_X);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2010-01-05 15:23:09 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/****************** common struct passed to callbacks ******************/
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
typedef struct PEData {
|
|
|
|
ViewContext vc;
|
|
|
|
bglMats mats;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2018-06-13 14:26:26 +02:00
|
|
|
Main *bmain;
|
2009-02-20 20:39:27 +00:00
|
|
|
Scene *scene;
|
|
|
|
Object *ob;
|
|
|
|
DerivedMesh *dm;
|
2009-09-16 17:43:09 +00:00
|
|
|
PTCacheEdit *edit;
|
2014-10-22 16:36:23 +02:00
|
|
|
BVHTreeFromMesh shape_bvh;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2011-05-12 16:47:36 +00:00
|
|
|
const int *mval;
|
2009-02-20 20:39:27 +00:00
|
|
|
rcti *rect;
|
|
|
|
float rad;
|
|
|
|
float dist;
|
|
|
|
float dval;
|
|
|
|
int select;
|
|
|
|
|
|
|
|
float *dvec;
|
|
|
|
float combfac;
|
|
|
|
float pufffac;
|
|
|
|
float cutfac;
|
|
|
|
float smoothfac;
|
|
|
|
float weightfac;
|
|
|
|
float growfac;
|
2009-07-25 22:31:02 +00:00
|
|
|
int totrekey;
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
int invert;
|
|
|
|
int tot;
|
|
|
|
float vec[3];
|
2013-05-16 00:07:01 +00:00
|
|
|
|
|
|
|
int select_action;
|
|
|
|
int select_toggle_action;
|
2009-02-20 20:39:27 +00:00
|
|
|
} PEData;
|
|
|
|
|
|
|
|
static void PE_set_data(bContext *C, PEData *data)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2009-02-20 20:39:27 +00:00
|
|
|
memset(data, 0, sizeof(*data));
|
|
|
|
|
2018-06-13 14:26:26 +02:00
|
|
|
data->bmain = CTX_data_main(C);
|
2009-02-20 20:39:27 +00:00
|
|
|
data->scene= CTX_data_scene(C);
|
|
|
|
data->ob= CTX_data_active_object(C);
|
2018-06-13 14:26:26 +02:00
|
|
|
data->edit= PE_get_current(data->bmain, data->scene, data->ob);
|
2009-02-20 20:39:27 +00:00
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
static void PE_set_view3d_data(bContext *C, PEData *data)
|
|
|
|
{
|
|
|
|
PE_set_data(C, data);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2018-03-08 17:30:24 +11:00
|
|
|
ED_view3d_viewcontext_init(C, &data->vc);
|
2011-05-28 13:11:24 +00:00
|
|
|
/* note, the object argument means the modelview matrix does not account for the objects matrix, use viewmat rather than (obmat * viewmat) */
|
2010-01-26 11:51:28 +00:00
|
|
|
view3d_get_transformation(data->vc.ar, data->vc.rv3d, NULL, &data->mats);
|
2009-02-25 19:29:58 +00:00
|
|
|
|
2015-04-20 23:39:54 +10:00
|
|
|
if (V3D_IS_ZBUF(data->vc.v3d)) {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (data->vc.v3d->flag & V3D_INVALID_BACKBUF) {
|
2010-11-27 00:23:06 +00:00
|
|
|
/* needed or else the draw matrix can be incorrect */
|
|
|
|
view3d_operator_needs_opengl(C);
|
2010-11-26 12:57:35 +00:00
|
|
|
|
2015-04-21 03:19:27 +10:00
|
|
|
ED_view3d_backbuf_validate(&data->vc);
|
2010-11-26 12:57:35 +00:00
|
|
|
/* we may need to force an update here by setting the rv3d as dirty
|
|
|
|
* for now it seems ok, but take care!:
|
|
|
|
* rv3d->depths->dirty = 1; */
|
2011-05-21 08:56:37 +00:00
|
|
|
ED_view3d_depth_update(data->vc.ar);
|
2010-11-26 12:57:35 +00:00
|
|
|
}
|
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2015-06-05 12:56:56 +02:00
|
|
|
static bool PE_create_shape_tree(PEData *data, Object *shapeob)
|
2014-10-22 16:36:23 +02:00
|
|
|
{
|
|
|
|
DerivedMesh *dm = shapeob->derivedFinal;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-10-22 16:36:23 +02:00
|
|
|
memset(&data->shape_bvh, 0, sizeof(data->shape_bvh));
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2015-02-03 16:40:27 +11:00
|
|
|
if (!dm) {
|
2015-06-05 12:56:56 +02:00
|
|
|
return false;
|
2015-02-03 16:40:27 +11:00
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2018-05-03 15:52:09 -03:00
|
|
|
return (bvhtree_from_mesh_get(&data->shape_bvh, dm, BVHTREE_FROM_LOOPTRI, 4) != NULL);
|
2014-10-22 16:36:23 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void PE_free_shape_tree(PEData *data)
|
|
|
|
{
|
|
|
|
free_bvhtree_from_mesh(&data->shape_bvh);
|
|
|
|
}
|
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/*************************** selection utilities *******************************/
|
|
|
|
|
2014-02-05 22:36:15 +11:00
|
|
|
static bool key_test_depth(PEData *data, const float co[3], const int screen_co[2])
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2009-02-20 20:39:27 +00:00
|
|
|
View3D *v3d= data->vc.v3d;
|
2012-11-23 21:22:13 +00:00
|
|
|
ViewDepths *vd = data->vc.rv3d->depths;
|
2009-01-24 13:45:24 +00:00
|
|
|
double ux, uy, uz;
|
|
|
|
float depth;
|
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/* nothing to do */
|
2015-04-20 23:39:54 +10:00
|
|
|
if (!V3D_IS_ZBUF(v3d))
|
|
|
|
return true;
|
2012-10-05 05:11:10 +00:00
|
|
|
|
|
|
|
/* used to calculate here but all callers have the screen_co already, so pass as arg */
|
|
|
|
#if 0
|
|
|
|
if (ED_view3d_project_int_global(data->vc.ar, co, screen_co,
|
2012-12-21 03:49:47 +00:00
|
|
|
V3D_PROJ_TEST_CLIP_BB | V3D_PROJ_TEST_CLIP_WIN | V3D_PROJ_TEST_CLIP_NEAR) != V3D_PROJ_RET_OK)
|
refactor ED_view3d_project_short & ED_view3d_project_short_noclip,
This is apart of a code cleanup to make ED_view3d_project_short/ED_view3d_project_int/ED_view3d_project_float interchangeable. Currently they work very differently in a way thats quite confusing (and cause of bugs in blender that remain uncorrected) - fixes coming.
There are also cases where ED_view3d_project_short is used, then the values are converted from shorts into int's after because ED_view3d_project_int() behaves differently, will unify behavior of these functions after this commit.
- rather then clip/noclip versions, pass flags (for bound-box clip, window clip).
- rather then store the invalid clip-value, return success (or error value clip_near, clip_bb, clip_win, overflow).
- remove local copies of project functions from drawobject.c: view3d_project_short_clip, view3d_project_short_noclip, view3d_project_short_clip_persmat.
add functions:
- ED_view3d_project_short_global() global space projection
- ED_view3d_project_short_object() object space projection.
- ED_view3d_project_short_ex() take perspective matrix and local space option as args.
- ED_view3d_project_base() - special function to set the Object 'Base' screen coords (sx, sy), since this is a common enough operation.
2012-10-04 16:46:15 +00:00
|
|
|
{
|
2009-01-24 13:45:24 +00:00
|
|
|
return 0;
|
refactor ED_view3d_project_short & ED_view3d_project_short_noclip,
This is apart of a code cleanup to make ED_view3d_project_short/ED_view3d_project_int/ED_view3d_project_float interchangeable. Currently they work very differently in a way thats quite confusing (and cause of bugs in blender that remain uncorrected) - fixes coming.
There are also cases where ED_view3d_project_short is used, then the values are converted from shorts into int's after because ED_view3d_project_int() behaves differently, will unify behavior of these functions after this commit.
- rather then clip/noclip versions, pass flags (for bound-box clip, window clip).
- rather then store the invalid clip-value, return success (or error value clip_near, clip_bb, clip_win, overflow).
- remove local copies of project functions from drawobject.c: view3d_project_short_clip, view3d_project_short_noclip, view3d_project_short_clip_persmat.
add functions:
- ED_view3d_project_short_global() global space projection
- ED_view3d_project_short_object() object space projection.
- ED_view3d_project_short_ex() take perspective matrix and local space option as args.
- ED_view3d_project_base() - special function to set the Object 'Base' screen coords (sx, sy), since this is a common enough operation.
2012-10-04 16:46:15 +00:00
|
|
|
}
|
2012-10-05 05:11:10 +00:00
|
|
|
#endif
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2012-04-29 15:47:02 +00:00
|
|
|
gluProject(co[0], co[1], co[2], data->mats.modelview, data->mats.projection,
|
2011-11-06 14:00:55 +00:00
|
|
|
(GLint *)data->mats.viewport, &ux, &uy, &uz);
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2012-11-23 21:22:13 +00:00
|
|
|
/* check if screen_co is within bounds because brush_cut uses out of screen coords */
|
2012-11-26 11:03:14 +00:00
|
|
|
if (screen_co[0] >= 0 && screen_co[0] < vd->w && screen_co[1] >= 0 && screen_co[1] < vd->h) {
|
2012-11-23 21:22:13 +00:00
|
|
|
BLI_assert(vd && vd->depths);
|
2010-11-26 12:57:35 +00:00
|
|
|
/* we know its not clipped */
|
2012-10-05 05:11:10 +00:00
|
|
|
depth = vd->depths[screen_co[1] * vd->w + screen_co[0]];
|
2010-11-26 12:57:35 +00:00
|
|
|
}
|
2012-11-23 21:22:13 +00:00
|
|
|
else
|
|
|
|
return 0;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if ((float)uz - 0.00001f > depth)
|
2009-12-18 13:35:30 +00:00
|
|
|
return 0;
|
|
|
|
else
|
|
|
|
return 1;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2014-02-05 22:36:15 +11:00
|
|
|
static bool key_inside_circle(PEData *data, float rad, const float co[3], float *distance)
|
2009-02-20 20:39:27 +00:00
|
|
|
{
|
|
|
|
float dx, dy, dist;
|
2012-10-05 05:11:10 +00:00
|
|
|
int screen_co[2];
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2012-10-04 17:52:12 +00:00
|
|
|
/* TODO, should this check V3D_PROJ_TEST_CLIP_BB too? */
|
2012-10-07 14:00:18 +00:00
|
|
|
if (ED_view3d_project_int_global(data->vc.ar, co, screen_co, V3D_PROJ_TEST_CLIP_WIN) != V3D_PROJ_RET_OK) {
|
2009-02-20 20:39:27 +00:00
|
|
|
return 0;
|
2012-10-04 17:52:12 +00:00
|
|
|
}
|
|
|
|
|
2012-10-05 05:11:10 +00:00
|
|
|
dx= data->mval[0] - screen_co[0];
|
|
|
|
dy= data->mval[1] - screen_co[1];
|
2014-09-17 14:11:37 +10:00
|
|
|
dist = sqrtf(dx * dx + dy * dy);
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (dist > rad)
|
2009-02-20 20:39:27 +00:00
|
|
|
return 0;
|
|
|
|
|
2012-10-05 05:11:10 +00:00
|
|
|
if (key_test_depth(data, co, screen_co)) {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (distance)
|
2009-02-20 20:39:27 +00:00
|
|
|
*distance=dist;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-02-05 22:36:15 +11:00
|
|
|
static bool key_inside_rect(PEData *data, const float co[3])
|
2009-02-20 20:39:27 +00:00
|
|
|
{
|
2012-10-05 05:11:10 +00:00
|
|
|
int screen_co[2];
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2012-10-07 14:00:18 +00:00
|
|
|
if (ED_view3d_project_int_global(data->vc.ar, co, screen_co, V3D_PROJ_TEST_CLIP_WIN) != V3D_PROJ_RET_OK) {
|
2009-02-20 20:39:27 +00:00
|
|
|
return 0;
|
2012-10-04 17:52:12 +00:00
|
|
|
}
|
2012-04-28 06:31:57 +00:00
|
|
|
|
2012-10-05 05:11:10 +00:00
|
|
|
if (screen_co[0] > data->rect->xmin && screen_co[0] < data->rect->xmax &&
|
|
|
|
screen_co[1] > data->rect->ymin && screen_co[1] < data->rect->ymax)
|
2012-04-28 06:31:57 +00:00
|
|
|
{
|
2012-10-05 05:11:10 +00:00
|
|
|
return key_test_depth(data, co, screen_co);
|
2012-04-28 06:31:57 +00:00
|
|
|
}
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-02-05 22:36:15 +11:00
|
|
|
static bool key_inside_test(PEData *data, const float co[3])
|
2009-02-20 20:39:27 +00:00
|
|
|
{
|
2012-03-24 06:38:07 +00:00
|
|
|
if (data->mval)
|
2009-02-25 19:29:58 +00:00
|
|
|
return key_inside_circle(data, data->rad, co, NULL);
|
2009-02-20 20:39:27 +00:00
|
|
|
else
|
|
|
|
return key_inside_rect(data, co);
|
|
|
|
}
|
|
|
|
|
2014-02-05 22:36:15 +11:00
|
|
|
static bool point_is_selected(PTCacheEditPoint *point)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2009-09-16 17:43:09 +00:00
|
|
|
KEY_K;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (point->flag & PEP_HIDE)
|
2009-02-20 20:39:27 +00:00
|
|
|
return 0;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_SELECTED_KEYS {
|
|
|
|
return 1;
|
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-01-24 13:45:24 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/*************************** iterators *******************************/
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
typedef void (*ForPointFunc)(PEData *data, int point_index);
|
|
|
|
typedef void (*ForKeyFunc)(PEData *data, int point_index, int key_index);
|
2012-12-11 14:29:01 +00:00
|
|
|
typedef void (*ForKeyMatFunc)(PEData *data, float mat[4][4], float imat[4][4], int point_index, int key_index, PTCacheEditKey *key);
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
static void for_mouse_hit_keys(PEData *data, ForKeyFunc func, int nearest)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2009-06-23 00:41:55 +00:00
|
|
|
ParticleEditSettings *pset= PE_settings(data->scene);
|
2009-09-16 17:43:09 +00:00
|
|
|
PTCacheEdit *edit= data->edit;
|
|
|
|
POINT_P; KEY_K;
|
|
|
|
int nearest_point, nearest_key;
|
2009-02-20 20:39:27 +00:00
|
|
|
float dist= data->rad;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/* in path select mode we have no keys */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (pset->selectmode==SCE_SELECT_PATH)
|
2009-02-20 20:39:27 +00:00
|
|
|
return;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
nearest_point= -1;
|
2009-02-20 20:39:27 +00:00
|
|
|
nearest_key= -1;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_VISIBLE_POINTS {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (pset->selectmode == SCE_SELECT_END) {
|
2014-01-16 01:34:08 +06:00
|
|
|
if (point->totkey) {
|
|
|
|
/* only do end keys */
|
|
|
|
key= point->keys + point->totkey-1;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2014-01-16 01:34:08 +06:00
|
|
|
if (nearest) {
|
|
|
|
if (key_inside_circle(data, dist, KEY_WCO, &dist)) {
|
|
|
|
nearest_point= p;
|
|
|
|
nearest_key= point->totkey-1;
|
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
2014-01-16 01:34:08 +06:00
|
|
|
else if (key_inside_test(data, KEY_WCO))
|
|
|
|
func(data, p, point->totkey-1);
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
2009-02-20 20:39:27 +00:00
|
|
|
else {
|
|
|
|
/* do all keys */
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_VISIBLE_KEYS {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (nearest) {
|
|
|
|
if (key_inside_circle(data, dist, KEY_WCO, &dist)) {
|
2009-09-16 17:43:09 +00:00
|
|
|
nearest_point= p;
|
2009-02-20 20:39:27 +00:00
|
|
|
nearest_key= k;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
2012-03-24 06:38:07 +00:00
|
|
|
else if (key_inside_test(data, KEY_WCO))
|
2009-09-16 17:43:09 +00:00
|
|
|
func(data, p, k);
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
/* do nearest only */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (nearest && nearest_point > -1)
|
2009-09-16 17:43:09 +00:00
|
|
|
func(data, nearest_point, nearest_key);
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
static void foreach_mouse_hit_point(PEData *data, ForPointFunc func, int selected)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2009-06-23 00:41:55 +00:00
|
|
|
ParticleEditSettings *pset= PE_settings(data->scene);
|
2009-09-16 17:43:09 +00:00
|
|
|
PTCacheEdit *edit= data->edit;
|
|
|
|
POINT_P; KEY_K;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/* all is selected in path mode */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (pset->selectmode==SCE_SELECT_PATH)
|
2009-01-24 13:45:24 +00:00
|
|
|
selected=0;
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_VISIBLE_POINTS {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (pset->selectmode==SCE_SELECT_END) {
|
2014-01-16 01:34:08 +06:00
|
|
|
if (point->totkey) {
|
|
|
|
/* only do end keys */
|
|
|
|
key= point->keys + point->totkey - 1;
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2014-01-16 01:34:08 +06:00
|
|
|
if (selected==0 || key->flag & PEK_SELECT)
|
|
|
|
if (key_inside_circle(data, data->rad, KEY_WCO, &data->dist))
|
|
|
|
func(data, p);
|
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
2009-02-20 20:39:27 +00:00
|
|
|
else {
|
|
|
|
/* do all keys */
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_VISIBLE_KEYS {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (selected==0 || key->flag & PEK_SELECT) {
|
|
|
|
if (key_inside_circle(data, data->rad, KEY_WCO, &data->dist)) {
|
2009-09-16 17:43:09 +00:00
|
|
|
func(data, p);
|
2009-02-20 20:39:27 +00:00
|
|
|
break;
|
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
static void foreach_mouse_hit_key(PEData *data, ForKeyMatFunc func, int selected)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2009-09-16 17:43:09 +00:00
|
|
|
PTCacheEdit *edit = data->edit;
|
|
|
|
ParticleSystem *psys = edit->psys;
|
|
|
|
ParticleSystemModifierData *psmd = NULL;
|
2009-06-23 00:41:55 +00:00
|
|
|
ParticleEditSettings *pset= PE_settings(data->scene);
|
2009-09-16 17:43:09 +00:00
|
|
|
POINT_P; KEY_K;
|
2014-06-26 16:09:59 +10:00
|
|
|
float mat[4][4], imat[4][4];
|
|
|
|
|
|
|
|
unit_m4(mat);
|
|
|
|
unit_m4(imat);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit->psys)
|
2009-09-16 17:43:09 +00:00
|
|
|
psmd= psys_get_modifier(data->ob, edit->psys);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/* all is selected in path mode */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (pset->selectmode==SCE_SELECT_PATH)
|
2009-02-20 20:39:27 +00:00
|
|
|
selected= 0;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_VISIBLE_POINTS {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (pset->selectmode==SCE_SELECT_END) {
|
2014-01-16 01:34:08 +06:00
|
|
|
if (point->totkey) {
|
|
|
|
/* only do end keys */
|
|
|
|
key= point->keys + point->totkey-1;
|
2010-01-06 12:00:53 +00:00
|
|
|
|
2014-01-16 01:34:08 +06:00
|
|
|
if (selected==0 || key->flag & PEK_SELECT) {
|
|
|
|
if (key_inside_circle(data, data->rad, KEY_WCO, &data->dist)) {
|
|
|
|
if (edit->psys && !(edit->psys->flag & PSYS_GLOBAL_HAIR)) {
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
psys_mat_hair_to_global(data->ob, psmd->dm_final, psys->part->from, psys->particles + p, mat);
|
2014-01-16 01:34:08 +06:00
|
|
|
invert_m4_m4(imat, mat);
|
|
|
|
}
|
|
|
|
|
|
|
|
func(data, mat, imat, p, point->totkey-1, key);
|
|
|
|
}
|
2010-01-06 12:00:53 +00:00
|
|
|
}
|
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
2009-02-20 20:39:27 +00:00
|
|
|
else {
|
|
|
|
/* do all keys */
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_VISIBLE_KEYS {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (selected==0 || key->flag & PEK_SELECT) {
|
|
|
|
if (key_inside_circle(data, data->rad, KEY_WCO, &data->dist)) {
|
|
|
|
if (edit->psys && !(edit->psys->flag & PSYS_GLOBAL_HAIR)) {
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
psys_mat_hair_to_global(data->ob, psmd->dm_final, psys->part->from, psys->particles + p, mat);
|
2012-04-29 15:47:02 +00:00
|
|
|
invert_m4_m4(imat, mat);
|
2010-01-06 12:00:53 +00:00
|
|
|
}
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
func(data, mat, imat, p, k, key);
|
2010-01-06 12:00:53 +00:00
|
|
|
}
|
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
static void foreach_selected_point(PEData *data, ForPointFunc func)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2009-09-16 17:43:09 +00:00
|
|
|
PTCacheEdit *edit = data->edit;
|
|
|
|
POINT_P;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_SELECTED_POINTS {
|
|
|
|
func(data, p);
|
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
static void foreach_selected_key(PEData *data, ForKeyFunc func)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2009-09-16 17:43:09 +00:00
|
|
|
PTCacheEdit *edit = data->edit;
|
|
|
|
POINT_P; KEY_K;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_VISIBLE_POINTS {
|
|
|
|
LOOP_SELECTED_KEYS {
|
|
|
|
func(data, p, k);
|
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
static void foreach_point(PEData *data, ForPointFunc func)
|
2009-02-20 20:39:27 +00:00
|
|
|
{
|
2009-09-16 17:43:09 +00:00
|
|
|
PTCacheEdit *edit = data->edit;
|
|
|
|
POINT_P;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-10-21 05:46:41 +00:00
|
|
|
LOOP_POINTS {
|
2009-09-16 17:43:09 +00:00
|
|
|
func(data, p);
|
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
static int count_selected_keys(Scene *scene, PTCacheEdit *edit)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2009-06-23 00:41:55 +00:00
|
|
|
ParticleEditSettings *pset= PE_settings(scene);
|
2009-09-16 17:43:09 +00:00
|
|
|
POINT_P; KEY_K;
|
|
|
|
int sel= 0;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_VISIBLE_POINTS {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (pset->selectmode==SCE_SELECT_POINT) {
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_SELECTED_KEYS {
|
|
|
|
sel++;
|
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
2012-03-24 06:38:07 +00:00
|
|
|
else if (pset->selectmode==SCE_SELECT_END) {
|
2014-01-16 01:34:08 +06:00
|
|
|
if (point->totkey) {
|
|
|
|
key = point->keys + point->totkey - 1;
|
|
|
|
if (key->flag & PEK_SELECT)
|
|
|
|
sel++;
|
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2009-01-24 13:45:24 +00:00
|
|
|
return sel;
|
|
|
|
}
|
|
|
|
|
|
|
|
/************************************************/
|
|
|
|
/* Particle Edit Mirroring */
|
|
|
|
/************************************************/
|
|
|
|
|
|
|
|
static void PE_update_mirror_cache(Object *ob, ParticleSystem *psys)
|
|
|
|
{
|
2009-09-16 17:43:09 +00:00
|
|
|
PTCacheEdit *edit;
|
2009-01-24 13:45:24 +00:00
|
|
|
ParticleSystemModifierData *psmd;
|
|
|
|
KDTree *tree;
|
|
|
|
KDTreeNearest nearest;
|
2009-09-16 17:43:09 +00:00
|
|
|
HairKey *key;
|
|
|
|
PARTICLE_P;
|
2009-01-24 13:45:24 +00:00
|
|
|
float mat[4][4], co[3];
|
2009-09-16 17:43:09 +00:00
|
|
|
int index, totpart;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
|
|
|
edit= psys->edit;
|
|
|
|
psmd= psys_get_modifier(ob, psys);
|
|
|
|
totpart= psys->totpart;
|
|
|
|
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
if (!psmd->dm_final)
|
2009-10-22 23:22:05 +00:00
|
|
|
return;
|
|
|
|
|
2009-01-24 13:45:24 +00:00
|
|
|
tree= BLI_kdtree_new(totpart);
|
|
|
|
|
|
|
|
/* insert particles into kd tree */
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_PARTICLES {
|
|
|
|
key = pa->hair;
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
psys_mat_hair_to_orco(ob, psmd->dm_final, psys->part->from, pa, mat);
|
2011-11-06 14:00:55 +00:00
|
|
|
copy_v3_v3(co, key->co);
|
2009-11-10 20:43:45 +00:00
|
|
|
mul_m4_v3(mat, co);
|
2014-03-18 09:05:07 +11:00
|
|
|
BLI_kdtree_insert(tree, p, co);
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
BLI_kdtree_balance(tree);
|
|
|
|
|
|
|
|
/* lookup particles and set in mirror cache */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!edit->mirror_cache)
|
2009-01-24 13:45:24 +00:00
|
|
|
edit->mirror_cache= MEM_callocN(sizeof(int)*totpart, "PE mirror cache");
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_PARTICLES {
|
|
|
|
key = pa->hair;
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
psys_mat_hair_to_orco(ob, psmd->dm_final, psys->part->from, pa, mat);
|
2011-11-06 14:00:55 +00:00
|
|
|
copy_v3_v3(co, key->co);
|
2009-11-10 20:43:45 +00:00
|
|
|
mul_m4_v3(mat, co);
|
2012-10-22 08:15:51 +00:00
|
|
|
co[0] = -co[0];
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2014-03-18 09:05:07 +11:00
|
|
|
index= BLI_kdtree_find_nearest(tree, co, &nearest);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
|
|
|
/* this needs a custom threshold still, duplicated for editmode mirror */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (index != -1 && index != p && (nearest.dist <= 0.0002f))
|
2012-10-22 08:15:51 +00:00
|
|
|
edit->mirror_cache[p] = index;
|
2009-01-24 13:45:24 +00:00
|
|
|
else
|
2012-10-22 08:15:51 +00:00
|
|
|
edit->mirror_cache[p] = -1;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* make sure mirrors are in two directions */
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_PARTICLES {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit->mirror_cache[p]) {
|
2009-09-16 17:43:09 +00:00
|
|
|
index= edit->mirror_cache[p];
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit->mirror_cache[index] != p)
|
2012-10-22 08:15:51 +00:00
|
|
|
edit->mirror_cache[p] = -1;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
BLI_kdtree_free(tree);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void PE_mirror_particle(Object *ob, DerivedMesh *dm, ParticleSystem *psys, ParticleData *pa, ParticleData *mpa)
|
|
|
|
{
|
|
|
|
HairKey *hkey, *mhkey;
|
2009-09-16 17:43:09 +00:00
|
|
|
PTCacheEditPoint *point, *mpoint;
|
|
|
|
PTCacheEditKey *key, *mkey;
|
|
|
|
PTCacheEdit *edit;
|
2009-01-24 13:45:24 +00:00
|
|
|
float mat[4][4], mmat[4][4], immat[4][4];
|
|
|
|
int i, mi, k;
|
|
|
|
|
|
|
|
edit= psys->edit;
|
|
|
|
i= pa - psys->particles;
|
|
|
|
|
|
|
|
/* find mirrored particle if needed */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!mpa) {
|
|
|
|
if (!edit->mirror_cache)
|
2009-01-24 13:45:24 +00:00
|
|
|
PE_update_mirror_cache(ob, psys);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!edit->mirror_cache)
|
2011-01-27 12:21:14 +00:00
|
|
|
return; /* something went wrong! */
|
2009-01-24 13:45:24 +00:00
|
|
|
|
|
|
|
mi= edit->mirror_cache[i];
|
2012-03-24 06:38:07 +00:00
|
|
|
if (mi == -1)
|
2009-01-24 13:45:24 +00:00
|
|
|
return;
|
|
|
|
mpa= psys->particles + mi;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
mi= mpa - psys->particles;
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
point = edit->points + i;
|
|
|
|
mpoint = edit->points + mi;
|
|
|
|
|
2009-01-24 13:45:24 +00:00
|
|
|
/* make sure they have the same amount of keys */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (pa->totkey != mpa->totkey) {
|
|
|
|
if (mpa->hair) MEM_freeN(mpa->hair);
|
|
|
|
if (mpoint->keys) MEM_freeN(mpoint->keys);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
|
|
|
mpa->hair= MEM_dupallocN(pa->hair);
|
2010-10-29 12:49:36 +00:00
|
|
|
mpa->totkey= pa->totkey;
|
2009-09-16 17:43:09 +00:00
|
|
|
mpoint->keys= MEM_dupallocN(point->keys);
|
|
|
|
mpoint->totkey= point->totkey;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
|
|
|
mhkey= mpa->hair;
|
2009-09-16 17:43:09 +00:00
|
|
|
mkey= mpoint->keys;
|
2012-03-24 06:38:07 +00:00
|
|
|
for (k=0; k<mpa->totkey; k++, mkey++, mhkey++) {
|
2009-01-24 13:45:24 +00:00
|
|
|
mkey->co= mhkey->co;
|
|
|
|
mkey->time= &mhkey->time;
|
2010-10-29 12:49:36 +00:00
|
|
|
mkey->flag &= ~PEK_SELECT;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* mirror positions and tags */
|
|
|
|
psys_mat_hair_to_orco(ob, dm, psys->part->from, pa, mat);
|
|
|
|
psys_mat_hair_to_orco(ob, dm, psys->part->from, mpa, mmat);
|
2009-11-10 20:43:45 +00:00
|
|
|
invert_m4_m4(immat, mmat);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
|
|
|
hkey=pa->hair;
|
|
|
|
mhkey=mpa->hair;
|
2009-09-16 17:43:09 +00:00
|
|
|
key= point->keys;
|
|
|
|
mkey= mpoint->keys;
|
2012-03-24 06:38:07 +00:00
|
|
|
for (k=0; k<pa->totkey; k++, hkey++, mhkey++, key++, mkey++) {
|
2011-11-06 14:00:55 +00:00
|
|
|
copy_v3_v3(mhkey->co, hkey->co);
|
2009-11-10 20:43:45 +00:00
|
|
|
mul_m4_v3(mat, mhkey->co);
|
2012-10-22 08:15:51 +00:00
|
|
|
mhkey->co[0] = -mhkey->co[0];
|
2009-11-10 20:43:45 +00:00
|
|
|
mul_m4_v3(immat, mhkey->co);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (key->flag & PEK_TAG)
|
2009-01-24 13:45:24 +00:00
|
|
|
mkey->flag |= PEK_TAG;
|
2011-07-05 01:49:34 +00:00
|
|
|
|
|
|
|
mkey->length = key->length;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (point->flag & PEP_TAG)
|
2009-09-16 17:43:09 +00:00
|
|
|
mpoint->flag |= PEP_TAG;
|
2012-03-24 06:38:07 +00:00
|
|
|
if (point->flag & PEP_EDIT_RECALC)
|
2009-09-16 17:43:09 +00:00
|
|
|
mpoint->flag |= PEP_EDIT_RECALC;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void PE_apply_mirror(Object *ob, ParticleSystem *psys)
|
|
|
|
{
|
2009-09-16 17:43:09 +00:00
|
|
|
PTCacheEdit *edit;
|
2009-01-24 13:45:24 +00:00
|
|
|
ParticleSystemModifierData *psmd;
|
2009-09-16 17:43:09 +00:00
|
|
|
POINT_P;
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!psys)
|
2009-09-16 17:43:09 +00:00
|
|
|
return;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
|
|
|
edit= psys->edit;
|
|
|
|
psmd= psys_get_modifier(ob, psys);
|
|
|
|
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
if (!psmd->dm_final)
|
2009-10-22 23:22:05 +00:00
|
|
|
return;
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!edit->mirror_cache)
|
2010-03-12 16:21:39 +00:00
|
|
|
PE_update_mirror_cache(ob, psys);
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!edit->mirror_cache)
|
2011-01-27 12:21:14 +00:00
|
|
|
return; /* something went wrong */
|
|
|
|
|
2009-01-24 13:45:24 +00:00
|
|
|
/* we delay settings the PARS_EDIT_RECALC for mirrored particles
|
|
|
|
* to avoid doing mirror twice */
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_POINTS {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (point->flag & PEP_EDIT_RECALC) {
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
PE_mirror_particle(ob, psmd->dm_final, psys, psys->particles + p, NULL);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit->mirror_cache[p] != -1)
|
2009-09-16 17:43:09 +00:00
|
|
|
edit->points[edit->mirror_cache[p]].flag &= ~PEP_EDIT_RECALC;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_POINTS {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (point->flag & PEP_EDIT_RECALC)
|
|
|
|
if (edit->mirror_cache[p] != -1)
|
2009-09-16 17:43:09 +00:00
|
|
|
edit->points[edit->mirror_cache[p]].flag |= PEP_EDIT_RECALC;
|
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/************************************************/
|
|
|
|
/* Edit Calculation */
|
|
|
|
/************************************************/
|
|
|
|
/* tries to stop edited particles from going through the emitter's surface */
|
2009-09-16 17:43:09 +00:00
|
|
|
static void pe_deflect_emitter(Scene *scene, Object *ob, PTCacheEdit *edit)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2009-02-20 20:39:27 +00:00
|
|
|
ParticleEditSettings *pset= PE_settings(scene);
|
2009-09-16 17:43:09 +00:00
|
|
|
ParticleSystem *psys;
|
|
|
|
ParticleSystemModifierData *psmd;
|
|
|
|
POINT_P; KEY_K;
|
|
|
|
int index;
|
2009-11-01 00:06:53 +00:00
|
|
|
float *vec, *nor, dvec[3], dot, dist_1st=0.0f;
|
2009-01-24 13:45:24 +00:00
|
|
|
float hairimat[4][4], hairmat[4][4];
|
2014-03-12 11:52:43 +01:00
|
|
|
const float dist = ED_view3d_select_dist_px() * 0.01f;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit==NULL || edit->psys==NULL || (pset->flag & PE_DEFLECT_EMITTER)==0 || (edit->psys->flag & PSYS_GLOBAL_HAIR))
|
2009-01-24 13:45:24 +00:00
|
|
|
return;
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
psys = edit->psys;
|
2012-04-29 15:47:02 +00:00
|
|
|
psmd = psys_get_modifier(ob, psys);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
if (!psmd->dm_final)
|
2009-10-22 23:22:05 +00:00
|
|
|
return;
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_EDITED_POINTS {
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
psys_mat_hair_to_object(ob, psmd->dm_final, psys->part->from, psys->particles + p, hairmat);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_KEYS {
|
2009-11-10 20:43:45 +00:00
|
|
|
mul_m4_v3(hairmat, key->co);
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_KEYS {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (k==0) {
|
2009-11-10 20:43:45 +00:00
|
|
|
dist_1st = len_v3v3((key+1)->co, key->co);
|
2014-03-11 15:34:19 +11:00
|
|
|
dist_1st *= dist * pset->emitterdist;
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
else {
|
2014-03-18 09:05:07 +11:00
|
|
|
index= BLI_kdtree_find_nearest(edit->emitter_field, key->co, NULL);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
vec=edit->emitter_cosnos +index*6;
|
|
|
|
nor=vec+3;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-11-10 20:43:45 +00:00
|
|
|
sub_v3_v3v3(dvec, key->co, vec);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-04-29 15:47:02 +00:00
|
|
|
dot=dot_v3v3(dvec, nor);
|
|
|
|
copy_v3_v3(dvec, nor);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (dot>0.0f) {
|
|
|
|
if (dot<dist_1st) {
|
2009-11-10 20:43:45 +00:00
|
|
|
normalize_v3(dvec);
|
2012-04-29 15:47:02 +00:00
|
|
|
mul_v3_fl(dvec, dist_1st-dot);
|
2010-04-21 12:27:48 +00:00
|
|
|
add_v3_v3(key->co, dvec);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2009-11-10 20:43:45 +00:00
|
|
|
normalize_v3(dvec);
|
2012-04-29 15:47:02 +00:00
|
|
|
mul_v3_fl(dvec, dist_1st-dot);
|
2010-04-21 12:27:48 +00:00
|
|
|
add_v3_v3(key->co, dvec);
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
2012-03-24 06:38:07 +00:00
|
|
|
if (k==1)
|
2009-09-16 17:43:09 +00:00
|
|
|
dist_1st*=1.3333f;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-04-29 15:47:02 +00:00
|
|
|
invert_m4_m4(hairimat, hairmat);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_KEYS {
|
2009-11-10 20:43:45 +00:00
|
|
|
mul_m4_v3(hairimat, key->co);
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2012-03-01 12:20:18 +00:00
|
|
|
/* force set distances between neighboring keys */
|
2011-02-14 17:55:27 +00:00
|
|
|
static void PE_apply_lengths(Scene *scene, PTCacheEdit *edit)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-01-24 13:45:24 +00:00
|
|
|
ParticleEditSettings *pset=PE_settings(scene);
|
2009-09-16 17:43:09 +00:00
|
|
|
POINT_P; KEY_K;
|
2009-01-24 13:45:24 +00:00
|
|
|
float dv1[3];
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit==0 || (pset->flag & PE_KEEP_LENGTHS)==0)
|
2009-01-24 13:45:24 +00:00
|
|
|
return;
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit->psys && edit->psys->flag & PSYS_GLOBAL_HAIR)
|
2009-01-24 13:45:24 +00:00
|
|
|
return;
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_EDITED_POINTS {
|
|
|
|
LOOP_KEYS {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (k) {
|
2009-11-10 20:43:45 +00:00
|
|
|
sub_v3_v3v3(dv1, key->co, (key - 1)->co);
|
|
|
|
normalize_v3(dv1);
|
|
|
|
mul_v3_fl(dv1, (key - 1)->length);
|
|
|
|
add_v3_v3v3(key->co, (key - 1)->co, dv1);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2012-03-01 12:20:18 +00:00
|
|
|
/* try to find a nice solution to keep distances between neighboring keys */
|
2009-09-16 17:43:09 +00:00
|
|
|
static void pe_iterate_lengths(Scene *scene, PTCacheEdit *edit)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
|
|
|
ParticleEditSettings *pset=PE_settings(scene);
|
2009-09-16 17:43:09 +00:00
|
|
|
POINT_P;
|
|
|
|
PTCacheEditKey *key;
|
|
|
|
int j, k;
|
2009-01-24 13:45:24 +00:00
|
|
|
float tlen;
|
2012-10-22 08:15:51 +00:00
|
|
|
float dv0[3] = {0.0f, 0.0f, 0.0f};
|
|
|
|
float dv1[3] = {0.0f, 0.0f, 0.0f};
|
|
|
|
float dv2[3] = {0.0f, 0.0f, 0.0f};
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit==0 || (pset->flag & PE_KEEP_LENGTHS)==0)
|
2009-01-24 13:45:24 +00:00
|
|
|
return;
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit->psys && edit->psys->flag & PSYS_GLOBAL_HAIR)
|
2009-01-24 13:45:24 +00:00
|
|
|
return;
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_EDITED_POINTS {
|
2012-03-24 06:38:07 +00:00
|
|
|
for (j=1; j<point->totkey; j++) {
|
2009-09-16 17:43:09 +00:00
|
|
|
float mul= 1.0f / (float)point->totkey;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (pset->flag & PE_LOCK_FIRST) {
|
2009-09-16 17:43:09 +00:00
|
|
|
key= point->keys + 1;
|
2009-02-20 20:39:27 +00:00
|
|
|
k= 1;
|
2012-10-22 08:15:51 +00:00
|
|
|
dv1[0] = dv1[1] = dv1[2] = 0.0;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
2009-02-20 20:39:27 +00:00
|
|
|
else {
|
2009-09-16 17:43:09 +00:00
|
|
|
key= point->keys;
|
2009-02-20 20:39:27 +00:00
|
|
|
k= 0;
|
2012-10-22 08:15:51 +00:00
|
|
|
dv0[0] = dv0[1] = dv0[2] = 0.0;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
for (; k<point->totkey; k++, key++) {
|
|
|
|
if (k) {
|
2009-11-10 20:43:45 +00:00
|
|
|
sub_v3_v3v3(dv0, (key - 1)->co, key->co);
|
|
|
|
tlen= normalize_v3(dv0);
|
|
|
|
mul_v3_fl(dv0, (mul * (tlen - (key - 1)->length)));
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (k < point->totkey - 1) {
|
2009-11-10 20:43:45 +00:00
|
|
|
sub_v3_v3v3(dv2, (key + 1)->co, key->co);
|
|
|
|
tlen= normalize_v3(dv2);
|
|
|
|
mul_v3_fl(dv2, mul * (tlen - key->length));
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (k) {
|
2010-04-21 12:27:48 +00:00
|
|
|
add_v3_v3((key-1)->co, dv1);
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2011-11-06 14:00:55 +00:00
|
|
|
add_v3_v3v3(dv1, dv0, dv2);
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* set current distances to be kept between neighbouting keys */
|
2015-01-15 11:51:30 +01:00
|
|
|
void recalc_lengths(PTCacheEdit *edit)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2009-09-16 17:43:09 +00:00
|
|
|
POINT_P; KEY_K;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit==0)
|
2009-01-24 13:45:24 +00:00
|
|
|
return;
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_EDITED_POINTS {
|
|
|
|
key= point->keys;
|
2012-03-24 06:38:07 +00:00
|
|
|
for (k=0; k<point->totkey-1; k++, key++) {
|
2009-11-10 20:43:45 +00:00
|
|
|
key->length= len_v3v3(key->co, (key + 1)->co);
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* calculate a tree for finding nearest emitter's vertice */
|
2015-01-15 11:51:30 +01:00
|
|
|
void recalc_emitter_field(Object *ob, ParticleSystem *psys)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
DerivedMesh *dm=psys_get_modifier(ob, psys)->dm_final;
|
2009-09-16 17:43:09 +00:00
|
|
|
PTCacheEdit *edit= psys->edit;
|
2009-01-24 13:45:24 +00:00
|
|
|
float *vec, *nor;
|
2011-01-13 04:53:55 +00:00
|
|
|
int i, totface /*, totvert*/;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!dm)
|
2009-10-22 23:22:05 +00:00
|
|
|
return;
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit->emitter_cosnos)
|
2009-01-24 13:45:24 +00:00
|
|
|
MEM_freeN(edit->emitter_cosnos);
|
|
|
|
|
|
|
|
BLI_kdtree_free(edit->emitter_field);
|
|
|
|
|
2009-10-22 23:22:05 +00:00
|
|
|
totface=dm->getNumTessFaces(dm);
|
2011-01-13 04:53:55 +00:00
|
|
|
/*totvert=dm->getNumVerts(dm);*/ /*UNSUED*/
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-04-29 15:47:02 +00:00
|
|
|
edit->emitter_cosnos=MEM_callocN(totface*6*sizeof(float), "emitter cosnos");
|
2009-01-24 13:45:24 +00:00
|
|
|
|
|
|
|
edit->emitter_field= BLI_kdtree_new(totface);
|
|
|
|
|
|
|
|
vec=edit->emitter_cosnos;
|
|
|
|
nor=vec+3;
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
for (i=0; i<totface; i++, vec+=6, nor+=6) {
|
2012-04-29 15:47:02 +00:00
|
|
|
MFace *mface=dm->getTessFaceData(dm, i, CD_MFACE);
|
2011-01-13 04:53:55 +00:00
|
|
|
MVert *mvert;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-04-29 15:47:02 +00:00
|
|
|
mvert=dm->getVertData(dm, mface->v1, CD_MVERT);
|
|
|
|
copy_v3_v3(vec, mvert->co);
|
|
|
|
VECCOPY(nor, mvert->no);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-04-29 15:47:02 +00:00
|
|
|
mvert=dm->getVertData(dm, mface->v2, CD_MVERT);
|
|
|
|
add_v3_v3v3(vec, vec, mvert->co);
|
|
|
|
VECADD(nor, nor, mvert->no);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-04-29 15:47:02 +00:00
|
|
|
mvert=dm->getVertData(dm, mface->v3, CD_MVERT);
|
|
|
|
add_v3_v3v3(vec, vec, mvert->co);
|
|
|
|
VECADD(nor, nor, mvert->no);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (mface->v4) {
|
2012-04-29 15:47:02 +00:00
|
|
|
mvert=dm->getVertData(dm, mface->v4, CD_MVERT);
|
|
|
|
add_v3_v3v3(vec, vec, mvert->co);
|
|
|
|
VECADD(nor, nor, mvert->no);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-04-29 15:47:02 +00:00
|
|
|
mul_v3_fl(vec, 0.25);
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
else
|
2013-02-14 17:35:43 +00:00
|
|
|
mul_v3_fl(vec, 1.0f / 3.0f);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-11-10 20:43:45 +00:00
|
|
|
normalize_v3(nor);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2014-03-18 09:05:07 +11:00
|
|
|
BLI_kdtree_insert(edit->emitter_field, i, vec);
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
BLI_kdtree_balance(edit->emitter_field);
|
|
|
|
}
|
|
|
|
|
2018-06-13 14:26:26 +02:00
|
|
|
static void PE_update_selection(Main *bmain, Scene *scene, Object *ob, int useflag)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2018-06-13 14:26:26 +02:00
|
|
|
PTCacheEdit *edit= PE_get_current(bmain, scene, ob);
|
2009-01-24 13:45:24 +00:00
|
|
|
HairKey *hkey;
|
2009-09-16 17:43:09 +00:00
|
|
|
POINT_P; KEY_K;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
|
|
|
/* flag all particles to be updated if not using flag */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!useflag)
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_POINTS
|
|
|
|
point->flag |= PEP_EDIT_RECALC;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2018-06-04 09:31:30 +02:00
|
|
|
/* flush edit key flag to hair key flag to preserve selection
|
2009-01-24 13:45:24 +00:00
|
|
|
* on save */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit->psys) LOOP_POINTS {
|
2009-09-16 17:43:09 +00:00
|
|
|
hkey = edit->psys->particles[p].hair;
|
|
|
|
LOOP_KEYS {
|
2009-01-24 13:45:24 +00:00
|
|
|
hkey->editflag= key->flag;
|
2009-09-16 17:43:09 +00:00
|
|
|
hkey++;
|
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2016-06-23 07:53:49 +10:00
|
|
|
psys_cache_edit_paths(scene, ob, edit, CFRA, G.is_rendering);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
|
|
|
|
|
|
|
/* disable update flag */
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_POINTS
|
|
|
|
point->flag &= ~PEP_EDIT_RECALC;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2015-01-15 11:51:30 +01:00
|
|
|
void update_world_cos(Object *ob, PTCacheEdit *edit)
|
2009-09-16 17:43:09 +00:00
|
|
|
{
|
|
|
|
ParticleSystem *psys = edit->psys;
|
|
|
|
ParticleSystemModifierData *psmd= psys_get_modifier(ob, psys);
|
|
|
|
POINT_P; KEY_K;
|
|
|
|
float hairmat[4][4];
|
|
|
|
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
if (psys==0 || psys->edit==0 || psmd->dm_final==NULL)
|
2009-09-16 17:43:09 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
LOOP_POINTS {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!(psys->flag & PSYS_GLOBAL_HAIR))
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
psys_mat_hair_to_global(ob, psmd->dm_final, psys->part->from, psys->particles+p, hairmat);
|
2009-09-16 17:43:09 +00:00
|
|
|
|
|
|
|
LOOP_KEYS {
|
2012-04-29 15:47:02 +00:00
|
|
|
copy_v3_v3(key->world_co, key->co);
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!(psys->flag & PSYS_GLOBAL_HAIR))
|
2009-11-10 20:43:45 +00:00
|
|
|
mul_m4_v3(hairmat, key->world_co);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2010-10-17 06:38:56 +00:00
|
|
|
static void update_velocities(PTCacheEdit *edit)
|
2009-09-16 17:43:09 +00:00
|
|
|
{
|
|
|
|
/*TODO: get frs_sec properly */
|
|
|
|
float vec1[3], vec2[3], frs_sec, dfra;
|
|
|
|
POINT_P; KEY_K;
|
|
|
|
|
|
|
|
/* hair doesn't use velocities */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit->psys || !edit->points || !edit->points->keys->vel)
|
2009-09-16 17:43:09 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
frs_sec = edit->pid.flag & PTCACHE_VEL_PER_SEC ? 25.0f : 1.0f;
|
|
|
|
|
|
|
|
LOOP_EDITED_POINTS {
|
|
|
|
LOOP_KEYS {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (k==0) {
|
2009-09-16 17:43:09 +00:00
|
|
|
dfra = *(key+1)->time - *key->time;
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (dfra <= 0.0f)
|
2009-09-16 17:43:09 +00:00
|
|
|
continue;
|
|
|
|
|
2011-11-06 14:00:55 +00:00
|
|
|
sub_v3_v3v3(key->vel, (key+1)->co, key->co);
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (point->totkey>2) {
|
2011-11-06 14:00:55 +00:00
|
|
|
sub_v3_v3v3(vec1, (key+1)->co, (key+2)->co);
|
2009-11-10 20:43:45 +00:00
|
|
|
project_v3_v3v3(vec2, vec1, key->vel);
|
2011-11-06 14:00:55 +00:00
|
|
|
sub_v3_v3v3(vec2, vec1, vec2);
|
|
|
|
madd_v3_v3fl(key->vel, vec2, 0.5f);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
}
|
2012-03-24 06:38:07 +00:00
|
|
|
else if (k==point->totkey-1) {
|
2009-09-16 17:43:09 +00:00
|
|
|
dfra = *key->time - *(key-1)->time;
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (dfra <= 0.0f)
|
2009-09-16 17:43:09 +00:00
|
|
|
continue;
|
|
|
|
|
2011-11-06 14:00:55 +00:00
|
|
|
sub_v3_v3v3(key->vel, key->co, (key-1)->co);
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (point->totkey>2) {
|
2011-11-06 14:00:55 +00:00
|
|
|
sub_v3_v3v3(vec1, (key-2)->co, (key-1)->co);
|
2009-11-10 20:43:45 +00:00
|
|
|
project_v3_v3v3(vec2, vec1, key->vel);
|
2011-11-06 14:00:55 +00:00
|
|
|
sub_v3_v3v3(vec2, vec1, vec2);
|
|
|
|
madd_v3_v3fl(key->vel, vec2, 0.5f);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
dfra = *(key+1)->time - *(key-1)->time;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (dfra <= 0.0f)
|
2009-09-16 17:43:09 +00:00
|
|
|
continue;
|
|
|
|
|
2011-11-06 14:00:55 +00:00
|
|
|
sub_v3_v3v3(key->vel, (key+1)->co, (key-1)->co);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2009-11-10 20:43:45 +00:00
|
|
|
mul_v3_fl(key->vel, frs_sec/dfra);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2009-12-07 17:55:58 +00:00
|
|
|
|
2018-06-13 14:26:26 +02:00
|
|
|
void PE_update_object(Main *bmain, Scene *scene, Object *ob, int useflag)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2009-12-07 17:55:58 +00:00
|
|
|
/* use this to do partial particle updates, not usable when adding or
|
2012-03-03 16:31:46 +00:00
|
|
|
* removing, then a full redo is necessary and calling this may crash */
|
2009-01-24 13:45:24 +00:00
|
|
|
ParticleEditSettings *pset= PE_settings(scene);
|
2018-06-13 14:26:26 +02:00
|
|
|
PTCacheEdit *edit = PE_get_current(bmain, scene, ob);
|
2009-09-16 17:43:09 +00:00
|
|
|
POINT_P;
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!edit)
|
2009-09-16 17:43:09 +00:00
|
|
|
return;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
|
|
|
/* flag all particles to be updated if not using flag */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!useflag)
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_POINTS {
|
|
|
|
point->flag |= PEP_EDIT_RECALC;
|
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
|
|
|
|
/* do post process on particle edit keys */
|
2009-09-16 17:43:09 +00:00
|
|
|
pe_iterate_lengths(scene, edit);
|
|
|
|
pe_deflect_emitter(scene, ob, edit);
|
|
|
|
PE_apply_lengths(scene, edit);
|
2012-03-24 06:38:07 +00:00
|
|
|
if (pe_x_mirror(ob))
|
2012-04-29 15:47:02 +00:00
|
|
|
PE_apply_mirror(ob, edit->psys);
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit->psys)
|
2009-09-16 17:43:09 +00:00
|
|
|
update_world_cos(ob, edit);
|
2012-03-24 06:38:07 +00:00
|
|
|
if (pset->flag & PE_AUTO_VELOCITY)
|
2010-10-17 06:38:56 +00:00
|
|
|
update_velocities(edit);
|
2009-09-16 17:43:09 +00:00
|
|
|
PE_hide_keys_time(scene, edit, CFRA);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
|
|
|
/* regenerate path caches */
|
2016-06-23 07:53:49 +10:00
|
|
|
psys_cache_edit_paths(scene, ob, edit, CFRA, G.is_rendering);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
|
|
|
/* disable update flag */
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_POINTS {
|
|
|
|
point->flag &= ~PEP_EDIT_RECALC;
|
|
|
|
}
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit->psys)
|
2009-10-22 23:22:05 +00:00
|
|
|
edit->psys->flag &= ~PSYS_HAIR_UPDATED;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/************************************************/
|
|
|
|
/* Edit Selections */
|
|
|
|
/************************************************/
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2009-01-24 13:45:24 +00:00
|
|
|
/*-----selection callbacks-----*/
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
static void select_key(PEData *data, int point_index, int key_index)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2009-09-16 17:43:09 +00:00
|
|
|
PTCacheEdit *edit = data->edit;
|
|
|
|
PTCacheEditPoint *point = edit->points + point_index;
|
|
|
|
PTCacheEditKey *key = point->keys + key_index;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (data->select)
|
2009-02-20 20:39:27 +00:00
|
|
|
key->flag |= PEK_SELECT;
|
2009-01-24 13:45:24 +00:00
|
|
|
else
|
2009-02-20 20:39:27 +00:00
|
|
|
key->flag &= ~PEK_SELECT;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
point->flag |= PEP_EDIT_RECALC;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2010-10-17 06:38:56 +00:00
|
|
|
static void select_keys(PEData *data, int point_index, int UNUSED(key_index))
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2009-09-16 17:43:09 +00:00
|
|
|
PTCacheEdit *edit = data->edit;
|
|
|
|
PTCacheEditPoint *point = edit->points + point_index;
|
|
|
|
KEY_K;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_KEYS {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (data->select)
|
2009-02-20 20:39:27 +00:00
|
|
|
key->flag |= PEK_SELECT;
|
2009-01-24 13:45:24 +00:00
|
|
|
else
|
2009-02-20 20:39:27 +00:00
|
|
|
key->flag &= ~PEK_SELECT;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
point->flag |= PEP_EDIT_RECALC;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2012-05-24 21:05:27 +00:00
|
|
|
static void extend_key_select(PEData *data, int point_index, int key_index)
|
|
|
|
{
|
|
|
|
PTCacheEdit *edit = data->edit;
|
|
|
|
PTCacheEditPoint *point = edit->points + point_index;
|
|
|
|
PTCacheEditKey *key = point->keys + key_index;
|
|
|
|
|
|
|
|
key->flag |= PEK_SELECT;
|
|
|
|
point->flag |= PEP_EDIT_RECALC;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void deselect_key_select(PEData *data, int point_index, int key_index)
|
|
|
|
{
|
|
|
|
PTCacheEdit *edit = data->edit;
|
|
|
|
PTCacheEditPoint *point = edit->points + point_index;
|
|
|
|
PTCacheEditKey *key = point->keys + key_index;
|
|
|
|
|
|
|
|
key->flag &= ~PEK_SELECT;
|
|
|
|
point->flag |= PEP_EDIT_RECALC;
|
|
|
|
}
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
static void toggle_key_select(PEData *data, int point_index, int key_index)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2009-09-16 17:43:09 +00:00
|
|
|
PTCacheEdit *edit = data->edit;
|
|
|
|
PTCacheEditPoint *point = edit->points + point_index;
|
|
|
|
PTCacheEditKey *key = point->keys + key_index;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
key->flag ^= PEK_SELECT;
|
|
|
|
point->flag |= PEP_EDIT_RECALC;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/************************ de select all operator ************************/
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2013-05-16 00:07:01 +00:00
|
|
|
static void select_action_apply(PTCacheEditPoint *point, PTCacheEditKey *key, int action)
|
|
|
|
{
|
|
|
|
switch (action) {
|
2018-04-16 17:08:27 +02:00
|
|
|
case SEL_SELECT:
|
|
|
|
if ((key->flag & PEK_SELECT) == 0) {
|
|
|
|
key->flag |= PEK_SELECT;
|
|
|
|
point->flag |= PEP_EDIT_RECALC;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case SEL_DESELECT:
|
|
|
|
if (key->flag & PEK_SELECT) {
|
|
|
|
key->flag &= ~PEK_SELECT;
|
|
|
|
point->flag |= PEP_EDIT_RECALC;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case SEL_INVERT:
|
|
|
|
if ((key->flag & PEK_SELECT) == 0) {
|
|
|
|
key->flag |= PEK_SELECT;
|
|
|
|
point->flag |= PEP_EDIT_RECALC;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
key->flag &= ~PEK_SELECT;
|
|
|
|
point->flag |= PEP_EDIT_RECALC;
|
|
|
|
}
|
|
|
|
break;
|
2013-05-16 00:07:01 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-10-28 03:02:09 +00:00
|
|
|
static int pe_select_all_exec(bContext *C, wmOperator *op)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2018-06-13 14:26:26 +02:00
|
|
|
Main *bmain = CTX_data_main(C);
|
2009-02-20 20:39:27 +00:00
|
|
|
Scene *scene= CTX_data_scene(C);
|
|
|
|
Object *ob= CTX_data_active_object(C);
|
2018-06-13 14:26:26 +02:00
|
|
|
PTCacheEdit *edit= PE_get_current(bmain, scene, ob);
|
2009-09-16 17:43:09 +00:00
|
|
|
POINT_P; KEY_K;
|
2009-11-29 22:16:29 +00:00
|
|
|
int action = RNA_enum_get(op->ptr, "action");
|
|
|
|
|
|
|
|
if (action == SEL_TOGGLE) {
|
|
|
|
action = SEL_SELECT;
|
|
|
|
LOOP_VISIBLE_POINTS {
|
|
|
|
LOOP_SELECTED_KEYS {
|
|
|
|
action = SEL_DESELECT;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (action == SEL_DESELECT)
|
|
|
|
break;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-11-29 22:16:29 +00:00
|
|
|
LOOP_VISIBLE_POINTS {
|
|
|
|
LOOP_VISIBLE_KEYS {
|
2013-05-16 00:07:01 +00:00
|
|
|
select_action_apply(point, key, action);
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-06-13 14:26:26 +02:00
|
|
|
PE_update_selection(bmain, scene, ob, 1);
|
2010-06-18 04:39:32 +00:00
|
|
|
WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, ob);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
return OPERATOR_FINISHED;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2009-11-29 22:16:29 +00:00
|
|
|
void PARTICLE_OT_select_all(wmOperatorType *ot)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2009-02-20 20:39:27 +00:00
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "(De)select All";
|
|
|
|
ot->idname = "PARTICLE_OT_select_all";
|
2012-05-05 17:10:51 +00:00
|
|
|
ot->description = "(De)select all particles' keys";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = pe_select_all_exec;
|
|
|
|
ot->poll = PE_poll;
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
/* flags */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
|
2009-11-29 22:16:29 +00:00
|
|
|
|
|
|
|
WM_operator_properties_select_all(ot);
|
2009-02-20 20:39:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/************************ pick select operator ************************/
|
|
|
|
|
2013-03-19 23:17:44 +00:00
|
|
|
int PE_mouse_particles(bContext *C, const int mval[2], bool extend, bool deselect, bool toggle)
|
2009-02-20 20:39:27 +00:00
|
|
|
{
|
2018-06-13 14:26:26 +02:00
|
|
|
Main *bmain = CTX_data_main(C);
|
2009-02-20 20:39:27 +00:00
|
|
|
PEData data;
|
|
|
|
Scene *scene= CTX_data_scene(C);
|
|
|
|
Object *ob= CTX_data_active_object(C);
|
2018-06-13 14:26:26 +02:00
|
|
|
PTCacheEdit *edit= PE_get_current(bmain, scene, ob);
|
2009-09-16 17:43:09 +00:00
|
|
|
POINT_P; KEY_K;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!PE_start_edit(edit))
|
2009-02-25 19:29:58 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-05-24 21:05:27 +00:00
|
|
|
if (!extend && !deselect && !toggle) {
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_VISIBLE_POINTS {
|
|
|
|
LOOP_SELECTED_KEYS {
|
|
|
|
key->flag &= ~PEK_SELECT;
|
|
|
|
point->flag |= PEP_EDIT_RECALC;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
2009-02-25 19:29:58 +00:00
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
PE_set_view3d_data(C, &data);
|
2009-01-24 13:45:24 +00:00
|
|
|
data.mval= mval;
|
2014-03-11 15:34:19 +11:00
|
|
|
data.rad = ED_view3d_select_dist_px();
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-05-24 21:05:27 +00:00
|
|
|
/* 1 = nearest only */
|
|
|
|
if (extend)
|
|
|
|
for_mouse_hit_keys(&data, extend_key_select, 1);
|
|
|
|
else if (deselect)
|
|
|
|
for_mouse_hit_keys(&data, deselect_key_select, 1);
|
|
|
|
else
|
|
|
|
for_mouse_hit_keys(&data, toggle_key_select, 1);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2018-06-13 14:26:26 +02:00
|
|
|
PE_update_selection(bmain, scene, ob, 1);
|
2010-06-18 04:39:32 +00:00
|
|
|
WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, data.ob);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-25 19:29:58 +00:00
|
|
|
return OPERATOR_FINISHED;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2013-05-16 00:07:01 +00:00
|
|
|
/************************ select root operator ************************/
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
static void select_root(PEData *data, int point_index)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2013-05-16 00:07:01 +00:00
|
|
|
PTCacheEditPoint *point = data->edit->points + point_index;
|
|
|
|
PTCacheEditKey *key = point->keys;
|
|
|
|
|
|
|
|
if (point->flag & PEP_HIDE)
|
2010-04-30 01:22:21 +00:00
|
|
|
return;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2013-05-16 00:07:01 +00:00
|
|
|
if (data->select_action != SEL_TOGGLE)
|
|
|
|
select_action_apply(point, key, data->select_action);
|
|
|
|
else if (key->flag & PEK_SELECT)
|
|
|
|
data->select_toggle_action = SEL_DESELECT;
|
2009-02-20 20:39:27 +00:00
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2013-05-16 00:07:01 +00:00
|
|
|
static int select_roots_exec(bContext *C, wmOperator *op)
|
2009-02-20 20:39:27 +00:00
|
|
|
{
|
|
|
|
PEData data;
|
2013-05-16 00:07:01 +00:00
|
|
|
int action = RNA_enum_get(op->ptr, "action");
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
PE_set_data(C, &data);
|
2013-05-16 00:07:01 +00:00
|
|
|
|
|
|
|
if (action == SEL_TOGGLE) {
|
|
|
|
data.select_action = SEL_TOGGLE;
|
|
|
|
data.select_toggle_action = SEL_SELECT;
|
|
|
|
|
|
|
|
foreach_point(&data, select_root);
|
|
|
|
|
|
|
|
action = data.select_toggle_action;
|
|
|
|
}
|
|
|
|
|
|
|
|
data.select_action = action;
|
2009-09-16 17:43:09 +00:00
|
|
|
foreach_point(&data, select_root);
|
2009-11-09 08:51:34 +00:00
|
|
|
|
2018-06-13 14:26:26 +02:00
|
|
|
PE_update_selection(data.bmain, data.scene, data.ob, 1);
|
2010-06-18 04:39:32 +00:00
|
|
|
WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, data.ob);
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
return OPERATOR_FINISHED;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2010-04-30 01:22:21 +00:00
|
|
|
void PARTICLE_OT_select_roots(wmOperatorType *ot)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2009-02-20 20:39:27 +00:00
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Select Roots";
|
|
|
|
ot->idname = "PARTICLE_OT_select_roots";
|
2012-05-05 17:10:51 +00:00
|
|
|
ot->description = "Select roots of all visible particles";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = select_roots_exec;
|
|
|
|
ot->poll = PE_poll;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/* flags */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
|
2013-05-16 00:07:01 +00:00
|
|
|
|
|
|
|
/* properties */
|
|
|
|
WM_operator_properties_select_action(ot, SEL_SELECT);
|
2009-02-20 20:39:27 +00:00
|
|
|
}
|
|
|
|
|
2013-05-16 00:07:01 +00:00
|
|
|
/************************ select tip operator ************************/
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
static void select_tip(PEData *data, int point_index)
|
2009-02-20 20:39:27 +00:00
|
|
|
{
|
2009-09-16 17:43:09 +00:00
|
|
|
PTCacheEditPoint *point = data->edit->points + point_index;
|
2014-01-16 01:34:08 +06:00
|
|
|
PTCacheEditKey *key;
|
|
|
|
|
|
|
|
if (point->totkey == 0) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
key = &point->keys[point->totkey - 1];
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2010-04-30 01:22:21 +00:00
|
|
|
if (point->flag & PEP_HIDE)
|
|
|
|
return;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2013-05-16 00:07:01 +00:00
|
|
|
if (data->select_action != SEL_TOGGLE)
|
|
|
|
select_action_apply(point, key, data->select_action);
|
|
|
|
else if (key->flag & PEK_SELECT)
|
|
|
|
data->select_toggle_action = SEL_DESELECT;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2013-05-16 00:07:01 +00:00
|
|
|
static int select_tips_exec(bContext *C, wmOperator *op)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2009-02-20 20:39:27 +00:00
|
|
|
PEData data;
|
2013-05-16 00:07:01 +00:00
|
|
|
int action = RNA_enum_get(op->ptr, "action");
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
PE_set_data(C, &data);
|
2013-05-16 00:07:01 +00:00
|
|
|
|
|
|
|
if (action == SEL_TOGGLE) {
|
|
|
|
data.select_action = SEL_TOGGLE;
|
|
|
|
data.select_toggle_action = SEL_SELECT;
|
|
|
|
|
|
|
|
foreach_point(&data, select_tip);
|
|
|
|
|
|
|
|
action = data.select_toggle_action;
|
|
|
|
}
|
|
|
|
|
|
|
|
data.select_action = action;
|
2009-09-16 17:43:09 +00:00
|
|
|
foreach_point(&data, select_tip);
|
2009-11-09 08:51:34 +00:00
|
|
|
|
2018-06-13 14:26:26 +02:00
|
|
|
PE_update_selection(data.bmain, data.scene, data.ob, 1);
|
2010-06-18 04:39:32 +00:00
|
|
|
WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, data.ob);
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
2010-04-30 01:22:21 +00:00
|
|
|
void PARTICLE_OT_select_tips(wmOperatorType *ot)
|
2009-02-20 20:39:27 +00:00
|
|
|
{
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Select Tips";
|
|
|
|
ot->idname = "PARTICLE_OT_select_tips";
|
2012-05-05 17:10:51 +00:00
|
|
|
ot->description = "Select tips of all visible particles";
|
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = select_tips_exec;
|
|
|
|
ot->poll = PE_poll;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/* flags */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
|
2013-05-16 00:07:01 +00:00
|
|
|
|
|
|
|
/* properties */
|
|
|
|
WM_operator_properties_select_action(ot, SEL_SELECT);
|
2009-02-20 20:39:27 +00:00
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2014-10-08 18:09:32 +02:00
|
|
|
/*********************** select random operator ************************/
|
|
|
|
|
|
|
|
enum { RAN_HAIR, RAN_POINTS };
|
|
|
|
|
2017-10-18 15:07:26 +11:00
|
|
|
static const EnumPropertyItem select_random_type_items[] = {
|
2014-10-08 18:09:32 +02:00
|
|
|
{RAN_HAIR, "HAIR", 0, "Hair", ""},
|
|
|
|
{RAN_POINTS, "POINTS", 0, "Points", ""},
|
|
|
|
{0, NULL, 0, NULL, NULL}
|
|
|
|
};
|
|
|
|
|
|
|
|
static int select_random_exec(bContext *C, wmOperator *op)
|
|
|
|
{
|
|
|
|
PEData data;
|
|
|
|
int type;
|
|
|
|
|
|
|
|
/* used by LOOP_VISIBLE_POINTS, LOOP_VISIBLE_KEYS and LOOP_KEYS */
|
|
|
|
PTCacheEdit *edit;
|
|
|
|
PTCacheEditPoint *point;
|
|
|
|
PTCacheEditKey *key;
|
|
|
|
int p;
|
|
|
|
int k;
|
|
|
|
|
2016-06-22 14:02:51 +10:00
|
|
|
const float randfac = RNA_float_get(op->ptr, "percent") / 100.0f;
|
2016-03-29 01:20:45 +11:00
|
|
|
const int seed = WM_operator_properties_select_random_seed_increment_get(op);
|
2015-10-10 23:47:41 +11:00
|
|
|
const bool select = (RNA_enum_get(op->ptr, "action") == SEL_SELECT);
|
|
|
|
RNG *rng;
|
2014-10-08 18:09:32 +02:00
|
|
|
|
|
|
|
type = RNA_enum_get(op->ptr, "type");
|
|
|
|
|
|
|
|
PE_set_data(C, &data);
|
|
|
|
data.select_action = SEL_SELECT;
|
2018-06-13 14:26:26 +02:00
|
|
|
edit = PE_get_current(data.bmain, data.scene, data.ob);
|
2014-10-08 18:09:32 +02:00
|
|
|
|
2015-10-10 23:47:41 +11:00
|
|
|
rng = BLI_rng_new_srandom(seed);
|
|
|
|
|
2014-10-08 18:09:32 +02:00
|
|
|
switch (type) {
|
|
|
|
case RAN_HAIR:
|
|
|
|
LOOP_VISIBLE_POINTS {
|
2015-10-10 23:47:41 +11:00
|
|
|
int flag = ((BLI_rng_get_float(rng) < randfac) == select) ? SEL_SELECT : SEL_DESELECT;
|
2014-10-08 18:09:32 +02:00
|
|
|
LOOP_KEYS {
|
|
|
|
select_action_apply (point, key, flag);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case RAN_POINTS:
|
|
|
|
LOOP_VISIBLE_POINTS {
|
|
|
|
LOOP_VISIBLE_KEYS {
|
2015-10-10 23:47:41 +11:00
|
|
|
int flag = ((BLI_rng_get_float(rng) < randfac) == select) ? SEL_SELECT : SEL_DESELECT;
|
2014-10-08 18:09:32 +02:00
|
|
|
select_action_apply (point, key, flag);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2015-10-10 23:47:41 +11:00
|
|
|
BLI_rng_free(rng);
|
|
|
|
|
2018-06-13 14:26:26 +02:00
|
|
|
PE_update_selection(data.bmain, data.scene, data.ob, 1);
|
2014-10-08 18:09:32 +02:00
|
|
|
WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, data.ob);
|
|
|
|
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
void PARTICLE_OT_select_random(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
|
|
|
ot->name = "Select Random";
|
|
|
|
ot->idname = "PARTICLE_OT_select_random";
|
|
|
|
ot->description = "Select a randomly distributed set of hair or points";
|
|
|
|
|
|
|
|
/* api callbacks */
|
|
|
|
ot->exec = select_random_exec;
|
|
|
|
ot->poll = PE_poll;
|
|
|
|
|
|
|
|
/* flags */
|
|
|
|
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
|
|
|
|
|
|
|
|
/* properties */
|
2015-10-10 23:47:41 +11:00
|
|
|
WM_operator_properties_select_random(ot);
|
2014-10-08 18:09:32 +02:00
|
|
|
ot->prop = RNA_def_enum (ot->srna, "type", select_random_type_items, RAN_HAIR,
|
2015-07-21 12:01:03 +10:00
|
|
|
"Type", "Select either hair or points");
|
2014-10-08 18:09:32 +02:00
|
|
|
}
|
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/************************ select linked operator ************************/
|
|
|
|
|
|
|
|
static int select_linked_exec(bContext *C, wmOperator *op)
|
|
|
|
{
|
|
|
|
PEData data;
|
2011-05-12 16:47:36 +00:00
|
|
|
int mval[2];
|
2009-02-20 20:39:27 +00:00
|
|
|
int location[2];
|
|
|
|
|
|
|
|
RNA_int_get_array(op->ptr, "location", location);
|
2012-10-22 08:15:51 +00:00
|
|
|
mval[0] = location[0];
|
|
|
|
mval[1] = location[1];
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
PE_set_view3d_data(C, &data);
|
|
|
|
data.mval= mval;
|
2009-01-24 13:45:24 +00:00
|
|
|
data.rad=75.0f;
|
2009-02-20 20:39:27 +00:00
|
|
|
data.select= !RNA_boolean_get(op->ptr, "deselect");
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
for_mouse_hit_keys(&data, select_keys, 1); /* nearest only */
|
2018-06-13 14:26:26 +02:00
|
|
|
PE_update_selection(data.bmain, data.scene, data.ob, 1);
|
2010-06-18 04:39:32 +00:00
|
|
|
WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, data.ob);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2013-03-13 09:03:46 +00:00
|
|
|
static int select_linked_invoke(bContext *C, wmOperator *op, const wmEvent *event)
|
2009-02-20 20:39:27 +00:00
|
|
|
{
|
2011-05-20 07:40:05 +00:00
|
|
|
RNA_int_set_array(op->ptr, "location", event->mval);
|
2009-02-20 20:39:27 +00:00
|
|
|
return select_linked_exec(C, op);
|
|
|
|
}
|
|
|
|
|
|
|
|
void PARTICLE_OT_select_linked(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Select Linked";
|
|
|
|
ot->idname = "PARTICLE_OT_select_linked";
|
2012-05-05 17:10:51 +00:00
|
|
|
ot->description = "Select nearest particle from mouse pointer";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = select_linked_exec;
|
|
|
|
ot->invoke = select_linked_invoke;
|
|
|
|
ot->poll = PE_poll_view3d;
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
/* flags */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/* properties */
|
2011-09-19 12:26:20 +00:00
|
|
|
RNA_def_boolean(ot->srna, "deselect", 0, "Deselect", "Deselect linked keys rather than selecting them");
|
2009-02-20 20:39:27 +00:00
|
|
|
RNA_def_int_vector(ot->srna, "location", 2, NULL, 0, INT_MAX, "Location", "", 0, 16384);
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/************************ border select operator ************************/
|
2010-11-03 01:56:02 +00:00
|
|
|
void PE_deselect_all_visible(PTCacheEdit *edit)
|
|
|
|
{
|
|
|
|
POINT_P; KEY_K;
|
|
|
|
|
|
|
|
LOOP_VISIBLE_POINTS {
|
|
|
|
LOOP_SELECTED_KEYS {
|
|
|
|
key->flag &= ~PEK_SELECT;
|
|
|
|
point->flag |= PEP_EDIT_RECALC;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2013-03-19 23:17:44 +00:00
|
|
|
int PE_border_select(bContext *C, rcti *rect, bool select, bool extend)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2018-06-13 14:26:26 +02:00
|
|
|
Main *bmain = CTX_data_main(C);
|
2009-02-25 19:29:58 +00:00
|
|
|
Scene *scene= CTX_data_scene(C);
|
|
|
|
Object *ob= CTX_data_active_object(C);
|
2018-06-13 14:26:26 +02:00
|
|
|
PTCacheEdit *edit= PE_get_current(bmain, scene, ob);
|
2009-02-20 20:39:27 +00:00
|
|
|
PEData data;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!PE_start_edit(edit))
|
2009-02-25 19:29:58 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2010-11-03 01:56:02 +00:00
|
|
|
if (extend == 0 && select)
|
|
|
|
PE_deselect_all_visible(edit);
|
2009-11-29 22:16:29 +00:00
|
|
|
|
2009-02-25 19:29:58 +00:00
|
|
|
PE_set_view3d_data(C, &data);
|
2009-01-24 13:45:24 +00:00
|
|
|
data.rect= rect;
|
|
|
|
data.select= select;
|
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
for_mouse_hit_keys(&data, select_key, 0);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2018-06-13 14:26:26 +02:00
|
|
|
PE_update_selection(bmain, scene, ob, 1);
|
2010-06-18 04:39:32 +00:00
|
|
|
WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, ob);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-25 19:29:58 +00:00
|
|
|
return OPERATOR_FINISHED;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/************************ circle select operator ************************/
|
|
|
|
|
2011-05-12 16:47:36 +00:00
|
|
|
int PE_circle_select(bContext *C, int selecting, const int mval[2], float rad)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2018-06-13 14:26:26 +02:00
|
|
|
Main *bmain = CTX_data_main(C);
|
2009-02-25 19:29:58 +00:00
|
|
|
Scene *scene= CTX_data_scene(C);
|
|
|
|
Object *ob= CTX_data_active_object(C);
|
2018-06-13 14:26:26 +02:00
|
|
|
PTCacheEdit *edit= PE_get_current(bmain, scene, ob);
|
2009-02-20 20:39:27 +00:00
|
|
|
PEData data;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!PE_start_edit(edit))
|
2009-02-25 19:29:58 +00:00
|
|
|
return OPERATOR_FINISHED;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-25 19:29:58 +00:00
|
|
|
PE_set_view3d_data(C, &data);
|
|
|
|
data.mval= mval;
|
|
|
|
data.rad= rad;
|
2009-02-20 20:39:27 +00:00
|
|
|
data.select= selecting;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
for_mouse_hit_keys(&data, select_key, 0);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2018-06-13 14:26:26 +02:00
|
|
|
PE_update_selection(bmain, scene, ob, 1);
|
2010-06-18 04:39:32 +00:00
|
|
|
WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, ob);
|
2009-02-25 19:29:58 +00:00
|
|
|
|
|
|
|
return OPERATOR_FINISHED;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/************************ lasso select operator ************************/
|
|
|
|
|
2013-03-19 23:17:44 +00:00
|
|
|
int PE_lasso_select(bContext *C, const int mcords[][2], const short moves, bool extend, bool select)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2018-06-13 14:26:26 +02:00
|
|
|
Main *bmain = CTX_data_main(C);
|
2009-02-25 19:29:58 +00:00
|
|
|
Scene *scene= CTX_data_scene(C);
|
|
|
|
Object *ob= CTX_data_active_object(C);
|
|
|
|
ARegion *ar= CTX_wm_region(C);
|
2009-06-23 00:41:55 +00:00
|
|
|
ParticleEditSettings *pset= PE_settings(scene);
|
2018-06-13 14:26:26 +02:00
|
|
|
PTCacheEdit *edit = PE_get_current(bmain, scene, ob);
|
2009-09-16 17:43:09 +00:00
|
|
|
ParticleSystem *psys = edit->psys;
|
|
|
|
ParticleSystemModifierData *psmd = psys_get_modifier(ob, psys);
|
|
|
|
POINT_P; KEY_K;
|
2014-06-26 16:09:59 +10:00
|
|
|
float co[3], mat[4][4];
|
2012-10-05 05:11:10 +00:00
|
|
|
int screen_co[2];
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2010-11-26 13:40:47 +00:00
|
|
|
PEData data;
|
|
|
|
|
2014-06-26 16:09:59 +10:00
|
|
|
unit_m4(mat);
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!PE_start_edit(edit))
|
2009-02-25 19:29:58 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2010-11-03 01:56:02 +00:00
|
|
|
if (extend == 0 && select)
|
|
|
|
PE_deselect_all_visible(edit);
|
2010-11-26 13:40:47 +00:00
|
|
|
|
|
|
|
/* only for depths */
|
|
|
|
PE_set_view3d_data(C, &data);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_VISIBLE_POINTS {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit->psys && !(psys->flag & PSYS_GLOBAL_HAIR))
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
psys_mat_hair_to_global(ob, psmd->dm_final, psys->part->from, psys->particles + p, mat);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (pset->selectmode==SCE_SELECT_POINT) {
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_KEYS {
|
2011-11-06 14:00:55 +00:00
|
|
|
copy_v3_v3(co, key->co);
|
2009-11-10 20:43:45 +00:00
|
|
|
mul_m4_v3(mat, co);
|
2012-10-07 14:00:18 +00:00
|
|
|
if ((ED_view3d_project_int_global(ar, co, screen_co, V3D_PROJ_TEST_CLIP_WIN) == V3D_PROJ_RET_OK) &&
|
2012-10-05 05:11:10 +00:00
|
|
|
BLI_lasso_is_point_inside(mcords, moves, screen_co[0], screen_co[1], IS_CLIPPED) &&
|
|
|
|
key_test_depth(&data, co, screen_co))
|
2012-04-27 07:26:28 +00:00
|
|
|
{
|
2013-07-10 05:01:49 +00:00
|
|
|
if (select) {
|
|
|
|
if (!(key->flag & PEK_SELECT)) {
|
|
|
|
key->flag |= PEK_SELECT;
|
|
|
|
point->flag |= PEP_EDIT_RECALC;
|
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
2013-07-10 05:01:49 +00:00
|
|
|
else {
|
|
|
|
if (key->flag & PEK_SELECT) {
|
|
|
|
key->flag &= ~PEK_SELECT;
|
|
|
|
point->flag |= PEP_EDIT_RECALC;
|
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2012-03-24 06:38:07 +00:00
|
|
|
else if (pset->selectmode==SCE_SELECT_END) {
|
2014-01-16 01:34:08 +06:00
|
|
|
if (point->totkey) {
|
|
|
|
key= point->keys + point->totkey - 1;
|
|
|
|
|
|
|
|
copy_v3_v3(co, key->co);
|
|
|
|
mul_m4_v3(mat, co);
|
|
|
|
if ((ED_view3d_project_int_global(ar, co, screen_co, V3D_PROJ_TEST_CLIP_WIN) == V3D_PROJ_RET_OK) &&
|
|
|
|
BLI_lasso_is_point_inside(mcords, moves, screen_co[0], screen_co[1], IS_CLIPPED) &&
|
|
|
|
key_test_depth(&data, co, screen_co))
|
|
|
|
{
|
|
|
|
if (select) {
|
|
|
|
if (!(key->flag & PEK_SELECT)) {
|
|
|
|
key->flag |= PEK_SELECT;
|
|
|
|
point->flag |= PEP_EDIT_RECALC;
|
|
|
|
}
|
2013-07-10 05:01:49 +00:00
|
|
|
}
|
2014-01-16 01:34:08 +06:00
|
|
|
else {
|
|
|
|
if (key->flag & PEK_SELECT) {
|
|
|
|
key->flag &= ~PEK_SELECT;
|
|
|
|
point->flag |= PEP_EDIT_RECALC;
|
|
|
|
}
|
2013-07-10 05:01:49 +00:00
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-06-13 14:26:26 +02:00
|
|
|
PE_update_selection(bmain, scene, ob, 1);
|
2010-06-18 04:39:32 +00:00
|
|
|
WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, ob);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-25 19:29:58 +00:00
|
|
|
return OPERATOR_FINISHED;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/*************************** hide operator **************************/
|
|
|
|
|
|
|
|
static int hide_exec(bContext *C, wmOperator *op)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2018-06-13 14:26:26 +02:00
|
|
|
Main *bmain = CTX_data_main(C);
|
2009-02-20 20:39:27 +00:00
|
|
|
Object *ob= CTX_data_active_object(C);
|
|
|
|
Scene *scene= CTX_data_scene(C);
|
2018-06-13 14:26:26 +02:00
|
|
|
PTCacheEdit *edit= PE_get_current(bmain, scene, ob);
|
2009-09-16 17:43:09 +00:00
|
|
|
POINT_P; KEY_K;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (RNA_enum_get(op->ptr, "unselected")) {
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_UNSELECTED_POINTS {
|
|
|
|
point->flag |= PEP_HIDE;
|
|
|
|
point->flag |= PEP_EDIT_RECALC;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_KEYS
|
|
|
|
key->flag &= ~PEK_SELECT;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
2009-02-20 20:39:27 +00:00
|
|
|
else {
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_SELECTED_POINTS {
|
|
|
|
point->flag |= PEP_HIDE;
|
|
|
|
point->flag |= PEP_EDIT_RECALC;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_KEYS
|
|
|
|
key->flag &= ~PEK_SELECT;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-06-13 14:26:26 +02:00
|
|
|
PE_update_selection(bmain, scene, ob, 1);
|
2010-06-18 04:39:32 +00:00
|
|
|
WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, ob);
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
void PARTICLE_OT_hide(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Hide Selected";
|
|
|
|
ot->idname = "PARTICLE_OT_hide";
|
2012-05-05 17:10:51 +00:00
|
|
|
ot->description = "Hide selected particles";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = hide_exec;
|
|
|
|
ot->poll = PE_poll;
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
/* flags */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
/* props */
|
2011-09-19 12:26:20 +00:00
|
|
|
RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", "Hide unselected rather than selected");
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/*************************** reveal operator **************************/
|
|
|
|
|
2017-11-20 02:28:07 +11:00
|
|
|
static int reveal_exec(bContext *C, wmOperator *op)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2018-06-13 14:26:26 +02:00
|
|
|
Main *bmain = CTX_data_main(C);
|
2009-02-20 20:39:27 +00:00
|
|
|
Object *ob= CTX_data_active_object(C);
|
|
|
|
Scene *scene= CTX_data_scene(C);
|
2018-06-13 14:26:26 +02:00
|
|
|
PTCacheEdit *edit = PE_get_current(bmain, scene, ob);
|
2017-11-20 02:28:07 +11:00
|
|
|
const bool select = RNA_boolean_get(op->ptr, "select");
|
2009-09-16 17:43:09 +00:00
|
|
|
POINT_P; KEY_K;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_POINTS {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (point->flag & PEP_HIDE) {
|
2009-09-16 17:43:09 +00:00
|
|
|
point->flag &= ~PEP_HIDE;
|
|
|
|
point->flag |= PEP_EDIT_RECALC;
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2017-11-20 02:28:07 +11:00
|
|
|
LOOP_KEYS {
|
|
|
|
SET_FLAG_FROM_TEST(key->flag, select, PEK_SELECT);
|
|
|
|
}
|
2009-02-20 20:39:27 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-06-13 14:26:26 +02:00
|
|
|
PE_update_selection(bmain, scene, ob, 1);
|
2010-06-18 04:39:32 +00:00
|
|
|
WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, ob);
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
void PARTICLE_OT_reveal(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Reveal";
|
|
|
|
ot->idname = "PARTICLE_OT_reveal";
|
2012-05-05 17:10:51 +00:00
|
|
|
ot->description = "Show hidden particles";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = reveal_exec;
|
|
|
|
ot->poll = PE_poll;
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
/* flags */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
|
2017-11-20 02:28:07 +11:00
|
|
|
|
|
|
|
/* props */
|
|
|
|
RNA_def_boolean(ot->srna, "select", true, "Select", "");
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/************************ select less operator ************************/
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
static void select_less_keys(PEData *data, int point_index)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2009-09-16 17:43:09 +00:00
|
|
|
PTCacheEdit *edit= data->edit;
|
|
|
|
PTCacheEditPoint *point = edit->points + point_index;
|
|
|
|
KEY_K;
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_SELECTED_KEYS {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (k==0) {
|
|
|
|
if (((key+1)->flag&PEK_SELECT)==0)
|
2009-09-16 17:43:09 +00:00
|
|
|
key->flag |= PEK_TAG;
|
2009-02-20 20:39:27 +00:00
|
|
|
}
|
2012-03-24 06:38:07 +00:00
|
|
|
else if (k==point->totkey-1) {
|
|
|
|
if (((key-1)->flag&PEK_SELECT)==0)
|
2009-09-16 17:43:09 +00:00
|
|
|
key->flag |= PEK_TAG;
|
2009-02-20 20:39:27 +00:00
|
|
|
}
|
|
|
|
else {
|
2012-03-24 06:38:07 +00:00
|
|
|
if ((((key-1)->flag & (key+1)->flag) & PEK_SELECT)==0)
|
2009-09-16 17:43:09 +00:00
|
|
|
key->flag |= PEK_TAG;
|
2009-02-20 20:39:27 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_KEYS {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (key->flag&PEK_TAG) {
|
2009-09-16 17:43:09 +00:00
|
|
|
key->flag &= ~(PEK_TAG|PEK_SELECT);
|
2009-11-09 08:51:34 +00:00
|
|
|
point->flag |= PEP_EDIT_RECALC; /* redraw selection only */
|
|
|
|
}
|
2009-02-20 20:39:27 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-10-15 01:36:14 +00:00
|
|
|
static int select_less_exec(bContext *C, wmOperator *UNUSED(op))
|
2009-02-20 20:39:27 +00:00
|
|
|
{
|
|
|
|
PEData data;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
PE_set_data(C, &data);
|
2009-09-16 17:43:09 +00:00
|
|
|
foreach_point(&data, select_less_keys);
|
2009-11-09 08:51:34 +00:00
|
|
|
|
2018-06-13 14:26:26 +02:00
|
|
|
PE_update_selection(data.bmain, data.scene, data.ob, 1);
|
2010-06-18 04:39:32 +00:00
|
|
|
WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, data.ob);
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
void PARTICLE_OT_select_less(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Select Less";
|
|
|
|
ot->idname = "PARTICLE_OT_select_less";
|
2012-05-05 17:10:51 +00:00
|
|
|
ot->description = "Deselect boundary selected keys of each particle";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = select_less_exec;
|
|
|
|
ot->poll = PE_poll;
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
/* flags */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/************************ select more operator ************************/
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
static void select_more_keys(PEData *data, int point_index)
|
2009-02-20 20:39:27 +00:00
|
|
|
{
|
2009-09-16 17:43:09 +00:00
|
|
|
PTCacheEdit *edit= data->edit;
|
|
|
|
PTCacheEditPoint *point = edit->points + point_index;
|
|
|
|
KEY_K;
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_KEYS {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (key->flag & PEK_SELECT) continue;
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (k==0) {
|
|
|
|
if ((key+1)->flag&PEK_SELECT)
|
2009-09-16 17:43:09 +00:00
|
|
|
key->flag |= PEK_TAG;
|
2009-02-20 20:39:27 +00:00
|
|
|
}
|
2012-03-24 06:38:07 +00:00
|
|
|
else if (k==point->totkey-1) {
|
|
|
|
if ((key-1)->flag&PEK_SELECT)
|
2009-09-16 17:43:09 +00:00
|
|
|
key->flag |= PEK_TAG;
|
2009-02-20 20:39:27 +00:00
|
|
|
}
|
|
|
|
else {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (((key-1)->flag | (key+1)->flag) & PEK_SELECT)
|
2009-09-16 17:43:09 +00:00
|
|
|
key->flag |= PEK_TAG;
|
2009-02-20 20:39:27 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_KEYS {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (key->flag&PEK_TAG) {
|
2009-09-16 17:43:09 +00:00
|
|
|
key->flag &= ~PEK_TAG;
|
2009-02-20 20:39:27 +00:00
|
|
|
key->flag |= PEK_SELECT;
|
2009-11-09 08:51:34 +00:00
|
|
|
point->flag |= PEP_EDIT_RECALC; /* redraw selection only */
|
2009-02-20 20:39:27 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-10-15 01:36:14 +00:00
|
|
|
static int select_more_exec(bContext *C, wmOperator *UNUSED(op))
|
2009-02-20 20:39:27 +00:00
|
|
|
{
|
|
|
|
PEData data;
|
|
|
|
|
|
|
|
PE_set_data(C, &data);
|
2009-09-16 17:43:09 +00:00
|
|
|
foreach_point(&data, select_more_keys);
|
2009-11-09 08:51:34 +00:00
|
|
|
|
2018-06-13 14:26:26 +02:00
|
|
|
PE_update_selection(data.bmain, data.scene, data.ob, 1);
|
2010-06-18 04:39:32 +00:00
|
|
|
WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, data.ob);
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
void PARTICLE_OT_select_more(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Select More";
|
|
|
|
ot->idname = "PARTICLE_OT_select_more";
|
2012-05-05 17:10:51 +00:00
|
|
|
ot->description = "Select keys linked to boundary selected keys of each particle";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = select_more_exec;
|
|
|
|
ot->poll = PE_poll;
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
/* flags */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
|
2009-02-20 20:39:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/************************ rekey operator ************************/
|
|
|
|
|
|
|
|
static void rekey_particle(PEData *data, int pa_index)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2009-09-16 17:43:09 +00:00
|
|
|
PTCacheEdit *edit= data->edit;
|
|
|
|
ParticleSystem *psys= edit->psys;
|
2010-11-02 13:12:30 +00:00
|
|
|
ParticleSimulationData sim= {0};
|
2009-09-16 17:43:09 +00:00
|
|
|
ParticleData *pa= psys->particles + pa_index;
|
|
|
|
PTCacheEditPoint *point = edit->points + pa_index;
|
2009-01-24 13:45:24 +00:00
|
|
|
ParticleKey state;
|
2009-09-16 17:43:09 +00:00
|
|
|
HairKey *key, *new_keys, *okey;
|
|
|
|
PTCacheEditKey *ekey;
|
2009-01-24 13:45:24 +00:00
|
|
|
float dval, sta, end;
|
|
|
|
int k;
|
|
|
|
|
2010-11-02 13:12:30 +00:00
|
|
|
sim.scene= data->scene;
|
|
|
|
sim.ob= data->ob;
|
|
|
|
sim.psys= edit->psys;
|
|
|
|
|
2009-01-24 13:45:24 +00:00
|
|
|
pa->flag |= PARS_REKEY;
|
|
|
|
|
2012-04-29 15:47:02 +00:00
|
|
|
key= new_keys= MEM_callocN(data->totrekey * sizeof(HairKey), "Hair re-key keys");
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
okey = pa->hair;
|
2009-01-24 13:45:24 +00:00
|
|
|
/* root and tip stay the same */
|
2011-11-06 14:00:55 +00:00
|
|
|
copy_v3_v3(key->co, okey->co);
|
|
|
|
copy_v3_v3((key + data->totrekey - 1)->co, (okey + pa->totkey - 1)->co);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
sta= key->time= okey->time;
|
|
|
|
end= (key + data->totrekey - 1)->time= (okey + pa->totkey - 1)->time;
|
2009-07-25 22:31:02 +00:00
|
|
|
dval= (end - sta) / (float)(data->totrekey - 1);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
|
|
|
/* interpolate new keys from old ones */
|
2012-04-29 15:47:02 +00:00
|
|
|
for (k=1, key++; k<data->totrekey-1; k++, key++) {
|
2009-07-25 22:31:02 +00:00
|
|
|
state.time= (float)k / (float)(data->totrekey-1);
|
2009-10-22 23:22:05 +00:00
|
|
|
psys_get_particle_on_path(&sim, pa_index, &state, 0);
|
2011-11-06 14:00:55 +00:00
|
|
|
copy_v3_v3(key->co, state.co);
|
2009-02-20 20:39:27 +00:00
|
|
|
key->time= sta + k * dval;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* replace keys */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (pa->hair)
|
2009-01-24 13:45:24 +00:00
|
|
|
MEM_freeN(pa->hair);
|
2009-02-20 20:39:27 +00:00
|
|
|
pa->hair= new_keys;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
point->totkey=pa->totkey=data->totrekey;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (point->keys)
|
2009-09-16 17:43:09 +00:00
|
|
|
MEM_freeN(point->keys);
|
2012-04-29 15:47:02 +00:00
|
|
|
ekey= point->keys= MEM_callocN(pa->totkey * sizeof(PTCacheEditKey), "Hair re-key edit keys");
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
for (k=0, key=pa->hair; k<pa->totkey; k++, key++, ekey++) {
|
2009-02-20 20:39:27 +00:00
|
|
|
ekey->co= key->co;
|
|
|
|
ekey->time= &key->time;
|
2011-03-23 08:52:53 +00:00
|
|
|
ekey->flag |= PEK_SELECT;
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!(psys->flag & PSYS_GLOBAL_HAIR))
|
2009-09-16 17:43:09 +00:00
|
|
|
ekey->flag |= PEK_USE_WCO;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
pa->flag &= ~PARS_REKEY;
|
2009-09-16 17:43:09 +00:00
|
|
|
point->flag |= PEP_EDIT_RECALC;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
static int rekey_exec(bContext *C, wmOperator *op)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2009-02-20 20:39:27 +00:00
|
|
|
PEData data;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
PE_set_data(C, &data);
|
|
|
|
|
2009-07-25 22:31:02 +00:00
|
|
|
data.dval= 1.0f / (float)(data.totrekey-1);
|
2013-01-21 12:44:40 +00:00
|
|
|
data.totrekey= RNA_int_get(op->ptr, "keys_number");
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
foreach_selected_point(&data, rekey_particle);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
recalc_lengths(data.edit);
|
2018-06-13 14:26:26 +02:00
|
|
|
PE_update_object(data.bmain, data.scene, data.ob, 1);
|
2010-06-18 04:39:32 +00:00
|
|
|
WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, data.ob);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
void PARTICLE_OT_rekey(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Rekey";
|
|
|
|
ot->idname = "PARTICLE_OT_rekey";
|
2012-05-05 17:10:51 +00:00
|
|
|
ot->description = "Change the number of keys of selected particles (root and tip keys included)";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = rekey_exec;
|
|
|
|
ot->invoke = WM_operator_props_popup;
|
|
|
|
ot->poll = PE_hair_poll;
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
/* flags */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/* properties */
|
2013-01-21 12:44:40 +00:00
|
|
|
RNA_def_int(ot->srna, "keys_number", 2, 2, INT_MAX, "Number of Keys", "", 2, 100);
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2018-06-13 14:26:26 +02:00
|
|
|
static void rekey_particle_to_time(Main *bmain, Scene *scene, Object *ob, int pa_index, float path_time)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2018-06-13 14:26:26 +02:00
|
|
|
PTCacheEdit *edit= PE_get_current(bmain, scene, ob);
|
2009-09-16 17:43:09 +00:00
|
|
|
ParticleSystem *psys;
|
2010-11-02 13:12:30 +00:00
|
|
|
ParticleSimulationData sim= {0};
|
2009-01-24 13:45:24 +00:00
|
|
|
ParticleData *pa;
|
|
|
|
ParticleKey state;
|
|
|
|
HairKey *new_keys, *key;
|
2009-09-16 17:43:09 +00:00
|
|
|
PTCacheEditKey *ekey;
|
2009-01-24 13:45:24 +00:00
|
|
|
int k;
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!edit || !edit->psys) return;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
psys = edit->psys;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2010-11-02 13:12:30 +00:00
|
|
|
sim.scene= scene;
|
|
|
|
sim.ob= ob;
|
|
|
|
sim.psys= psys;
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
pa= psys->particles + pa_index;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
|
|
|
pa->flag |= PARS_REKEY;
|
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
key= new_keys= MEM_dupallocN(pa->hair);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-01-24 13:45:24 +00:00
|
|
|
/* interpolate new keys from old ones (roots stay the same) */
|
2012-03-24 06:38:07 +00:00
|
|
|
for (k=1, key++; k < pa->totkey; k++, key++) {
|
2009-02-20 20:39:27 +00:00
|
|
|
state.time= path_time * (float)k / (float)(pa->totkey-1);
|
2009-10-22 23:22:05 +00:00
|
|
|
psys_get_particle_on_path(&sim, pa_index, &state, 0);
|
2011-11-06 14:00:55 +00:00
|
|
|
copy_v3_v3(key->co, state.co);
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* replace hair keys */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (pa->hair)
|
2009-01-24 13:45:24 +00:00
|
|
|
MEM_freeN(pa->hair);
|
2009-02-20 20:39:27 +00:00
|
|
|
pa->hair= new_keys;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
|
|
|
/* update edit pointers */
|
2012-03-24 06:38:07 +00:00
|
|
|
for (k=0, key=pa->hair, ekey=edit->points[pa_index].keys; k<pa->totkey; k++, key++, ekey++) {
|
2009-02-20 20:39:27 +00:00
|
|
|
ekey->co= key->co;
|
|
|
|
ekey->time= &key->time;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
pa->flag &= ~PARS_REKEY;
|
|
|
|
}
|
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/************************* utilities **************************/
|
|
|
|
|
2010-10-16 14:32:17 +00:00
|
|
|
static int remove_tagged_particles(Object *ob, ParticleSystem *psys, int mirror)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2009-09-16 17:43:09 +00:00
|
|
|
PTCacheEdit *edit = psys->edit;
|
2009-01-24 13:45:24 +00:00
|
|
|
ParticleData *pa, *npa=0, *new_pars=0;
|
2009-09-16 17:43:09 +00:00
|
|
|
POINT_P;
|
|
|
|
PTCacheEditPoint *npoint=0, *new_points=0;
|
2009-01-24 13:45:24 +00:00
|
|
|
ParticleSystemModifierData *psmd;
|
2011-01-13 04:53:55 +00:00
|
|
|
int i, new_totpart= psys->totpart, removed= 0;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (mirror) {
|
2009-01-24 13:45:24 +00:00
|
|
|
/* mirror tags */
|
2009-02-20 20:39:27 +00:00
|
|
|
psmd= psys_get_modifier(ob, psys);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_TAGGED_POINTS {
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
PE_mirror_particle(ob, psmd->dm_final, psys, psys->particles + p, NULL);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_TAGGED_POINTS {
|
|
|
|
new_totpart--;
|
|
|
|
removed++;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (new_totpart != psys->totpart) {
|
|
|
|
if (new_totpart) {
|
2009-02-20 20:39:27 +00:00
|
|
|
npa= new_pars= MEM_callocN(new_totpart * sizeof(ParticleData), "ParticleData array");
|
2009-09-16 17:43:09 +00:00
|
|
|
npoint= new_points= MEM_callocN(new_totpart * sizeof(PTCacheEditPoint), "PTCacheEditKey array");
|
2011-01-27 12:21:14 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (ELEM(NULL, new_pars, new_points)) {
|
2016-06-19 06:25:54 +10:00
|
|
|
/* allocation error! */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (new_pars)
|
2011-01-27 12:21:14 +00:00
|
|
|
MEM_freeN(new_pars);
|
2012-03-24 06:38:07 +00:00
|
|
|
if (new_points)
|
2011-01-27 12:21:14 +00:00
|
|
|
MEM_freeN(new_points);
|
|
|
|
return 0;
|
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
pa= psys->particles;
|
2009-09-16 17:43:09 +00:00
|
|
|
point= edit->points;
|
2012-03-24 06:38:07 +00:00
|
|
|
for (i=0; i<psys->totpart; i++, pa++, point++) {
|
|
|
|
if (point->flag & PEP_TAG) {
|
|
|
|
if (point->keys)
|
2009-09-16 17:43:09 +00:00
|
|
|
MEM_freeN(point->keys);
|
2012-03-24 06:38:07 +00:00
|
|
|
if (pa->hair)
|
2009-01-24 13:45:24 +00:00
|
|
|
MEM_freeN(pa->hair);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
memcpy(npa, pa, sizeof(ParticleData));
|
2009-09-16 17:43:09 +00:00
|
|
|
memcpy(npoint, point, sizeof(PTCacheEditPoint));
|
2009-01-24 13:45:24 +00:00
|
|
|
npa++;
|
2009-09-16 17:43:09 +00:00
|
|
|
npoint++;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (psys->particles) MEM_freeN(psys->particles);
|
2009-02-20 20:39:27 +00:00
|
|
|
psys->particles= new_pars;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit->points) MEM_freeN(edit->points);
|
2009-09-16 17:43:09 +00:00
|
|
|
edit->points= new_points;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit->mirror_cache) {
|
2009-01-24 13:45:24 +00:00
|
|
|
MEM_freeN(edit->mirror_cache);
|
2009-02-20 20:39:27 +00:00
|
|
|
edit->mirror_cache= NULL;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (psys->child) {
|
2009-12-07 17:55:58 +00:00
|
|
|
MEM_freeN(psys->child);
|
|
|
|
psys->child= NULL;
|
|
|
|
psys->totchild=0;
|
|
|
|
}
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
edit->totpoint= psys->totpart= new_totpart;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return removed;
|
|
|
|
}
|
|
|
|
|
2010-10-16 14:32:17 +00:00
|
|
|
static void remove_tagged_keys(Object *ob, ParticleSystem *psys)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2009-09-16 17:43:09 +00:00
|
|
|
PTCacheEdit *edit= psys->edit;
|
2009-01-24 13:45:24 +00:00
|
|
|
ParticleData *pa;
|
2009-09-16 17:43:09 +00:00
|
|
|
HairKey *hkey, *nhkey, *new_hkeys=0;
|
|
|
|
POINT_P; KEY_K;
|
2010-07-23 16:48:45 +00:00
|
|
|
PTCacheEditKey *nkey, *new_keys;
|
2009-01-24 13:45:24 +00:00
|
|
|
ParticleSystemModifierData *psmd;
|
|
|
|
short new_totkey;
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (pe_x_mirror(ob)) {
|
2009-01-24 13:45:24 +00:00
|
|
|
/* mirror key tags */
|
2009-02-20 20:39:27 +00:00
|
|
|
psmd= psys_get_modifier(ob, psys);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_POINTS {
|
|
|
|
LOOP_TAGGED_KEYS {
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
PE_mirror_particle(ob, psmd->dm_final, psys, psys->particles + p, NULL);
|
2009-09-16 17:43:09 +00:00
|
|
|
break;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_POINTS {
|
|
|
|
new_totkey= point->totkey;
|
|
|
|
LOOP_TAGGED_KEYS {
|
|
|
|
new_totkey--;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
/* we can't have elements with less than two keys*/
|
2012-03-24 06:38:07 +00:00
|
|
|
if (new_totkey < 2)
|
2009-09-16 17:43:09 +00:00
|
|
|
point->flag |= PEP_TAG;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
2010-10-16 14:32:17 +00:00
|
|
|
remove_tagged_particles(ob, psys, pe_x_mirror(ob));
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_POINTS {
|
|
|
|
pa = psys->particles + p;
|
2009-02-20 20:39:27 +00:00
|
|
|
new_totkey= pa->totkey;
|
2009-09-16 17:43:09 +00:00
|
|
|
|
|
|
|
LOOP_TAGGED_KEYS {
|
|
|
|
new_totkey--;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (new_totkey != pa->totkey) {
|
2009-09-16 17:43:09 +00:00
|
|
|
nhkey= new_hkeys= MEM_callocN(new_totkey*sizeof(HairKey), "HairKeys");
|
2010-07-23 16:48:45 +00:00
|
|
|
nkey= new_keys= MEM_callocN(new_totkey*sizeof(PTCacheEditKey), "particle edit keys");
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2010-07-23 16:48:45 +00:00
|
|
|
hkey= pa->hair;
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_KEYS {
|
2012-03-24 07:52:14 +00:00
|
|
|
while (key->flag & PEK_TAG && hkey < pa->hair + pa->totkey) {
|
2009-01-24 13:45:24 +00:00
|
|
|
key++;
|
2009-09-16 17:43:09 +00:00
|
|
|
hkey++;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (hkey < pa->hair + pa->totkey) {
|
2011-11-06 14:00:55 +00:00
|
|
|
copy_v3_v3(nhkey->co, hkey->co);
|
2010-07-23 16:48:45 +00:00
|
|
|
nhkey->editflag = hkey->editflag;
|
2009-09-16 17:43:09 +00:00
|
|
|
nhkey->time= hkey->time;
|
|
|
|
nhkey->weight= hkey->weight;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2010-07-23 16:48:45 +00:00
|
|
|
nkey->co= nhkey->co;
|
|
|
|
nkey->time= &nhkey->time;
|
|
|
|
/* these can be copied from old edit keys */
|
|
|
|
nkey->flag = key->flag;
|
|
|
|
nkey->ftime = key->ftime;
|
|
|
|
nkey->length = key->length;
|
2011-11-06 14:00:55 +00:00
|
|
|
copy_v3_v3(nkey->world_co, key->world_co);
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
2010-07-23 16:48:45 +00:00
|
|
|
nkey++;
|
2009-09-16 17:43:09 +00:00
|
|
|
nhkey++;
|
2010-07-23 16:48:45 +00:00
|
|
|
hkey++;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
2010-07-23 16:48:45 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (pa->hair)
|
2009-01-24 13:45:24 +00:00
|
|
|
MEM_freeN(pa->hair);
|
2010-07-23 16:48:45 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (point->keys)
|
2010-07-23 16:48:45 +00:00
|
|
|
MEM_freeN(point->keys);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
pa->hair= new_hkeys;
|
2010-07-23 16:48:45 +00:00
|
|
|
point->keys= new_keys;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
point->totkey= pa->totkey= new_totkey;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2010-07-23 16:48:45 +00:00
|
|
|
/* flag for recalculating length */
|
|
|
|
point->flag |= PEP_EDIT_RECALC;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
/************************ subdivide opertor *********************/
|
|
|
|
|
2012-03-01 12:20:18 +00:00
|
|
|
/* works like normal edit mode subdivide, inserts keys between neighboring selected keys */
|
2009-02-20 20:39:27 +00:00
|
|
|
static void subdivide_particle(PEData *data, int pa_index)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2009-09-16 17:43:09 +00:00
|
|
|
PTCacheEdit *edit= data->edit;
|
|
|
|
ParticleSystem *psys= edit->psys;
|
2010-11-02 13:12:30 +00:00
|
|
|
ParticleSimulationData sim= {0};
|
2009-09-16 17:43:09 +00:00
|
|
|
ParticleData *pa= psys->particles + pa_index;
|
|
|
|
PTCacheEditPoint *point = edit->points + pa_index;
|
2009-01-24 13:45:24 +00:00
|
|
|
ParticleKey state;
|
|
|
|
HairKey *key, *nkey, *new_keys;
|
2009-09-16 17:43:09 +00:00
|
|
|
PTCacheEditKey *ekey, *nekey, *new_ekeys;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
|
|
|
int k;
|
|
|
|
short totnewkey=0;
|
|
|
|
float endtime;
|
|
|
|
|
2010-11-02 13:12:30 +00:00
|
|
|
sim.scene= data->scene;
|
|
|
|
sim.ob= data->ob;
|
|
|
|
sim.psys= edit->psys;
|
|
|
|
|
2012-04-29 15:47:02 +00:00
|
|
|
for (k=0, ekey=point->keys; k<pa->totkey-1; k++, ekey++) {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (ekey->flag&PEK_SELECT && (ekey+1)->flag&PEK_SELECT)
|
2009-01-24 13:45:24 +00:00
|
|
|
totnewkey++;
|
|
|
|
}
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (totnewkey==0) return;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
|
|
|
pa->flag |= PARS_REKEY;
|
|
|
|
|
2012-04-29 15:47:02 +00:00
|
|
|
nkey= new_keys= MEM_callocN((pa->totkey+totnewkey)*(sizeof(HairKey)), "Hair subdivide keys");
|
|
|
|
nekey= new_ekeys= MEM_callocN((pa->totkey+totnewkey)*(sizeof(PTCacheEditKey)), "Hair subdivide edit keys");
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
key = pa->hair;
|
|
|
|
endtime= key[pa->totkey-1].time;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
for (k=0, ekey=point->keys; k<pa->totkey-1; k++, key++, ekey++) {
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-04-29 15:47:02 +00:00
|
|
|
memcpy(nkey, key, sizeof(HairKey));
|
|
|
|
memcpy(nekey, ekey, sizeof(PTCacheEditKey));
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
nekey->co= nkey->co;
|
|
|
|
nekey->time= &nkey->time;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
|
|
|
nkey++;
|
|
|
|
nekey++;
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (ekey->flag & PEK_SELECT && (ekey+1)->flag & PEK_SELECT) {
|
2013-03-31 03:28:46 +00:00
|
|
|
nkey->time = (key->time + (key + 1)->time) * 0.5f;
|
|
|
|
state.time = (endtime != 0.0f) ? nkey->time / endtime: 0.0f;
|
2009-10-22 23:22:05 +00:00
|
|
|
psys_get_particle_on_path(&sim, pa_index, &state, 0);
|
2011-11-06 14:00:55 +00:00
|
|
|
copy_v3_v3(nkey->co, state.co);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
|
|
|
nekey->co= nkey->co;
|
2013-03-31 03:28:46 +00:00
|
|
|
nekey->time = &nkey->time;
|
2009-01-24 13:45:24 +00:00
|
|
|
nekey->flag |= PEK_SELECT;
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!(psys->flag & PSYS_GLOBAL_HAIR))
|
2009-09-16 17:43:09 +00:00
|
|
|
nekey->flag |= PEK_USE_WCO;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
|
|
|
nekey++;
|
|
|
|
nkey++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/*tip still not copied*/
|
2012-04-29 15:47:02 +00:00
|
|
|
memcpy(nkey, key, sizeof(HairKey));
|
|
|
|
memcpy(nekey, ekey, sizeof(PTCacheEditKey));
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
nekey->co= nkey->co;
|
|
|
|
nekey->time= &nkey->time;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (pa->hair)
|
2009-01-24 13:45:24 +00:00
|
|
|
MEM_freeN(pa->hair);
|
2009-02-20 20:39:27 +00:00
|
|
|
pa->hair= new_keys;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (point->keys)
|
2009-09-16 17:43:09 +00:00
|
|
|
MEM_freeN(point->keys);
|
|
|
|
point->keys= new_ekeys;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
point->totkey = pa->totkey = pa->totkey + totnewkey;
|
|
|
|
point->flag |= PEP_EDIT_RECALC;
|
2009-01-24 13:45:24 +00:00
|
|
|
pa->flag &= ~PARS_REKEY;
|
|
|
|
}
|
|
|
|
|
2010-10-15 01:36:14 +00:00
|
|
|
static int subdivide_exec(bContext *C, wmOperator *UNUSED(op))
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2009-02-20 20:39:27 +00:00
|
|
|
PEData data;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
PE_set_data(C, &data);
|
2009-09-16 17:43:09 +00:00
|
|
|
foreach_point(&data, subdivide_particle);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
recalc_lengths(data.edit);
|
2018-06-13 14:26:26 +02:00
|
|
|
PE_update_object(data.bmain, data.scene, data.ob, 1);
|
2010-06-18 04:39:32 +00:00
|
|
|
WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, data.ob);
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
void PARTICLE_OT_subdivide(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Subdivide";
|
|
|
|
ot->idname = "PARTICLE_OT_subdivide";
|
2012-05-05 17:10:51 +00:00
|
|
|
ot->description = "Subdivide selected particles segments (adds keys)";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = subdivide_exec;
|
|
|
|
ot->poll = PE_hair_poll;
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
/* flags */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/************************ remove doubles opertor *********************/
|
|
|
|
|
|
|
|
static int remove_doubles_exec(bContext *C, wmOperator *op)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2018-06-13 14:26:26 +02:00
|
|
|
Main *bmain = CTX_data_main(C);
|
2009-02-20 20:39:27 +00:00
|
|
|
Scene *scene= CTX_data_scene(C);
|
|
|
|
Object *ob= CTX_data_active_object(C);
|
2018-06-13 14:26:26 +02:00
|
|
|
PTCacheEdit *edit= PE_get_current(bmain, scene, ob);
|
2009-09-16 17:43:09 +00:00
|
|
|
ParticleSystem *psys = edit->psys;
|
2009-01-24 13:45:24 +00:00
|
|
|
ParticleSystemModifierData *psmd;
|
|
|
|
KDTree *tree;
|
|
|
|
KDTreeNearest nearest[10];
|
2009-09-16 17:43:09 +00:00
|
|
|
POINT_P;
|
2009-02-20 20:39:27 +00:00
|
|
|
float mat[4][4], co[3], threshold= RNA_float_get(op->ptr, "threshold");
|
2010-01-05 15:23:09 +00:00
|
|
|
int n, totn, removed, totremoved;
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (psys->flag & PSYS_GLOBAL_HAIR)
|
2009-09-16 17:43:09 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
|
|
|
edit= psys->edit;
|
|
|
|
psmd= psys_get_modifier(ob, psys);
|
|
|
|
totremoved= 0;
|
|
|
|
|
|
|
|
do {
|
|
|
|
removed= 0;
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
tree=BLI_kdtree_new(psys->totpart);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-01-24 13:45:24 +00:00
|
|
|
/* insert particles into kd tree */
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_SELECTED_POINTS {
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
psys_mat_hair_to_object(ob, psmd->dm_final, psys->part->from, psys->particles+p, mat);
|
2011-11-06 14:00:55 +00:00
|
|
|
copy_v3_v3(co, point->keys->co);
|
2009-11-10 20:43:45 +00:00
|
|
|
mul_m4_v3(mat, co);
|
2014-03-18 09:05:07 +11:00
|
|
|
BLI_kdtree_insert(tree, p, co);
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
BLI_kdtree_balance(tree);
|
|
|
|
|
|
|
|
/* tag particles to be removed */
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_SELECTED_POINTS {
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
psys_mat_hair_to_object(ob, psmd->dm_final, psys->part->from, psys->particles+p, mat);
|
2011-11-06 14:00:55 +00:00
|
|
|
copy_v3_v3(co, point->keys->co);
|
2009-11-10 20:43:45 +00:00
|
|
|
mul_m4_v3(mat, co);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2014-03-18 09:05:07 +11:00
|
|
|
totn = BLI_kdtree_find_nearest_n(tree, co, nearest, 10);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
for (n=0; n<totn; n++) {
|
2009-09-16 17:43:09 +00:00
|
|
|
/* this needs a custom threshold still */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (nearest[n].index > p && nearest[n].dist < threshold) {
|
|
|
|
if (!(point->flag & PEP_TAG)) {
|
2009-09-16 17:43:09 +00:00
|
|
|
point->flag |= PEP_TAG;
|
|
|
|
removed++;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
BLI_kdtree_free(tree);
|
|
|
|
|
|
|
|
/* remove tagged particles - don't do mirror here! */
|
2010-10-16 14:32:17 +00:00
|
|
|
remove_tagged_particles(ob, psys, 0);
|
2009-01-24 13:45:24 +00:00
|
|
|
totremoved += removed;
|
2012-03-24 07:52:14 +00:00
|
|
|
} while (removed);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (totremoved == 0)
|
2009-02-20 20:39:27 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
|
2012-10-16 07:53:10 +00:00
|
|
|
BKE_reportf(op->reports, RPT_INFO, "Removed %d double particles", totremoved);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2010-12-05 18:59:23 +00:00
|
|
|
DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
|
2010-06-18 04:39:32 +00:00
|
|
|
WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, ob);
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
void PARTICLE_OT_remove_doubles(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Remove Doubles";
|
|
|
|
ot->idname = "PARTICLE_OT_remove_doubles";
|
2012-05-05 17:10:51 +00:00
|
|
|
ot->description = "Remove selected particles close enough of others";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = remove_doubles_exec;
|
|
|
|
ot->poll = PE_hair_poll;
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
/* flags */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
/* properties */
|
2012-11-14 03:13:51 +00:00
|
|
|
RNA_def_float(ot->srna, "threshold", 0.0002f, 0.0f, FLT_MAX,
|
2018-05-09 14:26:47 +02:00
|
|
|
"Merge Distance", "Threshold distance within which particles are removed", 0.00001f, 0.1f);
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2010-01-15 17:28:00 +00:00
|
|
|
|
|
|
|
static int weight_set_exec(bContext *C, wmOperator *op)
|
|
|
|
{
|
2018-06-13 14:26:26 +02:00
|
|
|
Main *bmain = CTX_data_main(C);
|
2010-01-15 17:28:00 +00:00
|
|
|
Scene *scene= CTX_data_scene(C);
|
|
|
|
ParticleEditSettings *pset= PE_settings(scene);
|
|
|
|
Object *ob= CTX_data_active_object(C);
|
2018-06-13 14:26:26 +02:00
|
|
|
PTCacheEdit *edit= PE_get_current(bmain, scene, ob);
|
2010-01-15 17:28:00 +00:00
|
|
|
ParticleSystem *psys = edit->psys;
|
|
|
|
POINT_P;
|
|
|
|
KEY_K;
|
|
|
|
HairKey *hkey;
|
|
|
|
float weight;
|
|
|
|
ParticleBrushData *brush= &pset->brush[pset->brushtype];
|
2011-04-21 13:11:51 +00:00
|
|
|
float factor= RNA_float_get(op->ptr, "factor");
|
2010-01-15 17:28:00 +00:00
|
|
|
|
2010-03-22 17:12:08 +00:00
|
|
|
weight= brush->strength;
|
2010-04-27 13:22:43 +00:00
|
|
|
edit= psys->edit;
|
2010-01-15 17:28:00 +00:00
|
|
|
|
|
|
|
LOOP_SELECTED_POINTS {
|
|
|
|
ParticleData *pa= psys->particles + p;
|
|
|
|
|
|
|
|
LOOP_SELECTED_KEYS {
|
|
|
|
hkey= pa->hair + k;
|
2010-04-27 09:54:36 +00:00
|
|
|
hkey->weight= interpf(weight, hkey->weight, factor);
|
2010-01-15 17:28:00 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-12-05 18:59:23 +00:00
|
|
|
DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
|
2010-06-18 04:39:32 +00:00
|
|
|
WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, ob);
|
2010-01-15 17:28:00 +00:00
|
|
|
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
void PARTICLE_OT_weight_set(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Weight Set";
|
|
|
|
ot->idname = "PARTICLE_OT_weight_set";
|
2012-05-05 17:10:51 +00:00
|
|
|
ot->description = "Set the weight of selected keys";
|
2010-01-15 17:28:00 +00:00
|
|
|
|
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = weight_set_exec;
|
|
|
|
ot->poll = PE_hair_poll;
|
2010-01-15 17:28:00 +00:00
|
|
|
|
|
|
|
/* flags */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
|
2011-04-21 13:11:51 +00:00
|
|
|
|
2012-05-05 17:10:51 +00:00
|
|
|
RNA_def_float(ot->srna, "factor", 1, 0, 1, "Factor",
|
|
|
|
"Interpolation factor between current brush weight, and keys' weights", 0, 1);
|
2010-01-15 17:28:00 +00:00
|
|
|
}
|
|
|
|
|
2009-02-25 19:29:58 +00:00
|
|
|
/************************ cursor drawing *******************************/
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2010-10-16 14:32:17 +00:00
|
|
|
static void brush_drawcursor(bContext *C, int x, int y, void *UNUSED(customdata))
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2012-12-14 15:09:59 +00:00
|
|
|
Scene *scene = CTX_data_scene(C);
|
|
|
|
ParticleEditSettings *pset= PE_settings(scene);
|
2009-02-25 19:29:58 +00:00
|
|
|
ParticleBrushData *brush;
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (pset->brushtype < 0)
|
2009-02-25 19:29:58 +00:00
|
|
|
return;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-25 19:29:58 +00:00
|
|
|
brush= &pset->brush[pset->brushtype];
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (brush) {
|
2009-02-25 19:29:58 +00:00
|
|
|
glPushMatrix();
|
|
|
|
|
|
|
|
glTranslatef((float)x, (float)y, 0.0f);
|
|
|
|
|
|
|
|
glColor4ub(255, 255, 255, 128);
|
2012-04-29 17:55:54 +00:00
|
|
|
glEnable(GL_LINE_SMOOTH);
|
2009-02-25 19:29:58 +00:00
|
|
|
glEnable(GL_BLEND);
|
2012-12-14 15:09:59 +00:00
|
|
|
glutil_draw_lined_arc(0.0, M_PI*2.0, pe_brush_size_get(scene, brush), 40);
|
2009-02-25 19:29:58 +00:00
|
|
|
glDisable(GL_BLEND);
|
2012-04-29 17:55:54 +00:00
|
|
|
glDisable(GL_LINE_SMOOTH);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-02-25 19:29:58 +00:00
|
|
|
glPopMatrix();
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
2009-02-25 19:29:58 +00:00
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-25 19:29:58 +00:00
|
|
|
static void toggle_particle_cursor(bContext *C, int enable)
|
|
|
|
{
|
|
|
|
ParticleEditSettings *pset= PE_settings(CTX_data_scene(C));
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (pset->paintcursor && !enable) {
|
2009-02-25 19:29:58 +00:00
|
|
|
WM_paint_cursor_end(CTX_wm_manager(C), pset->paintcursor);
|
|
|
|
pset->paintcursor = NULL;
|
|
|
|
}
|
2012-03-24 06:38:07 +00:00
|
|
|
else if (enable)
|
2010-04-28 07:25:39 +00:00
|
|
|
pset->paintcursor= WM_paint_cursor_activate(CTX_wm_manager(C), PE_poll_view3d, brush_drawcursor, NULL);
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/*************************** delete operator **************************/
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
enum { DEL_PARTICLE, DEL_KEY };
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2017-10-18 15:07:26 +11:00
|
|
|
static const EnumPropertyItem delete_type_items[] = {
|
2009-06-16 00:52:21 +00:00
|
|
|
{DEL_PARTICLE, "PARTICLE", 0, "Particle", ""},
|
|
|
|
{DEL_KEY, "KEY", 0, "Key", ""},
|
2009-06-23 00:41:55 +00:00
|
|
|
{0, NULL, 0, NULL, NULL}};
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
static void set_delete_particle(PEData *data, int pa_index)
|
|
|
|
{
|
2009-09-16 17:43:09 +00:00
|
|
|
PTCacheEdit *edit= data->edit;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
edit->points[pa_index].flag |= PEP_TAG;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
static void set_delete_particle_key(PEData *data, int pa_index, int key_index)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2009-09-16 17:43:09 +00:00
|
|
|
PTCacheEdit *edit= data->edit;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
edit->points[pa_index].keys[key_index].flag |= PEK_TAG;
|
2009-02-20 20:39:27 +00:00
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
static int delete_exec(bContext *C, wmOperator *op)
|
|
|
|
{
|
|
|
|
PEData data;
|
|
|
|
int type= RNA_enum_get(op->ptr, "type");
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
PE_set_data(C, &data);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (type == DEL_KEY) {
|
2009-02-20 20:39:27 +00:00
|
|
|
foreach_selected_key(&data, set_delete_particle_key);
|
2010-10-16 14:32:17 +00:00
|
|
|
remove_tagged_keys(data.ob, data.edit->psys);
|
2009-09-16 17:43:09 +00:00
|
|
|
recalc_lengths(data.edit);
|
2009-02-20 20:39:27 +00:00
|
|
|
}
|
2012-03-24 06:38:07 +00:00
|
|
|
else if (type == DEL_PARTICLE) {
|
2009-09-16 17:43:09 +00:00
|
|
|
foreach_selected_point(&data, set_delete_particle);
|
2010-10-16 14:32:17 +00:00
|
|
|
remove_tagged_particles(data.ob, data.edit->psys, pe_x_mirror(data.ob));
|
2009-09-16 17:43:09 +00:00
|
|
|
recalc_lengths(data.edit);
|
2009-02-20 20:39:27 +00:00
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2010-12-05 18:59:23 +00:00
|
|
|
DAG_id_tag_update(&data.ob->id, OB_RECALC_DATA);
|
2010-06-18 04:39:32 +00:00
|
|
|
WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, data.ob);
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
void PARTICLE_OT_delete(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Delete";
|
|
|
|
ot->idname = "PARTICLE_OT_delete";
|
2012-05-05 17:10:51 +00:00
|
|
|
ot->description = "Delete selected particles or keys";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = delete_exec;
|
|
|
|
ot->invoke = WM_menu_invoke;
|
|
|
|
ot->poll = PE_hair_poll;
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
/* flags */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
/* properties */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->prop = RNA_def_enum(ot->srna, "type", delete_type_items, DEL_PARTICLE, "Type", "Delete a full particle or only keys");
|
2009-02-20 20:39:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*************************** mirror operator **************************/
|
|
|
|
|
2018-06-13 14:26:26 +02:00
|
|
|
static void PE_mirror_x(Main *bmain, Scene *scene, Object *ob, int tagged)
|
2009-02-20 20:39:27 +00:00
|
|
|
{
|
2012-09-30 06:12:47 +00:00
|
|
|
Mesh *me= (Mesh *)(ob->data);
|
2009-02-20 20:39:27 +00:00
|
|
|
ParticleSystemModifierData *psmd;
|
2018-06-13 14:26:26 +02:00
|
|
|
PTCacheEdit *edit= PE_get_current(bmain, scene, ob);
|
2009-09-16 17:43:09 +00:00
|
|
|
ParticleSystem *psys = edit->psys;
|
2009-02-20 20:39:27 +00:00
|
|
|
ParticleData *pa, *newpa, *new_pars;
|
2009-09-16 17:43:09 +00:00
|
|
|
PTCacheEditPoint *newpoint, *new_points;
|
|
|
|
POINT_P; KEY_K;
|
2009-02-20 20:39:27 +00:00
|
|
|
HairKey *hkey;
|
2011-05-08 23:43:18 +00:00
|
|
|
int *mirrorfaces = NULL;
|
2009-09-16 17:43:09 +00:00
|
|
|
int rotation, totpart, newtotpart;
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (psys->flag & PSYS_GLOBAL_HAIR)
|
2009-09-16 17:43:09 +00:00
|
|
|
return;
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
psmd= psys_get_modifier(ob, psys);
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
if (!psmd->dm_final)
|
2009-10-22 23:22:05 +00:00
|
|
|
return;
|
2009-02-20 20:39:27 +00:00
|
|
|
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
const bool use_dm_final_indices = (psys->part->use_modifier_stack && !psmd->dm_final->deformedOnly);
|
|
|
|
|
2012-04-05 06:26:18 +00:00
|
|
|
/* NOTE: this is not nice to use tessfaces but hard to avoid since pa->num uses tessfaces */
|
|
|
|
BKE_mesh_tessface_ensure(me);
|
|
|
|
|
2016-01-17 13:40:30 +11:00
|
|
|
/* Note: In case psys uses DM tessface indices, we mirror final DM itself, not orig mesh. Avoids an (impossible)
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
* dm -> orig -> dm tessface indices conversion... */
|
|
|
|
mirrorfaces = mesh_get_x_mirror_faces(ob, NULL, use_dm_final_indices ? psmd->dm_final : NULL);
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!edit->mirror_cache)
|
2009-02-20 20:39:27 +00:00
|
|
|
PE_update_mirror_cache(ob, psys);
|
|
|
|
|
|
|
|
totpart= psys->totpart;
|
|
|
|
newtotpart= psys->totpart;
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_VISIBLE_POINTS {
|
|
|
|
pa = psys->particles + p;
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!tagged) {
|
|
|
|
if (point_is_selected(point)) {
|
|
|
|
if (edit->mirror_cache[p] != -1) {
|
2009-02-20 20:39:27 +00:00
|
|
|
/* already has a mirror, don't need to duplicate */
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
PE_mirror_particle(ob, psmd->dm_final, psys, pa, NULL);
|
2009-02-20 20:39:27 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
else
|
2009-09-16 17:43:09 +00:00
|
|
|
point->flag |= PEP_TAG;
|
2009-02-20 20:39:27 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if ((point->flag & PEP_TAG) && mirrorfaces[pa->num*2] != -1)
|
2009-02-20 20:39:27 +00:00
|
|
|
newtotpart++;
|
|
|
|
}
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (newtotpart != psys->totpart) {
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
MFace *mtessface = use_dm_final_indices ? psmd->dm_final->getTessFaceArray(psmd->dm_final) : me->mface;
|
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/* allocate new arrays and copy existing */
|
|
|
|
new_pars= MEM_callocN(newtotpart*sizeof(ParticleData), "ParticleData new");
|
2009-09-16 17:43:09 +00:00
|
|
|
new_points= MEM_callocN(newtotpart*sizeof(PTCacheEditPoint), "PTCacheEditPoint new");
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (psys->particles) {
|
2009-06-08 20:08:19 +00:00
|
|
|
memcpy(new_pars, psys->particles, totpart*sizeof(ParticleData));
|
|
|
|
MEM_freeN(psys->particles);
|
|
|
|
}
|
2009-02-20 20:39:27 +00:00
|
|
|
psys->particles= new_pars;
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit->points) {
|
2009-09-16 17:43:09 +00:00
|
|
|
memcpy(new_points, edit->points, totpart*sizeof(PTCacheEditPoint));
|
|
|
|
MEM_freeN(edit->points);
|
2009-06-08 20:08:19 +00:00
|
|
|
}
|
2009-09-16 17:43:09 +00:00
|
|
|
edit->points= new_points;
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit->mirror_cache) {
|
2009-02-20 20:39:27 +00:00
|
|
|
MEM_freeN(edit->mirror_cache);
|
|
|
|
edit->mirror_cache= NULL;
|
|
|
|
}
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
edit->totpoint= psys->totpart= newtotpart;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/* create new elements */
|
|
|
|
newpa= psys->particles + totpart;
|
2009-09-16 17:43:09 +00:00
|
|
|
newpoint= edit->points + totpart;
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
for (p=0, point=edit->points; p<totpart; p++, point++) {
|
2009-09-16 17:43:09 +00:00
|
|
|
pa = psys->particles + p;
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
const int pa_num = pa->num;
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (point->flag & PEP_HIDE)
|
2010-01-05 15:23:09 +00:00
|
|
|
continue;
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
|
|
|
|
if (!(point->flag & PEP_TAG) || mirrorfaces[pa_num * 2] == -1)
|
2009-02-20 20:39:27 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
/* duplicate */
|
|
|
|
*newpa= *pa;
|
2009-09-16 17:43:09 +00:00
|
|
|
*newpoint= *point;
|
2012-03-24 06:38:07 +00:00
|
|
|
if (pa->hair) newpa->hair= MEM_dupallocN(pa->hair);
|
|
|
|
if (point->keys) newpoint->keys= MEM_dupallocN(point->keys);
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
/* rotate weights according to vertex index rotation */
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
rotation= mirrorfaces[pa_num * 2 + 1];
|
2012-10-22 08:15:51 +00:00
|
|
|
newpa->fuv[0] = pa->fuv[2];
|
|
|
|
newpa->fuv[1] = pa->fuv[1];
|
|
|
|
newpa->fuv[2] = pa->fuv[0];
|
|
|
|
newpa->fuv[3] = pa->fuv[3];
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
while (rotation--) {
|
|
|
|
if (mtessface[pa_num].v4) {
|
2012-03-22 01:35:13 +00:00
|
|
|
SHIFT4(float, newpa->fuv[0], newpa->fuv[1], newpa->fuv[2], newpa->fuv[3]);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
SHIFT3(float, newpa->fuv[0], newpa->fuv[1], newpa->fuv[2]);
|
|
|
|
}
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
}
|
2009-02-20 20:39:27 +00:00
|
|
|
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
/* assign face index */
|
|
|
|
/* NOTE: mesh_get_x_mirror_faces generates -1 for non-found mirror, same as DMCACHE_NOTFOUND... */
|
|
|
|
newpa->num = mirrorfaces[pa_num * 2];
|
2009-02-20 20:39:27 +00:00
|
|
|
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
if (use_dm_final_indices) {
|
2014-03-26 22:24:36 +02:00
|
|
|
newpa->num_dmcache = DMCACHE_ISCHILD;
|
|
|
|
}
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
else {
|
|
|
|
newpa->num_dmcache = psys_particle_dm_face_lookup(
|
|
|
|
psmd->dm_final, psmd->dm_deformed, newpa->num, newpa->fuv, NULL);
|
|
|
|
}
|
2014-03-26 22:24:36 +02:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/* update edit key pointers */
|
2009-09-16 17:43:09 +00:00
|
|
|
key= newpoint->keys;
|
2012-03-24 06:38:07 +00:00
|
|
|
for (k=0, hkey=newpa->hair; k<newpa->totkey; k++, hkey++, key++) {
|
2009-09-16 17:43:09 +00:00
|
|
|
key->co= hkey->co;
|
|
|
|
key->time= &hkey->time;
|
2009-02-20 20:39:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* map key positions as mirror over x axis */
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
PE_mirror_particle(ob, psmd->dm_final, psys, pa, newpa);
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
newpa++;
|
2009-09-16 17:43:09 +00:00
|
|
|
newpoint++;
|
2009-02-20 20:39:27 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_POINTS {
|
|
|
|
point->flag &= ~PEP_TAG;
|
|
|
|
}
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2011-12-04 23:13:28 +00:00
|
|
|
MEM_freeN(mirrorfaces);
|
2009-02-20 20:39:27 +00:00
|
|
|
}
|
|
|
|
|
2010-10-15 01:36:14 +00:00
|
|
|
static int mirror_exec(bContext *C, wmOperator *UNUSED(op))
|
2009-02-20 20:39:27 +00:00
|
|
|
{
|
2018-06-13 14:26:26 +02:00
|
|
|
Main *bmain = CTX_data_main(C);
|
2009-02-20 20:39:27 +00:00
|
|
|
Scene *scene= CTX_data_scene(C);
|
|
|
|
Object *ob= CTX_data_active_object(C);
|
2018-06-13 14:26:26 +02:00
|
|
|
PTCacheEdit *edit= PE_get_current(bmain, scene, ob);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2018-06-13 14:26:26 +02:00
|
|
|
PE_mirror_x(bmain, scene, ob, 0);
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
update_world_cos(ob, edit);
|
2010-06-18 04:39:32 +00:00
|
|
|
WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, ob);
|
2010-12-05 18:59:23 +00:00
|
|
|
DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
void PARTICLE_OT_mirror(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Mirror";
|
|
|
|
ot->idname = "PARTICLE_OT_mirror";
|
2012-05-05 17:10:51 +00:00
|
|
|
ot->description = "Duplicate and mirror the selected particles along the local X axis";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = mirror_exec;
|
|
|
|
ot->poll = PE_hair_poll;
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
/* flags */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
|
2009-02-20 20:39:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/************************* brush edit callbacks ********************/
|
|
|
|
|
2012-12-11 14:29:01 +00:00
|
|
|
static void brush_comb(PEData *data, float UNUSED(mat[4][4]), float imat[4][4], int point_index, int key_index, PTCacheEditKey *key)
|
2009-02-20 20:39:27 +00:00
|
|
|
{
|
|
|
|
ParticleEditSettings *pset= PE_settings(data->scene);
|
|
|
|
float cvec[3], fac;
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (pset->flag & PE_LOCK_FIRST && key_index == 0) return;
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
fac= (float)pow((double)(1.0f - data->dist / data->rad), (double)data->combfac);
|
|
|
|
|
2012-04-29 15:47:02 +00:00
|
|
|
copy_v3_v3(cvec, data->dvec);
|
|
|
|
mul_mat3_m4_v3(imat, cvec);
|
2009-11-10 20:43:45 +00:00
|
|
|
mul_v3_fl(cvec, fac);
|
2011-11-06 14:00:55 +00:00
|
|
|
add_v3_v3(key->co, cvec);
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
(data->edit->points + point_index)->flag |= PEP_EDIT_RECALC;
|
2009-02-20 20:39:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void brush_cut(PEData *data, int pa_index)
|
|
|
|
{
|
2009-09-16 17:43:09 +00:00
|
|
|
PTCacheEdit *edit = data->edit;
|
2009-02-20 20:39:27 +00:00
|
|
|
ARegion *ar= data->vc.ar;
|
|
|
|
Object *ob= data->ob;
|
2009-09-16 17:43:09 +00:00
|
|
|
ParticleEditSettings *pset= PE_settings(data->scene);
|
|
|
|
ParticleCacheKey *key= edit->pathcache[pa_index];
|
2009-02-20 20:39:27 +00:00
|
|
|
float rad2, cut_time= 1.0;
|
|
|
|
float x0, x1, v0, v1, o0, o1, xo0, xo1, d, dv;
|
2009-09-16 17:43:09 +00:00
|
|
|
int k, cut, keys= (int)pow(2.0, (double)pset->draw_step);
|
2012-10-05 05:11:10 +00:00
|
|
|
int screen_co[2];
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
/* blunt scissors */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (BLI_frand() > data->cutfac) return;
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2009-11-01 00:06:53 +00:00
|
|
|
/* don't cut hidden */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit->points[pa_index].flag & PEP_HIDE)
|
2009-11-01 00:06:53 +00:00
|
|
|
return;
|
|
|
|
|
2012-12-21 03:49:47 +00:00
|
|
|
if (ED_view3d_project_int_global(ar, key->co, screen_co, V3D_PROJ_TEST_CLIP_NEAR) != V3D_PROJ_RET_OK)
|
2012-10-04 17:52:12 +00:00
|
|
|
return;
|
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
rad2= data->rad * data->rad;
|
|
|
|
|
|
|
|
cut=0;
|
|
|
|
|
2012-10-05 05:11:10 +00:00
|
|
|
x0 = (float)screen_co[0];
|
|
|
|
x1 = (float)screen_co[1];
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
o0= (float)data->mval[0];
|
|
|
|
o1= (float)data->mval[1];
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
xo0= x0 - o0;
|
|
|
|
xo1= x1 - o1;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
|
|
|
/* check if root is inside circle */
|
2012-10-05 05:11:10 +00:00
|
|
|
if (xo0*xo0 + xo1*xo1 < rad2 && key_test_depth(data, key->co, screen_co)) {
|
2009-02-20 20:39:27 +00:00
|
|
|
cut_time= -1.0f;
|
|
|
|
cut= 1;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* calculate path time closest to root that was inside the circle */
|
2012-03-24 06:38:07 +00:00
|
|
|
for (k=1, key++; k<=keys; k++, key++) {
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-12-21 03:49:47 +00:00
|
|
|
if ((ED_view3d_project_int_global(ar, key->co, screen_co, V3D_PROJ_TEST_CLIP_NEAR) != V3D_PROJ_RET_OK) ||
|
2012-10-05 05:11:10 +00:00
|
|
|
key_test_depth(data, key->co, screen_co) == 0)
|
2012-10-04 17:52:12 +00:00
|
|
|
{
|
2012-10-05 05:11:10 +00:00
|
|
|
x0 = (float)screen_co[0];
|
|
|
|
x1 = (float)screen_co[1];
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
xo0= x0 - o0;
|
|
|
|
xo1= x1 - o1;
|
2009-01-24 13:45:24 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2012-10-05 05:11:10 +00:00
|
|
|
v0 = (float)screen_co[0] - x0;
|
|
|
|
v1 = (float)screen_co[1] - x1;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
dv= v0*v0 + v1*v1;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
d= (v0*xo1 - v1*xo0);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
d= dv * rad2 - d*d;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (d > 0.0f) {
|
2014-09-17 14:11:37 +10:00
|
|
|
d= sqrtf(d);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
cut_time= -(v0*xo0 + v1*xo1 + d);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (cut_time > 0.0f) {
|
2009-01-24 13:45:24 +00:00
|
|
|
cut_time /= dv;
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (cut_time < 1.0f) {
|
2009-01-24 13:45:24 +00:00
|
|
|
cut_time += (float)(k-1);
|
|
|
|
cut_time /= (float)keys;
|
2009-02-20 20:39:27 +00:00
|
|
|
cut= 1;
|
2009-01-24 13:45:24 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-10-05 05:11:10 +00:00
|
|
|
x0 = (float)screen_co[0];
|
|
|
|
x1 = (float)screen_co[1];
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
xo0= x0 - o0;
|
|
|
|
xo1= x1 - o1;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (cut) {
|
|
|
|
if (cut_time < 0.0f) {
|
2009-09-16 17:43:09 +00:00
|
|
|
edit->points[pa_index].flag |= PEP_TAG;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
else {
|
2018-06-13 14:26:26 +02:00
|
|
|
rekey_particle_to_time(data->bmain, data->scene, ob, pa_index, cut_time);
|
2009-09-16 17:43:09 +00:00
|
|
|
edit->points[pa_index].flag |= PEP_EDIT_RECALC;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
static void brush_length(PEData *data, int point_index)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2009-09-16 17:43:09 +00:00
|
|
|
PTCacheEdit *edit= data->edit;
|
|
|
|
PTCacheEditPoint *point = edit->points + point_index;
|
|
|
|
KEY_K;
|
2012-04-29 15:47:02 +00:00
|
|
|
float dvec[3], pvec[3] = {0.0f, 0.0f, 0.0f};
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_KEYS {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (k==0) {
|
2012-04-29 15:47:02 +00:00
|
|
|
copy_v3_v3(pvec, key->co);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
else {
|
2012-04-29 15:47:02 +00:00
|
|
|
sub_v3_v3v3(dvec, key->co, pvec);
|
|
|
|
copy_v3_v3(pvec, key->co);
|
|
|
|
mul_v3_fl(dvec, data->growfac);
|
|
|
|
add_v3_v3v3(key->co, (key-1)->co, dvec);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
point->flag |= PEP_EDIT_RECALC;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
static void brush_puff(PEData *data, int point_index)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2009-09-16 17:43:09 +00:00
|
|
|
PTCacheEdit *edit = data->edit;
|
|
|
|
ParticleSystem *psys = edit->psys;
|
|
|
|
PTCacheEditPoint *point = edit->points + point_index;
|
|
|
|
KEY_K;
|
2009-01-24 13:45:24 +00:00
|
|
|
float mat[4][4], imat[4][4];
|
2010-01-12 14:52:09 +00:00
|
|
|
|
2013-07-10 04:54:14 +00:00
|
|
|
float onor_prev[3]; /* previous normal (particle-space) */
|
|
|
|
float ofs_prev[3]; /* accumulate offset for puff_volume (particle-space) */
|
|
|
|
float co_root[3], no_root[3]; /* root location and normal (global-space) */
|
|
|
|
float co_prev[3], co[3]; /* track key coords as we loop (global-space) */
|
|
|
|
float fac = 0.0f, length_accum = 0.0f;
|
|
|
|
bool puff_volume = false;
|
2013-11-26 06:39:14 +11:00
|
|
|
bool changed = false;
|
2013-07-10 04:54:14 +00:00
|
|
|
|
|
|
|
zero_v3(ofs_prev);
|
2010-01-12 16:35:34 +00:00
|
|
|
|
|
|
|
{
|
|
|
|
ParticleEditSettings *pset= PE_settings(data->scene);
|
|
|
|
ParticleBrushData *brush= &pset->brush[pset->brushtype];
|
2013-07-10 04:54:14 +00:00
|
|
|
puff_volume = (brush->flag & PE_BRUSH_DATA_PUFF_VOLUME) != 0;
|
2010-01-12 16:35:34 +00:00
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (psys && !(psys->flag & PSYS_GLOBAL_HAIR)) {
|
2009-09-16 17:43:09 +00:00
|
|
|
psys_mat_hair_to_global(data->ob, data->dm, psys->part->from, psys->particles + point_index, mat);
|
2012-04-29 15:47:02 +00:00
|
|
|
invert_m4_m4(imat, mat);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
|
|
|
else {
|
2009-11-10 20:43:45 +00:00
|
|
|
unit_m4(mat);
|
|
|
|
unit_m4(imat);
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_KEYS {
|
2013-07-10 04:54:14 +00:00
|
|
|
float kco[3];
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (k==0) {
|
2009-09-16 17:43:09 +00:00
|
|
|
/* find root coordinate and normal on emitter */
|
2011-11-06 14:00:55 +00:00
|
|
|
copy_v3_v3(co, key->co);
|
2009-11-10 20:43:45 +00:00
|
|
|
mul_m4_v3(mat, co);
|
2010-01-14 08:53:10 +00:00
|
|
|
mul_v3_m4v3(kco, data->ob->imat, co); /* use 'kco' as the object space version of worldspace 'co', ob->imat is set before calling */
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2014-03-18 09:05:07 +11:00
|
|
|
point_index= BLI_kdtree_find_nearest(edit->emitter_field, kco, NULL);
|
2012-03-24 06:38:07 +00:00
|
|
|
if (point_index == -1) return;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2013-07-10 04:54:14 +00:00
|
|
|
copy_v3_v3(co_root, co);
|
|
|
|
copy_v3_v3(no_root, &edit->emitter_cosnos[point_index * 6 + 3]);
|
|
|
|
mul_mat3_m4_v3(data->ob->obmat, no_root); /* normal into global-space */
|
|
|
|
normalize_v3(no_root);
|
2010-01-12 14:52:09 +00:00
|
|
|
|
2013-07-10 04:54:14 +00:00
|
|
|
if (puff_volume) {
|
|
|
|
copy_v3_v3(onor_prev, no_root);
|
|
|
|
mul_mat3_m4_v3(imat, onor_prev); /* global-space into particle space */
|
|
|
|
normalize_v3(onor_prev);
|
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
fac= (float)pow((double)(1.0f - data->dist / data->rad), (double)data->pufffac);
|
|
|
|
fac *= 0.025f;
|
2012-03-24 06:38:07 +00:00
|
|
|
if (data->invert)
|
2009-09-16 17:43:09 +00:00
|
|
|
fac= -fac;
|
|
|
|
}
|
|
|
|
else {
|
2010-01-12 16:35:34 +00:00
|
|
|
/* compute position as if hair was standing up straight.
|
|
|
|
* */
|
2013-07-10 04:54:14 +00:00
|
|
|
float length;
|
|
|
|
copy_v3_v3(co_prev, co);
|
2011-11-06 14:00:55 +00:00
|
|
|
copy_v3_v3(co, key->co);
|
2009-11-10 20:43:45 +00:00
|
|
|
mul_m4_v3(mat, co);
|
2013-07-10 04:54:14 +00:00
|
|
|
length = len_v3v3(co_prev, co);
|
|
|
|
length_accum += length;
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if ((data->select==0 || (key->flag & PEK_SELECT)) && !(key->flag & PEK_HIDE)) {
|
2013-07-10 04:54:14 +00:00
|
|
|
float dco[3]; /* delta temp var */
|
|
|
|
|
|
|
|
madd_v3_v3v3fl(kco, co_root, no_root, length_accum);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2010-01-12 16:35:34 +00:00
|
|
|
/* blend between the current and straight position */
|
2011-11-06 14:00:55 +00:00
|
|
|
sub_v3_v3v3(dco, kco, co);
|
|
|
|
madd_v3_v3fl(co, dco, fac);
|
2013-07-10 04:54:14 +00:00
|
|
|
/* keep the same distance from the root or we get glitches [#35406] */
|
|
|
|
dist_ensure_v3_v3fl(co, co_root, length_accum);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2010-01-12 16:35:34 +00:00
|
|
|
/* re-use dco to compare before and after translation and add to the offset */
|
2011-11-06 14:00:55 +00:00
|
|
|
copy_v3_v3(dco, key->co);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2010-01-12 16:35:34 +00:00
|
|
|
mul_v3_m4v3(key->co, imat, co);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (puff_volume) {
|
2010-01-12 16:35:34 +00:00
|
|
|
/* accumulate the total distance moved to apply to unselected
|
|
|
|
* keys that come after */
|
2013-07-10 04:54:14 +00:00
|
|
|
sub_v3_v3v3(ofs_prev, key->co, dco);
|
2010-01-12 16:35:34 +00:00
|
|
|
}
|
2013-11-26 06:39:14 +11:00
|
|
|
changed = true;
|
2010-01-12 16:35:34 +00:00
|
|
|
}
|
|
|
|
else {
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (puff_volume) {
|
2010-01-12 16:35:34 +00:00
|
|
|
#if 0
|
|
|
|
/* this is simple but looks bad, adds annoying kinks */
|
|
|
|
add_v3_v3(key->co, ofs);
|
|
|
|
#else
|
|
|
|
/* translate (not rotate) the rest of the hair if its not selected */
|
2013-07-10 04:54:14 +00:00
|
|
|
{
|
2010-01-14 16:14:24 +00:00
|
|
|
#if 0 /* kindof works but looks worse then whats below */
|
|
|
|
|
|
|
|
/* Move the unselected point on a vector based on the
|
|
|
|
* hair direction and the offset */
|
2010-01-12 16:35:34 +00:00
|
|
|
float c1[3], c2[3];
|
2011-11-06 14:00:55 +00:00
|
|
|
sub_v3_v3v3(dco, lastco, co);
|
2010-01-14 16:14:24 +00:00
|
|
|
mul_mat3_m4_v3(imat, dco); /* into particle space */
|
2010-01-12 16:35:34 +00:00
|
|
|
|
2011-10-17 06:39:13 +00:00
|
|
|
/* move the point along a vector perpendicular to the
|
2010-01-12 16:35:34 +00:00
|
|
|
* hairs direction, reduces odd kinks, */
|
|
|
|
cross_v3_v3v3(c1, ofs, dco);
|
|
|
|
cross_v3_v3v3(c2, c1, dco);
|
|
|
|
normalize_v3(c2);
|
|
|
|
mul_v3_fl(c2, len_v3(ofs));
|
|
|
|
add_v3_v3(key->co, c2);
|
2010-01-14 16:14:24 +00:00
|
|
|
#else
|
|
|
|
/* Move the unselected point on a vector based on the
|
|
|
|
* the normal of the closest geometry */
|
|
|
|
float oco[3], onor[3];
|
2011-11-06 14:00:55 +00:00
|
|
|
copy_v3_v3(oco, key->co);
|
2010-01-14 16:14:24 +00:00
|
|
|
mul_m4_v3(mat, oco);
|
|
|
|
mul_v3_m4v3(kco, data->ob->imat, oco); /* use 'kco' as the object space version of worldspace 'co', ob->imat is set before calling */
|
|
|
|
|
2014-03-18 09:05:07 +11:00
|
|
|
point_index= BLI_kdtree_find_nearest(edit->emitter_field, kco, NULL);
|
2012-03-24 06:38:07 +00:00
|
|
|
if (point_index != -1) {
|
2010-01-14 16:14:24 +00:00
|
|
|
copy_v3_v3(onor, &edit->emitter_cosnos[point_index*6+3]);
|
|
|
|
mul_mat3_m4_v3(data->ob->obmat, onor); /* normal into worldspace */
|
|
|
|
mul_mat3_m4_v3(imat, onor); /* worldspace into particle space */
|
|
|
|
normalize_v3(onor);
|
2013-07-10 04:54:14 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
copy_v3_v3(onor, onor_prev);
|
|
|
|
}
|
2010-01-14 16:14:24 +00:00
|
|
|
|
2013-07-10 04:54:14 +00:00
|
|
|
if (!is_zero_v3(ofs_prev)) {
|
|
|
|
mul_v3_fl(onor, len_v3(ofs_prev));
|
2010-01-14 16:14:24 +00:00
|
|
|
|
|
|
|
add_v3_v3(key->co, onor);
|
|
|
|
}
|
2013-07-10 04:54:14 +00:00
|
|
|
|
|
|
|
copy_v3_v3(onor_prev, onor);
|
2010-01-14 16:14:24 +00:00
|
|
|
#endif
|
2010-01-12 16:35:34 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2013-11-26 06:39:14 +11:00
|
|
|
if (changed)
|
2010-01-12 16:35:34 +00:00
|
|
|
point->flag |= PEP_EDIT_RECALC;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2010-01-14 08:53:10 +00:00
|
|
|
|
2012-12-11 14:29:01 +00:00
|
|
|
static void BKE_brush_weight_get(PEData *data, float UNUSED(mat[4][4]), float UNUSED(imat[4][4]), int point_index, int key_index, PTCacheEditKey *UNUSED(key))
|
2010-01-14 08:53:10 +00:00
|
|
|
{
|
2015-02-02 23:29:53 +11:00
|
|
|
/* roots have full weight always */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (key_index) {
|
2010-01-14 08:53:10 +00:00
|
|
|
PTCacheEdit *edit = data->edit;
|
|
|
|
ParticleSystem *psys = edit->psys;
|
|
|
|
|
|
|
|
ParticleData *pa= psys->particles + point_index;
|
|
|
|
pa->hair[key_index].weight = data->weightfac;
|
|
|
|
|
|
|
|
(data->edit->points + point_index)->flag |= PEP_EDIT_RECALC;
|
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2012-12-11 14:29:01 +00:00
|
|
|
static void brush_smooth_get(PEData *data, float mat[4][4], float UNUSED(imat[4][4]), int UNUSED(point_index), int key_index, PTCacheEditKey *key)
|
2018-06-04 09:31:30 +02:00
|
|
|
{
|
2012-03-24 06:38:07 +00:00
|
|
|
if (key_index) {
|
2009-01-24 13:45:24 +00:00
|
|
|
float dvec[3];
|
|
|
|
|
2012-04-29 15:47:02 +00:00
|
|
|
sub_v3_v3v3(dvec, key->co, (key-1)->co);
|
|
|
|
mul_mat3_m4_v3(mat, dvec);
|
2011-11-06 14:00:55 +00:00
|
|
|
add_v3_v3(data->vec, dvec);
|
2009-01-24 13:45:24 +00:00
|
|
|
data->tot++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-12-11 14:29:01 +00:00
|
|
|
static void brush_smooth_do(PEData *data, float UNUSED(mat[4][4]), float imat[4][4], int point_index, int key_index, PTCacheEditKey *key)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
|
|
|
float vec[3], dvec[3];
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (key_index) {
|
2011-11-06 14:00:55 +00:00
|
|
|
copy_v3_v3(vec, data->vec);
|
2012-04-29 15:47:02 +00:00
|
|
|
mul_mat3_m4_v3(imat, vec);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-04-29 15:47:02 +00:00
|
|
|
sub_v3_v3v3(dvec, key->co, (key-1)->co);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-04-29 15:47:02 +00:00
|
|
|
sub_v3_v3v3(dvec, vec, dvec);
|
|
|
|
mul_v3_fl(dvec, data->smoothfac);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2011-11-06 14:00:55 +00:00
|
|
|
add_v3_v3(key->co, dvec);
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
(data->edit->points + point_index)->flag |= PEP_EDIT_RECALC;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2011-03-18 15:31:32 +00:00
|
|
|
/* convert from triangle barycentric weights to quad mean value weights */
|
2011-11-06 14:00:55 +00:00
|
|
|
static void intersect_dm_quad_weights(const float v1[3], const float v2[3], const float v3[3], const float v4[3], float w[4])
|
2011-03-18 15:31:32 +00:00
|
|
|
{
|
|
|
|
float co[3], vert[4][3];
|
|
|
|
|
2011-11-06 14:00:55 +00:00
|
|
|
copy_v3_v3(vert[0], v1);
|
|
|
|
copy_v3_v3(vert[1], v2);
|
|
|
|
copy_v3_v3(vert[2], v3);
|
|
|
|
copy_v3_v3(vert[3], v4);
|
2011-03-18 15:31:32 +00:00
|
|
|
|
2012-10-22 08:15:51 +00:00
|
|
|
co[0] = v1[0]*w[0] + v2[0]*w[1] + v3[0]*w[2] + v4[0]*w[3];
|
|
|
|
co[1] = v1[1]*w[0] + v2[1]*w[1] + v3[1]*w[2] + v4[1]*w[3];
|
|
|
|
co[2] = v1[2]*w[0] + v2[2]*w[1] + v3[2]*w[2] + v4[2]*w[3];
|
2011-03-18 15:31:32 +00:00
|
|
|
|
2011-11-06 14:00:55 +00:00
|
|
|
interp_weights_poly_v3(w, vert, 4, co);
|
2011-03-18 15:31:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* check intersection with a derivedmesh */
|
2011-11-06 14:00:55 +00:00
|
|
|
static int particle_intersect_dm(Scene *scene, Object *ob, DerivedMesh *dm,
|
|
|
|
float *vert_cos,
|
|
|
|
const float co1[3], const float co2[3],
|
|
|
|
float *min_d, int *min_face, float *min_w,
|
|
|
|
float *face_minmax, float *pa_minmax,
|
|
|
|
float radius, float *ipoint)
|
2011-03-18 15:31:32 +00:00
|
|
|
{
|
2011-11-06 14:00:55 +00:00
|
|
|
MFace *mface= NULL;
|
|
|
|
MVert *mvert= NULL;
|
2011-03-18 15:31:32 +00:00
|
|
|
int i, totface, intersect=0;
|
2012-04-29 15:47:02 +00:00
|
|
|
float cur_d, cur_uv[2], v1[3], v2[3], v3[3], v4[3], min[3], max[3], p_min[3], p_max[3];
|
2011-03-18 15:31:32 +00:00
|
|
|
float cur_ipoint[3];
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (dm == NULL) {
|
2011-03-18 15:31:32 +00:00
|
|
|
psys_disable_all(ob);
|
|
|
|
|
|
|
|
dm=mesh_get_derived_final(scene, ob, 0);
|
2012-03-24 06:38:07 +00:00
|
|
|
if (dm == NULL)
|
2011-03-18 15:31:32 +00:00
|
|
|
dm=mesh_get_derived_deform(scene, ob, 0);
|
|
|
|
|
|
|
|
psys_enable_all(ob);
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (dm == NULL)
|
2011-03-18 15:31:32 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-01-19 19:23:25 +00:00
|
|
|
/* BMESH_ONLY, deform dm may not have tessface */
|
|
|
|
DM_ensure_tessface(dm);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2011-03-18 15:31:32 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (pa_minmax==0) {
|
2012-04-29 15:47:02 +00:00
|
|
|
INIT_MINMAX(p_min, p_max);
|
2012-05-13 11:05:52 +00:00
|
|
|
minmax_v3v3_v3(p_min, p_max, co1);
|
|
|
|
minmax_v3v3_v3(p_min, p_max, co2);
|
2011-03-18 15:31:32 +00:00
|
|
|
}
|
2012-03-24 06:38:07 +00:00
|
|
|
else {
|
2012-04-29 15:47:02 +00:00
|
|
|
copy_v3_v3(p_min, pa_minmax);
|
|
|
|
copy_v3_v3(p_max, pa_minmax+3);
|
2011-03-18 15:31:32 +00:00
|
|
|
}
|
|
|
|
|
2011-04-15 01:19:13 +00:00
|
|
|
totface=dm->getNumTessFaces(dm);
|
2012-04-29 15:47:02 +00:00
|
|
|
mface=dm->getTessFaceDataArray(dm, CD_MFACE);
|
|
|
|
mvert=dm->getVertDataArray(dm, CD_MVERT);
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
|
2011-03-18 15:31:32 +00:00
|
|
|
/* lets intersect the faces */
|
2012-04-29 15:47:02 +00:00
|
|
|
for (i=0; i<totface; i++, mface++) {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (vert_cos) {
|
2012-04-29 15:47:02 +00:00
|
|
|
copy_v3_v3(v1, vert_cos+3*mface->v1);
|
|
|
|
copy_v3_v3(v2, vert_cos+3*mface->v2);
|
|
|
|
copy_v3_v3(v3, vert_cos+3*mface->v3);
|
2012-03-24 06:38:07 +00:00
|
|
|
if (mface->v4)
|
2012-04-29 15:47:02 +00:00
|
|
|
copy_v3_v3(v4, vert_cos+3*mface->v4);
|
2011-03-18 15:31:32 +00:00
|
|
|
}
|
2012-03-24 06:38:07 +00:00
|
|
|
else {
|
2012-04-29 15:47:02 +00:00
|
|
|
copy_v3_v3(v1, mvert[mface->v1].co);
|
|
|
|
copy_v3_v3(v2, mvert[mface->v2].co);
|
|
|
|
copy_v3_v3(v3, mvert[mface->v3].co);
|
2012-03-24 06:38:07 +00:00
|
|
|
if (mface->v4)
|
2012-04-29 15:47:02 +00:00
|
|
|
copy_v3_v3(v4, mvert[mface->v4].co);
|
2011-03-18 15:31:32 +00:00
|
|
|
}
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (face_minmax==0) {
|
2012-04-29 15:47:02 +00:00
|
|
|
INIT_MINMAX(min, max);
|
|
|
|
DO_MINMAX(v1, min, max);
|
|
|
|
DO_MINMAX(v2, min, max);
|
|
|
|
DO_MINMAX(v3, min, max);
|
2012-03-22 01:35:13 +00:00
|
|
|
if (mface->v4)
|
|
|
|
DO_MINMAX(v4, min, max);
|
2012-04-29 15:47:02 +00:00
|
|
|
if (isect_aabb_aabb_v3(min, max, p_min, p_max)==0)
|
2011-03-18 15:31:32 +00:00
|
|
|
continue;
|
|
|
|
}
|
2012-03-24 06:38:07 +00:00
|
|
|
else {
|
2011-11-06 14:00:55 +00:00
|
|
|
copy_v3_v3(min, face_minmax+6*i);
|
|
|
|
copy_v3_v3(max, face_minmax+6*i+3);
|
2012-04-29 15:47:02 +00:00
|
|
|
if (isect_aabb_aabb_v3(min, max, p_min, p_max)==0)
|
2011-03-18 15:31:32 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (radius>0.0f) {
|
|
|
|
if (isect_sweeping_sphere_tri_v3(co1, co2, radius, v2, v3, v1, &cur_d, cur_ipoint)) {
|
|
|
|
if (cur_d<*min_d) {
|
2011-03-18 15:31:32 +00:00
|
|
|
*min_d=cur_d;
|
2012-04-29 15:47:02 +00:00
|
|
|
copy_v3_v3(ipoint, cur_ipoint);
|
2011-03-18 15:31:32 +00:00
|
|
|
*min_face=i;
|
|
|
|
intersect=1;
|
|
|
|
}
|
|
|
|
}
|
2012-03-24 06:38:07 +00:00
|
|
|
if (mface->v4) {
|
|
|
|
if (isect_sweeping_sphere_tri_v3(co1, co2, radius, v4, v1, v3, &cur_d, cur_ipoint)) {
|
|
|
|
if (cur_d<*min_d) {
|
2011-03-18 15:31:32 +00:00
|
|
|
*min_d=cur_d;
|
2012-04-29 15:47:02 +00:00
|
|
|
copy_v3_v3(ipoint, cur_ipoint);
|
2011-03-18 15:31:32 +00:00
|
|
|
*min_face=i;
|
|
|
|
intersect=1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2012-03-24 06:38:07 +00:00
|
|
|
else {
|
2015-12-15 18:14:22 +11:00
|
|
|
if (isect_line_segment_tri_v3(co1, co2, v1, v2, v3, &cur_d, cur_uv)) {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (cur_d<*min_d) {
|
2011-03-18 15:31:32 +00:00
|
|
|
*min_d=cur_d;
|
2012-10-22 08:15:51 +00:00
|
|
|
min_w[0] = 1.0f - cur_uv[0] - cur_uv[1];
|
|
|
|
min_w[1] = cur_uv[0];
|
|
|
|
min_w[2] = cur_uv[1];
|
|
|
|
min_w[3] = 0.0f;
|
2012-03-24 06:38:07 +00:00
|
|
|
if (mface->v4)
|
2011-03-18 15:31:32 +00:00
|
|
|
intersect_dm_quad_weights(v1, v2, v3, v4, min_w);
|
|
|
|
*min_face=i;
|
|
|
|
intersect=1;
|
|
|
|
}
|
|
|
|
}
|
2012-03-24 06:38:07 +00:00
|
|
|
if (mface->v4) {
|
2015-12-15 18:14:22 +11:00
|
|
|
if (isect_line_segment_tri_v3(co1, co2, v1, v3, v4, &cur_d, cur_uv)) {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (cur_d<*min_d) {
|
2011-03-18 15:31:32 +00:00
|
|
|
*min_d=cur_d;
|
2012-10-22 08:15:51 +00:00
|
|
|
min_w[0] = 1.0f - cur_uv[0] - cur_uv[1];
|
|
|
|
min_w[1] = 0.0f;
|
|
|
|
min_w[2] = cur_uv[0];
|
|
|
|
min_w[3] = cur_uv[1];
|
2011-03-18 15:31:32 +00:00
|
|
|
intersect_dm_quad_weights(v1, v2, v3, v4, min_w);
|
|
|
|
*min_face=i;
|
|
|
|
intersect=1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return intersect;
|
|
|
|
}
|
|
|
|
|
2009-11-01 00:06:53 +00:00
|
|
|
static int brush_add(PEData *data, short number)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2009-02-20 20:39:27 +00:00
|
|
|
Scene *scene= data->scene;
|
|
|
|
Object *ob= data->ob;
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
DerivedMesh *dm;
|
2009-09-16 17:43:09 +00:00
|
|
|
PTCacheEdit *edit = data->edit;
|
|
|
|
ParticleSystem *psys= edit->psys;
|
2014-03-01 16:25:37 +11:00
|
|
|
ParticleData *add_pars;
|
2012-04-29 15:47:02 +00:00
|
|
|
ParticleSystemModifierData *psmd= psys_get_modifier(ob, psys);
|
2010-11-02 13:12:30 +00:00
|
|
|
ParticleSimulationData sim= {0};
|
2009-01-24 13:45:24 +00:00
|
|
|
ParticleEditSettings *pset= PE_settings(scene);
|
2009-02-20 20:39:27 +00:00
|
|
|
int i, k, n= 0, totpart= psys->totpart;
|
2009-10-22 23:22:05 +00:00
|
|
|
float mco[2];
|
2013-01-23 19:40:52 +00:00
|
|
|
float dmx, dmy;
|
2009-01-24 13:45:24 +00:00
|
|
|
float co1[3], co2[3], min_d, imat[4][4];
|
2010-11-02 13:12:30 +00:00
|
|
|
float framestep, timestep;
|
2009-02-20 20:39:27 +00:00
|
|
|
short size= pset->brush[PE_BRUSH_ADD].size;
|
|
|
|
short size2= size*size;
|
2013-04-15 23:12:40 +00:00
|
|
|
RNG *rng;
|
2014-03-26 22:24:36 +02:00
|
|
|
|
2012-04-29 15:47:02 +00:00
|
|
|
invert_m4_m4(imat, ob->obmat);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (psys->flag & PSYS_GLOBAL_HAIR)
|
2009-11-01 00:06:53 +00:00
|
|
|
return 0;
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2014-03-01 16:25:37 +11:00
|
|
|
add_pars = MEM_callocN(number * sizeof(ParticleData), "ParticleData add");
|
|
|
|
|
2013-04-15 23:12:40 +00:00
|
|
|
rng = BLI_rng_new_srandom(psys->seed+data->mval[0]+data->mval[1]);
|
2010-11-02 13:12:30 +00:00
|
|
|
|
|
|
|
sim.scene= scene;
|
|
|
|
sim.ob= ob;
|
|
|
|
sim.psys= psys;
|
|
|
|
sim.psmd= psmd;
|
|
|
|
|
|
|
|
timestep= psys_get_timestep(&sim);
|
|
|
|
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
if (psys->part->use_modifier_stack || psmd->dm_final->deformedOnly) {
|
|
|
|
dm = psmd->dm_final;
|
|
|
|
}
|
2014-03-26 22:24:36 +02:00
|
|
|
else {
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
dm = psmd->dm_deformed;
|
2014-03-26 22:24:36 +02:00
|
|
|
}
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
BLI_assert(dm);
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
for (i=0; i<number; i++) {
|
|
|
|
if (number>1) {
|
2013-01-23 19:40:52 +00:00
|
|
|
dmx = size;
|
|
|
|
dmy = size;
|
|
|
|
|
|
|
|
/* rejection sampling to get points in circle */
|
|
|
|
while (dmx*dmx + dmy*dmy > size2) {
|
2013-04-15 23:12:40 +00:00
|
|
|
dmx= (2.0f*BLI_rng_get_float(rng) - 1.0f)*size;
|
|
|
|
dmy= (2.0f*BLI_rng_get_float(rng) - 1.0f)*size;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
2013-01-23 19:40:52 +00:00
|
|
|
else {
|
|
|
|
dmx = 0.0f;
|
|
|
|
dmy = 0.0f;
|
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-10-22 08:15:51 +00:00
|
|
|
mco[0] = data->mval[0] + dmx;
|
|
|
|
mco[1] = data->mval[1] + dmy;
|
2013-04-22 20:00:37 +00:00
|
|
|
ED_view3d_win_to_segment(data->vc.ar, data->vc.v3d, mco, co1, co2, true);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-04-29 15:47:02 +00:00
|
|
|
mul_m4_v3(imat, co1);
|
|
|
|
mul_m4_v3(imat, co2);
|
2009-01-24 13:45:24 +00:00
|
|
|
min_d=2.0;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-01-24 13:45:24 +00:00
|
|
|
/* warning, returns the derived mesh face */
|
2014-03-26 22:24:36 +02:00
|
|
|
if (particle_intersect_dm(scene, ob, dm, 0, co1, co2, &min_d, &add_pars[n].num_dmcache, add_pars[n].fuv, 0, 0, 0, 0)) {
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
if (psys->part->use_modifier_stack && !psmd->dm_final->deformedOnly) {
|
|
|
|
add_pars[n].num = add_pars[n].num_dmcache;
|
|
|
|
add_pars[n].num_dmcache = DMCACHE_ISCHILD;
|
|
|
|
}
|
|
|
|
else if (dm == psmd->dm_deformed) {
|
|
|
|
/* Final DM is not same topology as orig mesh, we have to map num_dmcache to real final dm. */
|
|
|
|
add_pars[n].num = add_pars[n].num_dmcache;
|
|
|
|
add_pars[n].num_dmcache = psys_particle_dm_face_lookup(
|
|
|
|
psmd->dm_final, psmd->dm_deformed,
|
|
|
|
add_pars[n].num, add_pars[n].fuv, NULL);
|
|
|
|
}
|
|
|
|
else {
|
2014-03-26 22:24:36 +02:00
|
|
|
add_pars[n].num = add_pars[n].num_dmcache;
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
}
|
2014-03-26 22:24:36 +02:00
|
|
|
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
if (add_pars[n].num != DMCACHE_NOTFOUND) {
|
2014-03-26 22:24:36 +02:00
|
|
|
n++;
|
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
2012-03-24 06:38:07 +00:00
|
|
|
if (n) {
|
2009-01-24 13:45:24 +00:00
|
|
|
int newtotpart=totpart+n;
|
|
|
|
float hairmat[4][4], cur_co[3];
|
|
|
|
KDTree *tree=0;
|
2013-01-26 12:30:44 +00:00
|
|
|
ParticleData *pa, *new_pars = MEM_callocN(newtotpart*sizeof(ParticleData), "ParticleData new");
|
|
|
|
PTCacheEditPoint *point, *new_points = MEM_callocN(newtotpart*sizeof(PTCacheEditPoint), "PTCacheEditPoint array new");
|
2009-09-16 17:43:09 +00:00
|
|
|
PTCacheEditKey *key;
|
2009-01-24 13:45:24 +00:00
|
|
|
HairKey *hkey;
|
|
|
|
|
2013-01-26 12:30:44 +00:00
|
|
|
/* save existing elements */
|
|
|
|
memcpy(new_pars, psys->particles, totpart * sizeof(ParticleData));
|
|
|
|
memcpy(new_points, edit->points, totpart * sizeof(PTCacheEditPoint));
|
|
|
|
|
2009-01-24 13:45:24 +00:00
|
|
|
/* change old arrays to new ones */
|
2013-01-26 12:30:44 +00:00
|
|
|
if (psys->particles) MEM_freeN(psys->particles);
|
|
|
|
psys->particles= new_pars;
|
|
|
|
|
|
|
|
if (edit->points) MEM_freeN(edit->points);
|
|
|
|
edit->points= new_points;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit->mirror_cache) {
|
2009-01-24 13:45:24 +00:00
|
|
|
MEM_freeN(edit->mirror_cache);
|
2009-02-20 20:39:27 +00:00
|
|
|
edit->mirror_cache= NULL;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* create tree for interpolation */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (pset->flag & PE_INTERPOLATE_ADDED && psys->totpart) {
|
2009-01-24 13:45:24 +00:00
|
|
|
tree=BLI_kdtree_new(psys->totpart);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
for (i=0, pa=psys->particles; i<totpart; i++, pa++) {
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
psys_particle_on_dm(psmd->dm_final, psys->part->from, pa->num, pa->num_dmcache, pa->fuv, pa->foffset, cur_co, 0, 0, 0, 0, 0);
|
2014-03-18 09:05:07 +11:00
|
|
|
BLI_kdtree_insert(tree, i, cur_co);
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
BLI_kdtree_balance(tree);
|
|
|
|
}
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
edit->totpoint= psys->totpart= newtotpart;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
|
|
|
/* create new elements */
|
2013-01-24 00:46:51 +00:00
|
|
|
pa = psys->particles + totpart;
|
|
|
|
point = edit->points + totpart;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
for (i=totpart; i<newtotpart; i++, pa++, point++) {
|
2009-01-24 13:45:24 +00:00
|
|
|
memcpy(pa, add_pars + i - totpart, sizeof(ParticleData));
|
2009-02-20 20:39:27 +00:00
|
|
|
pa->hair= MEM_callocN(pset->totaddkey * sizeof(HairKey), "BakeKey key add");
|
2009-09-16 17:43:09 +00:00
|
|
|
key= point->keys= MEM_callocN(pset->totaddkey * sizeof(PTCacheEditKey), "PTCacheEditKey add");
|
|
|
|
point->totkey= pa->totkey= pset->totaddkey;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
for (k=0, hkey=pa->hair; k<pa->totkey; k++, hkey++, key++) {
|
2009-09-16 17:43:09 +00:00
|
|
|
key->co= hkey->co;
|
|
|
|
key->time= &hkey->time;
|
2009-10-22 23:22:05 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!(psys->flag & PSYS_GLOBAL_HAIR))
|
2009-10-22 23:22:05 +00:00
|
|
|
key->flag |= PEK_USE_WCO;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-01-24 13:45:24 +00:00
|
|
|
pa->size= 1.0f;
|
2014-07-02 12:17:43 +02:00
|
|
|
initialize_particle(&sim, pa);
|
2009-10-22 23:22:05 +00:00
|
|
|
reset_particle(&sim, pa, 0.0, 1.0);
|
2009-09-16 17:43:09 +00:00
|
|
|
point->flag |= PEP_EDIT_RECALC;
|
2012-03-24 06:38:07 +00:00
|
|
|
if (pe_x_mirror(ob))
|
2009-09-16 17:43:09 +00:00
|
|
|
point->flag |= PEP_TAG; /* signal for duplicate */
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
framestep= pa->lifetime/(float)(pset->totaddkey-1);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (tree) {
|
2010-10-29 10:31:45 +00:00
|
|
|
ParticleData *ppa;
|
2010-12-03 12:30:59 +00:00
|
|
|
HairKey *thkey;
|
|
|
|
ParticleKey key3[3];
|
2009-01-24 13:45:24 +00:00
|
|
|
KDTreeNearest ptn[3];
|
|
|
|
int w, maxw;
|
2011-01-27 12:21:14 +00:00
|
|
|
float maxd, totw=0.0, weight[3];
|
2009-01-24 13:45:24 +00:00
|
|
|
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
psys_particle_on_dm(psmd->dm_final, psys->part->from, pa->num, pa->num_dmcache, pa->fuv, pa->foffset, co1, 0, 0, 0, 0, 0);
|
2014-03-18 09:05:07 +11:00
|
|
|
maxw = BLI_kdtree_find_nearest_n(tree, co1, ptn, 3);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
maxd= ptn[maxw-1].dist;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
for (w=0; w<maxw; w++) {
|
2012-10-22 08:15:51 +00:00
|
|
|
weight[w] = (float)pow(2.0, (double)(-6.0f * ptn[w].dist / maxd));
|
2009-01-24 13:45:24 +00:00
|
|
|
totw += weight[w];
|
|
|
|
}
|
2012-03-24 06:38:07 +00:00
|
|
|
for (;w<3; w++) {
|
2012-10-22 08:15:51 +00:00
|
|
|
weight[w] = 0.0f;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2013-02-02 00:34:34 +00:00
|
|
|
if (totw > 0.0f) {
|
2013-01-23 19:40:52 +00:00
|
|
|
for (w=0; w<maxw; w++)
|
|
|
|
weight[w] /= totw;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
for (w=0; w<maxw; w++)
|
|
|
|
weight[w] = 1.0f/maxw;
|
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2010-10-29 10:31:45 +00:00
|
|
|
ppa= psys->particles+ptn[0].index;
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
for (k=0; k<pset->totaddkey; k++) {
|
2012-09-30 06:12:47 +00:00
|
|
|
thkey= (HairKey *)pa->hair + k;
|
2010-12-03 12:30:59 +00:00
|
|
|
thkey->time= pa->time + k * framestep;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2010-12-03 12:30:59 +00:00
|
|
|
key3[0].time= thkey->time/ 100.0f;
|
|
|
|
psys_get_particle_on_path(&sim, ptn[0].index, key3, 0);
|
|
|
|
mul_v3_fl(key3[0].co, weight[0]);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2013-01-23 19:40:52 +00:00
|
|
|
/* TODO: interpolating the weight would be nicer */
|
2010-12-03 12:30:59 +00:00
|
|
|
thkey->weight= (ppa->hair+MIN2(k, ppa->totkey-1))->weight;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (maxw>1) {
|
2010-12-03 12:30:59 +00:00
|
|
|
key3[1].time= key3[0].time;
|
|
|
|
psys_get_particle_on_path(&sim, ptn[1].index, &key3[1], 0);
|
|
|
|
mul_v3_fl(key3[1].co, weight[1]);
|
2011-11-06 14:00:55 +00:00
|
|
|
add_v3_v3(key3[0].co, key3[1].co);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (maxw>2) {
|
2010-12-03 12:30:59 +00:00
|
|
|
key3[2].time= key3[0].time;
|
|
|
|
psys_get_particle_on_path(&sim, ptn[2].index, &key3[2], 0);
|
|
|
|
mul_v3_fl(key3[2].co, weight[2]);
|
2011-11-06 14:00:55 +00:00
|
|
|
add_v3_v3(key3[0].co, key3[2].co);
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (k==0)
|
2011-11-06 14:00:55 +00:00
|
|
|
sub_v3_v3v3(co1, pa->state.co, key3[0].co);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2011-11-06 14:00:55 +00:00
|
|
|
add_v3_v3v3(thkey->co, key3[0].co, co1);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2010-12-03 12:30:59 +00:00
|
|
|
thkey->time= key3[0].time;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
2009-02-20 20:39:27 +00:00
|
|
|
else {
|
2012-03-24 06:38:07 +00:00
|
|
|
for (k=0, hkey=pa->hair; k<pset->totaddkey; k++, hkey++) {
|
2011-11-06 14:00:55 +00:00
|
|
|
madd_v3_v3v3fl(hkey->co, pa->state.co, pa->state.vel, k * framestep * timestep);
|
2009-09-16 17:43:09 +00:00
|
|
|
hkey->time += k * framestep;
|
2010-10-29 10:31:45 +00:00
|
|
|
hkey->weight = 1.f - (float)k/(float)(pset->totaddkey-1);
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
2012-03-24 06:38:07 +00:00
|
|
|
for (k=0, hkey=pa->hair; k<pset->totaddkey; k++, hkey++) {
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
psys_mat_hair_to_global(ob, psmd->dm_final, psys->part->from, pa, hairmat);
|
2012-04-29 15:47:02 +00:00
|
|
|
invert_m4_m4(imat, hairmat);
|
2009-11-10 20:43:45 +00:00
|
|
|
mul_m4_v3(imat, hkey->co);
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (tree)
|
2009-01-24 13:45:24 +00:00
|
|
|
BLI_kdtree_free(tree);
|
|
|
|
}
|
2014-03-01 16:25:37 +11:00
|
|
|
|
|
|
|
MEM_freeN(add_pars);
|
2014-03-26 22:24:36 +02:00
|
|
|
|
2013-04-15 23:12:40 +00:00
|
|
|
BLI_rng_free(rng);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-11-01 00:06:53 +00:00
|
|
|
return n;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
/************************* brush edit operator ********************/
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
typedef struct BrushEdit {
|
|
|
|
Scene *scene;
|
|
|
|
Object *ob;
|
2009-09-16 17:43:09 +00:00
|
|
|
PTCacheEdit *edit;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
int first;
|
|
|
|
int lastmouse[2];
|
2013-03-09 11:40:42 +00:00
|
|
|
float zfac;
|
2010-11-26 12:57:35 +00:00
|
|
|
|
|
|
|
/* optional cached view settings to avoid setting on every mousemove */
|
|
|
|
PEData data;
|
2009-02-20 20:39:27 +00:00
|
|
|
} BrushEdit;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
static int brush_edit_init(bContext *C, wmOperator *op)
|
|
|
|
{
|
2018-06-13 14:26:26 +02:00
|
|
|
Main *bmain = CTX_data_main(C);
|
2009-02-20 20:39:27 +00:00
|
|
|
Scene *scene= CTX_data_scene(C);
|
|
|
|
Object *ob= CTX_data_active_object(C);
|
|
|
|
ParticleEditSettings *pset= PE_settings(scene);
|
2018-06-13 14:26:26 +02:00
|
|
|
PTCacheEdit *edit= PE_get_current(bmain, scene, ob);
|
2009-02-20 20:39:27 +00:00
|
|
|
ARegion *ar= CTX_wm_region(C);
|
|
|
|
BrushEdit *bedit;
|
2012-12-21 17:47:50 +00:00
|
|
|
float min[3], max[3];
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (pset->brushtype < 0)
|
2009-02-20 20:39:27 +00:00
|
|
|
return 0;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-12-21 17:47:50 +00:00
|
|
|
/* set the 'distance factor' for grabbing (used in comb etc) */
|
|
|
|
INIT_MINMAX(min, max);
|
2018-06-13 14:26:26 +02:00
|
|
|
PE_minmax(bmain, scene, min, max);
|
2012-12-21 17:47:50 +00:00
|
|
|
mid_v3_v3v3(min, min, max);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
bedit= MEM_callocN(sizeof(BrushEdit), "BrushEdit");
|
|
|
|
bedit->first= 1;
|
|
|
|
op->customdata= bedit;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
bedit->scene= scene;
|
|
|
|
bedit->ob= ob;
|
2009-09-16 17:43:09 +00:00
|
|
|
bedit->edit= edit;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2013-03-09 11:40:42 +00:00
|
|
|
bedit->zfac = ED_view3d_calc_zfac(ar->regiondata, min, NULL);
|
|
|
|
|
2010-11-26 12:57:35 +00:00
|
|
|
/* cache view depths and settings for re-use */
|
|
|
|
PE_set_view3d_data(C, &bedit->data);
|
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
return 1;
|
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
static void brush_edit_apply(bContext *C, wmOperator *op, PointerRNA *itemptr)
|
|
|
|
{
|
2018-06-13 14:26:26 +02:00
|
|
|
Main *bmain = CTX_data_main(C);
|
2009-02-20 20:39:27 +00:00
|
|
|
BrushEdit *bedit= op->customdata;
|
|
|
|
Scene *scene= bedit->scene;
|
|
|
|
Object *ob= bedit->ob;
|
2009-09-16 17:43:09 +00:00
|
|
|
PTCacheEdit *edit= bedit->edit;
|
2009-02-20 20:39:27 +00:00
|
|
|
ParticleEditSettings *pset= PE_settings(scene);
|
2009-09-16 17:43:09 +00:00
|
|
|
ParticleSystemModifierData *psmd= edit->psys ? psys_get_modifier(ob, edit->psys) : NULL;
|
2009-02-20 20:39:27 +00:00
|
|
|
ParticleBrushData *brush= &pset->brush[pset->brushtype];
|
|
|
|
ARegion *ar= CTX_wm_region(C);
|
2009-09-16 17:43:09 +00:00
|
|
|
float vec[3], mousef[2];
|
2011-05-23 15:23:31 +00:00
|
|
|
int mval[2];
|
2011-06-21 11:15:37 +00:00
|
|
|
int flip, mouse[2], removed= 0, added=0, selected= 0, tot_steps= 1, step= 1;
|
|
|
|
float dx, dy, dmax;
|
2009-09-16 17:43:09 +00:00
|
|
|
int lock_root = pset->flag & PE_LOCK_FIRST;
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!PE_start_edit(edit))
|
2009-09-16 17:43:09 +00:00
|
|
|
return;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-08-18 21:14:36 +00:00
|
|
|
RNA_float_get_array(itemptr, "mouse", mousef);
|
|
|
|
mouse[0] = mousef[0];
|
|
|
|
mouse[1] = mousef[1];
|
2010-07-29 12:16:15 +00:00
|
|
|
flip= RNA_boolean_get(itemptr, "pen_flip");
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (bedit->first) {
|
2012-10-22 08:15:51 +00:00
|
|
|
bedit->lastmouse[0] = mouse[0];
|
|
|
|
bedit->lastmouse[1] = mouse[1];
|
2009-02-25 19:29:58 +00:00
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
dx= mouse[0] - bedit->lastmouse[0];
|
|
|
|
dy= mouse[1] - bedit->lastmouse[1];
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-10-22 08:15:51 +00:00
|
|
|
mval[0] = mouse[0];
|
|
|
|
mval[1] = mouse[1];
|
2009-01-24 13:45:24 +00:00
|
|
|
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
/* disable locking temporatily for disconnected hair */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit->psys && edit->psys->flag & PSYS_GLOBAL_HAIR)
|
2009-09-16 17:43:09 +00:00
|
|
|
pset->flag &= ~PE_LOCK_FIRST;
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (((pset->brushtype == PE_BRUSH_ADD) ?
|
2014-09-17 14:11:37 +10:00
|
|
|
(sqrtf(dx * dx + dy * dy) > pset->brush[PE_BRUSH_ADD].step) : (dx != 0 || dy != 0)) || bedit->first)
|
2012-05-24 16:35:45 +00:00
|
|
|
{
|
2010-11-26 12:57:35 +00:00
|
|
|
PEData data= bedit->data;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-25 19:29:58 +00:00
|
|
|
view3d_operator_needs_opengl(C);
|
2009-09-16 17:43:09 +00:00
|
|
|
selected= (short)count_selected_keys(scene, edit);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-10-23 13:28:22 +00:00
|
|
|
dmax = max_ff(fabsf(dx), fabsf(dy));
|
2012-12-14 15:09:59 +00:00
|
|
|
tot_steps = dmax/(0.2f * pe_brush_size_get(scene, brush)) + 1;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2011-06-21 11:15:37 +00:00
|
|
|
dx /= (float)tot_steps;
|
|
|
|
dy /= (float)tot_steps;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
for (step = 1; step<=tot_steps; step++) {
|
2011-06-21 11:15:37 +00:00
|
|
|
mval[0] = bedit->lastmouse[0] + step*dx;
|
|
|
|
mval[1] = bedit->lastmouse[1] + step*dy;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-04-28 06:31:57 +00:00
|
|
|
switch (pset->brushtype) {
|
2011-06-21 11:15:37 +00:00
|
|
|
case PE_BRUSH_COMB:
|
|
|
|
{
|
2012-09-06 23:41:03 +00:00
|
|
|
const float mval_f[2] = {dx, dy};
|
2009-09-16 17:43:09 +00:00
|
|
|
data.mval= mval;
|
2012-12-14 15:09:59 +00:00
|
|
|
data.rad= pe_brush_size_get(scene, brush);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2011-06-21 11:15:37 +00:00
|
|
|
data.combfac= (brush->strength - 0.5f) * 2.0f;
|
2012-03-24 06:38:07 +00:00
|
|
|
if (data.combfac < 0.0f)
|
2011-06-21 11:15:37 +00:00
|
|
|
data.combfac= 1.0f - 9.0f * data.combfac;
|
2009-09-16 17:43:09 +00:00
|
|
|
else
|
2011-06-21 11:15:37 +00:00
|
|
|
data.combfac= 1.0f - data.combfac;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2011-06-21 11:15:37 +00:00
|
|
|
invert_m4_m4(ob->imat, ob->obmat);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2013-03-09 11:40:42 +00:00
|
|
|
ED_view3d_win_to_delta(ar, mval_f, vec, bedit->zfac);
|
2011-06-21 11:15:37 +00:00
|
|
|
data.dvec= vec;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2011-06-21 11:15:37 +00:00
|
|
|
foreach_mouse_hit_key(&data, brush_comb, selected);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case PE_BRUSH_CUT:
|
|
|
|
{
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit->psys && edit->pathcache) {
|
2011-06-21 11:15:37 +00:00
|
|
|
data.mval= mval;
|
2012-12-14 15:09:59 +00:00
|
|
|
data.rad= pe_brush_size_get(scene, brush);
|
2011-06-21 11:15:37 +00:00
|
|
|
data.cutfac= brush->strength;
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (selected)
|
2011-06-21 11:15:37 +00:00
|
|
|
foreach_selected_point(&data, brush_cut);
|
|
|
|
else
|
|
|
|
foreach_point(&data, brush_cut);
|
|
|
|
|
|
|
|
removed= remove_tagged_particles(ob, edit->psys, pe_x_mirror(ob));
|
2012-03-24 06:38:07 +00:00
|
|
|
if (pset->flag & PE_KEEP_LENGTHS)
|
2011-06-21 11:15:37 +00:00
|
|
|
recalc_lengths(edit);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
removed= 0;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2011-06-21 11:15:37 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
case PE_BRUSH_LENGTH:
|
|
|
|
{
|
2009-09-16 17:43:09 +00:00
|
|
|
data.mval= mval;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-12-14 15:09:59 +00:00
|
|
|
data.rad= pe_brush_size_get(scene, brush);
|
2011-06-21 11:15:37 +00:00
|
|
|
data.growfac= brush->strength / 50.0f;
|
2009-02-20 20:39:27 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (brush->invert ^ flip)
|
2011-06-21 11:15:37 +00:00
|
|
|
data.growfac= 1.0f - data.growfac;
|
2009-09-16 17:43:09 +00:00
|
|
|
else
|
2011-06-21 11:15:37 +00:00
|
|
|
data.growfac= 1.0f + data.growfac;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2011-06-21 11:15:37 +00:00
|
|
|
foreach_mouse_hit_point(&data, brush_length, selected);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (pset->flag & PE_KEEP_LENGTHS)
|
2011-06-21 11:15:37 +00:00
|
|
|
recalc_lengths(edit);
|
|
|
|
break;
|
2009-09-16 17:43:09 +00:00
|
|
|
}
|
2011-06-21 11:15:37 +00:00
|
|
|
case PE_BRUSH_PUFF:
|
|
|
|
{
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit->psys) {
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
data.dm= psmd->dm_final;
|
2011-06-21 11:15:37 +00:00
|
|
|
data.mval= mval;
|
2012-12-14 15:09:59 +00:00
|
|
|
data.rad= pe_brush_size_get(scene, brush);
|
2011-06-21 11:15:37 +00:00
|
|
|
data.select= selected;
|
|
|
|
|
|
|
|
data.pufffac= (brush->strength - 0.5f) * 2.0f;
|
2012-03-24 06:38:07 +00:00
|
|
|
if (data.pufffac < 0.0f)
|
2011-06-21 11:15:37 +00:00
|
|
|
data.pufffac= 1.0f - 9.0f * data.pufffac;
|
|
|
|
else
|
|
|
|
data.pufffac= 1.0f - data.pufffac;
|
|
|
|
|
|
|
|
data.invert= (brush->invert ^ flip);
|
|
|
|
invert_m4_m4(ob->imat, ob->obmat);
|
|
|
|
|
|
|
|
foreach_mouse_hit_point(&data, brush_puff, selected);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case PE_BRUSH_ADD:
|
|
|
|
{
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit->psys && edit->psys->part->from==PART_FROM_FACE) {
|
2011-06-21 11:15:37 +00:00
|
|
|
data.mval= mval;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2011-06-21 11:15:37 +00:00
|
|
|
added= brush_add(&data, brush->count);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (pset->flag & PE_KEEP_LENGTHS)
|
2011-06-21 11:15:37 +00:00
|
|
|
recalc_lengths(edit);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
added= 0;
|
|
|
|
break;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
2011-06-21 11:15:37 +00:00
|
|
|
case PE_BRUSH_SMOOTH:
|
|
|
|
{
|
|
|
|
data.mval= mval;
|
2012-12-14 15:09:59 +00:00
|
|
|
data.rad= pe_brush_size_get(scene, brush);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-10-22 08:15:51 +00:00
|
|
|
data.vec[0] = data.vec[1] = data.vec[2] = 0.0f;
|
2011-06-21 11:15:37 +00:00
|
|
|
data.tot= 0;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2011-06-21 11:15:37 +00:00
|
|
|
data.smoothfac= brush->strength;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2011-06-21 11:15:37 +00:00
|
|
|
invert_m4_m4(ob->imat, ob->obmat);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2011-06-21 11:15:37 +00:00
|
|
|
foreach_mouse_hit_key(&data, brush_smooth_get, selected);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (data.tot) {
|
2011-06-21 11:15:37 +00:00
|
|
|
mul_v3_fl(data.vec, 1.0f / (float)data.tot);
|
|
|
|
foreach_mouse_hit_key(&data, brush_smooth_do, selected);
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
2009-02-20 20:39:27 +00:00
|
|
|
}
|
2011-06-21 11:15:37 +00:00
|
|
|
case PE_BRUSH_WEIGHT:
|
|
|
|
{
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit->psys) {
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
data.dm= psmd->dm_final;
|
2011-06-21 11:15:37 +00:00
|
|
|
data.mval= mval;
|
2012-12-14 15:09:59 +00:00
|
|
|
data.rad= pe_brush_size_get(scene, brush);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2011-06-21 11:15:37 +00:00
|
|
|
data.weightfac = brush->strength; /* note that this will never be zero */
|
2010-01-14 08:53:10 +00:00
|
|
|
|
2012-05-05 00:58:22 +00:00
|
|
|
foreach_mouse_hit_key(&data, BKE_brush_weight_get, selected);
|
2011-06-21 11:15:37 +00:00
|
|
|
}
|
2010-01-14 08:53:10 +00:00
|
|
|
|
2011-06-21 11:15:37 +00:00
|
|
|
break;
|
2010-01-14 08:53:10 +00:00
|
|
|
}
|
2009-02-20 20:39:27 +00:00
|
|
|
}
|
2012-03-24 06:38:07 +00:00
|
|
|
if ((pset->flag & PE_KEEP_LENGTHS)==0)
|
2011-06-21 11:15:37 +00:00
|
|
|
recalc_lengths(edit);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (ELEM(pset->brushtype, PE_BRUSH_ADD, PE_BRUSH_CUT) && (added || removed)) {
|
|
|
|
if (pset->brushtype == PE_BRUSH_ADD && pe_x_mirror(ob))
|
2018-06-13 14:26:26 +02:00
|
|
|
PE_mirror_x(bmain, scene, ob, 1);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-04-29 15:47:02 +00:00
|
|
|
update_world_cos(ob, edit);
|
2011-06-21 11:15:37 +00:00
|
|
|
psys_free_path_cache(NULL, edit);
|
|
|
|
DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
|
|
|
|
}
|
|
|
|
else
|
2018-06-13 14:26:26 +02:00
|
|
|
PE_update_object(bmain, scene, ob, 1);
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2012-03-06 18:40:15 +00:00
|
|
|
if (edit->psys) {
|
2012-01-13 15:14:08 +00:00
|
|
|
WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, ob);
|
2012-03-06 18:40:15 +00:00
|
|
|
}
|
|
|
|
else {
|
2012-01-13 15:14:08 +00:00
|
|
|
DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
|
|
|
|
WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
|
|
|
|
}
|
|
|
|
|
2012-10-22 08:15:51 +00:00
|
|
|
bedit->lastmouse[0] = mouse[0];
|
|
|
|
bedit->lastmouse[1] = mouse[1];
|
2009-02-20 20:39:27 +00:00
|
|
|
bedit->first= 0;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
2009-09-16 17:43:09 +00:00
|
|
|
|
|
|
|
pset->flag |= lock_root;
|
2009-02-20 20:39:27 +00:00
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2010-10-16 14:32:17 +00:00
|
|
|
static void brush_edit_exit(wmOperator *op)
|
2009-02-20 20:39:27 +00:00
|
|
|
{
|
|
|
|
BrushEdit *bedit= op->customdata;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
MEM_freeN(bedit);
|
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
static int brush_edit_exec(bContext *C, wmOperator *op)
|
|
|
|
{
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!brush_edit_init(C, op))
|
2009-02-20 20:39:27 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-04-30 16:22:40 +00:00
|
|
|
RNA_BEGIN (op->ptr, itemptr, "stroke")
|
|
|
|
{
|
2009-02-20 20:39:27 +00:00
|
|
|
brush_edit_apply(C, op, &itemptr);
|
|
|
|
}
|
|
|
|
RNA_END;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2010-10-16 14:32:17 +00:00
|
|
|
brush_edit_exit(op);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2013-03-13 09:03:46 +00:00
|
|
|
static void brush_edit_apply_event(bContext *C, wmOperator *op, const wmEvent *event)
|
2009-02-20 20:39:27 +00:00
|
|
|
{
|
|
|
|
PointerRNA itemptr;
|
2009-08-18 21:14:36 +00:00
|
|
|
float mouse[2];
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2011-05-20 07:40:05 +00:00
|
|
|
VECCOPY2D(mouse, event->mval);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/* fill in stroke */
|
|
|
|
RNA_collection_add(op->ptr, "stroke", &itemptr);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-08-18 21:14:36 +00:00
|
|
|
RNA_float_set_array(&itemptr, "mouse", mouse);
|
2014-04-01 11:34:00 +11:00
|
|
|
RNA_boolean_set(&itemptr, "pen_flip", event->shift != false); // XXX hardcoded
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/* apply */
|
|
|
|
brush_edit_apply(C, op, &itemptr);
|
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2013-03-13 09:03:46 +00:00
|
|
|
static int brush_edit_invoke(bContext *C, wmOperator *op, const wmEvent *event)
|
2009-02-20 20:39:27 +00:00
|
|
|
{
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!brush_edit_init(C, op))
|
2009-02-20 20:39:27 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
brush_edit_apply_event(C, op, event);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-10-22 23:22:05 +00:00
|
|
|
WM_event_add_modal_handler(C, op);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
return OPERATOR_RUNNING_MODAL;
|
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2013-03-13 09:03:46 +00:00
|
|
|
static int brush_edit_modal(bContext *C, wmOperator *op, const wmEvent *event)
|
2009-02-20 20:39:27 +00:00
|
|
|
{
|
2012-04-28 06:31:57 +00:00
|
|
|
switch (event->type) {
|
2009-02-20 20:39:27 +00:00
|
|
|
case LEFTMOUSE:
|
|
|
|
case MIDDLEMOUSE:
|
|
|
|
case RIGHTMOUSE: // XXX hardcoded
|
2018-06-13 18:23:09 +02:00
|
|
|
if (event->val == KM_RELEASE) {
|
|
|
|
brush_edit_exit(op);
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
break;
|
2009-02-20 20:39:27 +00:00
|
|
|
case MOUSEMOVE:
|
|
|
|
brush_edit_apply_event(C, op, event);
|
|
|
|
break;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
return OPERATOR_RUNNING_MODAL;
|
|
|
|
}
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2013-10-30 23:08:53 +00:00
|
|
|
static void brush_edit_cancel(bContext *UNUSED(C), wmOperator *op)
|
2009-02-20 20:39:27 +00:00
|
|
|
{
|
2010-10-16 14:32:17 +00:00
|
|
|
brush_edit_exit(op);
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
void PARTICLE_OT_brush_edit(wmOperatorType *ot)
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2009-02-20 20:39:27 +00:00
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Brush Edit";
|
|
|
|
ot->idname = "PARTICLE_OT_brush_edit";
|
2012-05-05 17:10:51 +00:00
|
|
|
ot->description = "Apply a stroke of brush to the particles";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = brush_edit_exec;
|
|
|
|
ot->invoke = brush_edit_invoke;
|
|
|
|
ot->modal = brush_edit_modal;
|
|
|
|
ot->cancel = brush_edit_cancel;
|
|
|
|
ot->poll = PE_poll_view3d;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/* flags */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
|
2009-02-20 20:39:27 +00:00
|
|
|
|
|
|
|
/* properties */
|
2017-10-16 16:11:04 +11:00
|
|
|
PropertyRNA *prop;
|
|
|
|
prop = RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, "Stroke", "");
|
|
|
|
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
|
2014-10-22 16:36:23 +02:00
|
|
|
/*********************** cut shape ***************************/
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
static bool shape_cut_poll(bContext *C)
|
2014-10-22 16:36:23 +02:00
|
|
|
{
|
|
|
|
if (PE_hair_poll(C)) {
|
2015-06-05 12:56:56 +02:00
|
|
|
Scene *scene = CTX_data_scene(C);
|
|
|
|
ParticleEditSettings *pset = PE_settings(scene);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2015-06-05 12:56:56 +02:00
|
|
|
if (pset->shape_object && (pset->shape_object->type == OB_MESH)) {
|
2014-10-22 16:36:23 +02:00
|
|
|
return true;
|
2015-06-05 12:56:56 +02:00
|
|
|
}
|
2014-10-22 16:36:23 +02:00
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-10-22 16:36:23 +02:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
typedef struct PointInsideBVH {
|
|
|
|
BVHTreeFromMesh bvhdata;
|
|
|
|
int num_hits;
|
|
|
|
} PointInsideBVH;
|
|
|
|
|
|
|
|
static void point_inside_bvh_cb(void *userdata, int index, const BVHTreeRay *ray, BVHTreeRayHit *hit)
|
|
|
|
{
|
|
|
|
PointInsideBVH *data = userdata;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-10-22 16:36:23 +02:00
|
|
|
data->bvhdata.raycast_callback(&data->bvhdata, index, ray, hit);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-10-22 16:36:23 +02:00
|
|
|
if (hit->index != -1)
|
|
|
|
++data->num_hits;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* true if the point is inside the shape mesh */
|
|
|
|
static bool shape_cut_test_point(PEData *data, ParticleCacheKey *key)
|
|
|
|
{
|
|
|
|
BVHTreeFromMesh *shape_bvh = &data->shape_bvh;
|
|
|
|
const float dir[3] = {1.0f, 0.0f, 0.0f};
|
2014-11-07 11:43:25 +01:00
|
|
|
PointInsideBVH userdata;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-11-07 11:43:25 +01:00
|
|
|
userdata.bvhdata = data->shape_bvh;
|
|
|
|
userdata.num_hits = 0;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2016-05-11 14:33:49 +10:00
|
|
|
BLI_bvhtree_ray_cast_all(
|
|
|
|
shape_bvh->tree, key->co, dir, 0.0f, BVH_RAYCAST_DIST_MAX,
|
|
|
|
point_inside_bvh_cb, &userdata);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-10-22 16:36:23 +02:00
|
|
|
/* for any point inside a watertight mesh the number of hits is uneven */
|
|
|
|
return (userdata.num_hits % 2) == 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void shape_cut(PEData *data, int pa_index)
|
|
|
|
{
|
|
|
|
PTCacheEdit *edit = data->edit;
|
|
|
|
Object *ob = data->ob;
|
|
|
|
ParticleEditSettings *pset = PE_settings(data->scene);
|
|
|
|
ParticleCacheKey *key;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-10-22 16:36:23 +02:00
|
|
|
bool cut;
|
|
|
|
float cut_time = 1.0;
|
|
|
|
int k, totkeys = 1 << pset->draw_step;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-10-22 16:36:23 +02:00
|
|
|
/* don't cut hidden */
|
|
|
|
if (edit->points[pa_index].flag & PEP_HIDE)
|
|
|
|
return;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-10-22 16:36:23 +02:00
|
|
|
cut = false;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-10-22 16:36:23 +02:00
|
|
|
/* check if root is inside the cut shape */
|
|
|
|
key = edit->pathcache[pa_index];
|
|
|
|
if (!shape_cut_test_point(data, key)) {
|
|
|
|
cut_time = -1.0f;
|
|
|
|
cut = true;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
for (k = 0; k < totkeys; k++, key++) {
|
|
|
|
BVHTreeRayHit hit;
|
|
|
|
float dir[3];
|
|
|
|
float len;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-10-22 16:36:23 +02:00
|
|
|
sub_v3_v3v3(dir, (key+1)->co, key->co);
|
|
|
|
len = normalize_v3(dir);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-10-22 16:36:23 +02:00
|
|
|
memset(&hit, 0, sizeof(hit));
|
|
|
|
hit.index = -1;
|
|
|
|
hit.dist = len;
|
|
|
|
BLI_bvhtree_ray_cast(data->shape_bvh.tree, key->co, dir, 0.0f, &hit, data->shape_bvh.raycast_callback, &data->shape_bvh);
|
|
|
|
if (hit.index >= 0) {
|
|
|
|
if (hit.dist < len) {
|
|
|
|
cut_time = (hit.dist / len + (float)k) / (float)totkeys;
|
|
|
|
cut = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (cut) {
|
|
|
|
if (cut_time < 0.0f) {
|
|
|
|
edit->points[pa_index].flag |= PEP_TAG;
|
|
|
|
}
|
|
|
|
else {
|
2018-06-13 14:26:26 +02:00
|
|
|
rekey_particle_to_time(data->bmain, data->scene, ob, pa_index, cut_time);
|
2014-10-22 16:36:23 +02:00
|
|
|
edit->points[pa_index].flag |= PEP_EDIT_RECALC;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-01-19 19:14:14 +01:00
|
|
|
static int shape_cut_exec(bContext *C, wmOperator *UNUSED(op))
|
2014-10-22 16:36:23 +02:00
|
|
|
{
|
2018-06-13 14:26:26 +02:00
|
|
|
Main *bmain = CTX_data_main(C);
|
2014-10-22 16:36:23 +02:00
|
|
|
Scene *scene = CTX_data_scene(C);
|
|
|
|
Object *ob = CTX_data_active_object(C);
|
|
|
|
ParticleEditSettings *pset = PE_settings(scene);
|
2018-06-13 14:26:26 +02:00
|
|
|
PTCacheEdit *edit = PE_get_current(bmain, scene, ob);
|
2014-10-22 16:36:23 +02:00
|
|
|
Object *shapeob = pset->shape_object;
|
|
|
|
int selected = count_selected_keys(scene, edit);
|
|
|
|
int lock_root = pset->flag & PE_LOCK_FIRST;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-10-22 16:36:23 +02:00
|
|
|
if (!PE_start_edit(edit))
|
|
|
|
return OPERATOR_CANCELLED;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-10-22 16:36:23 +02:00
|
|
|
/* disable locking temporatily for disconnected hair */
|
|
|
|
if (edit->psys && edit->psys->flag & PSYS_GLOBAL_HAIR)
|
|
|
|
pset->flag &= ~PE_LOCK_FIRST;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-10-22 16:36:23 +02:00
|
|
|
if (edit->psys && edit->pathcache) {
|
|
|
|
PEData data;
|
|
|
|
int removed;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-10-22 16:36:23 +02:00
|
|
|
PE_set_data(C, &data);
|
2015-06-05 12:56:56 +02:00
|
|
|
if (!PE_create_shape_tree(&data, shapeob)) {
|
|
|
|
/* shapeob may not have faces... */
|
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-10-22 16:36:23 +02:00
|
|
|
if (selected)
|
|
|
|
foreach_selected_point(&data, shape_cut);
|
|
|
|
else
|
|
|
|
foreach_point(&data, shape_cut);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-10-22 16:36:23 +02:00
|
|
|
removed = remove_tagged_particles(ob, edit->psys, pe_x_mirror(ob));
|
|
|
|
recalc_lengths(edit);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-10-22 16:36:23 +02:00
|
|
|
if (removed) {
|
|
|
|
update_world_cos(ob, edit);
|
|
|
|
psys_free_path_cache(NULL, edit);
|
|
|
|
DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
|
|
|
|
}
|
|
|
|
else
|
2018-06-13 14:26:26 +02:00
|
|
|
PE_update_object(bmain, scene, ob, 1);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-10-22 16:36:23 +02:00
|
|
|
if (edit->psys) {
|
|
|
|
WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, ob);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
|
|
|
|
WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
|
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-10-22 16:36:23 +02:00
|
|
|
PE_free_shape_tree(&data);
|
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-10-22 16:36:23 +02:00
|
|
|
pset->flag |= lock_root;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-10-22 16:36:23 +02:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
void PARTICLE_OT_shape_cut(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
|
|
|
ot->name = "Shape Cut";
|
|
|
|
ot->idname = "PARTICLE_OT_shape_cut";
|
|
|
|
ot->description = "Cut hair to conform to the set shape object";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2014-10-22 16:36:23 +02:00
|
|
|
/* api callbacks */
|
|
|
|
ot->exec = shape_cut_exec;
|
|
|
|
ot->poll = shape_cut_poll;
|
|
|
|
|
|
|
|
/* flags */
|
|
|
|
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
|
|
|
|
}
|
|
|
|
|
2009-02-20 20:39:27 +00:00
|
|
|
/************************ utilities ******************************/
|
|
|
|
|
2018-06-13 14:26:26 +02:00
|
|
|
int PE_minmax(Main *bmain, Scene *scene, float min[3], float max[3])
|
2009-01-24 13:45:24 +00:00
|
|
|
{
|
2009-02-20 20:39:27 +00:00
|
|
|
Object *ob= OBACT;
|
2018-06-13 14:26:26 +02:00
|
|
|
PTCacheEdit *edit= PE_get_current(bmain, scene, ob);
|
2009-12-26 20:23:13 +00:00
|
|
|
ParticleSystem *psys;
|
2009-09-16 17:43:09 +00:00
|
|
|
ParticleSystemModifierData *psmd = NULL;
|
|
|
|
POINT_P; KEY_K;
|
2009-01-24 13:45:24 +00:00
|
|
|
float co[3], mat[4][4];
|
2009-09-16 17:43:09 +00:00
|
|
|
int ok= 0;
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!edit) return ok;
|
2009-12-26 20:23:13 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if ((psys = edit->psys))
|
2009-09-16 17:43:09 +00:00
|
|
|
psmd= psys_get_modifier(ob, psys);
|
|
|
|
else
|
2009-11-10 20:43:45 +00:00
|
|
|
unit_m4(mat);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_VISIBLE_POINTS {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (psys)
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
psys_mat_hair_to_global(ob, psmd->dm_final, psys->part->from, psys->particles+p, mat);
|
2009-01-24 13:45:24 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_SELECTED_KEYS {
|
2011-11-06 14:00:55 +00:00
|
|
|
copy_v3_v3(co, key->co);
|
2009-11-10 20:43:45 +00:00
|
|
|
mul_m4_v3(mat, co);
|
2012-10-21 05:46:41 +00:00
|
|
|
DO_MINMAX(co, min, max);
|
2009-09-16 17:43:09 +00:00
|
|
|
ok= 1;
|
2009-01-24 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!ok) {
|
2014-04-01 11:34:00 +11:00
|
|
|
BKE_object_minmax(ob, min, max, true);
|
2009-01-24 13:45:24 +00:00
|
|
|
ok= 1;
|
|
|
|
}
|
2013-02-04 00:18:09 +00:00
|
|
|
|
2009-01-24 13:45:24 +00:00
|
|
|
return ok;
|
|
|
|
}
|
|
|
|
|
2009-02-25 19:29:58 +00:00
|
|
|
/************************ particle edit toggle operator ************************/
|
|
|
|
|
|
|
|
/* initialize needed data for bake edit */
|
2018-06-13 14:26:26 +02:00
|
|
|
void PE_create_particle_edit(Main *bmain, Scene *scene, Object *ob, PointCache *cache, ParticleSystem *psys)
|
2009-02-25 19:29:58 +00:00
|
|
|
{
|
2013-01-20 14:10:10 +00:00
|
|
|
PTCacheEdit *edit;
|
|
|
|
ParticleSystemModifierData *psmd = (psys) ? psys_get_modifier(ob, psys) : NULL;
|
2009-09-16 17:43:09 +00:00
|
|
|
POINT_P; KEY_K;
|
|
|
|
ParticleData *pa = NULL;
|
2009-02-25 19:29:58 +00:00
|
|
|
HairKey *hkey;
|
2009-09-16 17:43:09 +00:00
|
|
|
int totpoint;
|
2009-02-25 19:29:58 +00:00
|
|
|
|
2009-10-22 23:22:05 +00:00
|
|
|
/* no psmd->dm happens in case particle system modifier is not enabled */
|
Fix T47038: Particles in Particle Edit Mode get added in completely wrong location.
It also fixes another issue (crash) related to symmetric editing.
Quite involved, we (try to!) fix complete broken logic of parts of particle code, which would use poly index
as tessface one (or vice-versa). Issue most probably goes back to BMesh integration time...
This patch mostly fixes particle editing mode:
- Adding/removing particles when using generative modifiers (like subsurf) should now work.
- Adding/removing particles with a non-tessellated mesh (i.e. one having ngons) should also mostly work.
- X-axis-mirror-editing particles over ngons does not really work, not sure why currently.
- All this in both 'modes' (with or without using modifier stack for particles).
Tech side:
- Store a deformed-only DM in particle modifier data.
- Rename existing DM to make it clear it's a final one.
- Use deformed-only DM's tessface2poly mapping to 'solve' poly/tessface mismatches.
- Make (part of) mirror-editing code able to use a DM instead of raw mesh, so that we can mirror based on final DM
when editing particles using modifier stack (mandatory, since there is no way currently to find orig tessface
from an final DM tessface index).
Note that this patch is not really nice and clean (current particles are beyond hope on this side anyway),
it's more like some urgency bandage. Whole crap needs complete rewrite anyway,
BMesh's polygons make it really hard to work with current system (and looptri would not help much here).
Also, did not test everything possibly affected by those changes, so it needs some users' testing & validation too.
Reviewers: psy-fi
Subscribers: dfelinto, eyecandy
Maniphest Tasks: T47038
Differential Revision: https://developer.blender.org/D1685
2016-01-04 12:19:45 +01:00
|
|
|
if (!(psys && psmd && psmd->dm_final) && !cache)
|
2009-02-25 19:29:58 +00:00
|
|
|
return;
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (cache && cache->flag & PTCACHE_DISK_CACHE)
|
2009-09-16 17:43:09 +00:00
|
|
|
return;
|
2009-02-25 19:29:58 +00:00
|
|
|
|
2014-02-08 06:07:10 +11:00
|
|
|
if (psys == NULL && (cache && BLI_listbase_is_empty(&cache->mem_cache)))
|
2011-01-19 09:33:09 +00:00
|
|
|
return;
|
|
|
|
|
2013-01-20 14:10:10 +00:00
|
|
|
edit = (psys) ? psys->edit : cache->edit;
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!edit) {
|
2012-09-30 06:12:47 +00:00
|
|
|
totpoint = psys ? psys->totpart : (int)((PTCacheMem *)cache->mem_cache.first)->totpoint;
|
2009-02-25 19:29:58 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
edit= MEM_callocN(sizeof(PTCacheEdit), "PE_create_particle_edit");
|
2012-04-29 15:47:02 +00:00
|
|
|
edit->points=MEM_callocN(totpoint*sizeof(PTCacheEditPoint), "PTCacheEditPoints");
|
2009-09-16 17:43:09 +00:00
|
|
|
edit->totpoint = totpoint;
|
2009-02-25 19:29:58 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (psys && !cache) {
|
2009-09-16 17:43:09 +00:00
|
|
|
psys->edit= edit;
|
|
|
|
edit->psys = psys;
|
2009-02-25 19:29:58 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
psys->free_edit= PE_free_ptcache_edit;
|
2009-02-25 19:29:58 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
edit->pathcache = NULL;
|
2014-02-08 06:07:10 +11:00
|
|
|
BLI_listbase_clear(&edit->pathcachebufs);
|
2009-09-16 17:43:09 +00:00
|
|
|
|
|
|
|
pa = psys->particles;
|
|
|
|
LOOP_POINTS {
|
|
|
|
point->totkey = pa->totkey;
|
2012-04-29 15:47:02 +00:00
|
|
|
point->keys= MEM_callocN(point->totkey*sizeof(PTCacheEditKey), "ParticleEditKeys");
|
2009-09-16 17:43:09 +00:00
|
|
|
point->flag |= PEP_EDIT_RECALC;
|
|
|
|
|
|
|
|
hkey = pa->hair;
|
|
|
|
LOOP_KEYS {
|
|
|
|
key->co= hkey->co;
|
|
|
|
key->time= &hkey->time;
|
|
|
|
key->flag= hkey->editflag;
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!(psys->flag & PSYS_GLOBAL_HAIR)) {
|
2009-09-16 17:43:09 +00:00
|
|
|
key->flag |= PEK_USE_WCO;
|
2010-10-29 12:49:36 +00:00
|
|
|
hkey->editflag |= PEK_USE_WCO;
|
|
|
|
}
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
hkey++;
|
|
|
|
}
|
|
|
|
pa++;
|
2009-02-25 19:29:58 +00:00
|
|
|
}
|
2010-10-29 12:49:36 +00:00
|
|
|
update_world_cos(ob, edit);
|
2009-02-25 19:29:58 +00:00
|
|
|
}
|
2009-09-16 17:43:09 +00:00
|
|
|
else {
|
|
|
|
PTCacheMem *pm;
|
|
|
|
int totframe=0;
|
|
|
|
|
|
|
|
cache->edit= edit;
|
|
|
|
cache->free_edit= PE_free_ptcache_edit;
|
|
|
|
edit->psys = NULL;
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
for (pm=cache->mem_cache.first; pm; pm=pm->next)
|
2009-09-16 17:43:09 +00:00
|
|
|
totframe++;
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
for (pm=cache->mem_cache.first; pm; pm=pm->next) {
|
2009-09-16 17:43:09 +00:00
|
|
|
LOOP_POINTS {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (BKE_ptcache_mem_pointers_seek(p, pm) == 0)
|
2011-01-09 07:41:51 +00:00
|
|
|
continue;
|
2009-09-16 17:43:09 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!point->totkey) {
|
2012-04-29 15:47:02 +00:00
|
|
|
key = point->keys = MEM_callocN(totframe*sizeof(PTCacheEditKey), "ParticleEditKeys");
|
2009-09-16 17:43:09 +00:00
|
|
|
point->flag |= PEP_EDIT_RECALC;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
key = point->keys + point->totkey;
|
2009-02-25 19:29:58 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
key->co = pm->cur[BPHYS_DATA_LOCATION];
|
|
|
|
key->vel = pm->cur[BPHYS_DATA_VELOCITY];
|
|
|
|
key->rot = pm->cur[BPHYS_DATA_ROTATION];
|
|
|
|
key->ftime = (float)pm->frame;
|
|
|
|
key->time = &key->ftime;
|
2010-12-18 15:03:31 +00:00
|
|
|
BKE_ptcache_mem_pointers_incr(pm);
|
2009-09-16 17:43:09 +00:00
|
|
|
|
|
|
|
point->totkey++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
psys = NULL;
|
|
|
|
}
|
2009-02-25 19:29:58 +00:00
|
|
|
|
|
|
|
UI_GetThemeColor3ubv(TH_EDGE_SELECT, edit->sel_col);
|
|
|
|
UI_GetThemeColor3ubv(TH_WIRE, edit->nosel_col);
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
recalc_lengths(edit);
|
2012-03-24 06:38:07 +00:00
|
|
|
if (psys && !cache)
|
2009-09-16 17:43:09 +00:00
|
|
|
recalc_emitter_field(ob, psys);
|
2018-06-13 14:26:26 +02:00
|
|
|
PE_update_object(bmain, scene, ob, 1);
|
2009-02-25 19:29:58 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-07-02 11:47:00 +02:00
|
|
|
static bool particle_edit_toggle_poll(bContext *C)
|
2009-02-25 19:29:58 +00:00
|
|
|
{
|
2013-08-29 10:34:09 +00:00
|
|
|
Object *ob = CTX_data_active_object(C);
|
2009-02-25 19:29:58 +00:00
|
|
|
|
2013-08-29 10:34:09 +00:00
|
|
|
if (ob == NULL || ob->type != OB_MESH)
|
2009-02-25 19:29:58 +00:00
|
|
|
return 0;
|
2017-11-06 17:17:10 +01:00
|
|
|
if (!ob->data || ID_IS_LINKED(ob->data))
|
2013-08-29 10:34:09 +00:00
|
|
|
return 0;
|
|
|
|
if (CTX_data_edit_object(C))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return (ob->particlesystem.first ||
|
|
|
|
modifiers_findByType(ob, eModifierType_Cloth) ||
|
|
|
|
modifiers_findByType(ob, eModifierType_Softbody));
|
2009-02-25 19:29:58 +00:00
|
|
|
}
|
|
|
|
|
2013-08-29 10:34:09 +00:00
|
|
|
static int particle_edit_toggle_exec(bContext *C, wmOperator *op)
|
2009-02-25 19:29:58 +00:00
|
|
|
{
|
2018-06-13 14:26:26 +02:00
|
|
|
Main *bmain = CTX_data_main(C);
|
2013-08-29 10:34:09 +00:00
|
|
|
Scene *scene = CTX_data_scene(C);
|
|
|
|
Object *ob = CTX_data_active_object(C);
|
|
|
|
const int mode_flag = OB_MODE_PARTICLE_EDIT;
|
|
|
|
const bool is_mode_set = (ob->mode & mode_flag) != 0;
|
|
|
|
|
|
|
|
if (!is_mode_set) {
|
|
|
|
if (!ED_object_mode_compat_set(C, ob, mode_flag, op->reports)) {
|
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
|
|
|
}
|
2009-02-25 19:29:58 +00:00
|
|
|
|
2013-08-29 10:34:09 +00:00
|
|
|
if (!is_mode_set) {
|
2010-01-12 13:40:29 +00:00
|
|
|
PTCacheEdit *edit;
|
2013-08-29 10:34:09 +00:00
|
|
|
ob->mode |= mode_flag;
|
2018-06-13 14:26:26 +02:00
|
|
|
edit= PE_create_current(bmain, scene, ob);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2010-01-12 13:40:29 +00:00
|
|
|
/* mesh may have changed since last entering editmode.
|
|
|
|
* note, this may have run before if the edit data was just created, so could avoid this and speed up a little */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (edit && edit->psys)
|
2010-01-12 14:52:09 +00:00
|
|
|
recalc_emitter_field(ob, edit->psys);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-02-25 19:29:58 +00:00
|
|
|
toggle_particle_cursor(C, 1);
|
|
|
|
WM_event_add_notifier(C, NC_SCENE|ND_MODE|NS_MODE_PARTICLE, NULL);
|
|
|
|
}
|
|
|
|
else {
|
2013-08-29 10:34:09 +00:00
|
|
|
ob->mode &= ~mode_flag;
|
2009-02-25 19:29:58 +00:00
|
|
|
toggle_particle_cursor(C, 0);
|
|
|
|
WM_event_add_notifier(C, NC_SCENE|ND_MODE|NS_MODE_OBJECT, NULL);
|
|
|
|
}
|
|
|
|
|
2010-12-05 18:59:23 +00:00
|
|
|
DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
|
2009-02-25 19:29:58 +00:00
|
|
|
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
void PARTICLE_OT_particle_edit_toggle(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Particle Edit Toggle";
|
|
|
|
ot->idname = "PARTICLE_OT_particle_edit_toggle";
|
2012-05-05 17:10:51 +00:00
|
|
|
ot->description = "Toggle particle edit mode";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-02-25 19:29:58 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = particle_edit_toggle_exec;
|
|
|
|
ot->poll = particle_edit_toggle_poll;
|
2009-02-25 19:29:58 +00:00
|
|
|
|
|
|
|
/* flags */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
|
2009-02-25 19:29:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/************************ set editable operator ************************/
|
|
|
|
|
2010-10-15 01:36:14 +00:00
|
|
|
static int clear_edited_exec(bContext *C, wmOperator *UNUSED(op))
|
2009-02-25 19:29:58 +00:00
|
|
|
{
|
|
|
|
Object *ob= CTX_data_active_object(C);
|
2009-09-16 17:43:09 +00:00
|
|
|
ParticleSystem *psys = psys_get_current(ob);
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (psys->edit) {
|
2013-09-30 09:51:25 +00:00
|
|
|
if (psys->edit->edited || 1) {
|
2009-09-16 17:43:09 +00:00
|
|
|
PE_free_ptcache_edit(psys->edit);
|
2009-02-25 19:29:58 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
psys->edit = NULL;
|
|
|
|
psys->free_edit = NULL;
|
2009-02-25 19:29:58 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
psys->recalc |= PSYS_RECALC_RESET;
|
|
|
|
psys->flag &= ~PSYS_GLOBAL_HAIR;
|
|
|
|
psys->flag &= ~PSYS_EDITED;
|
2009-02-25 19:29:58 +00:00
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
psys_reset(psys, PSYS_RESET_DEPSGRAPH);
|
2010-06-18 04:39:32 +00:00
|
|
|
WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, ob);
|
2010-12-05 18:59:23 +00:00
|
|
|
DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
|
2009-02-25 19:29:58 +00:00
|
|
|
}
|
|
|
|
}
|
2010-09-07 05:47:34 +00:00
|
|
|
else { /* some operation might have protected hair from editing so let's clear the flag */
|
|
|
|
psys->recalc |= PSYS_RECALC_RESET;
|
|
|
|
psys->flag &= ~PSYS_GLOBAL_HAIR;
|
|
|
|
psys->flag &= ~PSYS_EDITED;
|
|
|
|
WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, ob);
|
2010-12-05 18:59:23 +00:00
|
|
|
DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
|
2010-09-07 05:47:34 +00:00
|
|
|
}
|
2009-02-25 19:29:58 +00:00
|
|
|
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
2013-09-30 09:51:25 +00:00
|
|
|
static int clear_edited_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
|
|
|
|
{
|
|
|
|
return WM_operator_confirm_message(C, op, "Lose changes done in particle mode? (no undo)");
|
|
|
|
}
|
|
|
|
|
2009-09-16 17:43:09 +00:00
|
|
|
void PARTICLE_OT_edited_clear(wmOperatorType *ot)
|
2009-02-25 19:29:58 +00:00
|
|
|
{
|
|
|
|
/* identifiers */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Clear Edited";
|
|
|
|
ot->idname = "PARTICLE_OT_edited_clear";
|
2012-05-05 17:10:51 +00:00
|
|
|
ot->description = "Undo all edition performed on the particle system";
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-02-25 19:29:58 +00:00
|
|
|
/* api callbacks */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = clear_edited_exec;
|
|
|
|
ot->poll = particle_edit_toggle_poll;
|
2013-09-30 09:51:25 +00:00
|
|
|
ot->invoke = clear_edited_invoke;
|
2009-02-25 19:29:58 +00:00
|
|
|
|
|
|
|
/* flags */
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
|
2009-02-25 19:29:58 +00:00
|
|
|
}
|
|
|
|
|
2016-04-26 16:05:52 +02:00
|
|
|
/************************ Unify length operator ************************/
|
|
|
|
|
|
|
|
static float calculate_point_length(PTCacheEditPoint *point)
|
|
|
|
{
|
|
|
|
float length = 0.0f;
|
|
|
|
KEY_K;
|
|
|
|
LOOP_KEYS {
|
|
|
|
if (k > 0) {
|
2016-05-09 01:16:58 +10:00
|
|
|
length += len_v3v3((key - 1)->co, key->co);
|
2016-04-26 16:05:52 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return length;
|
|
|
|
}
|
|
|
|
|
|
|
|
static float calculate_average_length(PTCacheEdit *edit)
|
|
|
|
{
|
|
|
|
int num_selected = 0;
|
|
|
|
float total_length = 0;
|
|
|
|
POINT_P;
|
|
|
|
LOOP_SELECTED_POINTS {
|
|
|
|
total_length += calculate_point_length(point);
|
|
|
|
++num_selected;
|
|
|
|
}
|
|
|
|
if (num_selected == 0) {
|
|
|
|
return 0.0f;
|
|
|
|
}
|
|
|
|
return total_length / num_selected;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void scale_point_factor(PTCacheEditPoint *point, float factor)
|
|
|
|
{
|
|
|
|
float orig_prev_co[3], prev_co[3];
|
|
|
|
KEY_K;
|
|
|
|
LOOP_KEYS {
|
|
|
|
if (k == 0) {
|
|
|
|
copy_v3_v3(orig_prev_co, key->co);
|
|
|
|
copy_v3_v3(prev_co, key->co);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
float new_co[3];
|
|
|
|
float delta[3];
|
|
|
|
|
|
|
|
sub_v3_v3v3(delta, key->co, orig_prev_co);
|
|
|
|
mul_v3_fl(delta, factor);
|
|
|
|
add_v3_v3v3(new_co, prev_co, delta);
|
|
|
|
|
|
|
|
copy_v3_v3(orig_prev_co, key->co);
|
|
|
|
copy_v3_v3(key->co, new_co);
|
|
|
|
copy_v3_v3(prev_co, key->co);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
point->flag |= PEP_EDIT_RECALC;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void scale_point_to_length(PTCacheEditPoint *point, float length)
|
|
|
|
{
|
|
|
|
const float point_length = calculate_point_length(point);
|
|
|
|
if (point_length != 0.0f) {
|
|
|
|
const float factor = length / point_length;
|
|
|
|
scale_point_factor(point, factor);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void scale_points_to_length(PTCacheEdit *edit, float length)
|
|
|
|
{
|
|
|
|
POINT_P;
|
|
|
|
LOOP_SELECTED_POINTS {
|
|
|
|
scale_point_to_length(point, length);
|
|
|
|
}
|
|
|
|
recalc_lengths(edit);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int unify_length_exec(bContext *C, wmOperator *UNUSED(op))
|
|
|
|
{
|
2018-06-13 14:26:26 +02:00
|
|
|
Main *bmain = CTX_data_main(C);
|
2016-04-26 16:05:52 +02:00
|
|
|
Object *ob = CTX_data_active_object(C);
|
|
|
|
Scene *scene = CTX_data_scene(C);
|
2018-06-13 14:26:26 +02:00
|
|
|
PTCacheEdit *edit = PE_get_current(bmain, scene, ob);
|
2016-04-26 16:05:52 +02:00
|
|
|
float average_length = calculate_average_length(edit);
|
|
|
|
if (average_length == 0.0f) {
|
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
|
|
|
scale_points_to_length(edit, average_length);
|
|
|
|
|
2018-06-13 14:26:26 +02:00
|
|
|
PE_update_object(bmain, scene, ob, 1);
|
2016-04-26 16:05:52 +02:00
|
|
|
if (edit->psys) {
|
|
|
|
WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, ob);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
|
|
|
|
WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
|
|
|
|
}
|
|
|
|
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
void PARTICLE_OT_unify_length(struct wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
|
|
|
ot->name = "Unify Length";
|
|
|
|
ot->idname = "PARTICLE_OT_unify_length";
|
|
|
|
ot->description = "Make selected hair the same length";
|
|
|
|
|
|
|
|
/* api callbacks */
|
|
|
|
ot->exec = unify_length_exec;
|
|
|
|
ot->poll = PE_poll_view3d;
|
|
|
|
|
|
|
|
/* flags */
|
|
|
|
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
|
|
|
|
}
|