2023-08-16 00:20:26 +10:00
|
|
|
/* SPDX-FileCopyrightText: 2005 Blender Authors
|
2023-05-31 16:19:06 +02:00
|
|
|
*
|
|
|
|
|
* SPDX-License-Identifier: GPL-2.0-or-later */
|
2010-04-11 22:12:30 +00:00
|
|
|
|
2019-02-18 08:08:12 +11:00
|
|
|
/** \file
|
|
|
|
|
* \ingroup modifiers
|
2011-02-25 13:57:17 +00:00
|
|
|
*/
|
|
|
|
|
|
2019-02-25 11:56:24 +01:00
|
|
|
#include "BLI_utildefines.h"
|
|
|
|
|
|
2020-12-15 10:47:58 +11:00
|
|
|
#include "BLI_kdopbvh.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_matrix.h"
|
|
|
|
|
#include "BLI_math_vector.h"
|
2019-02-25 11:56:24 +01:00
|
|
|
|
2020-06-05 10:41:03 -04:00
|
|
|
#include "BLT_translation.h"
|
|
|
|
|
|
2020-10-01 09:38:00 -05:00
|
|
|
#include "DNA_defaults.h"
|
2018-05-17 15:26:59 +02:00
|
|
|
#include "DNA_mesh_types.h"
|
2010-08-10 05:41:51 +00:00
|
|
|
#include "DNA_meshdata_types.h"
|
2020-12-15 10:47:58 +11:00
|
|
|
#include "DNA_object_force_types.h"
|
2020-03-19 09:33:03 +01:00
|
|
|
#include "DNA_object_types.h"
|
2020-06-05 10:41:03 -04:00
|
|
|
#include "DNA_screen_types.h"
|
2010-04-11 22:12:30 +00:00
|
|
|
|
2010-08-16 05:46:10 +00:00
|
|
|
#include "MEM_guardedalloc.h"
|
2010-04-11 22:12:30 +00:00
|
|
|
|
2010-04-12 00:36:50 +00:00
|
|
|
#include "BKE_collision.h"
|
2020-06-05 10:41:03 -04:00
|
|
|
#include "BKE_context.h"
|
2010-04-11 22:12:30 +00:00
|
|
|
#include "BKE_global.h"
|
2020-02-10 12:58:59 +01:00
|
|
|
#include "BKE_lib_id.h"
|
2023-06-14 11:59:32 -04:00
|
|
|
#include "BKE_mesh.hh"
|
2023-08-02 22:14:18 +02:00
|
|
|
#include "BKE_mesh_runtime.hh"
|
2010-04-11 22:12:30 +00:00
|
|
|
#include "BKE_modifier.h"
|
2016-12-28 17:30:58 +01:00
|
|
|
#include "BKE_pointcache.h"
|
2010-06-27 05:39:55 +00:00
|
|
|
#include "BKE_scene.h"
|
2020-06-05 10:41:03 -04:00
|
|
|
#include "BKE_screen.h"
|
|
|
|
|
|
2023-08-05 02:57:52 +02:00
|
|
|
#include "UI_interface.hh"
|
|
|
|
|
#include "UI_resources.hh"
|
2020-06-05 10:41:03 -04:00
|
|
|
|
2023-08-10 22:40:27 +02:00
|
|
|
#include "RNA_access.hh"
|
2022-03-14 16:54:46 +01:00
|
|
|
#include "RNA_prototypes.h"
|
2010-04-11 22:12:30 +00:00
|
|
|
|
2023-05-04 18:35:37 +02:00
|
|
|
#include "MOD_modifiertypes.hh"
|
|
|
|
|
#include "MOD_ui_common.hh"
|
|
|
|
|
#include "MOD_util.hh"
|
2018-05-17 15:26:59 +02:00
|
|
|
|
2023-08-28 15:01:05 +02:00
|
|
|
#include "BLO_read_write.hh"
|
2020-06-23 17:25:44 +02:00
|
|
|
|
2018-05-17 15:26:59 +02:00
|
|
|
#include "DEG_depsgraph_query.h"
|
2017-08-01 09:06:34 +10:00
|
|
|
|
2023-07-27 12:04:18 +10:00
|
|
|
static void init_data(ModifierData *md)
|
2010-04-11 22:12:30 +00:00
|
|
|
{
|
2012-05-06 13:38:33 +00:00
|
|
|
CollisionModifierData *collmd = (CollisionModifierData *)md;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-10-01 09:38:00 -05:00
|
|
|
BLI_assert(MEMCMP_STRUCT_AFTER_IS_ZERO(collmd, modifier));
|
|
|
|
|
|
|
|
|
|
MEMCPY_STRUCT_AFTER(collmd, DNA_struct_default_get(CollisionModifierData), modifier);
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
|
|
2023-07-27 12:04:18 +10:00
|
|
|
static void free_data(ModifierData *md)
|
2010-04-11 22:12:30 +00:00
|
|
|
{
|
2012-05-06 13:38:33 +00:00
|
|
|
CollisionModifierData *collmd = (CollisionModifierData *)md;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-05-08 14:21:02 +02:00
|
|
|
if (collmd) { /* Seriously? */
|
2015-07-30 15:43:07 +10:00
|
|
|
if (collmd->bvhtree) {
|
2010-04-11 22:12:30 +00:00
|
|
|
BLI_bvhtree_free(collmd->bvhtree);
|
2023-05-04 18:35:37 +02:00
|
|
|
collmd->bvhtree = nullptr;
|
2015-07-30 15:43:07 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2015-07-30 15:43:07 +10:00
|
|
|
MEM_SAFE_FREE(collmd->x);
|
|
|
|
|
MEM_SAFE_FREE(collmd->xnew);
|
|
|
|
|
MEM_SAFE_FREE(collmd->current_x);
|
|
|
|
|
MEM_SAFE_FREE(collmd->current_xnew);
|
|
|
|
|
MEM_SAFE_FREE(collmd->current_v);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-05-08 15:04:10 +02:00
|
|
|
MEM_SAFE_FREE(collmd->tri);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2011-03-18 15:31:32 +00:00
|
|
|
collmd->time_x = collmd->time_xnew = -1000;
|
2015-07-31 14:00:07 +10:00
|
|
|
collmd->mvert_num = 0;
|
|
|
|
|
collmd->tri_num = 0;
|
2016-10-07 13:27:11 +03:00
|
|
|
collmd->is_static = false;
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2023-07-27 12:04:18 +10:00
|
|
|
static bool depends_on_time(Scene * /*scene*/, ModifierData * /*md*/)
|
2010-04-11 22:12:30 +00:00
|
|
|
{
|
2013-06-02 03:59:19 +00:00
|
|
|
return true;
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
|
|
2023-07-27 12:04:18 +10:00
|
|
|
static void deform_verts(ModifierData *md,
|
|
|
|
|
const ModifierEvalContext *ctx,
|
|
|
|
|
Mesh *mesh,
|
|
|
|
|
float (*vertexCos)[3],
|
|
|
|
|
int /*verts_num*/)
|
2010-04-11 22:12:30 +00:00
|
|
|
{
|
2012-05-06 13:38:33 +00:00
|
|
|
CollisionModifierData *collmd = (CollisionModifierData *)md;
|
2018-05-01 17:33:04 +02:00
|
|
|
Object *ob = ctx->object;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2021-01-09 21:15:53 +03:00
|
|
|
/* If collision is disabled, free the stale data and exit. */
|
|
|
|
|
if (!ob->pd || !ob->pd->deflect) {
|
|
|
|
|
if (!ob->pd) {
|
|
|
|
|
printf("CollisionModifier: collision settings are missing!\n");
|
|
|
|
|
}
|
|
|
|
|
|
2023-07-27 12:04:18 +10:00
|
|
|
free_data(md);
|
2021-01-09 21:15:53 +03:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2023-07-07 13:07:15 +02:00
|
|
|
if (mesh) {
|
2011-02-13 03:21:27 +00:00
|
|
|
float current_time = 0;
|
2023-06-14 11:59:32 -04:00
|
|
|
int mvert_num = 0;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2023-07-07 13:07:15 +02:00
|
|
|
BKE_mesh_vert_coords_apply(mesh, vertexCos);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-05-17 15:28:18 +02:00
|
|
|
current_time = DEG_get_ctime(ctx->depsgraph);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-01-16 19:41:29 +01:00
|
|
|
if (G.debug & G_DEBUG_SIMDATA) {
|
2011-03-18 15:31:32 +00:00
|
|
|
printf("current_time %f, collmd->time_xnew %f\n", current_time, collmd->time_xnew);
|
2019-01-16 19:41:29 +01:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2023-07-07 13:07:15 +02:00
|
|
|
mvert_num = mesh->totvert;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
if (current_time < collmd->time_xnew) {
|
2023-07-27 12:04:18 +10:00
|
|
|
free_data((ModifierData *)collmd);
|
2018-09-26 17:18:16 +02:00
|
|
|
}
|
|
|
|
|
else if (current_time == collmd->time_xnew) {
|
|
|
|
|
if (mvert_num != collmd->mvert_num) {
|
2023-07-27 12:04:18 +10:00
|
|
|
free_data((ModifierData *)collmd);
|
2018-09-26 17:18:16 +02:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
|
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* check if mesh has changed */
|
2019-04-22 09:15:10 +10:00
|
|
|
if (collmd->x && (mvert_num != collmd->mvert_num)) {
|
2023-07-27 12:04:18 +10:00
|
|
|
free_data((ModifierData *)collmd);
|
2019-04-22 09:15:10 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
if (collmd->time_xnew == -1000) { /* first time */
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2023-07-07 13:07:15 +02:00
|
|
|
collmd->x = BKE_mesh_vert_coords_alloc(mesh, &mvert_num); /* frame start position */
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
for (uint i = 0; i < mvert_num; i++) {
|
|
|
|
|
/* we save global positions */
|
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
|
|
|
mul_m4_v3(ob->object_to_world, collmd->x[i]);
|
2018-09-26 17:18:16 +02:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2023-05-04 18:35:37 +02:00
|
|
|
collmd->xnew = static_cast<float(*)[3]>(MEM_dupallocN(collmd->x)); /* Frame end position. */
|
|
|
|
|
collmd->current_x = static_cast<float(*)[3]>(MEM_dupallocN(collmd->x)); /* Inter-frame. */
|
|
|
|
|
collmd->current_xnew = static_cast<float(*)[3]>(MEM_dupallocN(collmd->x)); /* Inter-frame. */
|
|
|
|
|
collmd->current_v = static_cast<float(*)[3]>(MEM_dupallocN(collmd->x)); /* Inter-frame. */
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
collmd->mvert_num = mvert_num;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
{
|
2023-07-25 21:59:47 -04:00
|
|
|
const blender::Span<MLoopTri> looptris = mesh->looptris();
|
|
|
|
|
collmd->tri_num = looptris.size();
|
2023-05-04 18:35:37 +02:00
|
|
|
MVertTri *tri = static_cast<MVertTri *>(
|
|
|
|
|
MEM_mallocN(sizeof(*tri) * collmd->tri_num, __func__));
|
Mesh: Replace MLoop struct with generic attributes
Implements #102359.
Split the `MLoop` struct into two separate integer arrays called
`corner_verts` and `corner_edges`, referring to the vertex each corner
is attached to and the next edge around the face at each corner. These
arrays can be sliced to give access to the edges or vertices in a face.
Then they are often referred to as "poly_verts" or "poly_edges".
The main benefits are halving the necessary memory bandwidth when only
one array is used and simplifications from using regular integer indices
instead of a special-purpose struct.
The commit also starts a renaming from "loop" to "corner" in mesh code.
Like the other mesh struct of array refactors, forward compatibility is
kept by writing files with the older format. This will be done until 4.0
to ease the transition process.
Looking at a small portion of the patch should give a good impression
for the rest of the changes. I tried to make the changes as small as
possible so it's easy to tell the correctness from the diff. Though I
found Blender developers have been very inventive over the last decade
when finding different ways to loop over the corners in a face.
For performance, nearly every piece of code that deals with `Mesh` is
slightly impacted. Any algorithm that is memory bottle-necked should
see an improvement. For example, here is a comparison of interpolating
a vertex float attribute to face corners (Ryzen 3700x):
**Before** (Average: 3.7 ms, Min: 3.4 ms)
```
threading::parallel_for(loops.index_range(), 4096, [&](IndexRange range) {
for (const int64_t i : range) {
dst[i] = src[loops[i].v];
}
});
```
**After** (Average: 2.9 ms, Min: 2.6 ms)
```
array_utils::gather(src, corner_verts, dst);
```
That's an improvement of 28% to the average timings, and it's also a
simplification, since an index-based routine can be used instead.
For more examples using the new arrays, see the design task.
Pull Request: https://projects.blender.org/blender/blender/pulls/104424
2023-03-20 15:55:13 +01:00
|
|
|
BKE_mesh_runtime_verttri_from_looptri(
|
2023-07-25 21:59:47 -04:00
|
|
|
tri, mesh->corner_verts().data(), looptris.data(), collmd->tri_num);
|
2018-09-26 17:18:16 +02:00
|
|
|
collmd->tri = tri;
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* create bounding box hierarchy */
|
|
|
|
|
collmd->bvhtree = bvhtree_build_from_mvert(
|
2018-10-01 08:42:26 +10:00
|
|
|
collmd->x, collmd->tri, collmd->tri_num, ob->pd->pdef_sboft);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
collmd->time_x = collmd->time_xnew = current_time;
|
|
|
|
|
collmd->is_static = true;
|
|
|
|
|
}
|
|
|
|
|
else if (mvert_num == collmd->mvert_num) {
|
|
|
|
|
/* put positions to old positions */
|
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
|
|
|
float(*temp)[3] = collmd->x;
|
2018-09-26 17:18:16 +02:00
|
|
|
collmd->x = collmd->xnew;
|
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->xnew = temp;
|
2018-09-26 17:18:16 +02:00
|
|
|
collmd->time_x = collmd->time_xnew;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2023-07-07 13:07:15 +02:00
|
|
|
memcpy(collmd->xnew, mesh->vert_positions().data(), mvert_num * sizeof(float[3]));
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
bool is_static = true;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
for (uint i = 0; i < mvert_num; i++) {
|
|
|
|
|
/* we save global positions */
|
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
|
|
|
mul_m4_v3(ob->object_to_world, collmd->xnew[i]);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* detect motion */
|
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
|
|
|
is_static = is_static && equals_v3v3(collmd->x[i], collmd->xnew[i]);
|
2018-09-26 17:18:16 +02:00
|
|
|
}
|
2019-04-17 06:17:24 +02: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
|
|
|
memcpy(collmd->current_xnew, collmd->x, mvert_num * sizeof(float[3]));
|
|
|
|
|
memcpy(collmd->current_x, collmd->x, mvert_num * sizeof(float[3]));
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
/* check if GUI setting has changed for bvh */
|
|
|
|
|
if (collmd->bvhtree) {
|
|
|
|
|
if (ob->pd->pdef_sboft != BLI_bvhtree_get_epsilon(collmd->bvhtree)) {
|
|
|
|
|
BLI_bvhtree_free(collmd->bvhtree);
|
2015-07-31 14:00:07 +10:00
|
|
|
collmd->bvhtree = bvhtree_build_from_mvert(
|
2018-10-01 08:42:26 +10:00
|
|
|
collmd->current_x, collmd->tri, collmd->tri_num, ob->pd->pdef_sboft);
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
2018-09-26 17:18:16 +02:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2023-07-31 11:50:54 +10:00
|
|
|
/* Happens on file load (ONLY when I un-comment changes in `readfile.cc`). */
|
2018-09-26 17:18:16 +02:00
|
|
|
if (!collmd->bvhtree) {
|
|
|
|
|
collmd->bvhtree = bvhtree_build_from_mvert(
|
2018-10-01 08:42:26 +10:00
|
|
|
collmd->current_x, collmd->tri, collmd->tri_num, ob->pd->pdef_sboft);
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
2018-09-26 17:18:16 +02:00
|
|
|
else if (!collmd->is_static || !is_static) {
|
|
|
|
|
/* recalc static bounding boxes */
|
|
|
|
|
bvhtree_update_from_mvert(collmd->bvhtree,
|
2018-10-01 08:42:26 +10:00
|
|
|
collmd->current_x,
|
|
|
|
|
collmd->current_xnew,
|
|
|
|
|
collmd->tri,
|
|
|
|
|
collmd->tri_num,
|
|
|
|
|
true);
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-26 17:18:16 +02:00
|
|
|
collmd->is_static = is_static;
|
|
|
|
|
collmd->time_xnew = current_time;
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
2018-09-26 17:18:16 +02:00
|
|
|
else if (mvert_num != collmd->mvert_num) {
|
2023-07-27 12:04:18 +10:00
|
|
|
free_data((ModifierData *)collmd);
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2023-07-27 12:04:18 +10:00
|
|
|
static void update_depsgraph(ModifierData * /*md*/, const ModifierUpdateDepsgraphContext *ctx)
|
2019-04-04 10:39:12 +02:00
|
|
|
{
|
2022-08-04 12:11:31 +02:00
|
|
|
DEG_add_depends_on_transform_relation(ctx->node, "Collision Modifier");
|
2019-04-04 10:39:12 +02:00
|
|
|
}
|
2010-04-11 22:12:30 +00:00
|
|
|
|
2023-05-04 18:35:37 +02:00
|
|
|
static void panel_draw(const bContext * /*C*/, Panel *panel)
|
2020-06-05 10:41:03 -04:00
|
|
|
{
|
|
|
|
|
uiLayout *layout = panel->layout;
|
|
|
|
|
|
2023-05-04 18:35:37 +02:00
|
|
|
PointerRNA *ptr = modifier_panel_get_property_pointers(panel, nullptr);
|
2020-06-05 10:41:03 -04:00
|
|
|
|
2021-11-02 17:50:18 +01:00
|
|
|
uiItemL(layout, TIP_("Settings are inside the Physics tab"), ICON_NONE);
|
2020-06-05 10:41:03 -04:00
|
|
|
|
2020-09-02 14:13:26 -05:00
|
|
|
modifier_panel_end(layout, ptr);
|
2020-06-05 10:41:03 -04:00
|
|
|
}
|
|
|
|
|
|
2023-07-27 12:04:18 +10:00
|
|
|
static void panel_register(ARegionType *region_type)
|
2020-06-05 10:41:03 -04:00
|
|
|
{
|
|
|
|
|
modifier_panel_register(region_type, eModifierType_Collision, panel_draw);
|
|
|
|
|
}
|
|
|
|
|
|
2023-07-27 12:04:18 +10:00
|
|
|
static void blend_read(BlendDataReader * /*reader*/, ModifierData *md)
|
2020-06-23 17:25:44 +02:00
|
|
|
{
|
|
|
|
|
CollisionModifierData *collmd = (CollisionModifierData *)md;
|
|
|
|
|
#if 0
|
2023-07-12 14:18:59 +02:00
|
|
|
/* TODO: #CollisionModifier should use point-cache
|
|
|
|
|
* + have proper reset events before enabling this. */
|
|
|
|
|
collmd->x = newdataadr(fd, collmd->x);
|
|
|
|
|
collmd->xnew = newdataadr(fd, collmd->xnew);
|
|
|
|
|
collmd->mfaces = newdataadr(fd, collmd->mfaces);
|
|
|
|
|
|
|
|
|
|
collmd->current_x = MEM_calloc_arrayN(collmd->mvert_num, sizeof(float[3]), "current_x");
|
|
|
|
|
collmd->current_xnew = MEM_calloc_arrayN(collmd->mvert_num, sizeof(float[3]), "current_xnew");
|
|
|
|
|
collmd->current_v = MEM_calloc_arrayN(collmd->mvert_num, sizeof(float[3]), "current_v");
|
2020-06-23 17:25:44 +02:00
|
|
|
#endif
|
|
|
|
|
|
2023-05-04 18:35:37 +02:00
|
|
|
collmd->x = nullptr;
|
|
|
|
|
collmd->xnew = nullptr;
|
|
|
|
|
collmd->current_x = nullptr;
|
|
|
|
|
collmd->current_xnew = nullptr;
|
|
|
|
|
collmd->current_v = nullptr;
|
2020-06-23 17:25:44 +02:00
|
|
|
collmd->time_x = collmd->time_xnew = -1000;
|
|
|
|
|
collmd->mvert_num = 0;
|
|
|
|
|
collmd->tri_num = 0;
|
|
|
|
|
collmd->is_static = false;
|
2023-05-04 18:35:37 +02:00
|
|
|
collmd->bvhtree = nullptr;
|
|
|
|
|
collmd->tri = nullptr;
|
2020-06-23 17:25:44 +02:00
|
|
|
}
|
|
|
|
|
|
2010-04-11 22:12:30 +00:00
|
|
|
ModifierTypeInfo modifierType_Collision = {
|
2023-07-26 17:08:14 +02:00
|
|
|
/*idname*/ "Collision",
|
2023-01-16 12:41:11 +11:00
|
|
|
/*name*/ N_("Collision"),
|
2023-07-27 12:04:18 +10:00
|
|
|
/*struct_name*/ "CollisionModifierData",
|
|
|
|
|
/*struct_size*/ sizeof(CollisionModifierData),
|
2023-01-16 12:41:11 +11:00
|
|
|
/*srna*/ &RNA_CollisionModifier,
|
|
|
|
|
/*type*/ eModifierTypeType_OnlyDeform,
|
|
|
|
|
/*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_Single,
|
|
|
|
|
/*icon*/ ICON_MOD_PHYSICS,
|
|
|
|
|
|
2023-07-27 12:04:18 +10:00
|
|
|
/*copy_data*/ nullptr,
|
|
|
|
|
|
|
|
|
|
/*deform_verts*/ deform_verts,
|
|
|
|
|
/*deform_matrices*/ nullptr,
|
|
|
|
|
/*deform_verts_EM*/ nullptr,
|
|
|
|
|
/*deform_matrices_EM*/ nullptr,
|
|
|
|
|
/*modify_mesh*/ nullptr,
|
|
|
|
|
/*modify_geometry_set*/ nullptr,
|
|
|
|
|
|
|
|
|
|
/*init_data*/ init_data,
|
|
|
|
|
/*required_data_mask*/ nullptr,
|
|
|
|
|
/*free_data*/ free_data,
|
|
|
|
|
/*is_disabled*/ nullptr,
|
|
|
|
|
/*update_depsgraph*/ update_depsgraph,
|
|
|
|
|
/*depends_on_time*/ depends_on_time,
|
|
|
|
|
/*depends_on_normals*/ nullptr,
|
|
|
|
|
/*foreach_ID_link*/ nullptr,
|
|
|
|
|
/*foreach_tex_link*/ nullptr,
|
|
|
|
|
/*free_runtime_data*/ nullptr,
|
|
|
|
|
/*panel_register*/ panel_register,
|
|
|
|
|
/*blend_write*/ nullptr,
|
|
|
|
|
/*blend_read*/ blend_read,
|
2010-04-11 22:12:30 +00:00
|
|
|
};
|