Cycles: remove approximate subdivision surface with gregory patches code.

It was never fully implemented and will be replaced by OpenSubdiv. Only linear
subdivision remains now. Also includes some refactoring in the split/dice code,
adding a SubdParams struct to pass around parameters more easily.

1 files changed, 0 insertions, 163 deletions

diff --git a/intern/cycles/subd/subd_patch.cpp b/intern/cycles/subd/subd_patch.cpp
index 4a029277370..fe9fa791813 100644
--- a/intern/cycles/subd/subd_patch.cpp
+++ b/intern/cycles/subd/subd_patch.cpp
@@ -27,14 +27,6 @@ CCL_NAMESPACE_BEGIN
 
 /* De Casteljau Evaluation */
 
-static float3 decasteljau_quadratic(float t, const float3 cp[3])
-{
-	float3 d0 = cp[0] + t*(cp[1] - cp[0]);
-	float3 d1 = cp[1] + t*(cp[2] - cp[1]);
-
-	return d0 + t*(d1 - d0);
-}
-
 static void decasteljau_cubic(float3 *P, float3 *dt, float t, const float3 cp[4])
 {
 	float3 d0 = cp[0] + t*(cp[1] - cp[0]);
@@ -63,17 +55,6 @@ static void decasteljau_bicubic(float3 *P, float3 *du, float3 *dv, const float3
 	if(du) decasteljau_cubic(du, NULL, v, utn);
 }
 
-static float3 decasteljau_tangent(const float3 cp[12], float u, float v)
-{
-	float3 ucp[3];
-
-	decasteljau_cubic(ucp+0, NULL, v, cp);
-	decasteljau_cubic(ucp+1, NULL, v, cp+4);
-	decasteljau_cubic(ucp+2, NULL, v, cp+8);
-
-	return decasteljau_quadratic(u, ucp);
-}
-
 /* Linear Quad Patch */
 
 void LinearQuadPatch::eval(float3 *P, float3 *dPdu, float3 *dPdv, float u, float v)
@@ -138,149 +119,5 @@ BoundBox BicubicPatch::bound()
 	return bbox;
 }
 
