2023-08-16 00:20:26 +10:00
|
|
|
/* SPDX-FileCopyrightText: Blender Authors
|
2023-05-31 16:19:06 +02:00
|
|
|
*
|
|
|
|
|
* SPDX-License-Identifier: GPL-2.0-or-later */
|
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
|
|
|
*/
|
|
|
|
|
|
2024-01-22 15:58:18 +01:00
|
|
|
#include <algorithm>
|
|
|
|
|
|
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"
|
2018-02-07 11:14:08 +11:00
|
|
|
#include "DNA_object_force_types.h"
|
2020-03-19 09:33:03 +01:00
|
|
|
#include "DNA_object_types.h"
|
2008-01-29 21:01:12 +00:00
|
|
|
#include "DNA_scene_types.h"
|
2010-08-10 05:41:51 +00:00
|
|
|
|
|
|
|
|
#include "BLI_blenlib.h"
|
2020-01-16 18:45:23 +01:00
|
|
|
#include "BLI_linklist.h"
|
Cleanup: reduce amount of math-related includes
Using ClangBuildAnalyzer on the whole Blender build, it was pointing
out that BLI_math.h is the heaviest "header hub" (i.e. non tiny file
that is included a lot).
However, there's very little (actually zero) source files in Blender
that need "all the math" (base, colors, vectors, matrices,
quaternions, intersection, interpolation, statistics, solvers and
time). A common use case is source files needing just vectors, or
just vectors & matrices, or just colors etc. Actually, 181 files
were including the whole math thing without needing it at all.
This change removes BLI_math.h completely, and instead in all the
places that need it, includes BLI_math_vector.h or BLI_math_color.h
and so on.
Change from that:
- BLI_math_color.h was included 1399 times -> now 408 (took 114.0sec
to parse -> now 36.3sec)
- BLI_simd.h 1403 -> 418 (109.7sec -> 34.9sec).
Full rebuild of Blender (Apple M1, Xcode, RelWithDebInfo) is not
affected much (342sec -> 334sec). Most of benefit would be when
someone's changing BLI_simd.h or BLI_math_color.h or similar files,
that now there's 3x fewer files result in a recompile.
Pull Request #110944
2023-08-09 11:39:20 +03:00
|
|
|
#include "BLI_math_geom.h"
|
|
|
|
|
#include "BLI_math_vector.h"
|
2018-09-26 17:18:16 +02:00
|
|
|
#include "BLI_task.h"
|
|
|
|
|
#include "BLI_threads.h"
|
2020-03-19 09:33:03 +01:00
|
|
|
#include "BLI_utildefines.h"
|
2008-03-13 22:45:36 +00:00
|
|
|
|
2023-08-22 07:27:35 -04:00
|
|
|
#include "BKE_cloth.hh"
|
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"
|
2024-01-23 15:18:09 -05:00
|
|
|
#include "BKE_layer.hh"
|
2023-11-14 09:30:40 +01:00
|
|
|
#include "BKE_modifier.hh"
|
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 "BKE_collision.h"
|
2020-03-19 09:33:03 +01:00
|
|
|
#include "BLI_kdopbvh.h"
|
2008-05-07 20:42:16 +00:00
|
|
|
|
2023-09-22 03:18:17 +02:00
|
|
|
#include "DEG_depsgraph.hh"
|
|
|
|
|
#include "DEG_depsgraph_physics.hh"
|
|
|
|
|
#include "DEG_depsgraph_query.hh"
|
2018-06-22 14:42:03 +02:00
|
|
|
|
2011-05-02 03:44:02 +00:00
|
|
|
#ifdef WITH_ELTOPO
|
2011-05-01 21:39:13 +00:00
|
|
|
# include "eltopo-capi.h"
|
|
|
|
|
#endif
|
|
|
|
|
|
2023-03-01 17:32:12 +01:00
|
|
|
struct ColDetectData {
|
2018-09-26 17:18:16 +02:00
|
|
|
ClothModifierData *clmd;
|
|
|
|
|
CollisionModifierData *collmd;
|
|
|
|
|
BVHTreeOverlap *overlap;
|
|
|
|
|
CollPair *collisions;
|
|
|
|
|
bool culling;
|
|
|
|
|
bool use_normal;
|
|
|
|
|
bool collided;
|
2023-03-01 17:32:12 +01:00
|
|
|
};
|
2018-09-26 17:18:16 +02:00
|
|
|
|
2023-03-01 17:32:12 +01:00
|
|
|
struct SelfColDetectData {
|
2018-09-26 17:18:16 +02:00
|
|
|
ClothModifierData *clmd;
|
|
|
|
|
BVHTreeOverlap *overlap;
|
|
|
|
|
CollPair *collisions;
|
|
|
|
|
bool collided;
|
2023-03-01 17:32:12 +01:00
|
|
|
};
|
2018-09-26 17:18:16 +02:00
|
|
|
|
2008-01-29 21:01:12 +00:00
|
|
|
/***********************************
|
2019-04-18 07:21:26 +02:00
|
|
|
* Collision modifier code start
|
|
|
|
|
***********************************/
|
2008-01-29 21:01:12 +00:00
|
|
|
|
2020-01-12 17:08:01 +01:00
|
|
|
void collision_move_object(CollisionModifierData *collmd,
|
|
|
|
|
const float step,
|
|
|
|
|
const float prevstep,
|
|
|
|
|
const bool moving_bvh)
|
2008-01-29 21:01:12 +00:00
|
|
|
{
|
2022-09-25 17:04:52 +10:00
|
|
|
uint i = 0;
|
2019-04-17 06:17:24 +02: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++) {
|
Mesh: Move positions to a generic attribute
**Changes**
As described in T93602, this patch removes all use of the `MVert`
struct, replacing it with a generic named attribute with the name
`"position"`, consistent with other geometry types.
Variable names have been changed from `verts` to `positions`, to align
with the attribute name and the more generic design (positions are not
vertices, they are just an attribute stored on the point domain).
This change is made possible by previous commits that moved all other
data out of `MVert` to runtime data or other generic attributes. What
remains is mostly a simple type change. Though, the type still shows up
859 times, so the patch is quite large.
One compromise is that now `CD_MASK_BAREMESH` now contains
`CD_PROP_FLOAT3`. With the general move towards generic attributes
over custom data types, we are removing use of these type masks anyway.
**Benefits**
The most obvious benefit is reduced memory usage and the benefits
that brings in memory-bound situations. `float3` is only 3 bytes, in
comparison to `MVert` which was 4. When there are millions of vertices
this starts to matter more.
The other benefits come from using a more generic type. Instead of
writing algorithms specifically for `MVert`, code can just use arrays
of vectors. This will allow eliminating many temporary arrays or
wrappers used to extract positions.
Many possible improvements aren't implemented in this patch, though
I did switch simplify or remove the process of creating temporary
position arrays in a few places.
The design clarity that "positions are just another attribute" brings
allows removing explicit copying of vertices in some procedural
operations-- they are just processed like most other attributes.
**Performance**
This touches so many areas that it's hard to benchmark exhaustively,
but I observed some areas as examples.
* The mesh line node with 4 million count was 1.5x (8ms to 12ms) faster.
* The Spring splash screen went from ~4.3 to ~4.5 fps.
* The subdivision surface modifier/node was slightly faster
RNA access through Python may be slightly slower, since now we need
a name lookup instead of just a custom data type lookup for each index.
**Future Improvements**
* Remove uses of "vert_coords" functions:
* `BKE_mesh_vert_coords_alloc`
* `BKE_mesh_vert_coords_get`
* `BKE_mesh_vert_coords_apply{_with_mat4}`
* Remove more hidden copying of positions
* General simplification now possible in many areas
* Convert more code to C++ to use `float3` instead of `float[3]`
* Currently `reinterpret_cast` is used for those C-API functions
Differential Revision: https://developer.blender.org/D15982
2023-01-10 00:10:43 -05:00
|
|
|
zero_v3(collmd->current_v[i]);
|
2016-10-07 13:27:11 +03:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2016-10-07 13:27:11 +03:00
|
|
|
return;
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2015-07-31 14:00:07 +10:00
|
|
|
for (i = 0; i < collmd->mvert_num; i++) {
|
Mesh: Move positions to a generic attribute
**Changes**
As described in T93602, this patch removes all use of the `MVert`
struct, replacing it with a generic named attribute with the name
`"position"`, consistent with other geometry types.
Variable names have been changed from `verts` to `positions`, to align
with the attribute name and the more generic design (positions are not
vertices, they are just an attribute stored on the point domain).
This change is made possible by previous commits that moved all other
data out of `MVert` to runtime data or other generic attributes. What
remains is mostly a simple type change. Though, the type still shows up
859 times, so the patch is quite large.
One compromise is that now `CD_MASK_BAREMESH` now contains
`CD_PROP_FLOAT3`. With the general move towards generic attributes
over custom data types, we are removing use of these type masks anyway.
**Benefits**
The most obvious benefit is reduced memory usage and the benefits
that brings in memory-bound situations. `float3` is only 3 bytes, in
comparison to `MVert` which was 4. When there are millions of vertices
this starts to matter more.
The other benefits come from using a more generic type. Instead of
writing algorithms specifically for `MVert`, code can just use arrays
of vectors. This will allow eliminating many temporary arrays or
wrappers used to extract positions.
Many possible improvements aren't implemented in this patch, though
I did switch simplify or remove the process of creating temporary
position arrays in a few places.
The design clarity that "positions are just another attribute" brings
allows removing explicit copying of vertices in some procedural
operations-- they are just processed like most other attributes.
**Performance**
This touches so many areas that it's hard to benchmark exhaustively,
but I observed some areas as examples.
* The mesh line node with 4 million count was 1.5x (8ms to 12ms) faster.
* The Spring splash screen went from ~4.3 to ~4.5 fps.
* The subdivision surface modifier/node was slightly faster
RNA access through Python may be slightly slower, since now we need
a name lookup instead of just a custom data type lookup for each index.
**Future Improvements**
* Remove uses of "vert_coords" functions:
* `BKE_mesh_vert_coords_alloc`
* `BKE_mesh_vert_coords_get`
* `BKE_mesh_vert_coords_apply{_with_mat4}`
* Remove more hidden copying of positions
* General simplification now possible in many areas
* Convert more code to C++ to use `float3` instead of `float[3]`
* Currently `reinterpret_cast` is used for those C-API functions
Differential Revision: https://developer.blender.org/D15982
2023-01-10 00:10:43 -05:00
|
|
|
interp_v3_v3v3(collmd->current_x[i], collmd->x[i], collmd->xnew[i], prevstep);
|
|
|
|
|
interp_v3_v3v3(collmd->current_xnew[i], collmd->x[i], collmd->xnew[i], step);
|
|
|
|
|
sub_v3_v3v3(collmd->current_v[i], collmd->current_xnew[i], collmd->current_x[i]);
|
2008-01-29 21:01:12 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-01-12 17:08:01 +01:00
|
|
|
bvhtree_update_from_mvert(collmd->bvhtree,
|
|
|
|
|
collmd->current_xnew,
|
|
|
|
|
collmd->current_x,
|
2023-12-20 20:45:15 -05:00
|
|
|
reinterpret_cast<const blender::int3 *>(collmd->vert_tris),
|
2020-01-12 17:08:01 +01:00
|
|
|
collmd->tri_num,
|
|
|
|
|
moving_bvh);
|
2008-01-29 21:01:12 +00:00
|
|
|
}
|
|
|
|
|
|
Mesh: Move positions to a generic attribute
**Changes**
As described in T93602, this patch removes all use of the `MVert`
struct, replacing it with a generic named attribute with the name
`"position"`, consistent with other geometry types.
Variable names have been changed from `verts` to `positions`, to align
with the attribute name and the more generic design (positions are not
vertices, they are just an attribute stored on the point domain).
This change is made possible by previous commits that moved all other
data out of `MVert` to runtime data or other generic attributes. What
remains is mostly a simple type change. Though, the type still shows up
859 times, so the patch is quite large.
One compromise is that now `CD_MASK_BAREMESH` now contains
`CD_PROP_FLOAT3`. With the general move towards generic attributes
over custom data types, we are removing use of these type masks anyway.
**Benefits**
The most obvious benefit is reduced memory usage and the benefits
that brings in memory-bound situations. `float3` is only 3 bytes, in
comparison to `MVert` which was 4. When there are millions of vertices
this starts to matter more.
The other benefits come from using a more generic type. Instead of
writing algorithms specifically for `MVert`, code can just use arrays
of vectors. This will allow eliminating many temporary arrays or
wrappers used to extract positions.
Many possible improvements aren't implemented in this patch, though
I did switch simplify or remove the process of creating temporary
position arrays in a few places.
The design clarity that "positions are just another attribute" brings
allows removing explicit copying of vertices in some procedural
operations-- they are just processed like most other attributes.
**Performance**
This touches so many areas that it's hard to benchmark exhaustively,
but I observed some areas as examples.
* The mesh line node with 4 million count was 1.5x (8ms to 12ms) faster.
* The Spring splash screen went from ~4.3 to ~4.5 fps.
* The subdivision surface modifier/node was slightly faster
RNA access through Python may be slightly slower, since now we need
a name lookup instead of just a custom data type lookup for each index.
**Future Improvements**
* Remove uses of "vert_coords" functions:
* `BKE_mesh_vert_coords_alloc`
* `BKE_mesh_vert_coords_get`
* `BKE_mesh_vert_coords_apply{_with_mat4}`
* Remove more hidden copying of positions
* General simplification now possible in many areas
* Convert more code to C++ to use `float3` instead of `float[3]`
* Currently `reinterpret_cast` is used for those C-API functions
Differential Revision: https://developer.blender.org/D15982
2023-01-10 00:10:43 -05:00
|
|
|
BVHTree *bvhtree_build_from_mvert(const float (*positions)[3],
|
2023-12-20 20:45:15 -05:00
|
|
|
const blender::int3 *vert_tris,
|
2015-07-31 14:00:07 +10:00
|
|
|
int tri_num,
|
|
|
|
|
float epsilon)
|
2008-01-29 21:01:12 +00:00
|
|
|
{
|
2020-09-09 15:43:09 +02:00
|
|
|
BVHTree *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 */
|
2023-12-20 20:45:15 -05:00
|
|
|
for (int i = 0; i < tri_num; i++) {
|
2015-07-31 14:00:07 +10:00
|
|
|
float co[3][3];
|
2008-04-08 12:55:35 +00:00
|
|
|
|
2023-12-20 20:45:15 -05:00
|
|
|
copy_v3_v3(co[0], positions[vert_tris[i][0]]);
|
|
|
|
|
copy_v3_v3(co[1], positions[vert_tris[i][1]]);
|
|
|
|
|
copy_v3_v3(co[2], positions[vert_tris[i][2]]);
|
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,
|
Mesh: Move positions to a generic attribute
**Changes**
As described in T93602, this patch removes all use of the `MVert`
struct, replacing it with a generic named attribute with the name
`"position"`, consistent with other geometry types.
Variable names have been changed from `verts` to `positions`, to align
with the attribute name and the more generic design (positions are not
vertices, they are just an attribute stored on the point domain).
This change is made possible by previous commits that moved all other
data out of `MVert` to runtime data or other generic attributes. What
remains is mostly a simple type change. Though, the type still shows up
859 times, so the patch is quite large.
One compromise is that now `CD_MASK_BAREMESH` now contains
`CD_PROP_FLOAT3`. With the general move towards generic attributes
over custom data types, we are removing use of these type masks anyway.
**Benefits**
The most obvious benefit is reduced memory usage and the benefits
that brings in memory-bound situations. `float3` is only 3 bytes, in
comparison to `MVert` which was 4. When there are millions of vertices
this starts to matter more.
The other benefits come from using a more generic type. Instead of
writing algorithms specifically for `MVert`, code can just use arrays
of vectors. This will allow eliminating many temporary arrays or
wrappers used to extract positions.
Many possible improvements aren't implemented in this patch, though
I did switch simplify or remove the process of creating temporary
position arrays in a few places.
The design clarity that "positions are just another attribute" brings
allows removing explicit copying of vertices in some procedural
operations-- they are just processed like most other attributes.
**Performance**
This touches so many areas that it's hard to benchmark exhaustively,
but I observed some areas as examples.
* The mesh line node with 4 million count was 1.5x (8ms to 12ms) faster.
* The Spring splash screen went from ~4.3 to ~4.5 fps.
* The subdivision surface modifier/node was slightly faster
RNA access through Python may be slightly slower, since now we need
a name lookup instead of just a custom data type lookup for each index.
**Future Improvements**
* Remove uses of "vert_coords" functions:
* `BKE_mesh_vert_coords_alloc`
* `BKE_mesh_vert_coords_get`
* `BKE_mesh_vert_coords_apply{_with_mat4}`
* Remove more hidden copying of positions
* General simplification now possible in many areas
* Convert more code to C++ to use `float3` instead of `float[3]`
* Currently `reinterpret_cast` is used for those C-API functions
Differential Revision: https://developer.blender.org/D15982
2023-01-10 00:10:43 -05:00
|
|
|
const float (*positions)[3],
|
|
|
|
|
const float (*positions_moving)[3],
|
2023-12-20 20:45:15 -05:00
|
|
|
const blender::int3 *vert_tris,
|
2015-07-31 14:00:07 +10:00
|
|
|
int tri_num,
|
|
|
|
|
bool moving)
|
2008-01-29 21:01:12 +00:00
|
|
|
{
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2023-03-01 17:32:12 +01:00
|
|
|
if ((bvhtree == nullptr) || (positions == nullptr)) {
|
2008-01-29 21:01:12 +00:00
|
|
|
return;
|
2015-07-31 14:00:07 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2023-03-01 17:32:12 +01:00
|
|
|
if (positions_moving == nullptr) {
|
2015-07-31 14:00:07 +10:00
|
|
|
moving = false;
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2023-12-20 20:45:15 -05:00
|
|
|
for (int i = 0; i < tri_num; i++) {
|
2015-07-31 14:00:07 +10:00
|
|
|
float co[3][3];
|
|
|
|
|
bool ret;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2023-12-20 20:45:15 -05:00
|
|
|
copy_v3_v3(co[0], positions[vert_tris[i][0]]);
|
|
|
|
|
copy_v3_v3(co[1], positions[vert_tris[i][1]]);
|
|
|
|
|
copy_v3_v3(co[2], positions[vert_tris[i][2]]);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2015-07-31 14:00:07 +10:00
|
|
|
/* copy new locations into array */
|
|
|
|
|
if (moving) {
|
|
|
|
|
float co_moving[3][3];
|
|
|
|
|
/* update moving positions */
|
2023-12-20 20:45:15 -05:00
|
|
|
copy_v3_v3(co_moving[0], positions_moving[vert_tris[i][0]]);
|
|
|
|
|
copy_v3_v3(co_moving[1], positions_moving[vert_tris[i][1]]);
|
|
|
|
|
copy_v3_v3(co_moving[2], positions_moving[vert_tris[i][2]]);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2015-07-31 14:00:07 +10:00
|
|
|
ret = BLI_bvhtree_update_node(bvhtree, i, &co[0][0], &co_moving[0][0], 3);
|
|
|
|
|
}
|
|
|
|
|
else {
|
2023-03-01 17:32:12 +01:00
|
|
|
ret = BLI_bvhtree_update_node(bvhtree, i, &co[0][0], nullptr, 3);
|
2008-05-07 20:42:16 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02: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
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2015-07-31 14:00:07 +10:00
|
|
|
BLI_bvhtree_update_tree(bvhtree);
|
2008-01-29 21:01:12 +00:00
|
|
|
}
|
|
|
|
|
|
2019-04-18 07:21:26 +02: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;
|
|
|
|
|
}
|
|
|
|
|
|
2020-01-16 18:45:23 +01:00
|
|
|
static float compute_collision_point_tri_tri(const float a1[3],
|
|
|
|
|
const float a2[3],
|
|
|
|
|
const float a3[3],
|
|
|
|
|
const float b1[3],
|
|
|
|
|
const float b2[3],
|
|
|
|
|
const float b3[3],
|
|
|
|
|
bool culling,
|
|
|
|
|
bool use_normal,
|
|
|
|
|
float r_a[3],
|
|
|
|
|
float r_b[3],
|
|
|
|
|
float r_vec[3])
|
2018-09-26 17:18:16 +02:00
|
|
|
{
|
|
|
|
|
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];
|
|
|
|
|
float tmp, tmp_vec[3];
|
|
|
|
|
float normal[3], cent[3];
|
|
|
|
|
bool backside = false;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
copy_v3_v3(a[0], a1);
|
|
|
|
|
copy_v3_v3(a[1], a2);
|
|
|
|
|
copy_v3_v3(a[2], a3);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
copy_v3_v3(b[0], b1);
|
|
|
|
|
copy_v3_v3(b[1], b2);
|
|
|
|
|
copy_v3_v3(b[2], b3);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* Find intersections. */
|
2020-08-10 12:05:37 -03:00
|
|
|
int tri_a_edge_isect_count;
|
|
|
|
|
const bool is_intersecting = isect_tri_tri_v3_ex(
|
|
|
|
|
a, b, isect_a, isect_b, &tri_a_edge_isect_count);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* 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]);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-08-10 12:05:37 -03:00
|
|
|
if (!is_intersecting) {
|
2018-09-26 17:18:16 +02:00
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-08-10 12:05:37 -03:00
|
|
|
else if (tri_a_edge_isect_count != 1) {
|
|
|
|
|
/* It is not Edge intersection. */
|
|
|
|
|
backside = true;
|
|
|
|
|
}
|
2018-09-26 17:18:16 +02:00
|
|
|
}
|
|
|
|
|
else if (use_normal) {
|
|
|
|
|
normal_tri_v3(normal, b[0], b[1], b[2]);
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-08-10 12:05:37 -03:00
|
|
|
if (tri_a_edge_isect_count == 1) {
|
2018-09-26 17:18:16 +02:00
|
|
|
/* Edge intersection. */
|
|
|
|
|
copy_v3_v3(r_a, isect_a);
|
|
|
|
|
copy_v3_v3(r_b, isect_b);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
if (use_normal) {
|
|
|
|
|
copy_v3_v3(r_vec, normal);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
sub_v3_v3v3(r_vec, r_b, r_a);
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
return 0.0f;
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
if (backside) {
|
|
|
|
|
float maxdist = 0.0f;
|
|
|
|
|
bool found = false;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* Point projections. */
|
|
|
|
|
for (int i = 0; i < 3; i++) {
|
2023-03-01 17:32:12 +01:00
|
|
|
if (isect_ray_tri_v3(a[i], normal, b[0], b[1], b[2], &tmp, nullptr)) {
|
2018-09-26 17:18:16 +02:00
|
|
|
if (tmp > maxdist) {
|
|
|
|
|
maxdist = tmp;
|
|
|
|
|
copy_v3_v3(r_a, a[i]);
|
|
|
|
|
madd_v3_v3v3fl(r_b, a[i], normal, tmp);
|
|
|
|
|
found = true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
negate_v3(normal);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
for (int i = 0; i < 3; i++) {
|
2023-03-01 17:32:12 +01:00
|
|
|
if (isect_ray_tri_v3(b[i], normal, a[0], a[1], a[2], &tmp, nullptr)) {
|
2018-09-26 17:18:16 +02:00
|
|
|
if (tmp > maxdist) {
|
|
|
|
|
maxdist = tmp;
|
|
|
|
|
madd_v3_v3v3fl(r_a, b[i], normal, tmp);
|
|
|
|
|
copy_v3_v3(r_b, b[i]);
|
|
|
|
|
found = true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
negate_v3(normal);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* Edge projections. */
|
|
|
|
|
for (int i = 0; i < 3; i++) {
|
|
|
|
|
float dir[3];
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
sub_v3_v3v3(tmp_vec, b[next_ind(i)], b[i]);
|
|
|
|
|
cross_v3_v3v3(dir, tmp_vec, normal);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
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);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* If no point is found, will fallback onto regular proximity test below. */
|
|
|
|
|
if (found) {
|
|
|
|
|
sub_v3_v3v3(r_vec, r_b, r_a);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
if (use_normal) {
|
|
|
|
|
if (dot_v3v3(normal, r_vec) >= 0.0f) {
|
|
|
|
|
copy_v3_v3(r_vec, normal);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
negate_v3_v3(r_vec, normal);
|
|
|
|
|
}
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
return 0.0f;
|
|
|
|
|
}
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* 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]);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
if (tmp < dist) {
|
|
|
|
|
dist = tmp;
|
|
|
|
|
copy_v3_v3(r_a, a[i]);
|
|
|
|
|
copy_v3_v3(r_b, tmp_co1);
|
|
|
|
|
}
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
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]);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
if (tmp < dist) {
|
|
|
|
|
dist = tmp;
|
|
|
|
|
copy_v3_v3(r_a, tmp_co1);
|
|
|
|
|
copy_v3_v3(r_b, b[i]);
|
|
|
|
|
}
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* Closest edge. */
|
2020-08-10 12:05:37 -03:00
|
|
|
if (!is_intersecting) {
|
2018-09-26 17:18:16 +02:00
|
|
|
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);
|
2019-04-17 06:17:24 +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
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-08-10 12:05:37 -03:00
|
|
|
if (!is_intersecting) {
|
2018-09-26 17:18:16 +02:00
|
|
|
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;
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
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;
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
return dist;
|
|
|
|
|
}
|
|
|
|
|
|
2020-01-16 18:45:23 +01:00
|
|
|
static float compute_collision_point_edge_tri(const float a1[3],
|
|
|
|
|
const float a2[3],
|
|
|
|
|
const float b1[3],
|
|
|
|
|
const float b2[3],
|
|
|
|
|
const float b3[3],
|
|
|
|
|
bool culling,
|
|
|
|
|
bool use_normal,
|
|
|
|
|
float r_a[3],
|
|
|
|
|
float r_b[3],
|
|
|
|
|
float r_vec[3])
|
|
|
|
|
{
|
|
|
|
|
float a[2][3];
|
|
|
|
|
float b[3][3];
|
|
|
|
|
float dist = FLT_MAX;
|
|
|
|
|
float tmp_co1[3], tmp_co2[3];
|
|
|
|
|
float isect_a[3];
|
|
|
|
|
bool isect = false;
|
|
|
|
|
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(b[0], b1);
|
|
|
|
|
copy_v3_v3(b[1], b2);
|
|
|
|
|
copy_v3_v3(b[2], b3);
|
|
|
|
|
|
|
|
|
|
normal_tri_v3(normal, b[0], b[1], b[2]);
|
|
|
|
|
|
|
|
|
|
/* Find intersection. */
|
2023-03-01 17:32:12 +01:00
|
|
|
if (isect_line_segment_tri_v3(a[0], a[1], b[0], b[1], b[2], &tmp, nullptr)) {
|
2020-01-16 18:45:23 +01:00
|
|
|
interp_v3_v3v3(isect_a, a[0], a[1], tmp);
|
|
|
|
|
isect = true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Determine collision side. */
|
|
|
|
|
if (culling) {
|
|
|
|
|
if (isect) {
|
|
|
|
|
backside = true;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
mid_v3_v3v3v3(cent, b[0], b[1], b[2]);
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i < 2; i++) {
|
|
|
|
|
sub_v3_v3v3(tmp_vec, a[i], cent);
|
|
|
|
|
if (dot_v3v3(tmp_vec, normal) < 0.0f) {
|
|
|
|
|
backside = true;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (isect) {
|
|
|
|
|
/* Edge intersection. */
|
|
|
|
|
copy_v3_v3(r_a, isect_a);
|
|
|
|
|
copy_v3_v3(r_b, isect_a);
|
|
|
|
|
|
|
|
|
|
copy_v3_v3(r_vec, normal);
|
|
|
|
|
|
|
|
|
|
return 0.0f;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (backside) {
|
|
|
|
|
float maxdist = 0.0f;
|
|
|
|
|
bool found = false;
|
|
|
|
|
|
|
|
|
|
/* Point projections. */
|
|
|
|
|
for (int i = 0; i < 2; i++) {
|
2023-03-01 17:32:12 +01:00
|
|
|
if (isect_ray_tri_v3(a[i], normal, b[0], b[1], b[2], &tmp, nullptr)) {
|
2020-01-16 18:45:23 +01:00
|
|
|
if (tmp > maxdist) {
|
|
|
|
|
maxdist = tmp;
|
|
|
|
|
copy_v3_v3(r_a, a[i]);
|
|
|
|
|
madd_v3_v3v3fl(r_b, a[i], normal, tmp);
|
|
|
|
|
found = true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* 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);
|
|
|
|
|
|
|
|
|
|
if (isect_line_plane_v3(tmp_co1, a[0], a[1], b[i], dir) &&
|
|
|
|
|
point_in_slice_seg(tmp_co1, a[0], a[1]) &&
|
|
|
|
|
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 < 2; 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);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Closest edge. */
|
|
|
|
|
if (!isect) {
|
|
|
|
|
for (int j = 0; j < 3; j++) {
|
|
|
|
|
isect_seg_seg_v3(a[0], a[1], b[j], b[next_ind(j)], tmp_co1, tmp_co2);
|
|
|
|
|
tmp = len_squared_v3v3(tmp_co1, tmp_co2);
|
|
|
|
|
|
|
|
|
|
if (tmp < dist) {
|
|
|
|
|
dist = tmp;
|
|
|
|
|
copy_v3_v3(r_a, tmp_co1);
|
|
|
|
|
copy_v3_v3(r_b, tmp_co2);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (isect) {
|
|
|
|
|
sub_v3_v3v3(r_vec, r_b, r_a);
|
|
|
|
|
dist = 0.0f;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
sub_v3_v3v3(r_vec, r_a, r_b);
|
|
|
|
|
dist = sqrtf(dist);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
2021-10-22 10:28:56 +11:00
|
|
|
/* `w3` is not perfect. */
|
2020-02-13 10:39:21 -03:00
|
|
|
static void collision_compute_barycentric(const float pv[3],
|
|
|
|
|
const float p1[3],
|
|
|
|
|
const float p2[3],
|
|
|
|
|
const 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);
|
|
|
|
|
|
2023-03-03 16:22:49 +11:00
|
|
|
if (fabs(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
|
|
|
|
2023-03-01 17:32:12 +01:00
|
|
|
w1[0] = float((e * c - b * f) / d);
|
2008-04-08 12:55:35 +00:00
|
|
|
|
2019-04-22 09:39:35 +10:00
|
|
|
if (w1[0] < 0) {
|
2008-01-29 21:01:12 +00:00
|
|
|
w1[0] = 0;
|
2019-04-22 09:39:35 +10:00
|
|
|
}
|
2008-04-08 12:55:35 +00:00
|
|
|
|
2023-03-03 16:22:49 +11:00
|
|
|
w2[0] = float((f - b * double(w1[0])) / c);
|
2008-04-08 12:55:35 +00:00
|
|
|
|
2019-04-22 09:39:35 +10:00
|
|
|
if (w2[0] < 0) {
|
2008-01-29 21:01:12 +00:00
|
|
|
w2[0] = 0;
|
2019-04-22 09:39:35 +10:00
|
|
|
}
|
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
|
|
|
|
2020-02-13 10:39:21 -03:00
|
|
|
DO_INLINE void collision_interpolateOnTriangle(float to[3],
|
|
|
|
|
const float v1[3],
|
|
|
|
|
const float v2[3],
|
|
|
|
|
const float v3[3],
|
|
|
|
|
const double w1,
|
|
|
|
|
const double w2,
|
|
|
|
|
const 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
|
|
|
}
|
|
|
|
|
|
2020-08-20 08:24:32 -03:00
|
|
|
static void cloth_collision_impulse_vert(const float clamp_sq,
|
|
|
|
|
const float impulse[3],
|
2023-03-01 17:32:12 +01:00
|
|
|
ClothVertex *vert)
|
2020-08-12 14:45:03 -03:00
|
|
|
{
|
|
|
|
|
float impulse_len_sq = len_squared_v3(impulse);
|
|
|
|
|
|
|
|
|
|
if ((clamp_sq > 0.0f) && (impulse_len_sq > clamp_sq)) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (fabsf(vert->impulse[0]) < fabsf(impulse[0])) {
|
|
|
|
|
vert->impulse[0] = impulse[0];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (fabsf(vert->impulse[1]) < fabsf(impulse[1])) {
|
|
|
|
|
vert->impulse[1] = impulse[1];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (fabsf(vert->impulse[2]) < fabsf(impulse[2])) {
|
|
|
|
|
vert->impulse[2] = impulse[2];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
vert->impulse_count++;
|
|
|
|
|
}
|
|
|
|
|
|
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;
|
2020-08-12 17:12:38 -03:00
|
|
|
Cloth *cloth = clmd->clothObject;
|
2020-08-20 08:24:32 -03:00
|
|
|
const float clamp_sq = square_f(clmd->coll_parms->clamp * dt);
|
2020-08-12 17:57:26 -03:00
|
|
|
const float time_multiplier = 1.0f / (clmd->sim_parms->dt * clmd->sim_parms->timescale);
|
|
|
|
|
const float epsilon2 = BLI_bvhtree_get_epsilon(collmd->bvhtree);
|
|
|
|
|
const float min_distance = (clmd->coll_parms->epsilon + epsilon2) * (8.0f / 9.0f);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2023-03-01 17:32:12 +01:00
|
|
|
const bool is_hair = (clmd->hairdata != nullptr);
|
2018-09-26 17:18:16 +02:00
|
|
|
for (int i = 0; i < collision_count; i++, collpair++) {
|
2020-08-12 17:57:26 -03:00
|
|
|
float i1[3], i2[3], i3[3];
|
2020-08-12 18:03:12 -03:00
|
|
|
float v1[3], v2[3], relativeVelocity[3];
|
2012-05-15 13:46:50 +00:00
|
|
|
zero_v3(i1);
|
|
|
|
|
zero_v3(i2);
|
|
|
|
|
zero_v3(i3);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
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
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-01-16 18:45:23 +01:00
|
|
|
/* Compute barycentric coordinates and relative "velocity" for both collision points. */
|
2023-01-06 13:48:36 +02:00
|
|
|
float w1 = collpair->aw1, w2 = collpair->aw2, w3 = collpair->aw3;
|
|
|
|
|
float u1 = collpair->bw1, u2 = collpair->bw2, u3 = collpair->bw3;
|
2020-01-16 18:45:23 +01:00
|
|
|
|
2023-01-06 13:48:36 +02:00
|
|
|
if (is_hair) {
|
2020-08-12 17:12:38 -03:00
|
|
|
interp_v3_v3v3(v1, cloth->verts[collpair->ap1].tv, cloth->verts[collpair->ap2].tv, w2);
|
2020-01-16 18:45:23 +01:00
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
collision_interpolateOnTriangle(v1,
|
2020-08-12 17:12:38 -03:00
|
|
|
cloth->verts[collpair->ap1].tv,
|
|
|
|
|
cloth->verts[collpair->ap2].tv,
|
|
|
|
|
cloth->verts[collpair->ap3].tv,
|
2020-01-16 18:45:23 +01:00
|
|
|
w1,
|
|
|
|
|
w2,
|
|
|
|
|
w3);
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
collision_interpolateOnTriangle(v2,
|
Mesh: Move positions to a generic attribute
**Changes**
As described in T93602, this patch removes all use of the `MVert`
struct, replacing it with a generic named attribute with the name
`"position"`, consistent with other geometry types.
Variable names have been changed from `verts` to `positions`, to align
with the attribute name and the more generic design (positions are not
vertices, they are just an attribute stored on the point domain).
This change is made possible by previous commits that moved all other
data out of `MVert` to runtime data or other generic attributes. What
remains is mostly a simple type change. Though, the type still shows up
859 times, so the patch is quite large.
One compromise is that now `CD_MASK_BAREMESH` now contains
`CD_PROP_FLOAT3`. With the general move towards generic attributes
over custom data types, we are removing use of these type masks anyway.
**Benefits**
The most obvious benefit is reduced memory usage and the benefits
that brings in memory-bound situations. `float3` is only 3 bytes, in
comparison to `MVert` which was 4. When there are millions of vertices
this starts to matter more.
The other benefits come from using a more generic type. Instead of
writing algorithms specifically for `MVert`, code can just use arrays
of vectors. This will allow eliminating many temporary arrays or
wrappers used to extract positions.
Many possible improvements aren't implemented in this patch, though
I did switch simplify or remove the process of creating temporary
position arrays in a few places.
The design clarity that "positions are just another attribute" brings
allows removing explicit copying of vertices in some procedural
operations-- they are just processed like most other attributes.
**Performance**
This touches so many areas that it's hard to benchmark exhaustively,
but I observed some areas as examples.
* The mesh line node with 4 million count was 1.5x (8ms to 12ms) faster.
* The Spring splash screen went from ~4.3 to ~4.5 fps.
* The subdivision surface modifier/node was slightly faster
RNA access through Python may be slightly slower, since now we need
a name lookup instead of just a custom data type lookup for each index.
**Future Improvements**
* Remove uses of "vert_coords" functions:
* `BKE_mesh_vert_coords_alloc`
* `BKE_mesh_vert_coords_get`
* `BKE_mesh_vert_coords_apply{_with_mat4}`
* Remove more hidden copying of positions
* General simplification now possible in many areas
* Convert more code to C++ to use `float3` instead of `float[3]`
* Currently `reinterpret_cast` is used for those C-API functions
Differential Revision: https://developer.blender.org/D15982
2023-01-10 00:10:43 -05:00
|
|
|
collmd->current_v[collpair->bp1],
|
|
|
|
|
collmd->current_v[collpair->bp2],
|
|
|
|
|
collmd->current_v[collpair->bp3],
|
2018-09-26 17:18:16 +02:00
|
|
|
u1,
|
|
|
|
|
u2,
|
|
|
|
|
u3);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-04-29 17:11:40 +00:00
|
|
|
sub_v3_v3v3(relativeVelocity, v2, v1);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-04-27 12:07:07 +10:00
|
|
|
/* Calculate the normal component of the relative velocity
|
|
|
|
|
* (actually only the magnitude - the direction is stored in 'normal'). */
|
2020-08-12 18:03:12 -03:00
|
|
|
const float magrelVel = dot_v3v3(relativeVelocity, collpair->normal);
|
2020-08-12 17:57:26 -03:00
|
|
|
const float d = min_distance - collpair->distance;
|
2019-04-17 06:17:24 +02: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. */
|
2020-08-12 14:45:03 -03:00
|
|
|
float magtangent = 0, repulse = 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];
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* Calculate tangential velocity. */
|
|
|
|
|
copy_v3_v3(temp, collpair->normal);
|
|
|
|
|
mul_v3_fl(temp, magrelVel);
|
|
|
|
|
sub_v3_v3v3(vrel_t_pre, relativeVelocity, temp);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* Decrease in magnitude of relative tangential velocity due to coulomb friction
|
2019-04-27 12:07:07 +10:00
|
|
|
* in original formula "magrelVel" should be the
|
|
|
|
|
* "change of relative velocity in normal direction". */
|
2018-09-26 17:18:16 +02:00
|
|
|
magtangent = min_ff(collob->pd->pdef_cfrict * 0.01f * magrelVel, len_v3(vrel_t_pre));
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* Apply friction impulse. */
|
|
|
|
|
if (magtangent > ALMOST_ZERO) {
|
|
|
|
|
normalize_v3(vrel_t_pre);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
impulse = magtangent / 1.5;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2023-03-03 16:22:49 +11:00
|
|
|
VECADDMUL(i1, vrel_t_pre, double(w1) * impulse);
|
|
|
|
|
VECADDMUL(i2, vrel_t_pre, double(w2) * impulse);
|
2020-01-16 18:45:23 +01:00
|
|
|
|
|
|
|
|
if (!is_hair) {
|
2023-03-03 16:22:49 +11:00
|
|
|
VECADDMUL(i3, vrel_t_pre, double(w3) * impulse);
|
2020-01-16 18:45:23 +01:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
|
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* Apply velocity stopping impulse. */
|
|
|
|
|
impulse = magrelVel / 1.5f;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2023-03-03 16:22:49 +11:00
|
|
|
VECADDMUL(i1, collpair->normal, double(w1) * impulse);
|
|
|
|
|
VECADDMUL(i2, collpair->normal, double(w2) * impulse);
|
2020-01-16 18:45:23 +01:00
|
|
|
if (!is_hair) {
|
2023-03-03 16:22:49 +11:00
|
|
|
VECADDMUL(i3, collpair->normal, double(w3) * impulse);
|
2020-01-16 18:45:23 +01:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
if ((magrelVel < 0.1f * d * time_multiplier) && (d > ALMOST_ZERO)) {
|
2023-11-07 16:33:19 +11:00
|
|
|
repulse = std::min(d / time_multiplier, 0.1f * d * time_multiplier - magrelVel);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-07-06 23:56:59 +00:00
|
|
|
/* Stay on the safe side and clamp repulse. */
|
2012-05-15 11:14:50 +00:00
|
|
|
if (impulse > ALMOST_ZERO) {
|
2018-09-26 17:18:16 +02:00
|
|
|
repulse = min_ff(repulse, 5.0f * impulse);
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
|
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
repulse = max_ff(impulse, repulse);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
impulse = repulse / 1.5f;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
VECADDMUL(i1, collpair->normal, impulse);
|
|
|
|
|
VECADDMUL(i2, collpair->normal, impulse);
|
2020-01-16 18:45:23 +01:00
|
|
|
if (!is_hair) {
|
|
|
|
|
VECADDMUL(i3, collpair->normal, impulse);
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
|
|
|
|
|
2012-05-15 11:14:50 +00:00
|
|
|
result = 1;
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2020-08-12 14:45:03 -03:00
|
|
|
else if (d > ALMOST_ZERO) {
|
|
|
|
|
/* Stay on the safe side and clamp repulse. */
|
|
|
|
|
float repulse = d / time_multiplier;
|
|
|
|
|
float impulse = repulse / 4.5f;
|
2020-01-16 18:45:23 +01:00
|
|
|
|
2020-08-12 14:45:03 -03:00
|
|
|
VECADDMUL(i1, collpair->normal, w1 * impulse);
|
|
|
|
|
VECADDMUL(i2, collpair->normal, w2 * impulse);
|
2008-05-26 09:39:32 +00:00
|
|
|
|
2020-08-12 14:45:03 -03:00
|
|
|
if (!is_hair) {
|
|
|
|
|
VECADDMUL(i3, collpair->normal, w3 * impulse);
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2020-08-12 14:45:03 -03:00
|
|
|
|
|
|
|
|
result = 1;
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2008-05-26 09:39:32 +00:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
if (result) {
|
2020-08-20 08:24:32 -03:00
|
|
|
cloth_collision_impulse_vert(clamp_sq, i1, &cloth->verts[collpair->ap1]);
|
|
|
|
|
cloth_collision_impulse_vert(clamp_sq, i2, &cloth->verts[collpair->ap2]);
|
2020-08-12 18:40:48 -03:00
|
|
|
if (!is_hair) {
|
2020-08-20 08:24:32 -03:00
|
|
|
cloth_collision_impulse_vert(clamp_sq, i3, &cloth->verts[collpair->ap3]);
|
2020-08-12 18:40:48 -03:00
|
|
|
}
|
2008-05-26 09:39:32 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02: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;
|
2020-08-12 17:12:38 -03:00
|
|
|
Cloth *cloth = clmd->clothObject;
|
2020-08-12 17:57:26 -03:00
|
|
|
const float clamp_sq = square_f(clmd->coll_parms->self_clamp * dt);
|
|
|
|
|
const float time_multiplier = 1.0f / (clmd->sim_parms->dt * clmd->sim_parms->timescale);
|
|
|
|
|
const float min_distance = (2.0f * clmd->coll_parms->selfepsilon) * (8.0f / 9.0f);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
for (int i = 0; i < collision_count; i++, collpair++) {
|
2020-02-13 10:39:21 -03:00
|
|
|
float ia[3][3] = {{0.0f}};
|
|
|
|
|
float ib[3][3] = {{0.0f}};
|
2020-08-12 18:03:12 -03:00
|
|
|
float v1[3], v2[3], relativeVelocity[3];
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* Only handle static collisions here. */
|
|
|
|
|
if (collpair->flag & (COLLISION_IN_FUTURE | COLLISION_INACTIVE)) {
|
2018-06-22 14:42:03 +02:00
|
|
|
continue;
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
|
|
|
|
|
2023-01-06 13:48:36 +02:00
|
|
|
/* Retrieve barycentric coordinates for both collision points. */
|
|
|
|
|
float w1 = collpair->aw1, w2 = collpair->aw2, w3 = collpair->aw3;
|
|
|
|
|
float u1 = collpair->bw1, u2 = collpair->bw2, u3 = collpair->bw3;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-07-06 23:56:59 +00:00
|
|
|
/* Calculate relative "velocity". */
|
2018-09-26 17:18:16 +02:00
|
|
|
collision_interpolateOnTriangle(v1,
|
2020-08-12 17:12:38 -03:00
|
|
|
cloth->verts[collpair->ap1].tv,
|
|
|
|
|
cloth->verts[collpair->ap2].tv,
|
|
|
|
|
cloth->verts[collpair->ap3].tv,
|
2018-09-26 17:18:16 +02:00
|
|
|
w1,
|
|
|
|
|
w2,
|
|
|
|
|
w3);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
collision_interpolateOnTriangle(v2,
|
2020-08-12 17:12:38 -03:00
|
|
|
cloth->verts[collpair->bp1].tv,
|
|
|
|
|
cloth->verts[collpair->bp2].tv,
|
|
|
|
|
cloth->verts[collpair->bp3].tv,
|
2019-04-17 06:17:24 +02:00
|
|
|
u1,
|
|
|
|
|
u2,
|
|
|
|
|
u3);
|
|
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
sub_v3_v3v3(relativeVelocity, v2, v1);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-04-27 12:07:07 +10:00
|
|
|
/* Calculate the normal component of the relative velocity
|
|
|
|
|
* (actually only the magnitude - the direction is stored in 'normal'). */
|
2020-08-12 18:03:12 -03:00
|
|
|
const float magrelVel = dot_v3v3(relativeVelocity, collpair->normal);
|
2020-08-12 17:57:26 -03:00
|
|
|
const float d = min_distance - collpair->distance;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* TODO: Impulses should be weighed by mass as this is self col,
|
|
|
|
|
* this has to be done after mass distribution is implemented. */
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* If magrelVel < 0 the edges are approaching each other. */
|
|
|
|
|
if (magrelVel > 0.0f) {
|
|
|
|
|
/* Calculate Impulse magnitude to stop all motion in normal direction. */
|
2020-08-12 14:45:03 -03:00
|
|
|
float magtangent = 0, repulse = 0;
|
2018-09-26 17:18:16 +02:00
|
|
|
double impulse = 0.0;
|
|
|
|
|
float vrel_t_pre[3];
|
2020-08-12 14:45:03 -03:00
|
|
|
float temp[3];
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* Calculate tangential velocity. */
|
|
|
|
|
copy_v3_v3(temp, collpair->normal);
|
|
|
|
|
mul_v3_fl(temp, magrelVel);
|
|
|
|
|
sub_v3_v3v3(vrel_t_pre, relativeVelocity, temp);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* Decrease in magnitude of relative tangential velocity due to coulomb friction
|
2019-04-27 12:07:07 +10:00
|
|
|
* in original formula "magrelVel" should be the
|
|
|
|
|
* "change of relative velocity in normal direction". */
|
2018-09-26 17:18:16 +02:00
|
|
|
magtangent = min_ff(clmd->coll_parms->self_friction * 0.01f * magrelVel, len_v3(vrel_t_pre));
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* Apply friction impulse. */
|
|
|
|
|
if (magtangent > ALMOST_ZERO) {
|
|
|
|
|
normalize_v3(vrel_t_pre);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
impulse = magtangent / 1.5;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2023-03-03 16:22:49 +11:00
|
|
|
VECADDMUL(ia[0], vrel_t_pre, double(w1) * impulse);
|
|
|
|
|
VECADDMUL(ia[1], vrel_t_pre, double(w2) * impulse);
|
|
|
|
|
VECADDMUL(ia[2], vrel_t_pre, double(w3) * impulse);
|
2020-02-13 10:39:21 -03:00
|
|
|
|
2023-03-03 16:22:49 +11:00
|
|
|
VECADDMUL(ib[0], vrel_t_pre, double(u1) * -impulse);
|
|
|
|
|
VECADDMUL(ib[1], vrel_t_pre, double(u2) * -impulse);
|
|
|
|
|
VECADDMUL(ib[2], vrel_t_pre, double(u3) * -impulse);
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
|
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* Apply velocity stopping impulse. */
|
|
|
|
|
impulse = magrelVel / 3.0f;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2023-03-03 16:22:49 +11:00
|
|
|
VECADDMUL(ia[0], collpair->normal, double(w1) * impulse);
|
|
|
|
|
VECADDMUL(ia[1], collpair->normal, double(w2) * impulse);
|
|
|
|
|
VECADDMUL(ia[2], collpair->normal, double(w3) * impulse);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2023-03-03 16:22:49 +11:00
|
|
|
VECADDMUL(ib[0], collpair->normal, double(u1) * -impulse);
|
|
|
|
|
VECADDMUL(ib[1], collpair->normal, double(u2) * -impulse);
|
|
|
|
|
VECADDMUL(ib[2], collpair->normal, double(u3) * -impulse);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
if ((magrelVel < 0.1f * d * time_multiplier) && (d > ALMOST_ZERO)) {
|
2024-01-22 15:58:18 +01:00
|
|
|
repulse = std::min(d / time_multiplier, 0.1f * d * time_multiplier - magrelVel);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
if (impulse > ALMOST_ZERO) {
|
|
|
|
|
repulse = min_ff(repulse, 5.0 * impulse);
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
|
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
repulse = max_ff(impulse, repulse);
|
|
|
|
|
impulse = repulse / 1.5f;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2023-03-03 16:22:49 +11:00
|
|
|
VECADDMUL(ia[0], collpair->normal, double(w1) * impulse);
|
|
|
|
|
VECADDMUL(ia[1], collpair->normal, double(w2) * impulse);
|
|
|
|
|
VECADDMUL(ia[2], collpair->normal, double(w3) * impulse);
|
2020-02-13 10:39:21 -03:00
|
|
|
|
2023-03-03 16:22:49 +11:00
|
|
|
VECADDMUL(ib[0], collpair->normal, double(u1) * -impulse);
|
|
|
|
|
VECADDMUL(ib[1], collpair->normal, double(u2) * -impulse);
|
|
|
|
|
VECADDMUL(ib[2], collpair->normal, double(u3) * -impulse);
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
|
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
result = 1;
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2020-08-12 14:45:03 -03:00
|
|
|
else if (d > ALMOST_ZERO) {
|
|
|
|
|
/* Stay on the safe side and clamp repulse. */
|
|
|
|
|
float repulse = d * 1.0f / time_multiplier;
|
|
|
|
|
float impulse = repulse / 9.0f;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-08-12 14:45:03 -03:00
|
|
|
VECADDMUL(ia[0], collpair->normal, w1 * impulse);
|
|
|
|
|
VECADDMUL(ia[1], collpair->normal, w2 * impulse);
|
|
|
|
|
VECADDMUL(ia[2], collpair->normal, w3 * impulse);
|
2018-09-26 17:18:16 +02:00
|
|
|
|
2020-08-12 18:13:01 -03:00
|
|
|
VECADDMUL(ib[0], collpair->normal, u1 * -impulse);
|
|
|
|
|
VECADDMUL(ib[1], collpair->normal, u2 * -impulse);
|
|
|
|
|
VECADDMUL(ib[2], collpair->normal, u3 * -impulse);
|
2018-09-26 17:18:16 +02:00
|
|
|
|
2020-08-12 14:45:03 -03:00
|
|
|
result = 1;
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2018-09-26 17:18:16 +02:00
|
|
|
|
|
|
|
|
if (result) {
|
2020-08-20 08:24:32 -03:00
|
|
|
cloth_collision_impulse_vert(clamp_sq, ia[0], &cloth->verts[collpair->ap1]);
|
|
|
|
|
cloth_collision_impulse_vert(clamp_sq, ia[1], &cloth->verts[collpair->ap2]);
|
|
|
|
|
cloth_collision_impulse_vert(clamp_sq, ia[2], &cloth->verts[collpair->ap3]);
|
2018-09-26 17:18:16 +02:00
|
|
|
|
2020-08-20 08:24:32 -03:00
|
|
|
cloth_collision_impulse_vert(clamp_sq, ib[0], &cloth->verts[collpair->bp1]);
|
|
|
|
|
cloth_collision_impulse_vert(clamp_sq, ib[1], &cloth->verts[collpair->bp2]);
|
|
|
|
|
cloth_collision_impulse_vert(clamp_sq, ib[2], &cloth->verts[collpair->bp3]);
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
|
|
|
|
}
|
2018-09-26 17:18:16 +02: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
|
|
|
|
2023-03-01 17:32:12 +01:00
|
|
|
static bool cloth_bvh_collision_is_active(const ClothModifierData * /*clmd*/,
|
2021-01-06 14:48:42 +03:00
|
|
|
const Cloth *cloth,
|
2023-12-20 20:45:15 -05:00
|
|
|
const blender::int3 vert_tri_a)
|
2021-01-06 14:48:42 +03:00
|
|
|
{
|
|
|
|
|
const ClothVertex *verts = cloth->verts;
|
|
|
|
|
|
|
|
|
|
/* Fully pinned triangles don't need collision processing. */
|
2023-12-20 20:45:15 -05:00
|
|
|
const int flags_a = verts[vert_tri_a[0]].flags & verts[vert_tri_a[1]].flags &
|
|
|
|
|
verts[vert_tri_a[2]].flags;
|
2021-01-06 14:48:42 +03:00
|
|
|
|
2021-01-08 13:02:40 +03:00
|
|
|
if (flags_a & (CLOTH_VERT_FLAG_PINNED | CLOTH_VERT_FLAG_NOOBJCOLL)) {
|
2021-01-06 14:48:42 +03:00
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
static void cloth_collision(void *__restrict userdata,
|
|
|
|
|
const int index,
|
2023-03-01 17:32:12 +01:00
|
|
|
const TaskParallelTLS *__restrict /*tls*/)
|
2008-01-29 21:01:12 +00:00
|
|
|
{
|
2018-09-26 17:18:16 +02:00
|
|
|
ColDetectData *data = (ColDetectData *)userdata;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
ClothModifierData *clmd = data->clmd;
|
|
|
|
|
CollisionModifierData *collmd = data->collmd;
|
|
|
|
|
CollPair *collpair = data->collisions;
|
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];
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2023-12-20 20:45:15 -05:00
|
|
|
const blender::int3 vert_tri_a = clmd->clothObject->vert_tris[data->overlap[index].indexA];
|
|
|
|
|
const blender::int3 vert_tri_b = collmd->vert_tris[data->overlap[index].indexB];
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* Compute distance and normal. */
|
2023-12-20 20:45:15 -05:00
|
|
|
distance = compute_collision_point_tri_tri(verts1[vert_tri_a[0]].tx,
|
|
|
|
|
verts1[vert_tri_a[1]].tx,
|
|
|
|
|
verts1[vert_tri_a[2]].tx,
|
|
|
|
|
collmd->current_xnew[vert_tri_b[0]],
|
|
|
|
|
collmd->current_xnew[vert_tri_b[1]],
|
|
|
|
|
collmd->current_xnew[vert_tri_b[2]],
|
2020-01-16 18:45:23 +01:00
|
|
|
data->culling,
|
|
|
|
|
data->use_normal,
|
|
|
|
|
pa,
|
|
|
|
|
pb,
|
|
|
|
|
vect);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
if ((distance <= (epsilon1 + epsilon2 + ALMOST_ZERO)) && (len_squared_v3(vect) > ALMOST_ZERO)) {
|
2023-12-20 20:45:15 -05:00
|
|
|
collpair[index].ap1 = vert_tri_a[0];
|
|
|
|
|
collpair[index].ap2 = vert_tri_a[1];
|
|
|
|
|
collpair[index].ap3 = vert_tri_a[2];
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2023-12-20 20:45:15 -05:00
|
|
|
collpair[index].bp1 = vert_tri_b[0];
|
|
|
|
|
collpair[index].bp2 = vert_tri_b[1];
|
|
|
|
|
collpair[index].bp3 = vert_tri_b[2];
|
2019-04-17 06:17:24 +02: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);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
normalize_v3_v3(collpair[index].normal, collpair[index].vector);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
collpair[index].distance = distance;
|
|
|
|
|
collpair[index].flag = 0;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
data->collided = true;
|
2023-01-06 13:48:36 +02:00
|
|
|
|
|
|
|
|
/* Compute barycentric coordinates for both collision points. */
|
|
|
|
|
collision_compute_barycentric(pa,
|
2023-12-20 20:45:15 -05:00
|
|
|
verts1[vert_tri_a[0]].tx,
|
|
|
|
|
verts1[vert_tri_a[1]].tx,
|
|
|
|
|
verts1[vert_tri_a[2]].tx,
|
2023-01-06 13:48:36 +02:00
|
|
|
&collpair[index].aw1,
|
|
|
|
|
&collpair[index].aw2,
|
|
|
|
|
&collpair[index].aw3);
|
|
|
|
|
|
|
|
|
|
collision_compute_barycentric(pb,
|
2023-12-20 20:45:15 -05:00
|
|
|
collmd->current_xnew[vert_tri_b[0]],
|
|
|
|
|
collmd->current_xnew[vert_tri_b[1]],
|
|
|
|
|
collmd->current_xnew[vert_tri_b[2]],
|
2023-01-06 13:48:36 +02:00
|
|
|
&collpair[index].bw1,
|
|
|
|
|
&collpair[index].bw2,
|
|
|
|
|
&collpair[index].bw3);
|
2018-09-26 17:18:16 +02:00
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
collpair[index].flag = COLLISION_INACTIVE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2021-01-06 14:48:42 +03:00
|
|
|
static bool cloth_bvh_selfcollision_is_active(const ClothModifierData *clmd,
|
|
|
|
|
const Cloth *cloth,
|
2023-12-20 20:45:15 -05:00
|
|
|
const blender::int3 vert_tri_a,
|
|
|
|
|
const blender::int3 vert_tri_b)
|
2020-02-13 10:39:21 -03:00
|
|
|
{
|
2020-03-02 10:52:58 -03:00
|
|
|
const ClothVertex *verts = cloth->verts;
|
2021-01-06 14:48:42 +03:00
|
|
|
|
|
|
|
|
/* Skip when either triangle is excluded. */
|
2023-12-20 20:45:15 -05:00
|
|
|
const int flags_a = verts[vert_tri_a[0]].flags & verts[vert_tri_a[1]].flags &
|
|
|
|
|
verts[vert_tri_a[2]].flags;
|
|
|
|
|
const int flags_b = verts[vert_tri_b[0]].flags & verts[vert_tri_b[1]].flags &
|
|
|
|
|
verts[vert_tri_b[2]].flags;
|
2021-01-06 14:48:42 +03:00
|
|
|
|
|
|
|
|
if ((flags_a | flags_b) & CLOTH_VERT_FLAG_NOSELFCOLL) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Skip when both triangles are pinned. */
|
|
|
|
|
if ((flags_a & flags_b) & CLOTH_VERT_FLAG_PINNED) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2020-03-02 10:52:58 -03:00
|
|
|
/* Ignore overlap of neighboring triangles and triangles connected by a sewing edge. */
|
2021-01-06 14:48:42 +03:00
|
|
|
bool sewing_active = (clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_SEW);
|
|
|
|
|
|
2020-02-13 10:39:21 -03:00
|
|
|
for (uint i = 0; i < 3; i++) {
|
|
|
|
|
for (uint j = 0; j < 3; j++) {
|
2023-12-20 20:45:15 -05:00
|
|
|
if (vert_tri_a[i] == vert_tri_b[j]) {
|
2020-02-13 10:39:21 -03:00
|
|
|
return false;
|
|
|
|
|
}
|
2020-03-02 10:52:58 -03:00
|
|
|
|
|
|
|
|
if (sewing_active) {
|
2023-12-20 20:45:15 -05:00
|
|
|
if (cloth->sew_edge_graph.contains({vert_tri_a[i], vert_tri_b[j]})) {
|
2020-03-02 10:52:58 -03:00
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-02-13 10:39:21 -03:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
static void cloth_selfcollision(void *__restrict userdata,
|
|
|
|
|
const int index,
|
2023-03-01 17:32:12 +01:00
|
|
|
const TaskParallelTLS *__restrict /*tls*/)
|
2018-09-26 17:18:16 +02:00
|
|
|
{
|
|
|
|
|
SelfColDetectData *data = (SelfColDetectData *)userdata;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
ClothModifierData *clmd = data->clmd;
|
|
|
|
|
CollPair *collpair = data->collisions;
|
|
|
|
|
ClothVertex *verts1 = clmd->clothObject->verts;
|
|
|
|
|
float distance = 0.0f;
|
|
|
|
|
float epsilon = clmd->coll_parms->selfepsilon;
|
|
|
|
|
float pa[3], pb[3], vect[3];
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2023-01-06 02:34:39 +02:00
|
|
|
/* Collision math is currently not symmetric, so ensure a stable order for each pair. */
|
|
|
|
|
int indexA = data->overlap[index].indexA, indexB = data->overlap[index].indexB;
|
|
|
|
|
|
|
|
|
|
if (indexA > indexB) {
|
2024-01-31 22:01:30 -05:00
|
|
|
std::swap(indexA, indexB);
|
2023-01-06 02:34:39 +02:00
|
|
|
}
|
|
|
|
|
|
2023-12-20 20:45:15 -05:00
|
|
|
const blender::int3 vert_tri_a = clmd->clothObject->vert_tris[indexA];
|
|
|
|
|
const blender::int3 vert_tri_b = clmd->clothObject->vert_tris[indexB];
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2023-12-20 21:24:53 -05:00
|
|
|
BLI_assert(cloth_bvh_selfcollision_is_active(clmd, clmd->clothObject, vert_tri_a, vert_tri_b));
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* Compute distance and normal. */
|
2023-12-20 20:45:15 -05:00
|
|
|
distance = compute_collision_point_tri_tri(verts1[vert_tri_a[0]].tx,
|
|
|
|
|
verts1[vert_tri_a[1]].tx,
|
|
|
|
|
verts1[vert_tri_a[2]].tx,
|
|
|
|
|
verts1[vert_tri_b[0]].tx,
|
|
|
|
|
verts1[vert_tri_b[1]].tx,
|
|
|
|
|
verts1[vert_tri_b[2]].tx,
|
2020-01-16 18:45:23 +01:00
|
|
|
false,
|
|
|
|
|
false,
|
|
|
|
|
pa,
|
|
|
|
|
pb,
|
|
|
|
|
vect);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
if ((distance <= (epsilon * 2.0f + ALMOST_ZERO)) && (len_squared_v3(vect) > ALMOST_ZERO)) {
|
2023-12-20 20:45:15 -05:00
|
|
|
collpair[index].ap1 = vert_tri_a[0];
|
|
|
|
|
collpair[index].ap2 = vert_tri_a[1];
|
|
|
|
|
collpair[index].ap3 = vert_tri_a[2];
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2023-12-20 20:45:15 -05:00
|
|
|
collpair[index].bp1 = vert_tri_b[0];
|
|
|
|
|
collpair[index].bp2 = vert_tri_b[1];
|
|
|
|
|
collpair[index].bp3 = vert_tri_b[2];
|
2019-04-17 06:17:24 +02: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);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
normalize_v3_v3(collpair[index].normal, collpair[index].vector);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
collpair[index].distance = distance;
|
|
|
|
|
collpair[index].flag = 0;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
data->collided = true;
|
2023-01-06 13:48:36 +02:00
|
|
|
|
|
|
|
|
/* Compute barycentric coordinates for both collision points. */
|
|
|
|
|
collision_compute_barycentric(pa,
|
2023-12-20 20:45:15 -05:00
|
|
|
verts1[vert_tri_a[0]].tx,
|
|
|
|
|
verts1[vert_tri_a[1]].tx,
|
|
|
|
|
verts1[vert_tri_a[2]].tx,
|
2023-01-06 13:48:36 +02:00
|
|
|
&collpair[index].aw1,
|
|
|
|
|
&collpair[index].aw2,
|
|
|
|
|
&collpair[index].aw3);
|
|
|
|
|
|
|
|
|
|
collision_compute_barycentric(pb,
|
2023-12-20 20:45:15 -05:00
|
|
|
verts1[vert_tri_b[0]].tx,
|
|
|
|
|
verts1[vert_tri_b[1]].tx,
|
|
|
|
|
verts1[vert_tri_b[2]].tx,
|
2023-01-06 13:48:36 +02:00
|
|
|
&collpair[index].bw1,
|
|
|
|
|
&collpair[index].bw2,
|
|
|
|
|
&collpair[index].bw3);
|
2018-09-26 17:18:16 +02:00
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
collpair[index].flag = COLLISION_INACTIVE;
|
2008-03-03 19:02:01 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-01-16 18:45:23 +01:00
|
|
|
static void hair_collision(void *__restrict userdata,
|
|
|
|
|
const int index,
|
2023-03-01 17:32:12 +01:00
|
|
|
const TaskParallelTLS *__restrict /*tls*/)
|
2020-01-16 18:45:23 +01:00
|
|
|
{
|
|
|
|
|
ColDetectData *data = (ColDetectData *)userdata;
|
|
|
|
|
|
|
|
|
|
ClothModifierData *clmd = data->clmd;
|
|
|
|
|
CollisionModifierData *collmd = data->collmd;
|
|
|
|
|
CollPair *collpair = data->collisions;
|
|
|
|
|
ClothVertex *verts1 = clmd->clothObject->verts;
|
|
|
|
|
float distance = 0.0f;
|
|
|
|
|
float epsilon1 = clmd->coll_parms->epsilon;
|
|
|
|
|
float epsilon2 = BLI_bvhtree_get_epsilon(collmd->bvhtree);
|
|
|
|
|
float pa[3], pb[3], vect[3];
|
|
|
|
|
|
|
|
|
|
/* TODO: This is not efficient. Might be wise to instead build an array before iterating, to
|
|
|
|
|
* avoid walking the list every time. */
|
Mesh: Move edges to a generic attribute
Implements #95966, as the final step of #95965.
This commit changes the storage of mesh edge vertex indices from the
`MEdge` type to the generic `int2` attribute type. This follows the
general design for geometry and the attribute system, where the data
storage type and the usage semantics are separated.
The main benefit of the change is reduced memory usage-- the
requirements of storing mesh edges is reduced by 1/3. For example,
this saves 8MB on a 1 million vertex grid. This also gives performance
benefits to any memory-bound mesh processing algorithm that uses edges.
Another benefit is that all of the edge's vertex indices are
contiguous. In a few cases, it's helpful to process all of them as
`Span<int>` rather than `Span<int2>`. Similarly, the type is more
likely to match a generic format used by a library, or code that
shouldn't know about specific Blender `Mesh` types.
Various Notes:
- The `.edge_verts` name is used to reflect a mapping between domains,
similar to `.corner_verts`, etc. The period means that it the data
shouldn't change arbitrarily by the user or procedural operations.
- `edge[0]` is now used instead of `edge.v1`
- Signed integers are used instead of unsigned to reduce the mixing
of signed-ness, which can be error prone.
- All of the previously used core mesh data types (`MVert`, `MEdge`,
`MLoop`, `MPoly` are now deprecated. Only generic types are used).
- The `vec2i` DNA type is used in the few C files where necessary.
Pull Request: https://projects.blender.org/blender/blender/pulls/106638
2023-04-17 13:47:41 +02:00
|
|
|
const blender::int2 &edge_coll = reinterpret_cast<const blender::int2 *>(
|
|
|
|
|
clmd->clothObject->edges)[data->overlap[index].indexA];
|
2023-12-20 20:45:15 -05:00
|
|
|
const blender::int3 tri_coll = collmd->vert_tris[data->overlap[index].indexB];
|
2020-01-16 18:45:23 +01:00
|
|
|
|
|
|
|
|
/* Compute distance and normal. */
|
Mesh: Move edges to a generic attribute
Implements #95966, as the final step of #95965.
This commit changes the storage of mesh edge vertex indices from the
`MEdge` type to the generic `int2` attribute type. This follows the
general design for geometry and the attribute system, where the data
storage type and the usage semantics are separated.
The main benefit of the change is reduced memory usage-- the
requirements of storing mesh edges is reduced by 1/3. For example,
this saves 8MB on a 1 million vertex grid. This also gives performance
benefits to any memory-bound mesh processing algorithm that uses edges.
Another benefit is that all of the edge's vertex indices are
contiguous. In a few cases, it's helpful to process all of them as
`Span<int>` rather than `Span<int2>`. Similarly, the type is more
likely to match a generic format used by a library, or code that
shouldn't know about specific Blender `Mesh` types.
Various Notes:
- The `.edge_verts` name is used to reflect a mapping between domains,
similar to `.corner_verts`, etc. The period means that it the data
shouldn't change arbitrarily by the user or procedural operations.
- `edge[0]` is now used instead of `edge.v1`
- Signed integers are used instead of unsigned to reduce the mixing
of signed-ness, which can be error prone.
- All of the previously used core mesh data types (`MVert`, `MEdge`,
`MLoop`, `MPoly` are now deprecated. Only generic types are used).
- The `vec2i` DNA type is used in the few C files where necessary.
Pull Request: https://projects.blender.org/blender/blender/pulls/106638
2023-04-17 13:47:41 +02:00
|
|
|
distance = compute_collision_point_edge_tri(verts1[edge_coll[0]].tx,
|
|
|
|
|
verts1[edge_coll[1]].tx,
|
2023-12-20 20:45:15 -05:00
|
|
|
collmd->current_x[tri_coll[0]],
|
|
|
|
|
collmd->current_x[tri_coll[1]],
|
|
|
|
|
collmd->current_x[tri_coll[2]],
|
2020-01-16 18:45:23 +01:00
|
|
|
data->culling,
|
|
|
|
|
data->use_normal,
|
|
|
|
|
pa,
|
|
|
|
|
pb,
|
|
|
|
|
vect);
|
|
|
|
|
|
|
|
|
|
if ((distance <= (epsilon1 + epsilon2 + ALMOST_ZERO)) && (len_squared_v3(vect) > ALMOST_ZERO)) {
|
Mesh: Move edges to a generic attribute
Implements #95966, as the final step of #95965.
This commit changes the storage of mesh edge vertex indices from the
`MEdge` type to the generic `int2` attribute type. This follows the
general design for geometry and the attribute system, where the data
storage type and the usage semantics are separated.
The main benefit of the change is reduced memory usage-- the
requirements of storing mesh edges is reduced by 1/3. For example,
this saves 8MB on a 1 million vertex grid. This also gives performance
benefits to any memory-bound mesh processing algorithm that uses edges.
Another benefit is that all of the edge's vertex indices are
contiguous. In a few cases, it's helpful to process all of them as
`Span<int>` rather than `Span<int2>`. Similarly, the type is more
likely to match a generic format used by a library, or code that
shouldn't know about specific Blender `Mesh` types.
Various Notes:
- The `.edge_verts` name is used to reflect a mapping between domains,
similar to `.corner_verts`, etc. The period means that it the data
shouldn't change arbitrarily by the user or procedural operations.
- `edge[0]` is now used instead of `edge.v1`
- Signed integers are used instead of unsigned to reduce the mixing
of signed-ness, which can be error prone.
- All of the previously used core mesh data types (`MVert`, `MEdge`,
`MLoop`, `MPoly` are now deprecated. Only generic types are used).
- The `vec2i` DNA type is used in the few C files where necessary.
Pull Request: https://projects.blender.org/blender/blender/pulls/106638
2023-04-17 13:47:41 +02:00
|
|
|
collpair[index].ap1 = edge_coll[0];
|
|
|
|
|
collpair[index].ap2 = edge_coll[1];
|
2020-01-16 18:45:23 +01:00
|
|
|
|
2023-12-20 20:45:15 -05:00
|
|
|
collpair[index].bp1 = tri_coll[0];
|
|
|
|
|
collpair[index].bp2 = tri_coll[1];
|
|
|
|
|
collpair[index].bp3 = tri_coll[2];
|
2020-01-16 18:45:23 +01:00
|
|
|
|
|
|
|
|
copy_v3_v3(collpair[index].pa, pa);
|
|
|
|
|
copy_v3_v3(collpair[index].pb, pb);
|
|
|
|
|
copy_v3_v3(collpair[index].vector, vect);
|
|
|
|
|
|
|
|
|
|
normalize_v3_v3(collpair[index].normal, collpair[index].vector);
|
|
|
|
|
|
|
|
|
|
collpair[index].distance = distance;
|
|
|
|
|
collpair[index].flag = 0;
|
|
|
|
|
|
|
|
|
|
data->collided = true;
|
2023-01-06 13:48:36 +02:00
|
|
|
|
|
|
|
|
/* Compute barycentric coordinates for the collision points. */
|
|
|
|
|
collpair[index].aw2 = line_point_factor_v3(
|
Mesh: Move edges to a generic attribute
Implements #95966, as the final step of #95965.
This commit changes the storage of mesh edge vertex indices from the
`MEdge` type to the generic `int2` attribute type. This follows the
general design for geometry and the attribute system, where the data
storage type and the usage semantics are separated.
The main benefit of the change is reduced memory usage-- the
requirements of storing mesh edges is reduced by 1/3. For example,
this saves 8MB on a 1 million vertex grid. This also gives performance
benefits to any memory-bound mesh processing algorithm that uses edges.
Another benefit is that all of the edge's vertex indices are
contiguous. In a few cases, it's helpful to process all of them as
`Span<int>` rather than `Span<int2>`. Similarly, the type is more
likely to match a generic format used by a library, or code that
shouldn't know about specific Blender `Mesh` types.
Various Notes:
- The `.edge_verts` name is used to reflect a mapping between domains,
similar to `.corner_verts`, etc. The period means that it the data
shouldn't change arbitrarily by the user or procedural operations.
- `edge[0]` is now used instead of `edge.v1`
- Signed integers are used instead of unsigned to reduce the mixing
of signed-ness, which can be error prone.
- All of the previously used core mesh data types (`MVert`, `MEdge`,
`MLoop`, `MPoly` are now deprecated. Only generic types are used).
- The `vec2i` DNA type is used in the few C files where necessary.
Pull Request: https://projects.blender.org/blender/blender/pulls/106638
2023-04-17 13:47:41 +02:00
|
|
|
pa, verts1[edge_coll[0]].tx, verts1[edge_coll[1]].tx);
|
2023-01-06 13:48:36 +02:00
|
|
|
|
|
|
|
|
collpair[index].aw1 = 1.0f - collpair[index].aw2;
|
|
|
|
|
|
|
|
|
|
collision_compute_barycentric(pb,
|
2023-12-20 20:45:15 -05:00
|
|
|
collmd->current_xnew[tri_coll[0]],
|
|
|
|
|
collmd->current_xnew[tri_coll[1]],
|
|
|
|
|
collmd->current_xnew[tri_coll[2]],
|
2023-01-06 13:48:36 +02:00
|
|
|
&collpair[index].bw1,
|
|
|
|
|
&collpair[index].bw2,
|
|
|
|
|
&collpair[index].bw3);
|
2020-01-16 18:45:23 +01:00
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
collpair[index].flag = COLLISION_INACTIVE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2023-03-01 17:32:12 +01:00
|
|
|
static void add_collision_object(ListBase *relations,
|
|
|
|
|
Object *ob,
|
|
|
|
|
int level,
|
|
|
|
|
const ModifierType modifier_type)
|
2008-07-02 20:28:49 +00:00
|
|
|
{
|
2010-03-26 10:52:55 +00:00
|
|
|
/* only get objects with collision modifier */
|
2021-01-09 21:15:53 +03:00
|
|
|
ModifierData *cmd = BKE_modifiers_findby_type(ob, modifier_type);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-10-21 05:46:41 +00:00
|
|
|
if (cmd) {
|
2023-03-01 17:32:12 +01:00
|
|
|
CollisionRelation *relation = MEM_cnew<CollisionRelation>(__func__);
|
2018-06-22 14:42:03 +02:00
|
|
|
relation->ob = ob;
|
|
|
|
|
BLI_addtail(relations, relation);
|
2010-03-26 10:52:55 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02: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;
|
2019-04-17 06:17:24 +02: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) {
|
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
|
|
|
ListBase *BKE_collision_relations_create(Depsgraph *depsgraph,
|
|
|
|
|
Collection *collection,
|
2022-09-26 10:56:05 +10:00
|
|
|
uint modifier_type)
|
2010-03-26 10:52:55 +00:00
|
|
|
{
|
2022-09-14 21:30:20 +02:00
|
|
|
const Scene *scene = DEG_get_input_scene(depsgraph);
|
2018-06-25 14:07:14 +02:00
|
|
|
ViewLayer *view_layer = DEG_get_input_view_layer(depsgraph);
|
2022-09-14 21:30:20 +02:00
|
|
|
Base *base = BKE_collection_or_layer_objects(scene, 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;
|
|
|
|
|
|
2023-03-01 17:32:12 +01:00
|
|
|
ListBase *relations = MEM_cnew<ListBase>(__func__);
|
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) {
|
2023-03-01 17:32:12 +01:00
|
|
|
add_collision_object(relations, base->object, 0, ModifierType(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
|
|
|
Object **BKE_collision_objects_create(Depsgraph *depsgraph,
|
|
|
|
|
Object *self,
|
|
|
|
|
Collection *collection,
|
2022-09-26 10:56:05 +10:00
|
|
|
uint *numcollobj,
|
|
|
|
|
uint 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);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-06-22 14:42:03 +02:00
|
|
|
if (!relations) {
|
2018-06-25 14:21:15 +02:00
|
|
|
*numcollobj = 0;
|
2023-03-01 17:32:12 +01:00
|
|
|
return nullptr;
|
2018-06-22 14:42:03 +02:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-06-22 14:42:03 +02:00
|
|
|
int maxnum = BLI_listbase_count(relations);
|
|
|
|
|
int num = 0;
|
2023-03-01 17:32:12 +01:00
|
|
|
Object **objects = MEM_cnew_array<Object *>(maxnum, __func__);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-04-03 19:15:01 +02:00
|
|
|
LISTBASE_FOREACH (CollisionRelation *, relation, relations) {
|
2018-06-22 14:42:03 +02:00
|
|
|
/* Get evaluated object. */
|
|
|
|
|
Object *ob = (Object *)DEG_get_evaluated_id(depsgraph, &relation->ob->id);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2021-01-09 21:15:53 +03:00
|
|
|
if (modifier_type == eModifierType_Collision && !(ob->pd && ob->pd->deflect)) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2018-06-22 14:42:03 +02:00
|
|
|
if (ob != self) {
|
|
|
|
|
objects[num] = ob;
|
|
|
|
|
num++;
|
|
|
|
|
}
|
2010-03-26 10:52:55 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-06-22 14:42:03 +02:00
|
|
|
if (num == 0) {
|
|
|
|
|
MEM_freeN(objects);
|
2023-03-01 17:32:12 +01:00
|
|
|
objects = nullptr;
|
2018-06-22 14:42:03 +02:00
|
|
|
}
|
2019-04-17 06:17:24 +02: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
|
|
|
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);
|
2023-03-01 17:32:12 +01:00
|
|
|
ListBase *cache = nullptr;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-06-22 14:42:03 +02:00
|
|
|
if (!relations) {
|
2023-03-01 17:32:12 +01:00
|
|
|
return nullptr;
|
2010-03-26 10:52:55 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-04-03 19:15:01 +02:00
|
|
|
LISTBASE_FOREACH (CollisionRelation *, relation, relations) {
|
2018-06-22 14:42:03 +02:00
|
|
|
/* Get evaluated object. */
|
|
|
|
|
Object *ob = (Object *)DEG_get_evaluated_id(depsgraph, &relation->ob->id);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-06-22 14:42:03 +02:00
|
|
|
if (ob == self) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-05-08 10:14:02 +02:00
|
|
|
CollisionModifierData *cmd = (CollisionModifierData *)BKE_modifiers_findby_type(
|
2018-06-22 14:42:03 +02:00
|
|
|
ob, eModifierType_Collision);
|
|
|
|
|
if (cmd && cmd->bvhtree) {
|
2023-03-01 17:32:12 +01:00
|
|
|
if (cache == nullptr) {
|
|
|
|
|
cache = MEM_cnew<ListBase>(__func__);
|
2018-06-22 14:42:03 +02:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2023-03-01 17:32:12 +01:00
|
|
|
ColliderCache *col = MEM_cnew<ColliderCache>(__func__);
|
2018-06-22 14:42:03 +02:00
|
|
|
col->ob = ob;
|
|
|
|
|
col->collmd = cmd;
|
|
|
|
|
/* make sure collider is properly set up */
|
2020-01-12 17:08:01 +01:00
|
|
|
collision_move_object(cmd, 1.0, 0.0, true);
|
2018-06-22 14:42:03 +02:00
|
|
|
BLI_addtail(cache, col);
|
2010-06-18 14:14:13 +00:00
|
|
|
}
|
2010-03-26 10:52:55 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02: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);
|
2023-03-01 17:32:12 +01:00
|
|
|
*colliders = nullptr;
|
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-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)
|
|
|
|
|
{
|
2023-03-01 17:32:12 +01:00
|
|
|
const bool is_hair = (clmd->hairdata != nullptr);
|
2018-09-26 17:18:16 +02:00
|
|
|
*collisions = (CollPair *)MEM_mallocN(sizeof(CollPair) * numresult, "collision array");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2023-03-01 17:32:12 +01:00
|
|
|
ColDetectData data{};
|
|
|
|
|
data.clmd = clmd;
|
|
|
|
|
data.collmd = collmd;
|
|
|
|
|
data.overlap = overlap;
|
|
|
|
|
data.collisions = *collisions;
|
|
|
|
|
data.culling = culling;
|
|
|
|
|
data.use_normal = use_normal;
|
|
|
|
|
data.collided = false;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-07-30 14:56:47 +02:00
|
|
|
TaskParallelSettings settings;
|
2018-09-26 17:18:16 +02:00
|
|
|
BLI_parallel_range_settings_defaults(&settings);
|
|
|
|
|
settings.use_threading = true;
|
2020-01-16 18:45:23 +01:00
|
|
|
BLI_task_parallel_range(
|
|
|
|
|
0, numresult, &data, is_hair ? hair_collision : cloth_collision, &settings);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
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
|
|
|
{
|
2023-03-01 17:32:12 +01:00
|
|
|
SelfColDetectData data{};
|
|
|
|
|
data.clmd = clmd;
|
|
|
|
|
data.overlap = overlap;
|
|
|
|
|
data.collisions = collisions;
|
|
|
|
|
data.collided = false;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-07-30 14:56:47 +02:00
|
|
|
TaskParallelSettings settings;
|
2018-09-26 17:18:16 +02:00
|
|
|
BLI_parallel_range_settings_defaults(&settings);
|
|
|
|
|
settings.use_threading = true;
|
|
|
|
|
BLI_task_parallel_range(0, numresult, &data, cloth_selfcollision, &settings);
|
2019-04-17 06:17:24 +02: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;
|
2023-03-01 17:32:12 +01:00
|
|
|
ClothVertex *verts = nullptr;
|
2008-07-02 20:28:49 +00:00
|
|
|
int ret = 0;
|
|
|
|
|
int result = 0;
|
2019-04-17 06:17:24 +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;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2008-03-03 19:02:01 +00:00
|
|
|
result = 1;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
for (j = 0; j < 2; j++) {
|
2008-03-03 19:02:01 +00:00
|
|
|
result = 0;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
for (i = 0; i < numcollobj; i++) {
|
|
|
|
|
Object *collob = collobjs[i];
|
2020-05-08 10:14:02 +02:00
|
|
|
CollisionModifierData *collmd = (CollisionModifierData *)BKE_modifiers_findby_type(
|
2018-09-26 17:18:16 +02:00
|
|
|
collob, eModifierType_Collision);
|
2019-04-17 06:17:24 +02: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);
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02: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;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
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;
|
2023-03-01 17:32:12 +01:00
|
|
|
ClothVertex *verts = nullptr;
|
2018-09-26 17:18:16 +02:00
|
|
|
int ret = 0;
|
|
|
|
|
int result = 0;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
mvert_num = clmd->clothObject->mvert_num;
|
|
|
|
|
verts = cloth->verts;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
for (j = 0; j < 2; j++) {
|
|
|
|
|
result = 0;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
result += cloth_selfcollision_response_static(clmd, collisions, collision_count, dt);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* 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;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
ret++;
|
2008-05-14 16:09:56 +00:00
|
|
|
}
|
|
|
|
|
}
|
2008-05-07 20:42:16 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02: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
|
|
|
}
|
|
|
|
|
|
2023-03-01 17:32:12 +01:00
|
|
|
static bool cloth_bvh_obj_overlap_cb(void *userdata, int index_a, int /*index_b*/, int /*thread*/)
|
2021-01-06 14:48:42 +03:00
|
|
|
{
|
|
|
|
|
ClothModifierData *clmd = (ClothModifierData *)userdata;
|
2023-03-01 17:32:12 +01:00
|
|
|
Cloth *clothObject = clmd->clothObject;
|
2023-12-20 20:45:15 -05:00
|
|
|
const blender::int3 tri_a = clothObject->vert_tris[index_a];
|
2021-01-06 14:48:42 +03:00
|
|
|
|
|
|
|
|
return cloth_bvh_collision_is_active(clmd, clothObject, tri_a);
|
|
|
|
|
}
|
|
|
|
|
|
2023-03-01 17:32:12 +01:00
|
|
|
static bool cloth_bvh_self_overlap_cb(void *userdata, int index_a, int index_b, int /*thread*/)
|
2020-02-13 10:39:21 -03:00
|
|
|
{
|
2022-12-28 22:19:36 +02:00
|
|
|
/* This shouldn't happen, but just in case. Note that equal combinations
|
|
|
|
|
* (eg. (0,1) & (1,0)) would be filtered out by BLI_bvhtree_overlap_self. */
|
|
|
|
|
if (index_a != index_b) {
|
2020-03-02 10:52:58 -03:00
|
|
|
ClothModifierData *clmd = (ClothModifierData *)userdata;
|
2023-03-01 17:32:12 +01:00
|
|
|
Cloth *clothObject = clmd->clothObject;
|
2023-12-20 20:45:15 -05:00
|
|
|
const blender::int3 tri_a = clothObject->vert_tris[index_a];
|
|
|
|
|
const blender::int3 tri_b = clothObject->vert_tris[index_b];
|
2020-02-13 10:39:21 -03:00
|
|
|
|
2021-01-06 14:48:42 +03:00
|
|
|
if (cloth_bvh_selfcollision_is_active(clmd, clothObject, tri_a, tri_b)) {
|
2020-02-13 10:39:21 -03:00
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
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;
|
2023-03-01 17:32:12 +01:00
|
|
|
ClothVertex *verts = nullptr;
|
2008-05-26 10:36:14 +00:00
|
|
|
int ret = 0, ret2 = 0;
|
2023-03-01 17:32:12 +01:00
|
|
|
Object **collobjs = nullptr;
|
2022-09-26 10:56:05 +10:00
|
|
|
uint numcollobj = 0;
|
2023-03-01 17:32:12 +01:00
|
|
|
uint *coll_counts_obj = nullptr;
|
|
|
|
|
BVHTreeOverlap **overlap_obj = nullptr;
|
2018-09-26 17:18:16 +02:00
|
|
|
uint coll_count_self = 0;
|
2023-03-01 17:32:12 +01:00
|
|
|
BVHTreeOverlap *overlap_self = nullptr;
|
2022-12-28 23:39:36 +02:00
|
|
|
bool bvh_updated = false;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2023-03-01 17:32:12 +01:00
|
|
|
if ((clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_COLLOBJ) || cloth_bvh == nullptr) {
|
2008-01-29 21:01:12 +00:00
|
|
|
return 0;
|
2019-04-22 09:39:35 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +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;
|
2019-04-17 06:17:24 +02: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);
|
2022-12-28 23:39:36 +02:00
|
|
|
bvh_updated = true;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-01-16 18:45:23 +01:00
|
|
|
/* Enable self collision if this is a hair sim */
|
2023-03-01 17:32:12 +01:00
|
|
|
const bool is_hair = (clmd->hairdata != nullptr);
|
2020-01-16 18:45:23 +01:00
|
|
|
|
|
|
|
|
collobjs = BKE_collision_objects_create(depsgraph,
|
2023-03-01 17:32:12 +01:00
|
|
|
is_hair ? nullptr : ob,
|
2020-01-16 18:45:23 +01:00
|
|
|
clmd->coll_parms->group,
|
|
|
|
|
&numcollobj,
|
|
|
|
|
eModifierType_Collision);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
if (collobjs) {
|
2023-03-01 17:32:12 +01:00
|
|
|
coll_counts_obj = MEM_cnew_array<uint>(numcollobj, "CollCounts");
|
|
|
|
|
overlap_obj = MEM_cnew_array<BVHTreeOverlap *>(numcollobj, "BVHOverlap");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
for (i = 0; i < numcollobj; i++) {
|
|
|
|
|
Object *collob = collobjs[i];
|
2020-05-08 10:14:02 +02:00
|
|
|
CollisionModifierData *collmd = (CollisionModifierData *)BKE_modifiers_findby_type(
|
2018-09-26 17:18:16 +02:00
|
|
|
collob, eModifierType_Collision);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
if (!collmd->bvhtree) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* Move object to position (step) in time. */
|
2020-01-12 17:08:01 +01:00
|
|
|
collision_move_object(collmd, step + dt, step, false);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2021-01-06 14:48:42 +03:00
|
|
|
overlap_obj[i] = BLI_bvhtree_overlap(cloth_bvh,
|
|
|
|
|
collmd->bvhtree,
|
|
|
|
|
&coll_counts_obj[i],
|
2023-03-01 17:32:12 +01:00
|
|
|
is_hair ? nullptr : cloth_bvh_obj_overlap_cb,
|
2021-01-06 14:48:42 +03:00
|
|
|
clmd);
|
2018-09-26 17:18:16 +02:00
|
|
|
}
|
2018-09-14 15:46:55 +02:00
|
|
|
}
|
2012-05-15 11:14:50 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-14 15:46:55 +02:00
|
|
|
if (clmd->coll_parms->flags & CLOTH_COLLSETTINGS_FLAG_SELF) {
|
2022-12-28 23:39:36 +02:00
|
|
|
if (cloth->bvhselftree != cloth->bvhtree || !bvh_updated) {
|
|
|
|
|
bvhtree_update_from_cloth(clmd, false, true);
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2022-12-28 22:19:36 +02:00
|
|
|
overlap_self = BLI_bvhtree_overlap_self(
|
|
|
|
|
cloth->bvhselftree, &coll_count_self, cloth_bvh_self_overlap_cb, clmd);
|
2018-09-14 15:46:55 +02:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-14 15:46:55 +02:00
|
|
|
do {
|
2008-05-26 10:36:14 +00:00
|
|
|
ret2 = 0;
|
2019-04-17 06:17:24 +02: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;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2023-03-01 17:32:12 +01:00
|
|
|
collisions = MEM_cnew_array<CollPair *>(numcollobj, "CollPair");
|
2019-04-17 06:17:24 +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];
|
2020-05-08 10:14:02 +02:00
|
|
|
CollisionModifierData *collmd = (CollisionModifierData *)BKE_modifiers_findby_type(
|
2018-09-14 15:46:55 +02:00
|
|
|
collob, eModifierType_Collision);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-14 15:46:55 +02:00
|
|
|
if (!collmd->bvhtree) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2019-04-17 06:17:24 +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;
|
|
|
|
|
}
|
2019-04-17 06:17:24 +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
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-14 15:46:55 +02:00
|
|
|
for (i = 0; i < numcollobj; i++) {
|
|
|
|
|
MEM_SAFE_FREE(collisions[i]);
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-14 15:46:55 +02:00
|
|
|
MEM_freeN(collisions);
|
2018-09-26 17:18:16 +02:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* Self collisions. */
|
|
|
|
|
if (clmd->coll_parms->flags & CLOTH_COLLSETTINGS_FLAG_SELF) {
|
2023-03-01 17:32:12 +01:00
|
|
|
CollPair *collisions = nullptr;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
verts = cloth->verts;
|
|
|
|
|
mvert_num = cloth->mvert_num;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
if (cloth->bvhselftree) {
|
|
|
|
|
if (coll_count_self && overlap_self) {
|
|
|
|
|
collisions = (CollPair *)MEM_mallocN(sizeof(CollPair) * coll_count_self,
|
|
|
|
|
"collision array");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
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;
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
MEM_SAFE_FREE(collisions);
|
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* 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
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
|
|
|
|
|
2019-01-20 16:22:55 +01:00
|
|
|
add_v3_v3v3(verts[i].tx, verts[i].txold, verts[i].tv);
|
2008-01-29 21:01:12 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +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));
|
2019-04-17 06:17:24 +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
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
MEM_freeN(overlap_obj);
|
2008-02-12 11:04:58 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
MEM_SAFE_FREE(coll_counts_obj);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
MEM_SAFE_FREE(overlap_self);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-06-22 14:42:03 +02:00
|
|
|
BKE_collision_objects_free(collobjs);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2024-01-22 15:58:18 +01:00
|
|
|
return std::min(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;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-09-04 14:22:22 +02:00
|
|
|
/* compute barycentric coordinates */
|
|
|
|
|
collision_compute_barycentric(collpair->pb,
|
Mesh: Move positions to a generic attribute
**Changes**
As described in T93602, this patch removes all use of the `MVert`
struct, replacing it with a generic named attribute with the name
`"position"`, consistent with other geometry types.
Variable names have been changed from `verts` to `positions`, to align
with the attribute name and the more generic design (positions are not
vertices, they are just an attribute stored on the point domain).
This change is made possible by previous commits that moved all other
data out of `MVert` to runtime data or other generic attributes. What
remains is mostly a simple type change. Though, the type still shows up
859 times, so the patch is quite large.
One compromise is that now `CD_MASK_BAREMESH` now contains
`CD_PROP_FLOAT3`. With the general move towards generic attributes
over custom data types, we are removing use of these type masks anyway.
**Benefits**
The most obvious benefit is reduced memory usage and the benefits
that brings in memory-bound situations. `float3` is only 3 bytes, in
comparison to `MVert` which was 4. When there are millions of vertices
this starts to matter more.
The other benefits come from using a more generic type. Instead of
writing algorithms specifically for `MVert`, code can just use arrays
of vectors. This will allow eliminating many temporary arrays or
wrappers used to extract positions.
Many possible improvements aren't implemented in this patch, though
I did switch simplify or remove the process of creating temporary
position arrays in a few places.
The design clarity that "positions are just another attribute" brings
allows removing explicit copying of vertices in some procedural
operations-- they are just processed like most other attributes.
**Performance**
This touches so many areas that it's hard to benchmark exhaustively,
but I observed some areas as examples.
* The mesh line node with 4 million count was 1.5x (8ms to 12ms) faster.
* The Spring splash screen went from ~4.3 to ~4.5 fps.
* The subdivision surface modifier/node was slightly faster
RNA access through Python may be slightly slower, since now we need
a name lookup instead of just a custom data type lookup for each index.
**Future Improvements**
* Remove uses of "vert_coords" functions:
* `BKE_mesh_vert_coords_alloc`
* `BKE_mesh_vert_coords_get`
* `BKE_mesh_vert_coords_apply{_with_mat4}`
* Remove more hidden copying of positions
* General simplification now possible in many areas
* Convert more code to C++ to use `float3` instead of `float[3]`
* Currently `reinterpret_cast` is used for those C-API functions
Differential Revision: https://developer.blender.org/D15982
2023-01-10 00:10:43 -05:00
|
|
|
collmd->current_x[collpair->bp1],
|
|
|
|
|
collmd->current_x[collpair->bp2],
|
|
|
|
|
collmd->current_x[collpair->bp3],
|
2014-09-12 14:34:14 +02:00
|
|
|
&u1,
|
|
|
|
|
&u2,
|
|
|
|
|
&u3);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-09-12 14:34:14 +02:00
|
|
|
collision_interpolateOnTriangle(vel_new,
|
Mesh: Move positions to a generic attribute
**Changes**
As described in T93602, this patch removes all use of the `MVert`
struct, replacing it with a generic named attribute with the name
`"position"`, consistent with other geometry types.
Variable names have been changed from `verts` to `positions`, to align
with the attribute name and the more generic design (positions are not
vertices, they are just an attribute stored on the point domain).
This change is made possible by previous commits that moved all other
data out of `MVert` to runtime data or other generic attributes. What
remains is mostly a simple type change. Though, the type still shows up
859 times, so the patch is quite large.
One compromise is that now `CD_MASK_BAREMESH` now contains
`CD_PROP_FLOAT3`. With the general move towards generic attributes
over custom data types, we are removing use of these type masks anyway.
**Benefits**
The most obvious benefit is reduced memory usage and the benefits
that brings in memory-bound situations. `float3` is only 3 bytes, in
comparison to `MVert` which was 4. When there are millions of vertices
this starts to matter more.
The other benefits come from using a more generic type. Instead of
writing algorithms specifically for `MVert`, code can just use arrays
of vectors. This will allow eliminating many temporary arrays or
wrappers used to extract positions.
Many possible improvements aren't implemented in this patch, though
I did switch simplify or remove the process of creating temporary
position arrays in a few places.
The design clarity that "positions are just another attribute" brings
allows removing explicit copying of vertices in some procedural
operations-- they are just processed like most other attributes.
**Performance**
This touches so many areas that it's hard to benchmark exhaustively,
but I observed some areas as examples.
* The mesh line node with 4 million count was 1.5x (8ms to 12ms) faster.
* The Spring splash screen went from ~4.3 to ~4.5 fps.
* The subdivision surface modifier/node was slightly faster
RNA access through Python may be slightly slower, since now we need
a name lookup instead of just a custom data type lookup for each index.
**Future Improvements**
* Remove uses of "vert_coords" functions:
* `BKE_mesh_vert_coords_alloc`
* `BKE_mesh_vert_coords_get`
* `BKE_mesh_vert_coords_apply{_with_mat4}`
* Remove more hidden copying of positions
* General simplification now possible in many areas
* Convert more code to C++ to use `float3` instead of `float[3]`
* Currently `reinterpret_cast` is used for those C-API functions
Differential Revision: https://developer.blender.org/D15982
2023-01-10 00:10:43 -05:00
|
|
|
collmd->current_v[collpair->bp1],
|
|
|
|
|
collmd->current_v[collpair->bp2],
|
|
|
|
|
collmd->current_v[collpair->bp3],
|
2014-09-12 14:34:14 +02:00
|
|
|
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
|
|
|
}
|