2011-02-23 18:03:40 +00:00
|
|
|
/*
|
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
|
|
|
|
* of the License, or (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
|
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
|
|
*
|
|
|
|
|
* The Original Code is Copyright (C) Blender Foundation
|
|
|
|
|
* All rights reserved.
|
|
|
|
|
*/
|
2008-01-29 21:01:12 +00:00
|
|
|
|
2019-02-18 08:08:12 +11:00
|
|
|
/** \file
|
|
|
|
|
* \ingroup bke
|
2011-02-27 20:40:57 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
2008-01-29 21:01:12 +00:00
|
|
|
#include "MEM_guardedalloc.h"
|
2008-03-13 22:45:36 +00:00
|
|
|
|
2008-04-08 12:55:35 +00:00
|
|
|
#include "DNA_cloth_types.h"
|
2018-08-29 15:32:50 +02:00
|
|
|
#include "DNA_collection_types.h"
|
2014-09-01 17:46:17 +02:00
|
|
|
#include "DNA_effect_types.h"
|
2008-08-18 14:41:24 +00:00
|
|
|
#include "DNA_object_types.h"
|
2018-02-07 11:14:08 +11:00
|
|
|
#include "DNA_object_force_types.h"
|
2008-01-29 21:01:12 +00:00
|
|
|
#include "DNA_scene_types.h"
|
2010-08-10 05:41:51 +00:00
|
|
|
#include "DNA_meshdata_types.h"
|
|
|
|
|
|
2011-05-09 04:06:48 +00:00
|
|
|
#include "BLI_utildefines.h"
|
2010-08-10 05:41:51 +00:00
|
|
|
#include "BLI_blenlib.h"
|
|
|
|
|
#include "BLI_math.h"
|
2018-09-26 17:18:16 +02:00
|
|
|
#include "BLI_task.h"
|
|
|
|
|
#include "BLI_threads.h"
|
2008-03-13 22:45:36 +00:00
|
|
|
|
2013-04-05 17:56:54 +00:00
|
|
|
#include "BKE_cloth.h"
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
#include "BKE_collection.h"
|
2014-09-01 17:46:17 +02:00
|
|
|
#include "BKE_effect.h"
|
2017-10-16 17:15:03 -02:00
|
|
|
#include "BKE_layer.h"
|
2008-01-29 21:01:12 +00:00
|
|
|
#include "BKE_modifier.h"
|
2013-04-05 17:56:54 +00:00
|
|
|
#include "BKE_scene.h"
|
2011-01-07 19:18:31 +00:00
|
|
|
|
2008-05-07 20:42:16 +00:00
|
|
|
#include "BLI_kdopbvh.h"
|
|
|
|
|
#include "BKE_collision.h"
|
|
|
|
|
|
2018-06-22 14:42:03 +02:00
|
|
|
#include "DEG_depsgraph.h"
|
|
|
|
|
#include "DEG_depsgraph_physics.h"
|
|
|
|
|
#include "DEG_depsgraph_query.h"
|
|
|
|
|
|
2011-05-02 03:44:02 +00:00
|
|
|
#ifdef WITH_ELTOPO
|
2011-05-01 21:39:13 +00:00
|
|
|
#include "eltopo-capi.h"
|
|
|
|
|
#endif
|
|
|
|
|
|
2008-05-07 20:42:16 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
typedef struct ColDetectData {
|
|
|
|
|
ClothModifierData *clmd;
|
|
|
|
|
CollisionModifierData *collmd;
|
|
|
|
|
BVHTreeOverlap *overlap;
|
|
|
|
|
CollPair *collisions;
|
|
|
|
|
bool culling;
|
|
|
|
|
bool use_normal;
|
|
|
|
|
bool collided;
|
|
|
|
|
} ColDetectData;
|
|
|
|
|
|
|
|
|
|
typedef struct SelfColDetectData {
|
|
|
|
|
ClothModifierData *clmd;
|
|
|
|
|
BVHTreeOverlap *overlap;
|
|
|
|
|
CollPair *collisions;
|
|
|
|
|
bool collided;
|
|
|
|
|
} SelfColDetectData;
|
|
|
|
|
|
2008-01-29 21:01:12 +00:00
|
|
|
/***********************************
|
|
|
|
|
Collision modifier code start
|
|
|
|
|
***********************************/
|
|
|
|
|
|
|
|
|
|
/* step is limited from 0 (frame start position) to 1 (frame end position) */
|
2012-03-11 19:09:01 +00:00
|
|
|
void collision_move_object(CollisionModifierData *collmd, float step, float prevstep)
|
2008-01-29 21:01:12 +00:00
|
|
|
{
|
2018-09-26 17:18:16 +02:00
|
|
|
float oldx[3];
|
2008-01-29 21:01:12 +00:00
|
|
|
unsigned int i = 0;
|
2008-04-08 12:55:35 +00:00
|
|
|
|
2016-10-07 13:27:11 +03:00
|
|
|
/* the collider doesn't move this frame */
|
|
|
|
|
if (collmd->is_static) {
|
|
|
|
|
for (i = 0; i < collmd->mvert_num; i++) {
|
|
|
|
|
zero_v3(collmd->current_v[i].co);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2015-07-31 14:00:07 +10:00
|
|
|
for (i = 0; i < collmd->mvert_num; i++) {
|
2018-09-26 17:18:16 +02:00
|
|
|
interp_v3_v3v3(oldx, collmd->x[i].co, collmd->xnew[i].co, prevstep);
|
|
|
|
|
interp_v3_v3v3(collmd->current_x[i].co, collmd->x[i].co, collmd->xnew[i].co, step);
|
|
|
|
|
sub_v3_v3v3(collmd->current_v[i].co, collmd->current_x[i].co, oldx);
|
2008-01-29 21:01:12 +00:00
|
|
|
}
|
2010-05-25 13:33:59 +00:00
|
|
|
|
2015-07-31 14:00:07 +10:00
|
|
|
bvhtree_update_from_mvert(
|
2018-09-26 17:18:16 +02:00
|
|
|
collmd->bvhtree, collmd->current_x, NULL,
|
|
|
|
|
collmd->tri, collmd->tri_num, false);
|
2008-01-29 21:01:12 +00:00
|
|
|
}
|
|
|
|
|
|
2015-07-31 14:00:07 +10:00
|
|
|
BVHTree *bvhtree_build_from_mvert(
|
|
|
|
|
const MVert *mvert,
|
|
|
|
|
const struct MVertTri *tri, int tri_num,
|
|
|
|
|
float epsilon)
|
2008-01-29 21:01:12 +00:00
|
|
|
{
|
2008-05-07 20:42:16 +00:00
|
|
|
BVHTree *tree;
|
2015-07-31 14:00:07 +10:00
|
|
|
const MVertTri *vt;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
tree = BLI_bvhtree_new(tri_num, epsilon, 4, 26);
|
2008-01-29 21:01:12 +00:00
|
|
|
|
2015-07-31 14:00:07 +10:00
|
|
|
/* fill tree */
|
|
|
|
|
for (i = 0, vt = tri; i < tri_num; i++, vt++) {
|
|
|
|
|
float co[3][3];
|
2008-04-08 12:55:35 +00:00
|
|
|
|
2015-07-31 14:00:07 +10:00
|
|
|
copy_v3_v3(co[0], mvert[vt->tri[0]].co);
|
|
|
|
|
copy_v3_v3(co[1], mvert[vt->tri[1]].co);
|
|
|
|
|
copy_v3_v3(co[2], mvert[vt->tri[2]].co);
|
2008-01-29 21:01:12 +00:00
|
|
|
|
2015-07-31 14:00:07 +10:00
|
|
|
BLI_bvhtree_insert(tree, i, co[0], 3);
|
2008-05-07 20:42:16 +00:00
|
|
|
}
|
2008-04-08 12:55:35 +00:00
|
|
|
|
2015-07-31 14:00:07 +10:00
|
|
|
/* balance tree */
|
|
|
|
|
BLI_bvhtree_balance(tree);
|
2008-04-08 12:55:35 +00:00
|
|
|
|
2008-05-07 20:42:16 +00:00
|
|
|
return tree;
|
2008-01-29 21:01:12 +00:00
|
|
|
}
|
|
|
|
|
|
2015-07-31 14:00:07 +10:00
|
|
|
void bvhtree_update_from_mvert(
|
|
|
|
|
BVHTree *bvhtree,
|
|
|
|
|
const MVert *mvert, const MVert *mvert_moving,
|
|
|
|
|
const MVertTri *tri, int tri_num,
|
|
|
|
|
bool moving)
|
2008-01-29 21:01:12 +00:00
|
|
|
{
|
2015-07-31 14:00:07 +10:00
|
|
|
const MVertTri *vt;
|
2008-05-07 20:42:16 +00:00
|
|
|
int i;
|
2008-04-08 12:55:35 +00:00
|
|
|
|
2015-07-31 14:00:07 +10:00
|
|
|
if ((bvhtree == NULL) || (mvert == NULL)) {
|
2008-01-29 21:01:12 +00:00
|
|
|
return;
|
2015-07-31 14:00:07 +10:00
|
|
|
}
|
2008-04-08 12:55:35 +00:00
|
|
|
|
2015-07-31 14:00:07 +10:00
|
|
|
if (mvert_moving == NULL) {
|
|
|
|
|
moving = false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i = 0, vt = tri; i < tri_num; i++, vt++) {
|
|
|
|
|
float co[3][3];
|
|
|
|
|
bool ret;
|
|
|
|
|
|
|
|
|
|
copy_v3_v3(co[0], mvert[vt->tri[0]].co);
|
|
|
|
|
copy_v3_v3(co[1], mvert[vt->tri[1]].co);
|
|
|
|
|
copy_v3_v3(co[2], mvert[vt->tri[2]].co);
|
2008-04-08 12:55:35 +00:00
|
|
|
|
2015-07-31 14:00:07 +10:00
|
|
|
/* copy new locations into array */
|
|
|
|
|
if (moving) {
|
|
|
|
|
float co_moving[3][3];
|
|
|
|
|
/* update moving positions */
|
|
|
|
|
copy_v3_v3(co_moving[0], mvert_moving[vt->tri[0]].co);
|
|
|
|
|
copy_v3_v3(co_moving[1], mvert_moving[vt->tri[1]].co);
|
|
|
|
|
copy_v3_v3(co_moving[2], mvert_moving[vt->tri[2]].co);
|
|
|
|
|
|
|
|
|
|
ret = BLI_bvhtree_update_node(bvhtree, i, &co[0][0], &co_moving[0][0], 3);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
ret = BLI_bvhtree_update_node(bvhtree, i, &co[0][0], NULL, 3);
|
2008-05-07 20:42:16 +00:00
|
|
|
}
|
2008-04-08 12:55:35 +00:00
|
|
|
|
2015-07-31 14:00:07 +10:00
|
|
|
/* check if tree is already full */
|
|
|
|
|
if (ret == false) {
|
|
|
|
|
break;
|
|
|
|
|
}
|
2008-05-07 20:42:16 +00:00
|
|
|
}
|
2015-07-31 14:00:07 +10:00
|
|
|
|
|
|
|
|
BLI_bvhtree_update_tree(bvhtree);
|
2008-01-29 21:01:12 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/***********************************
|
|
|
|
|
Collision modifier code end
|
|
|
|
|
***********************************/
|
2008-05-29 14:23:08 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
BLI_INLINE int next_ind(int i)
|
|
|
|
|
{
|
|
|
|
|
return (++i < 3) ? i : 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static float compute_collision_point(float a1[3], float a2[3], float a3[3], float b1[3], float b2[3], float b3[3],
|
|
|
|
|
bool culling, bool use_normal, float r_a[3], float r_b[3], float r_vec[3])
|
|
|
|
|
{
|
|
|
|
|
float a[3][3];
|
|
|
|
|
float b[3][3];
|
|
|
|
|
float dist = FLT_MAX;
|
|
|
|
|
float tmp_co1[3], tmp_co2[3];
|
|
|
|
|
float isect_a[3], isect_b[3];
|
|
|
|
|
int isect_count = 0;
|
|
|
|
|
float tmp, tmp_vec[3];
|
|
|
|
|
float normal[3], cent[3];
|
|
|
|
|
bool backside = false;
|
|
|
|
|
|
|
|
|
|
copy_v3_v3(a[0], a1);
|
|
|
|
|
copy_v3_v3(a[1], a2);
|
|
|
|
|
copy_v3_v3(a[2], a3);
|
|
|
|
|
|
|
|
|
|
copy_v3_v3(b[0], b1);
|
|
|
|
|
copy_v3_v3(b[1], b2);
|
|
|
|
|
copy_v3_v3(b[2], b3);
|
|
|
|
|
|
|
|
|
|
/* Find intersections. */
|
|
|
|
|
for (int i = 0; i < 3; i++) {
|
|
|
|
|
if (isect_line_segment_tri_v3(a[i], a[next_ind(i)], b[0], b[1], b[2], &tmp, NULL)) {
|
|
|
|
|
interp_v3_v3v3(isect_a, a[i], a[next_ind(i)], tmp);
|
|
|
|
|
isect_count++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (isect_count == 0) {
|
|
|
|
|
for (int i = 0; i < 3; i++) {
|
|
|
|
|
if (isect_line_segment_tri_v3(b[i], b[next_ind(i)], a[0], a[1], a[2], &tmp, NULL)) {
|
|
|
|
|
isect_count++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (isect_count == 1) {
|
|
|
|
|
for (int i = 0; i < 3; i++) {
|
|
|
|
|
if (isect_line_segment_tri_v3(b[i], b[next_ind(i)], a[0], a[1], a[2], &tmp, NULL)) {
|
|
|
|
|
interp_v3_v3v3(isect_b, b[i], b[next_ind(i)], tmp);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Determine collision side. */
|
|
|
|
|
if (culling) {
|
|
|
|
|
normal_tri_v3(normal, b[0], b[1], b[2]);
|
|
|
|
|
mid_v3_v3v3v3(cent, b[0], b[1], b[2]);
|
|
|
|
|
|
|
|
|
|
if (isect_count == 2) {
|
|
|
|
|
backside = true;
|
|
|
|
|
}
|
|
|
|
|
else if (isect_count == 0) {
|
|
|
|
|
for (int i = 0; i < 3; i++) {
|
|
|
|
|
sub_v3_v3v3(tmp_vec, a[i], cent);
|
|
|
|
|
if (dot_v3v3(tmp_vec, normal) < 0.0f) {
|
|
|
|
|
backside = true;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (use_normal) {
|
|
|
|
|
normal_tri_v3(normal, b[0], b[1], b[2]);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (isect_count == 1) {
|
|
|
|
|
/* Edge intersection. */
|
|
|
|
|
copy_v3_v3(r_a, isect_a);
|
|
|
|
|
copy_v3_v3(r_b, isect_b);
|
|
|
|
|
|
|
|
|
|
if (use_normal) {
|
|
|
|
|
copy_v3_v3(r_vec, normal);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
sub_v3_v3v3(r_vec, r_b, r_a);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0.0f;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (backside) {
|
|
|
|
|
float maxdist = 0.0f;
|
|
|
|
|
bool found = false;
|
|
|
|
|
|
|
|
|
|
/* Point projections. */
|
|
|
|
|
for (int i = 0; i < 3; i++) {
|
|
|
|
|
if (isect_ray_tri_v3(a[i], normal, b[0], b[1], b[2], &tmp, NULL)) {
|
|
|
|
|
if (tmp > maxdist) {
|
|
|
|
|
maxdist = tmp;
|
|
|
|
|
copy_v3_v3(r_a, a[i]);
|
|
|
|
|
madd_v3_v3v3fl(r_b, a[i], normal, tmp);
|
|
|
|
|
found = true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
negate_v3(normal);
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i < 3; i++) {
|
|
|
|
|
if (isect_ray_tri_v3(b[i], normal, a[0], a[1], a[2], &tmp, NULL)) {
|
|
|
|
|
if (tmp > maxdist) {
|
|
|
|
|
maxdist = tmp;
|
|
|
|
|
madd_v3_v3v3fl(r_a, b[i], normal, tmp);
|
|
|
|
|
copy_v3_v3(r_b, b[i]);
|
|
|
|
|
found = true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
negate_v3(normal);
|
|
|
|
|
|
|
|
|
|
/* Edge projections. */
|
|
|
|
|
for (int i = 0; i < 3; i++) {
|
|
|
|
|
float dir[3];
|
|
|
|
|
|
|
|
|
|
sub_v3_v3v3(tmp_vec, b[next_ind(i)], b[i]);
|
|
|
|
|
cross_v3_v3v3(dir, tmp_vec, normal);
|
|
|
|
|
|
|
|
|
|
for (int j = 0; j < 3; j++) {
|
|
|
|
|
if (isect_line_plane_v3(tmp_co1, a[j], a[next_ind(j)], b[i], dir) &&
|
|
|
|
|
point_in_slice_seg(tmp_co1, a[j], a[next_ind(j)]) &&
|
|
|
|
|
point_in_slice_seg(tmp_co1, b[i], b[next_ind(i)]))
|
|
|
|
|
{
|
|
|
|
|
closest_to_line_v3(tmp_co2, tmp_co1, b[i], b[next_ind(i)]);
|
|
|
|
|
sub_v3_v3v3(tmp_vec, tmp_co1, tmp_co2);
|
|
|
|
|
tmp = len_v3(tmp_vec);
|
|
|
|
|
|
|
|
|
|
if ((tmp > maxdist) && (dot_v3v3(tmp_vec, normal) < 0.0f)) {
|
|
|
|
|
maxdist = tmp;
|
|
|
|
|
copy_v3_v3(r_a, tmp_co1);
|
|
|
|
|
copy_v3_v3(r_b, tmp_co2);
|
|
|
|
|
found = true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If no point is found, will fallback onto regular proximity test below. */
|
|
|
|
|
if (found) {
|
|
|
|
|
sub_v3_v3v3(r_vec, r_b, r_a);
|
|
|
|
|
|
|
|
|
|
if (use_normal) {
|
|
|
|
|
if (dot_v3v3(normal, r_vec) >= 0.0f) {
|
|
|
|
|
copy_v3_v3(r_vec, normal);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
negate_v3_v3(r_vec, normal);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0.0f;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Closest point. */
|
|
|
|
|
for (int i = 0; i < 3; i++) {
|
|
|
|
|
closest_on_tri_to_point_v3(tmp_co1, a[i], b[0], b[1], b[2]);
|
|
|
|
|
tmp = len_squared_v3v3(tmp_co1, a[i]);
|
|
|
|
|
|
|
|
|
|
if (tmp < dist) {
|
|
|
|
|
dist = tmp;
|
|
|
|
|
copy_v3_v3(r_a, a[i]);
|
|
|
|
|
copy_v3_v3(r_b, tmp_co1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i < 3; i++) {
|
|
|
|
|
closest_on_tri_to_point_v3(tmp_co1, b[i], a[0], a[1], a[2]);
|
|
|
|
|
tmp = len_squared_v3v3(tmp_co1, b[i]);
|
|
|
|
|
|
|
|
|
|
if (tmp < dist) {
|
|
|
|
|
dist = tmp;
|
|
|
|
|
copy_v3_v3(r_a, tmp_co1);
|
|
|
|
|
copy_v3_v3(r_b, b[i]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Closest edge. */
|
|
|
|
|
if (isect_count == 0) {
|
|
|
|
|
for (int i = 0; i < 3; i++) {
|
|
|
|
|
for (int j = 0; j < 3; j++) {
|
2018-10-01 00:16:44 -03:00
|
|
|
isect_seg_seg_v3(a[i], a[next_ind(i)], b[j], b[next_ind(j)], tmp_co1, tmp_co2);
|
|
|
|
|
tmp = len_squared_v3v3(tmp_co1, tmp_co2);
|
2018-09-26 17:18:16 +02:00
|
|
|
|
2018-10-01 00:16:44 -03:00
|
|
|
if (tmp < dist) {
|
|
|
|
|
dist = tmp;
|
|
|
|
|
copy_v3_v3(r_a, tmp_co1);
|
|
|
|
|
copy_v3_v3(r_b, tmp_co2);
|
2018-09-26 17:18:16 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (isect_count == 0) {
|
|
|
|
|
sub_v3_v3v3(r_vec, r_a, r_b);
|
|
|
|
|
dist = sqrtf(dist);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
sub_v3_v3v3(r_vec, r_b, r_a);
|
|
|
|
|
dist = 0.0f;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (culling && use_normal) {
|
|
|
|
|
copy_v3_v3(r_vec, normal);
|
|
|
|
|
}
|
|
|
|
|
else if (use_normal) {
|
|
|
|
|
if (dot_v3v3(normal, r_vec) >= 0.0f) {
|
|
|
|
|
copy_v3_v3(r_vec, normal);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
negate_v3_v3(r_vec, normal);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (culling && (dot_v3v3(r_vec, normal) < 0.0f)) {
|
|
|
|
|
return FLT_MAX;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return dist;
|
|
|
|
|
}
|
|
|
|
|
|
2008-01-29 21:01:12 +00:00
|
|
|
// w3 is not perfect
|
2009-09-14 16:52:06 +00:00
|
|
|
static void collision_compute_barycentric ( float pv[3], float p1[3], float p2[3], float p3[3], float *w1, float *w2, float *w3 )
|
2008-01-29 21:01:12 +00:00
|
|
|
{
|
2013-05-08 12:56:02 +00:00
|
|
|
/* dot_v3v3 */
|
|
|
|
|
#define INPR(v1, v2) ( (v1)[0] * (v2)[0] + (v1)[1] * (v2)[1] + (v1)[2] * (v2)[2])
|
|
|
|
|
|
2018-03-23 11:51:19 +01:00
|
|
|
double tempV1[3], tempV2[3], tempV4[3];
|
|
|
|
|
double a, b, c, d, e, f;
|
2008-01-29 21:01:12 +00:00
|
|
|
|
2019-01-20 16:22:55 +01:00
|
|
|
sub_v3db_v3fl_v3fl(tempV1, p1, p3);
|
|
|
|
|
sub_v3db_v3fl_v3fl(tempV2, p2, p3);
|
|
|
|
|
sub_v3db_v3fl_v3fl(tempV4, pv, p3);
|
2008-04-08 12:55:35 +00:00
|
|
|
|
|
|
|
|
a = INPR ( tempV1, tempV1 );
|
|
|
|
|
b = INPR ( tempV1, tempV2 );
|
|
|
|
|
c = INPR ( tempV2, tempV2 );
|
|
|
|
|
e = INPR ( tempV1, tempV4 );
|
|
|
|
|
f = INPR ( tempV2, tempV4 );
|
|
|
|
|
|
|
|
|
|
d = ( a * c - b * b );
|
|
|
|
|
|
2012-04-28 06:31:57 +00:00
|
|
|
if ( ABS ( d ) < (double)ALMOST_ZERO ) {
|
2008-01-29 21:01:12 +00:00
|
|
|
*w1 = *w2 = *w3 = 1.0 / 3.0;
|
|
|
|
|
return;
|
|
|
|
|
}
|
2008-04-08 12:55:35 +00:00
|
|
|
|
|
|
|
|
w1[0] = ( float ) ( ( e * c - b * f ) / d );
|
|
|
|
|
|
|
|
|
|
if ( w1[0] < 0 )
|
2008-01-29 21:01:12 +00:00
|
|
|
w1[0] = 0;
|
2008-04-08 12:55:35 +00:00
|
|
|
|
|
|
|
|
w2[0] = ( float ) ( ( f - b * ( double ) w1[0] ) / c );
|
|
|
|
|
|
|
|
|
|
if ( w2[0] < 0 )
|
2008-01-29 21:01:12 +00:00
|
|
|
w2[0] = 0;
|
2008-04-08 12:55:35 +00:00
|
|
|
|
2008-01-29 21:01:12 +00:00
|
|
|
w3[0] = 1.0f - w1[0] - w2[0];
|
2013-05-08 12:56:02 +00:00
|
|
|
|
|
|
|
|
#undef INPR
|
2008-01-29 21:01:12 +00:00
|
|
|
}
|
|
|
|
|
|
2012-11-23 10:03:50 +00:00
|
|
|
#ifdef __GNUC__
|
|
|
|
|
# pragma GCC diagnostic push
|
|
|
|
|
# pragma GCC diagnostic ignored "-Wdouble-promotion"
|
|
|
|
|
#endif
|
2012-11-04 07:18:29 +00:00
|
|
|
|
2008-04-08 12:55:35 +00:00
|
|
|
DO_INLINE void collision_interpolateOnTriangle ( float to[3], float v1[3], float v2[3], float v3[3], double w1, double w2, double w3 )
|
2008-01-29 21:01:12 +00:00
|
|
|
{
|
2012-03-23 20:18:09 +00:00
|
|
|
zero_v3(to);
|
|
|
|
|
VECADDMUL(to, v1, w1);
|
|
|
|
|
VECADDMUL(to, v2, w2);
|
|
|
|
|
VECADDMUL(to, v3, w3);
|
2008-01-29 21:01:12 +00:00
|
|
|
}
|
|
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
static int cloth_collision_response_static(ClothModifierData *clmd, CollisionModifierData *collmd, Object *collob,
|
|
|
|
|
CollPair *collpair, uint collision_count, const float dt)
|
2008-01-29 21:01:12 +00:00
|
|
|
{
|
|
|
|
|
int result = 0;
|
|
|
|
|
Cloth *cloth1;
|
|
|
|
|
float w1, w2, w3, u1, u2, u3;
|
|
|
|
|
float v1[3], v2[3], relativeVelocity[3];
|
|
|
|
|
float magrelVel;
|
2018-09-26 17:18:16 +02:00
|
|
|
float epsilon2 = BLI_bvhtree_get_epsilon(collmd->bvhtree);
|
2008-04-08 12:55:35 +00:00
|
|
|
|
2008-01-29 21:01:12 +00:00
|
|
|
cloth1 = clmd->clothObject;
|
|
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
for (int i = 0; i < collision_count; i++, collpair++) {
|
2012-05-15 13:46:50 +00:00
|
|
|
float i1[3], i2[3], i3[3];
|
|
|
|
|
|
|
|
|
|
zero_v3(i1);
|
|
|
|
|
zero_v3(i2);
|
|
|
|
|
zero_v3(i3);
|
|
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* Only handle static collisions here. */
|
|
|
|
|
if (collpair->flag & (COLLISION_IN_FUTURE | COLLISION_INACTIVE)) {
|
2008-05-07 20:42:16 +00:00
|
|
|
continue;
|
2018-09-26 17:18:16 +02:00
|
|
|
}
|
2008-04-08 12:55:35 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* Compute barycentric coordinates for both collision points. */
|
|
|
|
|
collision_compute_barycentric(collpair->pa,
|
|
|
|
|
cloth1->verts[collpair->ap1].tx,
|
|
|
|
|
cloth1->verts[collpair->ap2].tx,
|
|
|
|
|
cloth1->verts[collpair->ap3].tx,
|
|
|
|
|
&w1, &w2, &w3);
|
2008-04-08 12:55:35 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
collision_compute_barycentric(collpair->pb,
|
|
|
|
|
collmd->current_x[collpair->bp1].co,
|
|
|
|
|
collmd->current_x[collpair->bp2].co,
|
|
|
|
|
collmd->current_x[collpair->bp3].co,
|
|
|
|
|
&u1, &u2, &u3);
|
2008-04-08 12:55:35 +00:00
|
|
|
|
2012-07-06 23:56:59 +00:00
|
|
|
/* Calculate relative "velocity". */
|
2018-09-26 17:18:16 +02:00
|
|
|
collision_interpolateOnTriangle(v1, cloth1->verts[collpair->ap1].tv, cloth1->verts[collpair->ap2].tv, cloth1->verts[collpair->ap3].tv, w1, w2, w3);
|
2008-04-08 12:55:35 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
collision_interpolateOnTriangle(v2, collmd->current_v[collpair->bp1].co, collmd->current_v[collpair->bp2].co, collmd->current_v[collpair->bp3].co, u1, u2, u3);
|
2008-04-08 12:55:35 +00:00
|
|
|
|
2012-04-29 17:11:40 +00:00
|
|
|
sub_v3_v3v3(relativeVelocity, v2, v1);
|
2008-04-08 12:55:35 +00:00
|
|
|
|
2012-07-06 23:56:59 +00:00
|
|
|
/* Calculate the normal component of the relative velocity (actually only the magnitude - the direction is stored in 'normal'). */
|
2012-04-29 17:11:40 +00:00
|
|
|
magrelVel = dot_v3v3(relativeVelocity, collpair->normal);
|
2008-04-08 12:55:35 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* If magrelVel < 0 the edges are approaching each other. */
|
|
|
|
|
if (magrelVel > 0.0f) {
|
2012-07-06 23:56:59 +00:00
|
|
|
/* Calculate Impulse magnitude to stop all motion in normal direction. */
|
2008-02-28 00:01:19 +00:00
|
|
|
float magtangent = 0, repulse = 0, d = 0;
|
2008-02-03 22:37:43 +00:00
|
|
|
double impulse = 0.0;
|
|
|
|
|
float vrel_t_pre[3];
|
2018-09-26 17:18:16 +02:00
|
|
|
float temp[3];
|
|
|
|
|
float time_multiplier;
|
2008-05-26 09:39:32 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* Calculate tangential velocity. */
|
|
|
|
|
copy_v3_v3(temp, collpair->normal);
|
2012-05-15 11:14:50 +00:00
|
|
|
mul_v3_fl(temp, magrelVel);
|
|
|
|
|
sub_v3_v3v3(vrel_t_pre, relativeVelocity, temp);
|
2008-05-26 09:39:32 +00:00
|
|
|
|
2012-07-06 23:56:59 +00:00
|
|
|
/* Decrease in magnitude of relative tangential velocity due to coulomb friction
|
2018-09-26 17:18:16 +02:00
|
|
|
* in original formula "magrelVel" should be the "change of relative velocity in normal direction". */
|
|
|
|
|
magtangent = min_ff(collob->pd->pdef_cfrict * 0.01f * magrelVel, len_v3(vrel_t_pre));
|
2008-05-26 09:39:32 +00:00
|
|
|
|
2012-07-06 23:56:59 +00:00
|
|
|
/* Apply friction impulse. */
|
2012-05-15 11:14:50 +00:00
|
|
|
if ( magtangent > ALMOST_ZERO ) {
|
|
|
|
|
normalize_v3(vrel_t_pre);
|
2008-05-26 09:39:32 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
impulse = magtangent / 1.5;
|
|
|
|
|
|
|
|
|
|
VECADDMUL(i1, vrel_t_pre, w1 * impulse);
|
|
|
|
|
VECADDMUL(i2, vrel_t_pre, w2 * impulse);
|
|
|
|
|
VECADDMUL(i3, vrel_t_pre, w3 * impulse);
|
2012-05-15 11:14:50 +00:00
|
|
|
}
|
2008-05-26 09:39:32 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* Apply velocity stopping impulse. */
|
|
|
|
|
impulse = magrelVel / 1.5f;
|
2008-05-26 09:39:32 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
VECADDMUL(i1, collpair->normal, w1 * impulse);
|
2012-05-15 11:14:50 +00:00
|
|
|
cloth1->verts[collpair->ap1].impulse_count++;
|
2008-05-26 09:39:32 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
VECADDMUL(i2, collpair->normal, w2 * impulse);
|
2012-05-15 11:14:50 +00:00
|
|
|
cloth1->verts[collpair->ap2].impulse_count++;
|
2008-05-26 09:39:32 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
VECADDMUL(i3, collpair->normal, w3 * impulse);
|
2012-05-15 11:14:50 +00:00
|
|
|
cloth1->verts[collpair->ap3].impulse_count++;
|
2008-05-26 09:39:32 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
time_multiplier = 1.0f / (clmd->sim_parms->dt * clmd->sim_parms->timescale);
|
2008-05-26 09:39:32 +00:00
|
|
|
|
2012-05-15 11:14:50 +00:00
|
|
|
d = clmd->coll_parms->epsilon*8.0f/9.0f + epsilon2*8.0f/9.0f - collpair->distance;
|
2008-05-26 09:39:32 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
if ((magrelVel < 0.1f * d * time_multiplier) && (d > ALMOST_ZERO)) {
|
|
|
|
|
repulse = MIN2(d / time_multiplier, 0.1f * d * time_multiplier - magrelVel);
|
|
|
|
|
|
|
|
|
|
/* Stay on the safe side and clamp repulse. */
|
|
|
|
|
if (impulse > ALMOST_ZERO) {
|
|
|
|
|
repulse = min_ff(repulse, 5.0f * impulse);
|
|
|
|
|
}
|
|
|
|
|
|
2012-10-27 11:18:54 +00:00
|
|
|
repulse = max_ff(impulse, repulse);
|
2008-05-26 09:39:32 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
impulse = repulse / 1.5f;
|
|
|
|
|
|
|
|
|
|
VECADDMUL(i1, collpair->normal, impulse);
|
|
|
|
|
VECADDMUL(i2, collpair->normal, impulse);
|
|
|
|
|
VECADDMUL(i3, collpair->normal, impulse);
|
2008-05-26 09:39:32 +00:00
|
|
|
}
|
|
|
|
|
|
2012-05-15 13:46:50 +00:00
|
|
|
result = 1;
|
|
|
|
|
}
|
2012-06-27 18:29:47 +00:00
|
|
|
else {
|
2018-09-26 17:18:16 +02:00
|
|
|
float time_multiplier = 1.0f / (clmd->sim_parms->dt * clmd->sim_parms->timescale);
|
|
|
|
|
float d;
|
|
|
|
|
|
|
|
|
|
d = clmd->coll_parms->epsilon*8.0f/9.0f + epsilon2*8.0f/9.0f - collpair->distance;
|
2012-06-02 22:01:04 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
if (d > ALMOST_ZERO) {
|
|
|
|
|
/* Stay on the safe side and clamp repulse. */
|
|
|
|
|
float repulse = d / time_multiplier;
|
|
|
|
|
float impulse = repulse / 4.5f;
|
2008-05-26 09:39:32 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
VECADDMUL(i1, collpair->normal, w1 * impulse);
|
|
|
|
|
VECADDMUL(i2, collpair->normal, w2 * impulse);
|
|
|
|
|
VECADDMUL(i3, collpair->normal, w3 * impulse);
|
2008-05-26 09:39:32 +00:00
|
|
|
|
2012-05-15 13:46:50 +00:00
|
|
|
cloth1->verts[collpair->ap1].impulse_count++;
|
|
|
|
|
cloth1->verts[collpair->ap2].impulse_count++;
|
|
|
|
|
cloth1->verts[collpair->ap3].impulse_count++;
|
2008-05-26 09:39:32 +00:00
|
|
|
|
2012-05-15 13:46:50 +00:00
|
|
|
result = 1;
|
2012-05-15 11:14:50 +00:00
|
|
|
}
|
2012-05-15 13:46:50 +00:00
|
|
|
}
|
2008-05-26 09:39:32 +00:00
|
|
|
|
2012-05-22 22:03:41 +00:00
|
|
|
if (result) {
|
2018-09-26 17:18:16 +02:00
|
|
|
float clamp = clmd->coll_parms->clamp * dt;
|
|
|
|
|
|
|
|
|
|
if ((clamp > 0.0f) &&
|
|
|
|
|
((len_v3(i1) > clamp) ||
|
|
|
|
|
(len_v3(i2) > clamp) ||
|
|
|
|
|
(len_v3(i3) > clamp)))
|
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2012-05-15 13:46:50 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
for (int j = 0; j < 3; j++) {
|
|
|
|
|
if (cloth1->verts[collpair->ap1].impulse_count > 0 && ABS(cloth1->verts[collpair->ap1].impulse[j]) < ABS(i1[j]))
|
|
|
|
|
cloth1->verts[collpair->ap1].impulse[j] = i1[j];
|
2012-05-15 13:46:50 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
if (cloth1->verts[collpair->ap2].impulse_count > 0 && ABS(cloth1->verts[collpair->ap2].impulse[j]) < ABS(i2[j]))
|
|
|
|
|
cloth1->verts[collpair->ap2].impulse[j] = i2[j];
|
2012-05-15 13:46:50 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
if (cloth1->verts[collpair->ap3].impulse_count > 0 && ABS(cloth1->verts[collpair->ap3].impulse[j]) < ABS(i3[j]))
|
|
|
|
|
cloth1->verts[collpair->ap3].impulse[j] = i3[j];
|
2012-05-15 13:46:50 +00:00
|
|
|
}
|
2008-05-26 09:39:32 +00:00
|
|
|
}
|
|
|
|
|
}
|
2018-09-26 17:18:16 +02:00
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int cloth_selfcollision_response_static(ClothModifierData *clmd, CollPair *collpair,
|
|
|
|
|
uint collision_count, const float dt)
|
|
|
|
|
{
|
|
|
|
|
int result = 0;
|
|
|
|
|
Cloth *cloth1;
|
|
|
|
|
float w1, w2, w3, u1, u2, u3;
|
|
|
|
|
float v1[3], v2[3], relativeVelocity[3];
|
|
|
|
|
float magrelVel;
|
|
|
|
|
|
|
|
|
|
cloth1 = clmd->clothObject;
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i < collision_count; i++, collpair++) {
|
|
|
|
|
float i1[3], i2[3], i3[3];
|
|
|
|
|
|
|
|
|
|
zero_v3(i1);
|
|
|
|
|
zero_v3(i2);
|
|
|
|
|
zero_v3(i3);
|
|
|
|
|
|
|
|
|
|
/* Only handle static collisions here. */
|
|
|
|
|
if (collpair->flag & (COLLISION_IN_FUTURE | COLLISION_INACTIVE)) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Compute barycentric coordinates for both collision points. */
|
|
|
|
|
collision_compute_barycentric(collpair->pa,
|
|
|
|
|
cloth1->verts[collpair->ap1].tx,
|
|
|
|
|
cloth1->verts[collpair->ap2].tx,
|
|
|
|
|
cloth1->verts[collpair->ap3].tx,
|
|
|
|
|
&w1, &w2, &w3);
|
|
|
|
|
|
|
|
|
|
collision_compute_barycentric(collpair->pb,
|
|
|
|
|
cloth1->verts[collpair->bp1].tx,
|
|
|
|
|
cloth1->verts[collpair->bp2].tx,
|
|
|
|
|
cloth1->verts[collpair->bp3].tx,
|
|
|
|
|
&u1, &u2, &u3);
|
|
|
|
|
|
|
|
|
|
/* Calculate relative "velocity". */
|
|
|
|
|
collision_interpolateOnTriangle(v1, cloth1->verts[collpair->ap1].tv, cloth1->verts[collpair->ap2].tv, cloth1->verts[collpair->ap3].tv, w1, w2, w3);
|
|
|
|
|
|
|
|
|
|
collision_interpolateOnTriangle(v2, cloth1->verts[collpair->bp1].tv, cloth1->verts[collpair->bp2].tv, cloth1->verts[collpair->bp3].tv, u1, u2, u3);
|
|
|
|
|
|
|
|
|
|
sub_v3_v3v3(relativeVelocity, v2, v1);
|
|
|
|
|
|
|
|
|
|
/* Calculate the normal component of the relative velocity (actually only the magnitude - the direction is stored in 'normal'). */
|
|
|
|
|
magrelVel = dot_v3v3(relativeVelocity, collpair->normal);
|
|
|
|
|
|
|
|
|
|
/* TODO: Impulses should be weighed by mass as this is self col,
|
|
|
|
|
* this has to be done after mass distribution is implemented. */
|
|
|
|
|
|
|
|
|
|
/* If magrelVel < 0 the edges are approaching each other. */
|
|
|
|
|
if (magrelVel > 0.0f) {
|
|
|
|
|
/* Calculate Impulse magnitude to stop all motion in normal direction. */
|
|
|
|
|
float magtangent = 0, repulse = 0, d = 0;
|
|
|
|
|
double impulse = 0.0;
|
|
|
|
|
float vrel_t_pre[3];
|
|
|
|
|
float temp[3], time_multiplier;
|
|
|
|
|
|
|
|
|
|
/* Calculate tangential velocity. */
|
|
|
|
|
copy_v3_v3(temp, collpair->normal);
|
|
|
|
|
mul_v3_fl(temp, magrelVel);
|
|
|
|
|
sub_v3_v3v3(vrel_t_pre, relativeVelocity, temp);
|
|
|
|
|
|
|
|
|
|
/* Decrease in magnitude of relative tangential velocity due to coulomb friction
|
|
|
|
|
* in original formula "magrelVel" should be the "change of relative velocity in normal direction". */
|
|
|
|
|
magtangent = min_ff(clmd->coll_parms->self_friction * 0.01f * magrelVel, len_v3(vrel_t_pre));
|
|
|
|
|
|
|
|
|
|
/* Apply friction impulse. */
|
|
|
|
|
if (magtangent > ALMOST_ZERO) {
|
|
|
|
|
normalize_v3(vrel_t_pre);
|
|
|
|
|
|
|
|
|
|
impulse = magtangent / 1.5;
|
|
|
|
|
|
|
|
|
|
VECADDMUL(i1, vrel_t_pre, w1 * impulse);
|
|
|
|
|
VECADDMUL(i2, vrel_t_pre, w2 * impulse);
|
|
|
|
|
VECADDMUL(i3, vrel_t_pre, w3 * impulse);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Apply velocity stopping impulse. */
|
|
|
|
|
impulse = magrelVel / 3.0f;
|
|
|
|
|
|
|
|
|
|
VECADDMUL(i1, collpair->normal, w1 * impulse);
|
|
|
|
|
cloth1->verts[collpair->ap1].impulse_count++;
|
|
|
|
|
|
|
|
|
|
VECADDMUL(i2, collpair->normal, w2 * impulse);
|
|
|
|
|
cloth1->verts[collpair->ap2].impulse_count++;
|
|
|
|
|
|
|
|
|
|
VECADDMUL(i3, collpair->normal, w3 * impulse);
|
|
|
|
|
cloth1->verts[collpair->ap3].impulse_count++;
|
|
|
|
|
|
|
|
|
|
time_multiplier = 1.0f / (clmd->sim_parms->dt * clmd->sim_parms->timescale);
|
|
|
|
|
|
|
|
|
|
d = clmd->coll_parms->selfepsilon * 8.0f / 9.0f * 2.0f - collpair->distance;
|
|
|
|
|
|
|
|
|
|
if ((magrelVel < 0.1f * d * time_multiplier) && (d > ALMOST_ZERO)) {
|
|
|
|
|
repulse = MIN2 (d / time_multiplier, 0.1f * d * time_multiplier - magrelVel);
|
|
|
|
|
|
|
|
|
|
if (impulse > ALMOST_ZERO) {
|
|
|
|
|
repulse = min_ff(repulse, 5.0*impulse);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
repulse = max_ff(impulse, repulse);
|
|
|
|
|
|
|
|
|
|
impulse = repulse / 1.5f;
|
|
|
|
|
|
|
|
|
|
VECADDMUL(i1, collpair->normal, w1 * impulse);
|
|
|
|
|
VECADDMUL(i2, collpair->normal, w2 * impulse);
|
|
|
|
|
VECADDMUL(i3, collpair->normal, w3 * impulse);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
result = 1;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
float time_multiplier = 1.0f / (clmd->sim_parms->dt * clmd->sim_parms->timescale);
|
|
|
|
|
float d;
|
|
|
|
|
|
|
|
|
|
d = clmd->coll_parms->selfepsilon * 8.0f / 9.0f * 2.0f - collpair->distance;
|
|
|
|
|
|
|
|
|
|
if ( d > ALMOST_ZERO) {
|
|
|
|
|
/* Stay on the safe side and clamp repulse. */
|
|
|
|
|
float repulse = d*1.0f/time_multiplier;
|
|
|
|
|
float impulse = repulse / 9.0f;
|
|
|
|
|
|
|
|
|
|
VECADDMUL(i1, collpair->normal, w1 * impulse);
|
|
|
|
|
VECADDMUL(i2, collpair->normal, w2 * impulse);
|
|
|
|
|
VECADDMUL(i3, collpair->normal, w3 * impulse);
|
|
|
|
|
|
|
|
|
|
cloth1->verts[collpair->ap1].impulse_count++;
|
|
|
|
|
cloth1->verts[collpair->ap2].impulse_count++;
|
|
|
|
|
cloth1->verts[collpair->ap3].impulse_count++;
|
|
|
|
|
|
|
|
|
|
result = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (result) {
|
|
|
|
|
float clamp = clmd->coll_parms->self_clamp * dt;
|
|
|
|
|
|
|
|
|
|
if ((clamp > 0.0f) &&
|
|
|
|
|
((len_v3(i1) > clamp) ||
|
|
|
|
|
(len_v3(i2) > clamp) ||
|
|
|
|
|
(len_v3(i3) > clamp)))
|
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (int j = 0; j < 3; j++) {
|
|
|
|
|
if (cloth1->verts[collpair->ap1].impulse_count > 0 && ABS(cloth1->verts[collpair->ap1].impulse[j]) < ABS(i1[j]))
|
|
|
|
|
cloth1->verts[collpair->ap1].impulse[j] = i1[j];
|
|
|
|
|
|
|
|
|
|
if (cloth1->verts[collpair->ap2].impulse_count > 0 && ABS(cloth1->verts[collpair->ap2].impulse[j]) < ABS(i2[j]))
|
|
|
|
|
cloth1->verts[collpair->ap2].impulse[j] = i2[j];
|
|
|
|
|
|
|
|
|
|
if (cloth1->verts[collpair->ap3].impulse_count > 0 && ABS(cloth1->verts[collpair->ap3].impulse[j]) < ABS(i3[j]))
|
|
|
|
|
cloth1->verts[collpair->ap3].impulse[j] = i3[j];
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2012-05-15 11:14:50 +00:00
|
|
|
return result;
|
2008-05-26 09:39:32 +00:00
|
|
|
}
|
|
|
|
|
|
2012-11-23 10:03:50 +00:00
|
|
|
#ifdef __GNUC__
|
|
|
|
|
# pragma GCC diagnostic pop
|
|
|
|
|
#endif
|
2012-11-04 07:18:29 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
static void cloth_collision(
|
|
|
|
|
void *__restrict userdata,
|
|
|
|
|
const int index,
|
|
|
|
|
const ParallelRangeTLS *__restrict UNUSED(tls))
|
2008-01-29 21:01:12 +00:00
|
|
|
{
|
2018-09-26 17:18:16 +02:00
|
|
|
ColDetectData *data = (ColDetectData *)userdata;
|
|
|
|
|
|
|
|
|
|
ClothModifierData *clmd = data->clmd;
|
|
|
|
|
CollisionModifierData *collmd = data->collmd;
|
|
|
|
|
CollPair *collpair = data->collisions;
|
2015-07-31 14:00:07 +10:00
|
|
|
const MVertTri *tri_a, *tri_b;
|
2012-05-15 11:14:50 +00:00
|
|
|
ClothVertex *verts1 = clmd->clothObject->verts;
|
2018-09-26 17:18:16 +02:00
|
|
|
float distance = 0.0f;
|
2012-05-15 11:14:50 +00:00
|
|
|
float epsilon1 = clmd->coll_parms->epsilon;
|
2018-09-26 17:18:16 +02:00
|
|
|
float epsilon2 = BLI_bvhtree_get_epsilon(collmd->bvhtree);
|
|
|
|
|
float pa[3], pb[3], vect[3];
|
2008-05-26 09:39:32 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
tri_a = &clmd->clothObject->tri[data->overlap[index].indexA];
|
|
|
|
|
tri_b = &collmd->tri[data->overlap[index].indexB];
|
2015-07-31 14:00:07 +10:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* Compute distance and normal. */
|
|
|
|
|
distance = compute_collision_point(verts1[tri_a->tri[0]].tx, verts1[tri_a->tri[1]].tx, verts1[tri_a->tri[2]].tx,
|
|
|
|
|
collmd->current_x[tri_b->tri[0]].co, collmd->current_x[tri_b->tri[1]].co, collmd->current_x[tri_b->tri[2]].co,
|
|
|
|
|
data->culling, data->use_normal, pa, pb, vect);
|
2015-07-31 14:00:07 +10:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
if ((distance <= (epsilon1 + epsilon2 + ALMOST_ZERO)) && (len_squared_v3(vect) > ALMOST_ZERO)) {
|
|
|
|
|
collpair[index].ap1 = tri_a->tri[0];
|
|
|
|
|
collpair[index].ap2 = tri_a->tri[1];
|
|
|
|
|
collpair[index].ap3 = tri_a->tri[2];
|
2015-07-31 14:00:07 +10:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
collpair[index].bp1 = tri_b->tri[0];
|
|
|
|
|
collpair[index].bp2 = tri_b->tri[1];
|
|
|
|
|
collpair[index].bp3 = tri_b->tri[2];
|
2015-07-31 14:00:07 +10:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
copy_v3_v3(collpair[index].pa, pa);
|
|
|
|
|
copy_v3_v3(collpair[index].pb, pb);
|
|
|
|
|
copy_v3_v3(collpair[index].vector, vect);
|
2008-05-26 09:39:32 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
normalize_v3_v3(collpair[index].normal, collpair[index].vector);
|
2008-05-26 09:39:32 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
collpair[index].distance = distance;
|
|
|
|
|
collpair[index].flag = 0;
|
|
|
|
|
|
|
|
|
|
data->collided = true;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
collpair[index].flag = COLLISION_INACTIVE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void cloth_selfcollision(
|
|
|
|
|
void *__restrict userdata,
|
|
|
|
|
const int index,
|
|
|
|
|
const ParallelRangeTLS *__restrict UNUSED(tls))
|
|
|
|
|
{
|
|
|
|
|
SelfColDetectData *data = (SelfColDetectData *)userdata;
|
2008-05-26 09:39:32 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
ClothModifierData *clmd = data->clmd;
|
|
|
|
|
CollPair *collpair = data->collisions;
|
|
|
|
|
const MVertTri *tri_a, *tri_b;
|
|
|
|
|
ClothVertex *verts1 = clmd->clothObject->verts;
|
|
|
|
|
float distance = 0.0f;
|
|
|
|
|
float epsilon = clmd->coll_parms->selfepsilon;
|
|
|
|
|
float pa[3], pb[3], vect[3];
|
|
|
|
|
|
|
|
|
|
tri_a = &clmd->clothObject->tri[data->overlap[index].indexA];
|
|
|
|
|
tri_b = &clmd->clothObject->tri[data->overlap[index].indexB];
|
|
|
|
|
|
|
|
|
|
for (uint i = 0; i < 3; i++) {
|
|
|
|
|
for (uint j = 0; j < 3; j++) {
|
|
|
|
|
if (tri_a->tri[i] == tri_b->tri[j]) {
|
|
|
|
|
collpair[index].flag = COLLISION_INACTIVE;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (((verts1[tri_a->tri[0]].flags & verts1[tri_a->tri[1]].flags & verts1[tri_a->tri[2]].flags) |
|
|
|
|
|
(verts1[tri_b->tri[0]].flags & verts1[tri_b->tri[1]].flags & verts1[tri_b->tri[2]].flags)) & CLOTH_VERT_FLAG_NOSELFCOLL)
|
|
|
|
|
{
|
|
|
|
|
collpair[index].flag = COLLISION_INACTIVE;
|
|
|
|
|
return;
|
|
|
|
|
}
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* Compute distance and normal. */
|
|
|
|
|
distance = compute_collision_point(verts1[tri_a->tri[0]].tx, verts1[tri_a->tri[1]].tx, verts1[tri_a->tri[2]].tx,
|
|
|
|
|
verts1[tri_b->tri[0]].tx, verts1[tri_b->tri[1]].tx, verts1[tri_b->tri[2]].tx,
|
|
|
|
|
false, false, pa, pb, vect);
|
2008-05-26 09:39:32 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
if ((distance <= (epsilon * 2.0f + ALMOST_ZERO)) && (len_squared_v3(vect) > ALMOST_ZERO)) {
|
|
|
|
|
collpair[index].ap1 = tri_a->tri[0];
|
|
|
|
|
collpair[index].ap2 = tri_a->tri[1];
|
|
|
|
|
collpair[index].ap3 = tri_a->tri[2];
|
2008-05-26 09:39:32 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
collpair[index].bp1 = tri_b->tri[0];
|
|
|
|
|
collpair[index].bp2 = tri_b->tri[1];
|
|
|
|
|
collpair[index].bp3 = tri_b->tri[2];
|
2008-05-26 09:39:32 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
copy_v3_v3(collpair[index].pa, pa);
|
|
|
|
|
copy_v3_v3(collpair[index].pb, pb);
|
|
|
|
|
copy_v3_v3(collpair[index].vector, vect);
|
2008-05-26 09:39:32 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
normalize_v3_v3(collpair[index].normal, collpair[index].vector);
|
2008-05-29 14:23:08 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
collpair[index].distance = distance;
|
|
|
|
|
collpair[index].flag = 0;
|
|
|
|
|
|
|
|
|
|
data->collided = true;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
collpair[index].flag = COLLISION_INACTIVE;
|
2008-03-03 19:02:01 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-06-22 14:42:03 +02:00
|
|
|
static void add_collision_object(ListBase *relations, Object *ob, int level, unsigned int modifier_type)
|
2008-07-02 20:28:49 +00:00
|
|
|
{
|
2010-03-26 10:52:55 +00:00
|
|
|
CollisionModifierData *cmd= NULL;
|
|
|
|
|
|
|
|
|
|
/* only get objects with collision modifier */
|
2012-03-24 06:18:31 +00:00
|
|
|
if (((modifier_type == eModifierType_Collision) && ob->pd && ob->pd->deflect) || (modifier_type != eModifierType_Collision))
|
2012-03-20 04:15:41 +00:00
|
|
|
cmd= (CollisionModifierData *)modifiers_findByType(ob, modifier_type);
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2012-10-21 05:46:41 +00:00
|
|
|
if (cmd) {
|
2018-06-22 14:42:03 +02:00
|
|
|
CollisionRelation *relation = MEM_callocN(sizeof(CollisionRelation), "CollisionRelation");
|
|
|
|
|
relation->ob = ob;
|
|
|
|
|
BLI_addtail(relations, relation);
|
2010-03-26 10:52:55 +00:00
|
|
|
}
|
2008-04-08 12:55:35 +00:00
|
|
|
|
2010-03-26 10:52:55 +00:00
|
|
|
/* objects in dupli groups, one level only for now */
|
2018-06-22 14:42:03 +02:00
|
|
|
/* TODO: this doesn't really work, we are not taking into account the
|
|
|
|
|
* dupli transforms and can get objects in the list multiple times. */
|
2019-02-17 19:00:54 +11:00
|
|
|
if (ob->instance_collection && level == 0) {
|
|
|
|
|
Collection *collection= ob->instance_collection;
|
2008-05-07 20:42:16 +00:00
|
|
|
|
2010-03-26 10:52:55 +00:00
|
|
|
/* add objects */
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN(collection, object)
|
2017-12-01 11:24:21 -02:00
|
|
|
{
|
2018-06-22 14:42:03 +02:00
|
|
|
add_collision_object(relations, object, level+1, modifier_type);
|
2017-12-01 11:24:21 -02:00
|
|
|
}
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
FOREACH_COLLECTION_OBJECT_RECURSIVE_END;
|
2012-10-21 05:46:41 +00:00
|
|
|
}
|
2010-03-26 10:52:55 +00:00
|
|
|
}
|
2008-05-07 20:42:16 +00:00
|
|
|
|
2018-06-22 14:42:03 +02:00
|
|
|
/* Create list of collision relations in the collection or entire scene.
|
|
|
|
|
* This is used by the depsgraph to build relations, as well as faster
|
|
|
|
|
* lookup of colliders during evaluation. */
|
|
|
|
|
ListBase *BKE_collision_relations_create(Depsgraph *depsgraph, Collection *collection, unsigned int modifier_type)
|
2010-03-26 10:52:55 +00:00
|
|
|
{
|
2018-06-25 14:07:14 +02:00
|
|
|
ViewLayer *view_layer = DEG_get_input_view_layer(depsgraph);
|
2018-06-25 14:21:15 +02:00
|
|
|
Base *base = BKE_collection_or_layer_objects(view_layer, collection);
|
2018-06-25 14:07:14 +02:00
|
|
|
const bool for_render = (DEG_get_mode(depsgraph) == DAG_EVAL_RENDER);
|
|
|
|
|
const int base_flag = (for_render) ? BASE_ENABLED_RENDER : BASE_ENABLED_VIEWPORT;
|
|
|
|
|
|
2018-06-22 14:42:03 +02:00
|
|
|
ListBase *relations = MEM_callocN(sizeof(ListBase), "CollisionRelation list");
|
2010-03-26 10:52:55 +00:00
|
|
|
|
2018-06-25 14:07:14 +02:00
|
|
|
for (; base; base = base->next) {
|
|
|
|
|
if (base->flag & base_flag) {
|
|
|
|
|
add_collision_object(relations, base->object, 0, modifier_type);
|
2010-06-18 14:14:13 +00:00
|
|
|
}
|
2008-03-03 19:02:01 +00:00
|
|
|
}
|
2010-03-26 10:52:55 +00:00
|
|
|
|
2018-06-22 14:42:03 +02:00
|
|
|
return relations;
|
2008-07-02 20:28:49 +00:00
|
|
|
}
|
|
|
|
|
|
2018-06-22 14:42:03 +02:00
|
|
|
void BKE_collision_relations_free(ListBase *relations)
|
Fix depsgraph to compute more accurate links for collision & force.
Current implementation more or less indiscriminately links physics
objects to colliders and forces, ignoring precise details of layer
checks and collider groups. The new depsgraph seemed to lack some
such links at all. The relevant code in modifiers suffers from a
lot of duplication.
Different physics simulations use independent implementations of
collision and similar things, which results in a lot of variance:
* Cloth collides with objects on same or visible layer with dupli.
* Softbody collides with objects on same layer without dupli.
* Non-hair particles collide on same layer with dupli.
* Smoke uses same code as cloth, but needs different modifier.
* Dynamic paint "collides" with brushes on any layer without dupli.
Force fields with absorption also imply dependency on colliders:
* For most systems, colliders are selected from same layer as field.
* For non-hair particles, it uses the same exact set as the particles.
As a special quirk, smoke ignores smoke flow force fields; on the other
hand dependency on such field implies dependency on the smoke domain.
This introduces two utility functions each for old and new depsgraph
that are flexible enough to handle all these variations, and uses them
to handle particles, cloth, smoke, softbody and dynpaint.
One thing to watch out for is that depsgraph code shouldn't rely on
any properties that don't cause a graph rebuild when changed. This
was violated in the original code that was building force field links,
while taking zero field weights into account.
This change may cause new dependency cycles in cases where necessary
dependencies were missing, but may also remove cycles in situations
where unnecessary links were previously created. It's also now possible
to solve some cycles by switching to explicit groups, since they are
now properly taken into account for dependencies.
Differential Revision: https://developer.blender.org/D2141
2016-08-12 18:23:29 +03:00
|
|
|
{
|
2018-06-22 14:42:03 +02:00
|
|
|
if (relations) {
|
|
|
|
|
BLI_freelistN(relations);
|
|
|
|
|
MEM_freeN(relations);
|
|
|
|
|
}
|
Fix depsgraph to compute more accurate links for collision & force.
Current implementation more or less indiscriminately links physics
objects to colliders and forces, ignoring precise details of layer
checks and collider groups. The new depsgraph seemed to lack some
such links at all. The relevant code in modifiers suffers from a
lot of duplication.
Different physics simulations use independent implementations of
collision and similar things, which results in a lot of variance:
* Cloth collides with objects on same or visible layer with dupli.
* Softbody collides with objects on same layer without dupli.
* Non-hair particles collide on same layer with dupli.
* Smoke uses same code as cloth, but needs different modifier.
* Dynamic paint "collides" with brushes on any layer without dupli.
Force fields with absorption also imply dependency on colliders:
* For most systems, colliders are selected from same layer as field.
* For non-hair particles, it uses the same exact set as the particles.
As a special quirk, smoke ignores smoke flow force fields; on the other
hand dependency on such field implies dependency on the smoke domain.
This introduces two utility functions each for old and new depsgraph
that are flexible enough to handle all these variations, and uses them
to handle particles, cloth, smoke, softbody and dynpaint.
One thing to watch out for is that depsgraph code shouldn't rely on
any properties that don't cause a graph rebuild when changed. This
was violated in the original code that was building force field links,
while taking zero field weights into account.
This change may cause new dependency cycles in cases where necessary
dependencies were missing, but may also remove cycles in situations
where unnecessary links were previously created. It's also now possible
to solve some cycles by switching to explicit groups, since they are
now properly taken into account for dependencies.
Differential Revision: https://developer.blender.org/D2141
2016-08-12 18:23:29 +03:00
|
|
|
}
|
|
|
|
|
|
2018-06-22 14:42:03 +02:00
|
|
|
/* Create effective list of colliders from relations built beforehand.
|
|
|
|
|
* Self will be excluded. */
|
|
|
|
|
Object **BKE_collision_objects_create(Depsgraph *depsgraph, Object *self, Collection *collection, unsigned int *numcollobj, unsigned int modifier_type)
|
Unified effector functionality for particles, cloth and softbody
* Unified scene wide gravity (currently in scene buttons)
instead of each simulation having it's own gravity.
* Weight parameters for all effectors and an effector group
setting.
* Every effector can use noise.
* Most effectors have "shapes" point, plane, surface, every point.
- "Point" is most like the old effectors and uses the
effector location as the effector point.
- "Plane" uses the closest point on effectors local xy-plane
as the effector point.
- "Surface" uses the closest point on an effector object's
surface as the effector point.
- "Every Point" uses every point in a mesh effector object
as an effector point.
- The falloff is calculated from this point, so for example
with "surface" shape and "use only negative z axis" it's
possible to apply force only "inside" the effector object.
* Spherical effector is now renamed as "force" as it's no longer
just spherical.
* New effector parameter "flow", which makes the effector act as
surrounding air velocity, so the resulting force is
proportional to the velocity difference of the point and "air
velocity". For example a wind field with flow=1.0 results in
proper non-accelerating wind.
* New effector fields "turbulence", which creates nice random
flow paths, and "drag", which slows the points down.
* Much improved vortex field.
* Effectors can now effect particle rotation as well as location.
* Use full, or only positive/negative z-axis to apply force
(note. the z-axis is the surface normal in the case of
effector shape "surface")
* New "force field" submenu in add menu, which adds an empty
with the chosen effector (curve object for corve guides).
* Other dynamics should be quite easy to add to the effector
system too if wanted.
* "Unified" doesn't mean that force fields give the exact same results for
particles, softbody & cloth, since their final effect depends on many external
factors, like for example the surface area of the effected faces.
Code changes
* Subversion bump for correct handling of global gravity.
* Separate ui py file for common dynamics stuff.
* Particle settings updating is flushed with it's id through
DAG_id_flush_update(..).
Known issues
* Curve guides don't yet have all ui buttons in place, but they
should work none the less.
* Hair dynamics don't yet respect force fields.
Other changes
* Particle emission defaults now to frames 1-200 with life of 50
frames to fill the whole default timeline.
* Many particles drawing related crashes fixed.
* Sometimes particles didn't update on first frame properly.
* Hair with object/group visualization didn't work properly.
* Memory leaks with PointCacheID lists (Genscher, remember to
free pidlists after use :).
2009-09-30 22:10:14 +00:00
|
|
|
{
|
2018-06-25 16:04:56 +02:00
|
|
|
ListBase *relations = DEG_get_collision_relations(depsgraph, collection, modifier_type);
|
Unified effector functionality for particles, cloth and softbody
* Unified scene wide gravity (currently in scene buttons)
instead of each simulation having it's own gravity.
* Weight parameters for all effectors and an effector group
setting.
* Every effector can use noise.
* Most effectors have "shapes" point, plane, surface, every point.
- "Point" is most like the old effectors and uses the
effector location as the effector point.
- "Plane" uses the closest point on effectors local xy-plane
as the effector point.
- "Surface" uses the closest point on an effector object's
surface as the effector point.
- "Every Point" uses every point in a mesh effector object
as an effector point.
- The falloff is calculated from this point, so for example
with "surface" shape and "use only negative z axis" it's
possible to apply force only "inside" the effector object.
* Spherical effector is now renamed as "force" as it's no longer
just spherical.
* New effector parameter "flow", which makes the effector act as
surrounding air velocity, so the resulting force is
proportional to the velocity difference of the point and "air
velocity". For example a wind field with flow=1.0 results in
proper non-accelerating wind.
* New effector fields "turbulence", which creates nice random
flow paths, and "drag", which slows the points down.
* Much improved vortex field.
* Effectors can now effect particle rotation as well as location.
* Use full, or only positive/negative z-axis to apply force
(note. the z-axis is the surface normal in the case of
effector shape "surface")
* New "force field" submenu in add menu, which adds an empty
with the chosen effector (curve object for corve guides).
* Other dynamics should be quite easy to add to the effector
system too if wanted.
* "Unified" doesn't mean that force fields give the exact same results for
particles, softbody & cloth, since their final effect depends on many external
factors, like for example the surface area of the effected faces.
Code changes
* Subversion bump for correct handling of global gravity.
* Separate ui py file for common dynamics stuff.
* Particle settings updating is flushed with it's id through
DAG_id_flush_update(..).
Known issues
* Curve guides don't yet have all ui buttons in place, but they
should work none the less.
* Hair dynamics don't yet respect force fields.
Other changes
* Particle emission defaults now to frames 1-200 with life of 50
frames to fill the whole default timeline.
* Many particles drawing related crashes fixed.
* Sometimes particles didn't update on first frame properly.
* Hair with object/group visualization didn't work properly.
* Memory leaks with PointCacheID lists (Genscher, remember to
free pidlists after use :).
2009-09-30 22:10:14 +00:00
|
|
|
|
2018-06-22 14:42:03 +02:00
|
|
|
if (!relations) {
|
2018-06-25 14:21:15 +02:00
|
|
|
*numcollobj = 0;
|
2018-06-22 14:42:03 +02:00
|
|
|
return NULL;
|
|
|
|
|
}
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2018-06-22 14:42:03 +02:00
|
|
|
int maxnum = BLI_listbase_count(relations);
|
|
|
|
|
int num = 0;
|
|
|
|
|
Object **objects = MEM_callocN(sizeof(Object*) * maxnum, __func__);
|
2010-03-26 10:52:55 +00:00
|
|
|
|
2018-06-22 14:42:03 +02:00
|
|
|
for (CollisionRelation *relation = relations->first; relation; relation = relation->next) {
|
|
|
|
|
/* Get evaluated object. */
|
|
|
|
|
Object *ob = (Object*)DEG_get_evaluated_id(depsgraph, &relation->ob->id);
|
|
|
|
|
|
|
|
|
|
if (ob != self) {
|
|
|
|
|
objects[num] = ob;
|
|
|
|
|
num++;
|
|
|
|
|
}
|
2010-03-26 10:52:55 +00:00
|
|
|
}
|
Unified effector functionality for particles, cloth and softbody
* Unified scene wide gravity (currently in scene buttons)
instead of each simulation having it's own gravity.
* Weight parameters for all effectors and an effector group
setting.
* Every effector can use noise.
* Most effectors have "shapes" point, plane, surface, every point.
- "Point" is most like the old effectors and uses the
effector location as the effector point.
- "Plane" uses the closest point on effectors local xy-plane
as the effector point.
- "Surface" uses the closest point on an effector object's
surface as the effector point.
- "Every Point" uses every point in a mesh effector object
as an effector point.
- The falloff is calculated from this point, so for example
with "surface" shape and "use only negative z axis" it's
possible to apply force only "inside" the effector object.
* Spherical effector is now renamed as "force" as it's no longer
just spherical.
* New effector parameter "flow", which makes the effector act as
surrounding air velocity, so the resulting force is
proportional to the velocity difference of the point and "air
velocity". For example a wind field with flow=1.0 results in
proper non-accelerating wind.
* New effector fields "turbulence", which creates nice random
flow paths, and "drag", which slows the points down.
* Much improved vortex field.
* Effectors can now effect particle rotation as well as location.
* Use full, or only positive/negative z-axis to apply force
(note. the z-axis is the surface normal in the case of
effector shape "surface")
* New "force field" submenu in add menu, which adds an empty
with the chosen effector (curve object for corve guides).
* Other dynamics should be quite easy to add to the effector
system too if wanted.
* "Unified" doesn't mean that force fields give the exact same results for
particles, softbody & cloth, since their final effect depends on many external
factors, like for example the surface area of the effected faces.
Code changes
* Subversion bump for correct handling of global gravity.
* Separate ui py file for common dynamics stuff.
* Particle settings updating is flushed with it's id through
DAG_id_flush_update(..).
Known issues
* Curve guides don't yet have all ui buttons in place, but they
should work none the less.
* Hair dynamics don't yet respect force fields.
Other changes
* Particle emission defaults now to frames 1-200 with life of 50
frames to fill the whole default timeline.
* Many particles drawing related crashes fixed.
* Sometimes particles didn't update on first frame properly.
* Hair with object/group visualization didn't work properly.
* Memory leaks with PointCacheID lists (Genscher, remember to
free pidlists after use :).
2009-09-30 22:10:14 +00:00
|
|
|
|
2018-06-22 14:42:03 +02:00
|
|
|
if (num == 0) {
|
|
|
|
|
MEM_freeN(objects);
|
|
|
|
|
objects = NULL;
|
|
|
|
|
}
|
Unified effector functionality for particles, cloth and softbody
* Unified scene wide gravity (currently in scene buttons)
instead of each simulation having it's own gravity.
* Weight parameters for all effectors and an effector group
setting.
* Every effector can use noise.
* Most effectors have "shapes" point, plane, surface, every point.
- "Point" is most like the old effectors and uses the
effector location as the effector point.
- "Plane" uses the closest point on effectors local xy-plane
as the effector point.
- "Surface" uses the closest point on an effector object's
surface as the effector point.
- "Every Point" uses every point in a mesh effector object
as an effector point.
- The falloff is calculated from this point, so for example
with "surface" shape and "use only negative z axis" it's
possible to apply force only "inside" the effector object.
* Spherical effector is now renamed as "force" as it's no longer
just spherical.
* New effector parameter "flow", which makes the effector act as
surrounding air velocity, so the resulting force is
proportional to the velocity difference of the point and "air
velocity". For example a wind field with flow=1.0 results in
proper non-accelerating wind.
* New effector fields "turbulence", which creates nice random
flow paths, and "drag", which slows the points down.
* Much improved vortex field.
* Effectors can now effect particle rotation as well as location.
* Use full, or only positive/negative z-axis to apply force
(note. the z-axis is the surface normal in the case of
effector shape "surface")
* New "force field" submenu in add menu, which adds an empty
with the chosen effector (curve object for corve guides).
* Other dynamics should be quite easy to add to the effector
system too if wanted.
* "Unified" doesn't mean that force fields give the exact same results for
particles, softbody & cloth, since their final effect depends on many external
factors, like for example the surface area of the effected faces.
Code changes
* Subversion bump for correct handling of global gravity.
* Separate ui py file for common dynamics stuff.
* Particle settings updating is flushed with it's id through
DAG_id_flush_update(..).
Known issues
* Curve guides don't yet have all ui buttons in place, but they
should work none the less.
* Hair dynamics don't yet respect force fields.
Other changes
* Particle emission defaults now to frames 1-200 with life of 50
frames to fill the whole default timeline.
* Many particles drawing related crashes fixed.
* Sometimes particles didn't update on first frame properly.
* Hair with object/group visualization didn't work properly.
* Memory leaks with PointCacheID lists (Genscher, remember to
free pidlists after use :).
2009-09-30 22:10:14 +00:00
|
|
|
|
2018-06-22 14:42:03 +02:00
|
|
|
*numcollobj = num;
|
|
|
|
|
return objects;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void BKE_collision_objects_free(Object **objects)
|
|
|
|
|
{
|
|
|
|
|
if (objects) {
|
|
|
|
|
MEM_freeN(objects);
|
Unified effector functionality for particles, cloth and softbody
* Unified scene wide gravity (currently in scene buttons)
instead of each simulation having it's own gravity.
* Weight parameters for all effectors and an effector group
setting.
* Every effector can use noise.
* Most effectors have "shapes" point, plane, surface, every point.
- "Point" is most like the old effectors and uses the
effector location as the effector point.
- "Plane" uses the closest point on effectors local xy-plane
as the effector point.
- "Surface" uses the closest point on an effector object's
surface as the effector point.
- "Every Point" uses every point in a mesh effector object
as an effector point.
- The falloff is calculated from this point, so for example
with "surface" shape and "use only negative z axis" it's
possible to apply force only "inside" the effector object.
* Spherical effector is now renamed as "force" as it's no longer
just spherical.
* New effector parameter "flow", which makes the effector act as
surrounding air velocity, so the resulting force is
proportional to the velocity difference of the point and "air
velocity". For example a wind field with flow=1.0 results in
proper non-accelerating wind.
* New effector fields "turbulence", which creates nice random
flow paths, and "drag", which slows the points down.
* Much improved vortex field.
* Effectors can now effect particle rotation as well as location.
* Use full, or only positive/negative z-axis to apply force
(note. the z-axis is the surface normal in the case of
effector shape "surface")
* New "force field" submenu in add menu, which adds an empty
with the chosen effector (curve object for corve guides).
* Other dynamics should be quite easy to add to the effector
system too if wanted.
* "Unified" doesn't mean that force fields give the exact same results for
particles, softbody & cloth, since their final effect depends on many external
factors, like for example the surface area of the effected faces.
Code changes
* Subversion bump for correct handling of global gravity.
* Separate ui py file for common dynamics stuff.
* Particle settings updating is flushed with it's id through
DAG_id_flush_update(..).
Known issues
* Curve guides don't yet have all ui buttons in place, but they
should work none the less.
* Hair dynamics don't yet respect force fields.
Other changes
* Particle emission defaults now to frames 1-200 with life of 50
frames to fill the whole default timeline.
* Many particles drawing related crashes fixed.
* Sometimes particles didn't update on first frame properly.
* Hair with object/group visualization didn't work properly.
* Memory leaks with PointCacheID lists (Genscher, remember to
free pidlists after use :).
2009-09-30 22:10:14 +00:00
|
|
|
}
|
2010-03-26 10:52:55 +00:00
|
|
|
}
|
|
|
|
|
|
2018-06-22 14:42:03 +02:00
|
|
|
/* Create effective list of colliders from relations built beforehand.
|
|
|
|
|
* Self will be excluded. */
|
|
|
|
|
ListBase *BKE_collider_cache_create(Depsgraph *depsgraph, Object *self, Collection *collection)
|
2010-03-26 10:52:55 +00:00
|
|
|
{
|
2018-06-25 16:04:56 +02:00
|
|
|
ListBase *relations = DEG_get_collision_relations(depsgraph, collection, eModifierType_Collision);
|
2018-06-22 14:42:03 +02:00
|
|
|
ListBase *cache = NULL;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2018-06-22 14:42:03 +02:00
|
|
|
if (!relations) {
|
|
|
|
|
return NULL;
|
2010-03-26 10:52:55 +00:00
|
|
|
}
|
2010-06-18 14:14:13 +00:00
|
|
|
|
2018-06-22 14:42:03 +02:00
|
|
|
for (CollisionRelation *relation = relations->first; relation; relation = relation->next) {
|
|
|
|
|
/* Get evaluated object. */
|
|
|
|
|
Object *ob = (Object*)DEG_get_evaluated_id(depsgraph, &relation->ob->id);
|
|
|
|
|
|
|
|
|
|
if (ob == self) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CollisionModifierData *cmd = (CollisionModifierData *)modifiers_findByType(ob, eModifierType_Collision);
|
|
|
|
|
if (cmd && cmd->bvhtree) {
|
|
|
|
|
if (cache == NULL) {
|
|
|
|
|
cache = MEM_callocN(sizeof(ListBase), "ColliderCache array");
|
|
|
|
|
}
|
2010-06-18 14:14:13 +00:00
|
|
|
|
2018-06-22 14:42:03 +02:00
|
|
|
ColliderCache *col = MEM_callocN(sizeof(ColliderCache), "ColliderCache");
|
|
|
|
|
col->ob = ob;
|
|
|
|
|
col->collmd = cmd;
|
|
|
|
|
/* make sure collider is properly set up */
|
|
|
|
|
collision_move_object(cmd, 1.0, 0.0);
|
|
|
|
|
BLI_addtail(cache, col);
|
2010-06-18 14:14:13 +00:00
|
|
|
}
|
2010-03-26 10:52:55 +00:00
|
|
|
}
|
|
|
|
|
|
2018-06-22 14:42:03 +02:00
|
|
|
return cache;
|
Unified effector functionality for particles, cloth and softbody
* Unified scene wide gravity (currently in scene buttons)
instead of each simulation having it's own gravity.
* Weight parameters for all effectors and an effector group
setting.
* Every effector can use noise.
* Most effectors have "shapes" point, plane, surface, every point.
- "Point" is most like the old effectors and uses the
effector location as the effector point.
- "Plane" uses the closest point on effectors local xy-plane
as the effector point.
- "Surface" uses the closest point on an effector object's
surface as the effector point.
- "Every Point" uses every point in a mesh effector object
as an effector point.
- The falloff is calculated from this point, so for example
with "surface" shape and "use only negative z axis" it's
possible to apply force only "inside" the effector object.
* Spherical effector is now renamed as "force" as it's no longer
just spherical.
* New effector parameter "flow", which makes the effector act as
surrounding air velocity, so the resulting force is
proportional to the velocity difference of the point and "air
velocity". For example a wind field with flow=1.0 results in
proper non-accelerating wind.
* New effector fields "turbulence", which creates nice random
flow paths, and "drag", which slows the points down.
* Much improved vortex field.
* Effectors can now effect particle rotation as well as location.
* Use full, or only positive/negative z-axis to apply force
(note. the z-axis is the surface normal in the case of
effector shape "surface")
* New "force field" submenu in add menu, which adds an empty
with the chosen effector (curve object for corve guides).
* Other dynamics should be quite easy to add to the effector
system too if wanted.
* "Unified" doesn't mean that force fields give the exact same results for
particles, softbody & cloth, since their final effect depends on many external
factors, like for example the surface area of the effected faces.
Code changes
* Subversion bump for correct handling of global gravity.
* Separate ui py file for common dynamics stuff.
* Particle settings updating is flushed with it's id through
DAG_id_flush_update(..).
Known issues
* Curve guides don't yet have all ui buttons in place, but they
should work none the less.
* Hair dynamics don't yet respect force fields.
Other changes
* Particle emission defaults now to frames 1-200 with life of 50
frames to fill the whole default timeline.
* Many particles drawing related crashes fixed.
* Sometimes particles didn't update on first frame properly.
* Hair with object/group visualization didn't work properly.
* Memory leaks with PointCacheID lists (Genscher, remember to
free pidlists after use :).
2009-09-30 22:10:14 +00:00
|
|
|
}
|
2010-03-26 10:52:55 +00:00
|
|
|
|
2018-06-22 14:42:03 +02:00
|
|
|
void BKE_collider_cache_free(ListBase **colliders)
|
Unified effector functionality for particles, cloth and softbody
* Unified scene wide gravity (currently in scene buttons)
instead of each simulation having it's own gravity.
* Weight parameters for all effectors and an effector group
setting.
* Every effector can use noise.
* Most effectors have "shapes" point, plane, surface, every point.
- "Point" is most like the old effectors and uses the
effector location as the effector point.
- "Plane" uses the closest point on effectors local xy-plane
as the effector point.
- "Surface" uses the closest point on an effector object's
surface as the effector point.
- "Every Point" uses every point in a mesh effector object
as an effector point.
- The falloff is calculated from this point, so for example
with "surface" shape and "use only negative z axis" it's
possible to apply force only "inside" the effector object.
* Spherical effector is now renamed as "force" as it's no longer
just spherical.
* New effector parameter "flow", which makes the effector act as
surrounding air velocity, so the resulting force is
proportional to the velocity difference of the point and "air
velocity". For example a wind field with flow=1.0 results in
proper non-accelerating wind.
* New effector fields "turbulence", which creates nice random
flow paths, and "drag", which slows the points down.
* Much improved vortex field.
* Effectors can now effect particle rotation as well as location.
* Use full, or only positive/negative z-axis to apply force
(note. the z-axis is the surface normal in the case of
effector shape "surface")
* New "force field" submenu in add menu, which adds an empty
with the chosen effector (curve object for corve guides).
* Other dynamics should be quite easy to add to the effector
system too if wanted.
* "Unified" doesn't mean that force fields give the exact same results for
particles, softbody & cloth, since their final effect depends on many external
factors, like for example the surface area of the effected faces.
Code changes
* Subversion bump for correct handling of global gravity.
* Separate ui py file for common dynamics stuff.
* Particle settings updating is flushed with it's id through
DAG_id_flush_update(..).
Known issues
* Curve guides don't yet have all ui buttons in place, but they
should work none the less.
* Hair dynamics don't yet respect force fields.
Other changes
* Particle emission defaults now to frames 1-200 with life of 50
frames to fill the whole default timeline.
* Many particles drawing related crashes fixed.
* Sometimes particles didn't update on first frame properly.
* Hair with object/group visualization didn't work properly.
* Memory leaks with PointCacheID lists (Genscher, remember to
free pidlists after use :).
2009-09-30 22:10:14 +00:00
|
|
|
{
|
2012-03-24 06:18:31 +00:00
|
|
|
if (*colliders) {
|
Unified effector functionality for particles, cloth and softbody
* Unified scene wide gravity (currently in scene buttons)
instead of each simulation having it's own gravity.
* Weight parameters for all effectors and an effector group
setting.
* Every effector can use noise.
* Most effectors have "shapes" point, plane, surface, every point.
- "Point" is most like the old effectors and uses the
effector location as the effector point.
- "Plane" uses the closest point on effectors local xy-plane
as the effector point.
- "Surface" uses the closest point on an effector object's
surface as the effector point.
- "Every Point" uses every point in a mesh effector object
as an effector point.
- The falloff is calculated from this point, so for example
with "surface" shape and "use only negative z axis" it's
possible to apply force only "inside" the effector object.
* Spherical effector is now renamed as "force" as it's no longer
just spherical.
* New effector parameter "flow", which makes the effector act as
surrounding air velocity, so the resulting force is
proportional to the velocity difference of the point and "air
velocity". For example a wind field with flow=1.0 results in
proper non-accelerating wind.
* New effector fields "turbulence", which creates nice random
flow paths, and "drag", which slows the points down.
* Much improved vortex field.
* Effectors can now effect particle rotation as well as location.
* Use full, or only positive/negative z-axis to apply force
(note. the z-axis is the surface normal in the case of
effector shape "surface")
* New "force field" submenu in add menu, which adds an empty
with the chosen effector (curve object for corve guides).
* Other dynamics should be quite easy to add to the effector
system too if wanted.
* "Unified" doesn't mean that force fields give the exact same results for
particles, softbody & cloth, since their final effect depends on many external
factors, like for example the surface area of the effected faces.
Code changes
* Subversion bump for correct handling of global gravity.
* Separate ui py file for common dynamics stuff.
* Particle settings updating is flushed with it's id through
DAG_id_flush_update(..).
Known issues
* Curve guides don't yet have all ui buttons in place, but they
should work none the less.
* Hair dynamics don't yet respect force fields.
Other changes
* Particle emission defaults now to frames 1-200 with life of 50
frames to fill the whole default timeline.
* Many particles drawing related crashes fixed.
* Sometimes particles didn't update on first frame properly.
* Hair with object/group visualization didn't work properly.
* Memory leaks with PointCacheID lists (Genscher, remember to
free pidlists after use :).
2009-09-30 22:10:14 +00:00
|
|
|
BLI_freelistN(*colliders);
|
|
|
|
|
MEM_freeN(*colliders);
|
|
|
|
|
*colliders = NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
2010-03-26 10:52:55 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
static bool cloth_bvh_objcollisions_nearcheck(ClothModifierData * clmd, CollisionModifierData *collmd,
|
|
|
|
|
CollPair **collisions, int numresult,
|
|
|
|
|
BVHTreeOverlap *overlap, bool culling, bool use_normal)
|
|
|
|
|
{
|
|
|
|
|
*collisions = (CollPair *)MEM_mallocN(sizeof(CollPair) * numresult, "collision array");
|
|
|
|
|
|
2019-01-07 00:06:58 +11:00
|
|
|
ColDetectData data = {
|
|
|
|
|
.clmd = clmd,
|
|
|
|
|
.collmd = collmd,
|
|
|
|
|
.overlap = overlap,
|
|
|
|
|
.collisions = *collisions,
|
|
|
|
|
.culling = culling,
|
|
|
|
|
.use_normal = use_normal,
|
|
|
|
|
.collided = false,
|
|
|
|
|
};
|
2018-09-26 17:18:16 +02:00
|
|
|
|
|
|
|
|
ParallelRangeSettings settings;
|
|
|
|
|
BLI_parallel_range_settings_defaults(&settings);
|
|
|
|
|
settings.use_threading = true;
|
|
|
|
|
BLI_task_parallel_range(0, numresult, &data, cloth_collision, &settings);
|
|
|
|
|
|
|
|
|
|
return data.collided;
|
|
|
|
|
}
|
2011-05-01 21:39:13 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
static bool cloth_bvh_selfcollisions_nearcheck(ClothModifierData * clmd, CollPair *collisions,
|
|
|
|
|
int numresult, BVHTreeOverlap *overlap)
|
2008-07-02 20:28:49 +00:00
|
|
|
{
|
2019-01-07 00:06:58 +11:00
|
|
|
SelfColDetectData data = {
|
|
|
|
|
.clmd = clmd,
|
|
|
|
|
.overlap = overlap,
|
|
|
|
|
.collisions = collisions,
|
|
|
|
|
.collided = false,
|
|
|
|
|
};
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
ParallelRangeSettings settings;
|
|
|
|
|
BLI_parallel_range_settings_defaults(&settings);
|
|
|
|
|
settings.use_threading = true;
|
|
|
|
|
BLI_task_parallel_range(0, numresult, &data, cloth_selfcollision, &settings);
|
2011-05-01 21:39:13 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
return data.collided;
|
2008-07-02 20:28:49 +00:00
|
|
|
}
|
2008-04-08 12:55:35 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
static int cloth_bvh_objcollisions_resolve(ClothModifierData * clmd, Object **collobjs, CollPair **collisions,
|
|
|
|
|
uint *collision_counts, const uint numcollobj, const float dt)
|
2008-07-02 20:28:49 +00:00
|
|
|
{
|
|
|
|
|
Cloth *cloth = clmd->clothObject;
|
2018-09-26 17:18:16 +02:00
|
|
|
int i = 0, j = 0, mvert_num = 0;
|
2008-07-02 20:28:49 +00:00
|
|
|
ClothVertex *verts = NULL;
|
|
|
|
|
int ret = 0;
|
|
|
|
|
int result = 0;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2015-07-31 14:00:07 +10:00
|
|
|
mvert_num = clmd->clothObject->mvert_num;
|
2008-07-02 20:28:49 +00:00
|
|
|
verts = cloth->verts;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2008-03-03 19:02:01 +00:00
|
|
|
result = 1;
|
2018-09-26 17:18:16 +02:00
|
|
|
|
|
|
|
|
for (j = 0; j < 2; j++) {
|
2008-03-03 19:02:01 +00:00
|
|
|
result = 0;
|
2008-04-08 12:55:35 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
for (i = 0; i < numcollobj; i++) {
|
|
|
|
|
Object *collob= collobjs[i];
|
|
|
|
|
CollisionModifierData *collmd = (CollisionModifierData *)modifiers_findByType(collob, eModifierType_Collision);
|
2012-05-15 11:14:50 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
if ( collmd->bvhtree ) {
|
|
|
|
|
result += cloth_collision_response_static(clmd, collmd, collob, collisions[i], collision_counts[i], dt);
|
|
|
|
|
}
|
|
|
|
|
}
|
2008-05-26 09:39:32 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* Apply impulses in parallel. */
|
|
|
|
|
if (result) {
|
|
|
|
|
for (i = 0; i < mvert_num; i++) {
|
|
|
|
|
// calculate "velocities" (just xnew = xold + v; no dt in v)
|
|
|
|
|
if (verts[i].impulse_count) {
|
2019-01-20 16:22:55 +01:00
|
|
|
add_v3_v3(verts[i].tv, verts[i].impulse);
|
|
|
|
|
add_v3_v3(verts[i].dcvel, verts[i].impulse);
|
2018-09-26 17:18:16 +02:00
|
|
|
zero_v3(verts[i].impulse);
|
|
|
|
|
verts[i].impulse_count = 0;
|
|
|
|
|
|
|
|
|
|
ret++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int cloth_bvh_selfcollisions_resolve(ClothModifierData * clmd, CollPair *collisions, int collision_count, const float dt)
|
|
|
|
|
{
|
|
|
|
|
Cloth *cloth = clmd->clothObject;
|
|
|
|
|
int i = 0, j = 0, mvert_num = 0;
|
|
|
|
|
ClothVertex *verts = NULL;
|
|
|
|
|
int ret = 0;
|
|
|
|
|
int result = 0;
|
|
|
|
|
|
|
|
|
|
mvert_num = clmd->clothObject->mvert_num;
|
|
|
|
|
verts = cloth->verts;
|
|
|
|
|
|
|
|
|
|
for (j = 0; j < 2; j++) {
|
|
|
|
|
result = 0;
|
|
|
|
|
|
|
|
|
|
result += cloth_selfcollision_response_static(clmd, collisions, collision_count, dt);
|
|
|
|
|
|
|
|
|
|
/* Apply impulses in parallel. */
|
|
|
|
|
if (result) {
|
|
|
|
|
for (i = 0; i < mvert_num; i++) {
|
|
|
|
|
if (verts[i].impulse_count) {
|
|
|
|
|
// VECADDMUL ( verts[i].tv, verts[i].impulse, 1.0f / verts[i].impulse_count );
|
2019-01-20 16:22:55 +01:00
|
|
|
add_v3_v3(verts[i].tv, verts[i].impulse);
|
|
|
|
|
add_v3_v3(verts[i].dcvel, verts[i].impulse);
|
2018-09-26 17:18:16 +02:00
|
|
|
zero_v3(verts[i].impulse);
|
|
|
|
|
verts[i].impulse_count = 0;
|
|
|
|
|
|
|
|
|
|
ret++;
|
2008-05-14 16:09:56 +00:00
|
|
|
}
|
|
|
|
|
}
|
2008-05-07 20:42:16 +00:00
|
|
|
}
|
2012-05-15 11:14:50 +00:00
|
|
|
|
2012-05-22 22:03:41 +00:00
|
|
|
if (!result) {
|
2012-05-15 11:14:50 +00:00
|
|
|
break;
|
2012-05-22 22:03:41 +00:00
|
|
|
}
|
2008-03-03 19:02:01 +00:00
|
|
|
}
|
|
|
|
|
return ret;
|
2008-02-12 11:04:58 +00:00
|
|
|
}
|
|
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
int cloth_bvh_collision(Depsgraph *depsgraph, Object *ob, ClothModifierData *clmd, float step, float dt)
|
2008-01-29 21:01:12 +00:00
|
|
|
{
|
2018-09-26 17:18:16 +02:00
|
|
|
Cloth *cloth = clmd->clothObject;
|
|
|
|
|
BVHTree *cloth_bvh = cloth->bvhtree;
|
|
|
|
|
uint i = 0, mvert_num = 0;
|
|
|
|
|
int rounds = 0;
|
2008-01-29 21:01:12 +00:00
|
|
|
ClothVertex *verts = NULL;
|
2008-05-26 10:36:14 +00:00
|
|
|
int ret = 0, ret2 = 0;
|
2009-09-21 21:19:58 +00:00
|
|
|
Object **collobjs = NULL;
|
2010-10-21 08:32:53 +00:00
|
|
|
unsigned int numcollobj = 0;
|
2018-09-26 17:18:16 +02:00
|
|
|
uint *coll_counts_obj = NULL;
|
|
|
|
|
BVHTreeOverlap **overlap_obj = NULL;
|
|
|
|
|
uint coll_count_self = 0;
|
|
|
|
|
BVHTreeOverlap *overlap_self = NULL;
|
2008-01-29 21:01:12 +00:00
|
|
|
|
2010-02-24 18:06:51 +00:00
|
|
|
if ((clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_COLLOBJ) || cloth_bvh==NULL)
|
2008-01-29 21:01:12 +00:00
|
|
|
return 0;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2008-01-29 21:01:12 +00:00
|
|
|
verts = cloth->verts;
|
2015-07-31 14:00:07 +10:00
|
|
|
mvert_num = cloth->mvert_num;
|
2008-04-08 12:55:35 +00:00
|
|
|
|
2018-09-14 15:46:55 +02:00
|
|
|
if (clmd->coll_parms->flags & CLOTH_COLLSETTINGS_FLAG_ENABLED) {
|
2018-09-26 17:18:16 +02:00
|
|
|
bvhtree_update_from_cloth(clmd, false, false);
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2018-09-14 15:46:55 +02:00
|
|
|
collobjs = BKE_collision_objects_create(depsgraph, ob, clmd->coll_parms->group, &numcollobj, eModifierType_Collision);
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
if (collobjs) {
|
|
|
|
|
coll_counts_obj = MEM_callocN(sizeof(uint) * numcollobj, "CollCounts");
|
|
|
|
|
overlap_obj = MEM_callocN(sizeof(*overlap_obj) * numcollobj, "BVHOverlap");
|
2008-04-08 12:55:35 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
for (i = 0; i < numcollobj; i++) {
|
|
|
|
|
Object *collob = collobjs[i];
|
|
|
|
|
CollisionModifierData *collmd = (CollisionModifierData *)modifiers_findByType(collob, eModifierType_Collision);
|
2012-05-15 11:14:50 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
if (!collmd->bvhtree) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2012-05-15 11:14:50 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* Move object to position (step) in time. */
|
|
|
|
|
collision_move_object(collmd, step + dt, step);
|
|
|
|
|
|
|
|
|
|
overlap_obj[i] = BLI_bvhtree_overlap(cloth_bvh, collmd->bvhtree, &coll_counts_obj[i], NULL, NULL);
|
|
|
|
|
}
|
2018-09-14 15:46:55 +02:00
|
|
|
}
|
2012-05-15 11:14:50 +00:00
|
|
|
}
|
|
|
|
|
|
2018-09-14 15:46:55 +02:00
|
|
|
if (clmd->coll_parms->flags & CLOTH_COLLSETTINGS_FLAG_SELF) {
|
2018-09-26 17:18:16 +02:00
|
|
|
bvhtree_update_from_cloth(clmd, false, true);
|
|
|
|
|
|
|
|
|
|
overlap_self = BLI_bvhtree_overlap(cloth->bvhselftree, cloth->bvhselftree, &coll_count_self, NULL, NULL);
|
2018-09-14 15:46:55 +02:00
|
|
|
}
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2018-09-14 15:46:55 +02:00
|
|
|
do {
|
2008-05-26 10:36:14 +00:00
|
|
|
ret2 = 0;
|
2008-04-08 12:55:35 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* Object collisions. */
|
|
|
|
|
if ((clmd->coll_parms->flags & CLOTH_COLLSETTINGS_FLAG_ENABLED) && collobjs) {
|
|
|
|
|
CollPair **collisions;
|
|
|
|
|
bool collided = false;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
collisions = MEM_callocN(sizeof(CollPair *) * numcollobj, "CollPair");
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2018-09-14 15:46:55 +02:00
|
|
|
for (i = 0; i < numcollobj; i++) {
|
2018-09-26 17:18:16 +02:00
|
|
|
Object *collob = collobjs[i];
|
2018-09-14 15:46:55 +02:00
|
|
|
CollisionModifierData *collmd = (CollisionModifierData *)modifiers_findByType(collob, eModifierType_Collision);
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2018-09-14 15:46:55 +02:00
|
|
|
if (!collmd->bvhtree) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
if (coll_counts_obj[i] && overlap_obj[i]) {
|
|
|
|
|
collided = cloth_bvh_objcollisions_nearcheck(clmd, collmd, &collisions[i], coll_counts_obj[i], overlap_obj[i],
|
|
|
|
|
(collob->pd->flag & PFIELD_CLOTH_USE_CULLING),
|
|
|
|
|
(collob->pd->flag & PFIELD_CLOTH_USE_NORMAL)) || collided;
|
2018-09-14 15:46:55 +02:00
|
|
|
}
|
2018-09-26 17:18:16 +02:00
|
|
|
}
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
if (collided) {
|
|
|
|
|
ret += cloth_bvh_objcollisions_resolve(clmd, collobjs, collisions, coll_counts_obj, numcollobj, dt);
|
|
|
|
|
ret2 += ret;
|
2018-09-14 15:46:55 +02:00
|
|
|
}
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2018-09-14 15:46:55 +02:00
|
|
|
for (i = 0; i < numcollobj; i++) {
|
|
|
|
|
MEM_SAFE_FREE(collisions[i]);
|
|
|
|
|
}
|
2008-04-08 12:55:35 +00:00
|
|
|
|
2018-09-14 15:46:55 +02:00
|
|
|
MEM_freeN(collisions);
|
2018-09-26 17:18:16 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Self collisions. */
|
|
|
|
|
if (clmd->coll_parms->flags & CLOTH_COLLSETTINGS_FLAG_SELF) {
|
|
|
|
|
CollPair *collisions = NULL;
|
|
|
|
|
|
|
|
|
|
verts = cloth->verts;
|
|
|
|
|
mvert_num = cloth->mvert_num;
|
|
|
|
|
|
|
|
|
|
if (cloth->bvhselftree) {
|
|
|
|
|
if (coll_count_self && overlap_self) {
|
|
|
|
|
collisions = (CollPair *)MEM_mallocN(sizeof(CollPair) * coll_count_self, "collision array");
|
|
|
|
|
|
|
|
|
|
if (cloth_bvh_selfcollisions_nearcheck(clmd, collisions, coll_count_self, overlap_self)) {
|
|
|
|
|
ret += cloth_bvh_selfcollisions_resolve(clmd, collisions, coll_count_self, dt);
|
|
|
|
|
ret2 += ret;
|
|
|
|
|
}
|
|
|
|
|
}
|
2008-04-08 12:55:35 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
}
|
2018-09-14 15:46:55 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
MEM_SAFE_FREE(collisions);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Apply all collision resolution. */
|
|
|
|
|
if (ret2) {
|
2018-09-14 15:46:55 +02:00
|
|
|
for (i = 0; i < mvert_num; i++) {
|
|
|
|
|
if (clmd->sim_parms->vgroup_mass > 0) {
|
|
|
|
|
if (verts [i].flags & CLOTH_VERT_FLAG_PINNED) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2008-02-12 12:02:39 +00:00
|
|
|
}
|
2008-04-08 12:55:35 +00:00
|
|
|
|
2019-01-20 16:22:55 +01:00
|
|
|
add_v3_v3v3(verts[i].tx, verts[i].txold, verts[i].tv);
|
2018-09-14 15:46:55 +02:00
|
|
|
}
|
2008-01-29 21:01:12 +00:00
|
|
|
}
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2018-09-14 15:46:55 +02:00
|
|
|
rounds++;
|
2018-09-26 17:18:16 +02:00
|
|
|
}
|
|
|
|
|
while (ret2 && (clmd->coll_parms->loop_count > rounds));
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
if (overlap_obj) {
|
|
|
|
|
for (i = 0; i < numcollobj; i++) {
|
|
|
|
|
MEM_SAFE_FREE(overlap_obj[i]);
|
2008-02-12 11:04:58 +00:00
|
|
|
}
|
2018-09-26 17:18:16 +02:00
|
|
|
|
|
|
|
|
MEM_freeN(overlap_obj);
|
2008-02-12 11:04:58 +00:00
|
|
|
}
|
2018-09-26 17:18:16 +02:00
|
|
|
|
|
|
|
|
MEM_SAFE_FREE(coll_counts_obj);
|
|
|
|
|
|
|
|
|
|
MEM_SAFE_FREE(overlap_self);
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2018-06-22 14:42:03 +02:00
|
|
|
BKE_collision_objects_free(collobjs);
|
2008-04-08 12:55:35 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
return MIN2(ret, 1);
|
2008-01-29 21:01:12 +00:00
|
|
|
}
|
2014-08-30 15:23:40 +02:00
|
|
|
|
2014-09-01 17:46:17 +02:00
|
|
|
BLI_INLINE void max_v3_v3v3(float r[3], const float a[3], const float b[3])
|
|
|
|
|
{
|
|
|
|
|
r[0] = max_ff(a[0], b[0]);
|
|
|
|
|
r[1] = max_ff(a[1], b[1]);
|
|
|
|
|
r[2] = max_ff(a[2], b[2]);
|
|
|
|
|
}
|
2014-08-30 15:23:40 +02:00
|
|
|
|
2014-09-12 14:34:14 +02:00
|
|
|
void collision_get_collider_velocity(float vel_old[3], float vel_new[3], CollisionModifierData *collmd, CollPair *collpair)
|
2014-09-04 14:22:22 +02:00
|
|
|
{
|
|
|
|
|
float u1, u2, u3;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2014-09-04 14:22:22 +02:00
|
|
|
/* compute barycentric coordinates */
|
|
|
|
|
collision_compute_barycentric(collpair->pb,
|
|
|
|
|
collmd->current_x[collpair->bp1].co,
|
|
|
|
|
collmd->current_x[collpair->bp2].co,
|
|
|
|
|
collmd->current_x[collpair->bp3].co,
|
2014-09-12 14:34:14 +02:00
|
|
|
&u1, &u2, &u3);
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2014-09-12 14:34:14 +02:00
|
|
|
collision_interpolateOnTriangle(vel_new, collmd->current_v[collpair->bp1].co, collmd->current_v[collpair->bp2].co, collmd->current_v[collpair->bp3].co, u1, u2, u3);
|
2014-09-04 14:22:22 +02:00
|
|
|
/* XXX assume constant velocity of the collider for now */
|
2014-09-12 14:34:14 +02:00
|
|
|
copy_v3_v3(vel_old, vel_new);
|
2014-09-04 14:22:22 +02:00
|
|
|
}
|
|
|
|
|
|
2014-09-03 11:17:24 +02:00
|
|
|
BLI_INLINE bool cloth_point_face_collision_params(const float p1[3], const float p2[3], const float v0[3], const float v1[3], const float v2[3],
|
2017-01-11 15:15:54 -02:00
|
|
|
float r_nor[3], float *r_lambda, float r_w[3])
|
2014-09-03 11:17:24 +02:00
|
|
|
{
|
2014-09-04 14:19:05 +02:00
|
|
|
float edge1[3], edge2[3], p2face[3], p1p2[3], v0p2[3];
|
|
|
|
|
float nor_v0p2, nor_p1p2;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2014-09-04 14:19:05 +02:00
|
|
|
sub_v3_v3v3(edge1, v1, v0);
|
|
|
|
|
sub_v3_v3v3(edge2, v2, v0);
|
|
|
|
|
cross_v3_v3v3(r_nor, edge1, edge2);
|
|
|
|
|
normalize_v3(r_nor);
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2018-10-18 12:20:33 +02:00
|
|
|
sub_v3_v3v3(v0p2, p2, v0);
|
2014-09-04 14:19:05 +02:00
|
|
|
nor_v0p2 = dot_v3v3(v0p2, r_nor);
|
|
|
|
|
madd_v3_v3v3fl(p2face, p2, r_nor, -nor_v0p2);
|
2017-01-11 15:15:54 -02:00
|
|
|
interp_weights_tri_v3(r_w, v0, v1, v2, p2face);
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2014-09-04 14:19:05 +02:00
|
|
|
sub_v3_v3v3(p1p2, p2, p1);
|
|
|
|
|
nor_p1p2 = dot_v3v3(p1p2, r_nor);
|
|
|
|
|
*r_lambda = (nor_p1p2 != 0.0f ? nor_v0p2 / nor_p1p2 : 0.0f);
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2014-09-04 14:19:05 +02:00
|
|
|
return r_w[1] >= 0.0f && r_w[2] >= 0.0f && r_w[1] + r_w[2] <= 1.0f;
|
2014-09-03 11:17:24 +02:00
|
|
|
}
|
2014-08-30 15:23:40 +02:00
|
|
|
|
2015-07-31 14:00:07 +10:00
|
|
|
static CollPair *cloth_point_collpair(
|
|
|
|
|
float p1[3], float p2[3], const MVert *mverts, int bp1, int bp2, int bp3,
|
|
|
|
|
int index_cloth, int index_coll, float epsilon, CollPair *collpair)
|
2014-08-30 15:23:40 +02:00
|
|
|
{
|
2015-07-31 14:00:07 +10:00
|
|
|
const float *co1 = mverts[bp1].co, *co2 = mverts[bp2].co, *co3 = mverts[bp3].co;
|
2015-03-06 17:30:05 +11:00
|
|
|
float lambda /*, distance1 */, distance2;
|
2014-09-03 11:17:24 +02:00
|
|
|
float facenor[3], v1p1[3], v1p2[3];
|
2017-01-11 15:15:54 -02:00
|
|
|
float w[3];
|
2014-09-03 11:17:24 +02:00
|
|
|
|
2014-09-04 14:19:05 +02:00
|
|
|
if (!cloth_point_face_collision_params(p1, p2, co1, co2, co3, facenor, &lambda, w))
|
2014-08-30 15:23:40 +02:00
|
|
|
return collpair;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2014-09-03 11:17:24 +02:00
|
|
|
sub_v3_v3v3(v1p1, p1, co1);
|
2015-03-06 17:30:05 +11:00
|
|
|
// distance1 = dot_v3v3(v1p1, facenor);
|
2014-09-03 11:17:24 +02:00
|
|
|
sub_v3_v3v3(v1p2, p2, co1);
|
|
|
|
|
distance2 = dot_v3v3(v1p2, facenor);
|
2014-09-04 15:06:15 +02:00
|
|
|
// if (distance2 > epsilon || (distance1 < 0.0f && distance2 < 0.0f))
|
|
|
|
|
if (distance2 > epsilon)
|
2014-09-03 11:17:24 +02:00
|
|
|
return collpair;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2014-08-30 15:23:40 +02:00
|
|
|
collpair->face1 = index_cloth; /* XXX actually not a face, but equivalent index for point */
|
|
|
|
|
collpair->face2 = index_coll;
|
|
|
|
|
collpair->ap1 = index_cloth;
|
|
|
|
|
collpair->ap2 = collpair->ap3 = -1; /* unused */
|
|
|
|
|
collpair->bp1 = bp1;
|
|
|
|
|
collpair->bp2 = bp2;
|
|
|
|
|
collpair->bp3 = bp3;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2014-09-02 12:49:55 +02:00
|
|
|
/* note: using the second point here, which is
|
|
|
|
|
* the current updated position that needs to be corrected
|
|
|
|
|
*/
|
|
|
|
|
copy_v3_v3(collpair->pa, p2);
|
2014-09-03 11:17:24 +02:00
|
|
|
collpair->distance = distance2;
|
2014-09-03 23:49:24 +02:00
|
|
|
mul_v3_v3fl(collpair->vector, facenor, -distance2);
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2014-08-30 15:23:40 +02:00
|
|
|
interp_v3_v3v3v3(collpair->pb, co1, co2, co3, w);
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2014-09-03 11:17:24 +02:00
|
|
|
copy_v3_v3(collpair->normal, facenor);
|
2014-08-30 15:23:40 +02:00
|
|
|
collpair->time = lambda;
|
|
|
|
|
collpair->flag = 0;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2014-08-30 15:23:40 +02:00
|
|
|
collpair++;
|
|
|
|
|
return collpair;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//Determines collisions on overlap, collisions are written to collpair[i] and collision+number_collision_found is returned
|
2015-07-31 14:00:07 +10:00
|
|
|
static CollPair *cloth_point_collision(
|
|
|
|
|
ModifierData *md1, ModifierData *md2,
|
|
|
|
|
BVHTreeOverlap *overlap, float epsilon, CollPair *collpair, float UNUSED(dt))
|
2014-08-30 15:23:40 +02:00
|
|
|
{
|
|
|
|
|
ClothModifierData *clmd = (ClothModifierData *)md1;
|
|
|
|
|
CollisionModifierData *collmd = (CollisionModifierData *) md2;
|
|
|
|
|
/* Cloth *cloth = clmd->clothObject; */ /* UNUSED */
|
|
|
|
|
ClothVertex *vert = NULL;
|
2015-07-31 14:00:07 +10:00
|
|
|
const MVertTri *vt;
|
|
|
|
|
const MVert *mverts = collmd->current_x;
|
2014-08-30 15:23:40 +02:00
|
|
|
|
|
|
|
|
vert = &clmd->clothObject->verts[overlap->indexA];
|
2015-07-31 14:00:07 +10:00
|
|
|
vt = &collmd->tri[overlap->indexB];
|
2014-08-30 15:23:40 +02:00
|
|
|
|
2015-07-31 14:00:07 +10:00
|
|
|
collpair = cloth_point_collpair(
|
|
|
|
|
vert->tx, vert->x, mverts,
|
|
|
|
|
vt->tri[0], vt->tri[1], vt->tri[2],
|
|
|
|
|
overlap->indexA, overlap->indexB,
|
|
|
|
|
epsilon, collpair);
|
2014-08-30 15:23:40 +02:00
|
|
|
|
|
|
|
|
return collpair;
|
|
|
|
|
}
|
|
|
|
|
|
2017-11-18 17:22:54 +11:00
|
|
|
static void cloth_points_objcollisions_nearcheck(
|
|
|
|
|
ClothModifierData *clmd, CollisionModifierData *collmd,
|
|
|
|
|
CollPair **collisions, CollPair **collisions_index,
|
|
|
|
|
int numresult, BVHTreeOverlap *overlap, float epsilon, double dt)
|
2014-08-30 15:23:40 +02:00
|
|
|
{
|
|
|
|
|
int i;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2014-08-30 15:23:40 +02:00
|
|
|
/* can return 2 collisions in total */
|
|
|
|
|
*collisions = (CollPair *) MEM_mallocN(sizeof(CollPair) * numresult * 2, "collision array" );
|
|
|
|
|
*collisions_index = *collisions;
|
|
|
|
|
|
|
|
|
|
for ( i = 0; i < numresult; i++ ) {
|
|
|
|
|
*collisions_index = cloth_point_collision((ModifierData *)clmd, (ModifierData *)collmd,
|
2014-09-03 11:17:24 +02:00
|
|
|
overlap+i, epsilon, *collisions_index, dt);
|
2014-08-30 15:23:40 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-06-22 14:42:03 +02:00
|
|
|
void cloth_find_point_contacts(Depsgraph *depsgraph, Object *ob, ClothModifierData *clmd, float step, float dt,
|
2014-09-03 15:44:03 +02:00
|
|
|
ColliderContacts **r_collider_contacts, int *r_totcolliders)
|
|
|
|
|
{
|
|
|
|
|
Cloth *cloth= clmd->clothObject;
|
|
|
|
|
BVHTree *cloth_bvh;
|
2015-07-31 14:00:07 +10:00
|
|
|
unsigned int i = 0, mvert_num = 0;
|
2014-09-03 15:44:03 +02:00
|
|
|
ClothVertex *verts = NULL;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2014-09-03 15:44:03 +02:00
|
|
|
ColliderContacts *collider_contacts;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2014-09-03 15:44:03 +02:00
|
|
|
Object **collobjs = NULL;
|
|
|
|
|
unsigned int numcollobj = 0;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2014-09-03 15:44:03 +02:00
|
|
|
verts = cloth->verts;
|
2015-07-31 14:00:07 +10:00
|
|
|
mvert_num = cloth->mvert_num;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2014-09-03 15:44:03 +02:00
|
|
|
////////////////////////////////////////////////////////////
|
|
|
|
|
// static collisions
|
|
|
|
|
////////////////////////////////////////////////////////////
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2018-09-03 17:32:46 +02:00
|
|
|
/* Check we do have collision objects to test against, before doing anything else. */
|
2018-09-03 17:44:36 +02:00
|
|
|
collobjs = BKE_collision_objects_create(depsgraph, ob, clmd->coll_parms->group, &numcollobj, eModifierType_Collision);
|
2018-09-03 17:32:46 +02:00
|
|
|
if (!collobjs) {
|
|
|
|
|
*r_collider_contacts = NULL;
|
|
|
|
|
*r_totcolliders = 0;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2014-09-03 15:44:03 +02:00
|
|
|
// create temporary cloth points bvh
|
2018-09-26 17:18:16 +02:00
|
|
|
cloth_bvh = BLI_bvhtree_new(mvert_num, clmd->coll_parms->epsilon, 4, 6);
|
2014-09-03 15:44:03 +02:00
|
|
|
/* fill tree */
|
2015-07-31 14:00:07 +10:00
|
|
|
for (i = 0; i < mvert_num; i++) {
|
2014-09-03 15:44:03 +02:00
|
|
|
float co[6];
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2014-09-03 15:44:03 +02:00
|
|
|
copy_v3_v3(&co[0*3], verts[i].x);
|
|
|
|
|
copy_v3_v3(&co[1*3], verts[i].tx);
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2014-09-03 15:44:03 +02:00
|
|
|
BLI_bvhtree_insert(cloth_bvh, i, co, 2);
|
|
|
|
|
}
|
|
|
|
|
/* balance tree */
|
|
|
|
|
BLI_bvhtree_balance(cloth_bvh);
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2014-09-03 15:44:03 +02:00
|
|
|
/* move object to position (step) in time */
|
|
|
|
|
for (i = 0; i < numcollobj; i++) {
|
|
|
|
|
Object *collob= collobjs[i];
|
|
|
|
|
CollisionModifierData *collmd = (CollisionModifierData *)modifiers_findByType(collob, eModifierType_Collision);
|
|
|
|
|
if (!collmd->bvhtree)
|
|
|
|
|
continue;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2014-09-03 15:44:03 +02:00
|
|
|
/* move object to position (step) in time */
|
|
|
|
|
collision_move_object ( collmd, step + dt, step );
|
|
|
|
|
}
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2014-09-03 15:44:03 +02:00
|
|
|
collider_contacts = MEM_callocN(sizeof(ColliderContacts) * numcollobj, "CollPair");
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2014-09-03 15:44:03 +02:00
|
|
|
// check all collision objects
|
|
|
|
|
for (i = 0; i < numcollobj; i++) {
|
|
|
|
|
ColliderContacts *ct = collider_contacts + i;
|
|
|
|
|
Object *collob= collobjs[i];
|
|
|
|
|
CollisionModifierData *collmd = (CollisionModifierData *)modifiers_findByType(collob, eModifierType_Collision);
|
|
|
|
|
BVHTreeOverlap *overlap;
|
|
|
|
|
unsigned int result = 0;
|
|
|
|
|
float epsilon;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2014-09-03 15:44:03 +02:00
|
|
|
ct->ob = collob;
|
|
|
|
|
ct->collmd = collmd;
|
|
|
|
|
ct->collisions = NULL;
|
|
|
|
|
ct->totcollisions = 0;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2014-09-03 15:44:03 +02:00
|
|
|
if (!collmd->bvhtree)
|
|
|
|
|
continue;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2014-09-03 15:44:03 +02:00
|
|
|
/* search for overlapping collision pairs */
|
2015-08-20 17:32:25 +10:00
|
|
|
overlap = BLI_bvhtree_overlap(cloth_bvh, collmd->bvhtree, &result, NULL, NULL);
|
2016-05-06 06:03:03 +10:00
|
|
|
epsilon = BLI_bvhtree_get_epsilon(collmd->bvhtree);
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2014-09-03 15:44:03 +02:00
|
|
|
// go to next object if no overlap is there
|
|
|
|
|
if (result && overlap) {
|
|
|
|
|
CollPair *collisions_index;
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2014-09-03 15:44:03 +02:00
|
|
|
/* check if collisions really happen (costly near check) */
|
|
|
|
|
cloth_points_objcollisions_nearcheck(clmd, collmd, &ct->collisions, &collisions_index,
|
|
|
|
|
result, overlap, epsilon, dt);
|
|
|
|
|
ct->totcollisions = (int)(collisions_index - ct->collisions);
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2014-09-03 15:44:03 +02:00
|
|
|
// resolve nearby collisions
|
|
|
|
|
// ret += cloth_points_objcollisions_resolve(clmd, collmd, collob->pd, collisions[i], collisions_index[i], dt);
|
|
|
|
|
}
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2014-09-03 15:44:03 +02:00
|
|
|
if (overlap)
|
|
|
|
|
MEM_freeN(overlap);
|
|
|
|
|
}
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2018-06-22 14:42:03 +02:00
|
|
|
BKE_collision_objects_free(collobjs);
|
2014-09-03 15:44:03 +02:00
|
|
|
|
|
|
|
|
BLI_bvhtree_free(cloth_bvh);
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2014-09-03 15:44:03 +02:00
|
|
|
////////////////////////////////////////////////////////////
|
|
|
|
|
// update positions
|
|
|
|
|
// this is needed for bvh_calc_DOP_hull_moving() [kdop.c]
|
|
|
|
|
////////////////////////////////////////////////////////////
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2014-09-03 15:44:03 +02:00
|
|
|
// verts come from clmd
|
2015-07-31 14:00:07 +10:00
|
|
|
for (i = 0; i < mvert_num; i++) {
|
2018-09-14 15:46:55 +02:00
|
|
|
if (clmd->sim_parms->vgroup_mass > 0) {
|
2014-09-03 15:44:03 +02:00
|
|
|
if (verts [i].flags & CLOTH_VERT_FLAG_PINNED) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
}
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2019-01-20 16:22:55 +01:00
|
|
|
add_v3_v3v3(verts[i].tx, verts[i].txold, verts[i].tv);
|
2014-09-03 15:44:03 +02:00
|
|
|
}
|
|
|
|
|
////////////////////////////////////////////////////////////
|
2018-06-17 17:05:51 +02:00
|
|
|
|
2014-09-03 15:44:03 +02:00
|
|
|
*r_collider_contacts = collider_contacts;
|
|
|
|
|
*r_totcolliders = numcollobj;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void cloth_free_contacts(ColliderContacts *collider_contacts, int totcolliders)
|
|
|
|
|
{
|
|
|
|
|
if (collider_contacts) {
|
|
|
|
|
int i;
|
|
|
|
|
for (i = 0; i < totcolliders; ++i) {
|
|
|
|
|
ColliderContacts *ct = collider_contacts + i;
|
|
|
|
|
if (ct->collisions) {
|
|
|
|
|
MEM_freeN(ct->collisions);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
MEM_freeN(collider_contacts);
|
|
|
|
|
}
|
|
|
|
|
}
|