Replace MFace w/ vert-tri's for collision modifier

Note that the collision modifier doesn't have any use for Loop indices,
so to avoid duplicating the loop array too,
MVertTri has been added which simply stores vertex indices (runtime only).

1 files changed, 3 insertions, 26 deletions

diff --git a/source/blender/physics/intern/implicit_eigen.cpp b/source/blender/physics/intern/implicit_eigen.cpp
index 0ea8ccb0a49..64a75083f72 100644
--- a/source/blender/physics/intern/implicit_eigen.cpp
+++ b/source/blender/physics/intern/implicit_eigen.cpp
@@ -92,7 +92,6 @@ extern "C" {
 typedef float Scalar;
 
 static float I[3][3] = {{1, 0, 0}, {0, 1, 0}, {0, 0, 1}};
-static float ZERO[3][3] = {{0, 0, 0}, {0, 0, 0}, {0, 0, 0}};
 
 /* slightly extended Eigen vector class
  * with conversion to/from plain C float array
@@ -786,33 +785,16 @@ static float calc_nor_area_tri(float nor[3], const float v1[3], const float v2[3
 	return normalize_v3(nor);
 }
 
-static float calc_nor_area_quad(float nor[3], const float v1[3], const float v2[3], const float v3[3], const float v4[3])
-{
-	float n1[3], n2[3];
-	
-	sub_v3_v3v3(n1, v1, v3);
-	sub_v3_v3v3(n2, v2, v4);
-	
-	cross_v3_v3v3(nor, n1, n2);
-	return normalize_v3(nor);
-}
-
 /* XXX does not support force jacobians yet, since the effector system does not provide them either */
-void BPH_mass_spring_force_face_wind(Implicit_Data *data, int v1, int v2, int v3, int v4, const float (*winvec)[3])
+void BPH_mass_spring_force_face_wind(Implicit_Data *data, int v1, int v2, int v3, const float (*winvec)[3])
 {
 	const float effector_scale = 0.02f;
 	float win[3], nor[3], area;
 	float factor;
 	
 	// calculate face normal and area
-	if (v4) {
-		area = calc_nor_area_quad(nor, data->X.v3(v1), data->X.v3(v2), data->X.v3(v3), data->X.v3(v4));
-		factor = effector_scale * area * 0.25f;
-	}
-	else {
-		area = calc_nor_area_tri(nor, data->X.v3(v1), data->X.v3(v2), data->X.v3(v3));
-		factor = effector_scale * area / 3.0f;
-	}
+	area = calc_nor_area_tri(nor, data->X.v3(v1), data->X.v3(v2), data->X.v3(v3));
+	factor = effector_scale * area / 3.0f;
 	
 	world_to_root_v3(data, v1, win, winvec[v1]);
 	madd_v3_v3fl(data->F.v3(v1), nor, factor * dot_v3v3(win, nor));
@@ -822,11 +804,6 @@ void BPH_mass_spring_force_face_wind(Implicit_Data *data, int v1, int v2, int v3
 	
 	world_to_root_v3(data, v3, win, winvec[v3]);
 	madd_v3_v3fl(data->F.v3(v3), nor, factor * dot_v3v3(win, nor));
-	
-	if (v4) {
-		world_to_root_v3(data, v4, win, winvec[v4]);
-		madd_v3_v3fl(data->F.v3(v4), nor, factor * dot_v3v3(win, nor));
-	}
 }
 
 void BPH_mass_spring_force_edge_wind(Implicit_Data *data, int v1, int v2, const float (*winvec)[3])