Janne Karhu
bff893a420
* 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 :).
161 lines
4.4 KiB
C++
161 lines
4.4 KiB
C++
/**
|
|
* BKE_cloth.h
|
|
*
|
|
* $Id$
|
|
*
|
|
* ***** 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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_COLLISIONS_H
|
|
#define BKE_COLLISIONS_H
|
|
|
|
#include <math.h>
|
|
#include <float.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
/* types */
|
|
#include "BLI_linklist.h"
|
|
#include "BKE_collision.h"
|
|
#include "BKE_customdata.h"
|
|
#include "BKE_DerivedMesh.h"
|
|
#include "DNA_cloth_types.h"
|
|
#include "DNA_customdata_types.h"
|
|
#include "DNA_meshdata_types.h"
|
|
#include "DNA_modifier_types.h"
|
|
#include "DNA_object_types.h"
|
|
|
|
#include "BLI_kdopbvh.h"
|
|
|
|
struct Object;
|
|
struct Scene;
|
|
struct Cloth;
|
|
struct MFace;
|
|
struct DerivedMesh;
|
|
struct ClothModifierData;
|
|
|
|
////////////////////////////////////////
|
|
// used for collisions in collision.c
|
|
////////////////////////////////////////
|
|
|
|
/* COLLISION FLAGS */
|
|
typedef enum
|
|
{
|
|
COLLISION_IN_FUTURE = ( 1 << 1 ),
|
|
} 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
|
|
int ap1, ap2, ap3, bp1, bp2, bp3;
|
|
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 ( MFace *mfaces, unsigned int numfaces, MVert *x, unsigned int numverts, float epsilon );
|
|
void bvhtree_update_from_mvert ( BVHTree * bvhtree, MFace *faces, int numfaces, MVert *x, MVert *xnew, int numverts, int moving );
|
|
|
|
/////////////////////////////////////////////////
|
|
|
|
LinkNode *BLI_linklist_append_fast ( LinkNode **listp, void *ptr );
|
|
|
|
// move Collision modifier object inter-frame with step = [0,1]
|
|
// defined in collisions.c
|
|
void collision_move_object ( CollisionModifierData *collmd, float step, float prevstep );
|
|
|
|
// interface for collision functions
|
|
void collisions_compute_barycentric ( float pv[3], float p1[3], float p2[3], float p3[3], float *w1, float *w2, float *w3 );
|
|
void interpolateOnTriangle ( float to[3], float v1[3], float v2[3], float v3[3], double w1, double w2, double w3 );
|
|
|
|
/////////////////////////////////////////////////
|
|
// used in effect.c
|
|
/////////////////////////////////////////////////
|
|
Object **get_collisionobjects(struct Scene *scene, Object *self, int *numcollobj);
|
|
|
|
typedef struct ColliderCache {
|
|
struct ColliderCache *next, *prev;
|
|
struct Object *ob;
|
|
struct CollisionModifierData *collmd;
|
|
} ColliderCache;
|
|
|
|
struct ListBase *get_collider_cache(struct Scene *scene, Object *self);
|
|
void free_collider_cache(struct ListBase **colliders);
|
|
|
|
/////////////////////////////////////////////////
|
|
|
|
|
|
|
|
/////////////////////////////////////////////////
|
|
|
|
#endif
|
|
|