Alexander Gavrilov
9368bdab01
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
172 lines
4.8 KiB
C++
172 lines
4.8 KiB
C++
/*
|
|
* ***** BEGIN GPL LICENSE BLOCK *****
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
* The Original Code is Copyright (C) Blender Foundation.
|
|
* All rights reserved.
|
|
*
|
|
* The Original Code is: all of this file.
|
|
*
|
|
* Contributor(s): Daniel Genrich
|
|
*
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
*/
|
|
#ifndef __BKE_COLLISION_H__
|
|
#define __BKE_COLLISION_H__
|
|
|
|
/** \file BKE_collision.h
|
|
* \ingroup bke
|
|
* \author Daniel Genrich
|
|
*/
|
|
|
|
#include <math.h>
|
|
#include <float.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
/* types */
|
|
#include "BKE_collision.h"
|
|
#include "DNA_cloth_types.h"
|
|
|
|
#include "BLI_kdopbvh.h"
|
|
|
|
struct CollisionModifierData;
|
|
struct Group;
|
|
struct MFace;
|
|
struct MVert;
|
|
struct Object;
|
|
struct Scene;
|
|
struct MVertTri;
|
|
|
|
////////////////////////////////////////
|
|
// 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_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
|
|
double distance; // magnitude of vector
|
|
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
|
|
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.c from collision.c
|
|
/////////////////////////////////////////////////
|
|
|
|
BVHTree *bvhtree_build_from_mvert(
|
|
const struct MVert *mvert,
|
|
const struct MVertTri *tri, int tri_num,
|
|
float epsilon);
|
|
void bvhtree_update_from_mvert(
|
|
BVHTree *bvhtree,
|
|
const struct MVert *mvert, const struct MVert *mvert_moving,
|
|
const struct MVertTri *tri, int tri_num,
|
|
bool moving);
|
|
|
|
/////////////////////////////////////////////////
|
|
|
|
// move Collision modifier object inter-frame with step = [0,1]
|
|
// defined in collisions.c
|
|
void collision_move_object(struct CollisionModifierData *collmd, float step, float prevstep);
|
|
|
|
void collision_get_collider_velocity(float vel_old[3], float vel_new[3], struct CollisionModifierData *collmd, struct CollPair *collpair);
|
|
|
|
/////////////////////////////////////////////////
|
|
// used in effect.c
|
|
/////////////////////////////////////////////////
|
|
|
|
/* explicit control over layer mask and dupli recursion */
|
|
struct Object **get_collisionobjects_ext(struct Scene *scene, struct Object *self, struct Group *group, int layer, unsigned int *numcollobj, unsigned int modifier_type, bool dupli);
|
|
|
|
struct Object **get_collisionobjects(struct Scene *scene, struct Object *self, struct Group *group, unsigned int *numcollobj, unsigned int modifier_type);
|
|
|
|
typedef struct ColliderCache {
|
|
struct ColliderCache *next, *prev;
|
|
struct Object *ob;
|
|
struct CollisionModifierData *collmd;
|
|
} ColliderCache;
|
|
|
|
struct ListBase *get_collider_cache(struct Scene *scene, struct Object *self, struct Group *group);
|
|
void free_collider_cache(struct ListBase **colliders);
|
|
|
|
/////////////////////////////////////////////////
|
|
|
|
|
|
|
|
/////////////////////////////////////////////////
|
|
|
|
#endif
|
|
|