Hans Goudey
1af62cb3bf
**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
172 lines
5.3 KiB
C++
172 lines
5.3 KiB
C++
/* SPDX-License-Identifier: GPL-2.0-or-later
|
|
* Copyright Blender Foundation. All rights reserved. */
|
|
#pragma once
|
|
|
|
/** \file
|
|
* \ingroup bke
|
|
*/
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
struct BVHTree;
|
|
struct Collection;
|
|
struct CollisionModifierData;
|
|
struct Depsgraph;
|
|
struct MVertTri;
|
|
struct Object;
|
|
struct Scene;
|
|
|
|
////////////////////////////////////////
|
|
// used for collisions in collision.c
|
|
////////////////////////////////////////
|
|
|
|
/* COLLISION FLAGS */
|
|
typedef enum {
|
|
COLLISION_IN_FUTURE = (1 << 1),
|
|
#ifdef WITH_ELTOPO
|
|
COLLISION_USE_COLLFACE = (1 << 2),
|
|
COLLISION_IS_EDGES = (1 << 3),
|
|
#endif
|
|
COLLISION_INACTIVE = (1 << 4),
|
|
} COLLISION_FLAGS;
|
|
|
|
////////////////////////////////////////
|
|
// used for collisions in collision.c
|
|
////////////////////////////////////////
|
|
/* used for collisions in collision.c */
|
|
typedef struct CollPair {
|
|
unsigned int face1; /* cloth face */
|
|
unsigned int face2; /* object face */
|
|
float distance;
|
|
float normal[3];
|
|
float vector[3]; /* unnormalized collision vector: p2-p1 */
|
|
float pa[3], pb[3]; /* collision point p1 on face1, p2 on face2 */
|
|
int flag;
|
|
float time; /* collision time, from 0 up to 1 */
|
|
|
|
/* mesh-mesh collision */
|
|
#ifdef WITH_ELTOPO /* Either ap* or bp* can be set, but not both. */
|
|
float bary[3];
|
|
int ap1, ap2, ap3, collp, bp1, bp2, bp3;
|
|
int collface;
|
|
#else
|
|
int ap1, ap2, ap3, bp1, bp2, bp3;
|
|
#endif
|
|
/* Barycentric weights of the collision point. */
|
|
float aw1, aw2, aw3, bw1, bw2, bw3;
|
|
int pointsb[4];
|
|
} CollPair;
|
|
|
|
/* used for collisions in collision.c */
|
|
typedef struct EdgeCollPair {
|
|
unsigned int p11, p12, p21, p22;
|
|
float normal[3];
|
|
float vector[3];
|
|
float time;
|
|
int lastsign;
|
|
float pa[3], pb[3]; /* collision point p1 on face1, p2 on face2 */
|
|
} EdgeCollPair;
|
|
|
|
/* used for collisions in collision.c */
|
|
typedef struct FaceCollPair {
|
|
unsigned int p11, p12, p13, p21;
|
|
float normal[3];
|
|
float vector[3];
|
|
float time;
|
|
int lastsign;
|
|
float pa[3], pb[3]; /* collision point p1 on face1, p2 on face2 */
|
|
} FaceCollPair;
|
|
|
|
////////////////////////////////////////
|
|
|
|
/////////////////////////////////////////////////
|
|
// forward declarations
|
|
/////////////////////////////////////////////////
|
|
|
|
/////////////////////////////////////////////////
|
|
// used in modifier.cc from collision.c
|
|
/////////////////////////////////////////////////
|
|
|
|
struct BVHTree *bvhtree_build_from_mvert(const float (*positions)[3],
|
|
const struct MVertTri *tri,
|
|
int tri_num,
|
|
float epsilon);
|
|
void bvhtree_update_from_mvert(struct BVHTree *bvhtree,
|
|
const float (*positions)[3],
|
|
const float (*positions_moving)[3],
|
|
const struct MVertTri *tri,
|
|
int tri_num,
|
|
bool moving);
|
|
|
|
/////////////////////////////////////////////////
|
|
|
|
/**
|
|
* Move Collision modifier object inter-frame with step = [0,1]
|
|
*
|
|
* \param step: is limited from 0 (frame start position) to 1 (frame end position).
|
|
*/
|
|
void collision_move_object(struct CollisionModifierData *collmd,
|
|
float step,
|
|
float prevstep,
|
|
bool moving_bvh);
|
|
|
|
void collision_get_collider_velocity(float vel_old[3],
|
|
float vel_new[3],
|
|
struct CollisionModifierData *collmd,
|
|
struct CollPair *collpair);
|
|
|
|
/* Collision relations for dependency graph build. */
|
|
|
|
typedef struct CollisionRelation {
|
|
struct CollisionRelation *next, *prev;
|
|
struct Object *ob;
|
|
} CollisionRelation;
|
|
|
|
/**
|
|
* Create list of collision relations in the collection or entire scene.
|
|
* This is used by the depsgraph to build relations, as well as faster
|
|
* lookup of colliders during evaluation.
|
|
*/
|
|
struct ListBase *BKE_collision_relations_create(struct Depsgraph *depsgraph,
|
|
struct Collection *collection,
|
|
unsigned int modifier_type);
|
|
void BKE_collision_relations_free(struct ListBase *relations);
|
|
|
|
/* Collision object lists for physics simulation evaluation. */
|
|
|
|
/**
|
|
* Create effective list of colliders from relations built beforehand.
|
|
* Self will be excluded.
|
|
*/
|
|
struct Object **BKE_collision_objects_create(struct Depsgraph *depsgraph,
|
|
struct Object *self,
|
|
struct Collection *collection,
|
|
unsigned int *numcollobj,
|
|
unsigned int modifier_type);
|
|
void BKE_collision_objects_free(struct Object **objects);
|
|
|
|
typedef struct ColliderCache {
|
|
struct ColliderCache *next, *prev;
|
|
struct Object *ob;
|
|
struct CollisionModifierData *collmd;
|
|
} ColliderCache;
|
|
|
|
/**
|
|
* Create effective list of colliders from relations built beforehand.
|
|
* Self will be excluded.
|
|
*/
|
|
struct ListBase *BKE_collider_cache_create(struct Depsgraph *depsgraph,
|
|
struct Object *self,
|
|
struct Collection *collection);
|
|
void BKE_collider_cache_free(struct ListBase **colliders);
|
|
|
|
/////////////////////////////////////////////////
|
|
|
|
/////////////////////////////////////////////////
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|