-/* Bicubic Patch with Tangent Fields */
-
-void BicubicTangentPatch::eval(float3 *P, float3 *dPdu, float3 *dPdv, float u, float v)
-{
-	decasteljau_bicubic(P, NULL, NULL, hull, u, v);
-
-	if(dPdu) *dPdu = decasteljau_tangent(utan, u, v);
-	if(dPdv) *dPdv = decasteljau_tangent(vtan, v, u);
-}
-
-BoundBox BicubicTangentPatch::bound()
-{
-	BoundBox bbox = BoundBox::empty;
-
-	for(int i = 0; i < 16; i++)
-		bbox.grow(hull[i]);
-	
-	return bbox;
-}
-
-/* Gregory Patch */
-
-static float no_zero_div(float f)
-{
-	if(f == 0.0f) return 1.0f;
-	return f;
-}
-
-void GregoryQuadPatch::eval(float3 *P, float3 *dPdu, float3 *dPdv, float u, float v)
-{
-	float3 bicubic[16];
-
-	float U = 1 - u;
-	float V = 1 - v;
-
-	/*  8     9     10     11
-	 * 12   0\1     2/3    13
-	 * 14   4/5     6\7    15
-	 * 16    17     18     19
-	 */
-
-	bicubic[5] = (u*hull[1] + v*hull[0])/no_zero_div(u + v);
-	bicubic[6] = (U*hull[2] + v*hull[3])/no_zero_div(U + v);
-	bicubic[9] = (u*hull[5] + V*hull[4])/no_zero_div(u + V);
-	bicubic[10] = (U*hull[6] + V*hull[7])/no_zero_div(U + V);
-
-	// Map gregory control points to bezier control points.
-	bicubic[0] = hull[8];
-	bicubic[1] = hull[9];
-	bicubic[2] = hull[10];
-	bicubic[3] = hull[11];
-	bicubic[4] = hull[12];
-	bicubic[7] = hull[13];
-	bicubic[8] = hull[14];
-	bicubic[11] = hull[15];
-	bicubic[12] = hull[16];
-	bicubic[13] = hull[17];
-	bicubic[14] = hull[18];
-	bicubic[15] = hull[19];
-
-	decasteljau_bicubic(P, dPdu, dPdv, bicubic, u, v);
-}
-
-BoundBox GregoryQuadPatch::bound()
-{
-	BoundBox bbox = BoundBox::empty;
-
-	for(int i = 0; i < 20; i++)
-		bbox.grow(hull[i]);
-	
-	return bbox;
-}
-
-void GregoryTrianglePatch::eval(float3 *P, float3 *dPdu, float3 *dPdv, float u, float v)
-{
-	/*		      6
-	 *		      
-	 *		14   0/1   7
-	 *						  
-	 *    13   5/4     3\2   8
-	 *		       
-	 * 12      11       10      9
-	 */
-
-	float w = 1 - u - v;
-	float uu = u * u;
-	float vv = v * v;
-	float ww = w * w;
-	float uuu = uu * u;
-	float vvv = vv * v;
-	float www = ww * w;
-
-	float U = 1 - u;
-	float V = 1 - v;
-	float W = 1 - w;
-
-	float3 C0 = ( v*U * hull[5] + u*V * hull[4] ) / no_zero_div(v*U + u*V);
-	float3 C1 = ( w*V * hull[3] + v*W * hull[2] ) / no_zero_div(w*V + v*W);
-	float3 C2 = ( u*W * hull[1] + w*U * hull[0] ) / no_zero_div(u*W + w*U);
-
-	*P =
-		(hull[12] * www + 3*hull[11] * ww*u + 3*hull[10] * w*uu + hull[ 9]*uuu) * (w + u) +
-		(hull[ 9] * uuu + 3*hull[ 8] * uu*v + 3*hull[ 7] * u*vv + hull[ 6]*vvv) * (u + v) +
-		(hull[ 6] * vvv + 3*hull[14] * vv*w + 3*hull[13] * v*ww + hull[12]*www) * (v + w) -
-		(hull[12] * www*w + hull[ 9] * uuu*u + hull[ 6] * vvv*v) +
-		12*(C0 * u*v*ww + C1 * uu*v*w   + C2 * u*vv*w);
-
-	if(dPdu || dPdv) {
-		float3 E1 = (hull[12]*www + 3*hull[11]*ww*u + 3*hull[10]*w*uu + hull[ 9]*uuu);
-		float3 E2 = (hull[ 9]*uuu + 3*hull[ 8]*uu*v + 3*hull[ 7]*u*vv + hull[ 6]*vvv);
-		float3 E3 = (hull[ 6]*vvv + 3*hull[14]*vv*w + 3*hull[13]*v*ww + hull[12]*www);
-
-		if(dPdu) {
-			float3 E1u = 3*( - hull[12]*ww + hull[11]*(ww-2*u*w) +   hull[10]*(2*u*w-uu) + hull[ 9]*uu);
-			float3 E2u = 3*(   hull[ 9]*uu + 2*hull[ 8]*u*v      +   hull[ 7]*vv		 );
-			float3 E3u = 3*(		    - hull[14]*vv		 - 2*hull[13]*v*w		- hull[12]*ww);
-			float3 Su  = 4*( -hull[12]*www + hull[9]*uuu);
-			float3 Cu  = 12*( C0*(ww*v-2*u*v*w) + C1*(2*u*v*w-uu*v) + C2*vv*(w-u) );
-
-			*dPdu = E1u*(w+u) + (E2+E2u*(u+v)) + (E3u*(v+w)-E3) - Su + Cu;
-		}
-
-		if(dPdv) {
-			float3 E1v = 3*(-hull[12]*ww  - 2*hull[11]*w*u       -   hull[10]*uu		 );
-			float3 E2v = 3*(		      hull[ 8]*uu		 + 2*hull[ 7]*u*v		+ hull[ 6]*vv);
-			float3 E3v = 3*( hull[ 6]*vv  +  hull[14]*(2*w*v-vv) +   hull[13]*(ww-2*w*v) - hull[12]*ww);
-			float3 Sv  = 4*(-hull[12]*www +  hull[ 6]*vvv);
-			float3 Cv  = 12*(C0*(u*ww-2*u*v*w) + C1*uu*(w-v) + C2*(2*u*v*w-u*vv));
-
-			*dPdv = ((E1v*(w+u)-E1) + (E2+E2v*(u+v)) + E3v*(v+w) - Sv + Cv );
-		}
-	}
-}
-
-BoundBox GregoryTrianglePatch::bound()
-{
-	BoundBox bbox = BoundBox::empty;
-
-	for(int i = 0; i < 20; i++)
-		bbox.grow(hull[i]);
-	
-	return bbox;
-}
-
 CCL_NAMESPACE_END