a42bf45333
discussed with Janne, Ton, Nathan and we agreed this kind of change at least needs discussion with module owners.
Its also too close to release to be making these kinds of changes.
commands used:
# reverse merge
svn merge -r36073:36072 .
# for some reason this gave a lot of property changes
svn revert `svn st | grep "^ M" | awk '{print $2}'`
# reverse merging didn't work here, removing while dir.
svn rm extern/eltopo/
# manually fixed conflict in
# ./source/blenderplayer/CMakeLists.txt
#
# also manually removed 2 lines from
# ./CMakeLists.txt
161 lines
4.5 KiB
C
161 lines
4.5 KiB
C
/*
|
|
* $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., 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_COLLISIONS_H
|
|
#define BKE_COLLISIONS_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 Cloth;
|
|
struct ClothModifierData;
|
|
struct CollisionModifierData;
|
|
struct DerivedMesh;
|
|
struct Group;
|
|
struct MFace;
|
|
struct MVert;
|
|
struct Object;
|
|
struct Scene;
|
|
struct LinkNode;
|
|
|
|
////////////////////////////////////////
|
|
// 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 ( struct MFace *mfaces, unsigned int numfaces, struct MVert *x, unsigned int numverts, float epsilon );
|
|
void bvhtree_update_from_mvert ( BVHTree * bvhtree, struct MFace *faces, int numfaces, struct MVert *x, struct MVert *xnew, int numverts, int moving );
|
|
|
|
/////////////////////////////////////////////////
|
|
|
|
struct LinkNode *BLI_linklist_append_fast ( struct LinkNode **listp, void *ptr );
|
|
|
|
// 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 );
|
|
|
|
// 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
|
|
/////////////////////////////////////////////////
|
|
struct Object **get_collisionobjects(struct Scene *scene, struct Object *self, struct Group *group, unsigned int *numcollobj);
|
|
|
|
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
|
|
|