Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Tönne <lukas.toenne@gmail.com>2014-09-03 13:17:24 +0400
committerLukas Tönne <lukas.toenne@gmail.com>2015-01-20 11:29:56 +0300
commitf98d388fd3b6225101692de994d64955557b3be5 (patch)
treea3b2b937a68031015fdeffc992a3a90997b03cc0 /source/blender/blenkernel/BKE_collision.h
parentdbf78406435b0ebed9fa69d3d1a96c083098b29c (diff)
Extended line/face collision near-check, to allow for distance margins.
The original BLI method for line/triangle intersection returns false in case the line does not actually intersect, but in order to generate repulsion forces we need to also handle contacts inside the margin.
Diffstat (limited to 'source/blender/blenkernel/BKE_collision.h')
-rw-r--r--source/blender/blenkernel/BKE_collision.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_collision.h b/source/blender/blenkernel/BKE_collision.h
index dab5631d716..c0ee5dcc63e 100644
--- a/source/blender/blenkernel/BKE_collision.h
+++ b/source/blender/blenkernel/BKE_collision.h
@@ -91,9 +91,6 @@ typedef struct CollPair {
int ap1, ap2, ap3, bp1, bp2, bp3;
#endif
int pointsb[4];
-
- /* hair collision */
- float va[3], vb[3]; /* */
}
CollPair;