remove decompose

Author: RichardGe

RadeonProRender/inc/Math/matrix.h

@@ -272,182 +272,4 @@ namespace RadeonProRender
 #undef m
 	}
 
-	///
-	/// Matrix decomposition based on: http://tog.acm.org/resources/GraphicsGems/gemsii/unmatrix.c
-	///
-	inline int
-		decompose(matrix const& mat,
-			float3& translation,
-			float3& scale,
-			float3& shear,
-			float3& rotation,
-			float4& perspective)
-	{
-		int i, j;
-		matrix locmat;
-		matrix pmat, invpmat, tinvpmat;
-		/* Vector4 type and functions need to be added to the common set. */
-		float4 prhs, psol;
-		float4 row[3], pdum3;
-
-		locmat = mat;
-		/* Normalize the matrix. */
-		if (locmat.m33 == 0)
-			return 0;
-		for (i = 0; i<4; i++)
-			for (j = 0; j<4; j++)
-				locmat.m[i][j] /= locmat.m33;
-		/* pmat is used to solve for perspective, but it also provides
-		* an easy way to test for singularity of the upper 3x3 component.
-		*/
-
-		pmat = locmat;
-		for (i = 0; i<3; i++)
-			pmat.m[i][3] = 0;
-		pmat.m33 = 1;
-
-		if (determinant(pmat) == 0.f)
-		{
-			scale.x = 0.f;
-			scale.y = 0.f;
-			scale.z = 0.f;
-
-			shear.x = 0.f;
-			shear.y = 0.f;
-			shear.z = 0.f;
-
-			rotation.x = 0.f;
-			rotation.y = 0.f;
-			rotation.z = 0.f;
-
-			perspective.x = perspective.y = perspective.z =
-			perspective.w = 0;
-
-			translation.x = locmat.m30;
-			translation.y = locmat.m31;
-			translation.z = locmat.m32;
-			return 1;
-		}
-
-		/* First, isolate perspective.  This is the messiest. */
-		if (locmat.m03 != 0 || locmat.m13 != 0 ||
-			locmat.m23 != 0) {
-			/* prhs is the right hand side of the equation. */
-			prhs.x = locmat.m03;
-			prhs.y = locmat.m13;
-			prhs.z = locmat.m23;
-			prhs.w = locmat.m33;
-
-			/* Solve the equation by inverting pmat and multiplying
-			* prhs by the inverse.  (This is the easiest way, not
-			* necessarily the best.)
-			* inverse function (and det4x4, above) from the Matrix
-			* Inversion gem in the first volume.
-			*/
-			invpmat = inverse(pmat);
-			tinvpmat = invpmat.transpose();
-			psol = tinvpmat * prhs;
-
-			/* Stuff the answer away. */
-			perspective.x = psol.x;
-			perspective.y = psol.y;
-			perspective.z = psol.z;
-			perspective.w = psol.w;
-			/* Clear the perspective partition. */
-			locmat.m03 = locmat.m13 =
-				locmat.m23 = 0;
-			locmat.m33 = 1;
-		}
-		else		/* No perspective. */
-			perspective.x = perspective.y = perspective.z =
-			perspective.w = 0;
-
-		/* Next take care of translation (easy). */
-		translation.x = locmat.m30;
-		translation.y = locmat.m31;
-		translation.z = locmat.m32;
-		locmat.m30 = 0;
-		locmat.m31 = 0;
-		locmat.m32 = 0;
-
-
-		/* Now get scale and shear. */
-		for (i = 0; i<3; i++) {
-			row[i].x = locmat.m[i][0];
-			row[i].y = locmat.m[i][1];
-			row[i].z = locmat.m[i][2];
-		}
-
-		/* Compute X scale factor and normalize first row. */
-		scale.x = sqrtf(row[0].sqnorm());
-		row[0].normalize();
-
-		/* Compute XY shear factor and make 2nd row orthogonal to 1st. */
-		shear.x = dot(row[0], row[1]);
-		row[1] = row[1] - shear.x * row[0];
-
-		/* Now, compute Y scale and normalize 2nd row. */
-		scale.y = sqrtf(row[1].sqnorm());
-		row[1].normalize();
-		shear.x /= scale.y;
-
-		/* Compute XZ and YZ shears, orthogonalize 3rd row. */
-		shear.y = dot(row[0], row[2]);
-		row[2] = row[2] - shear.y * row[0];
-
-		shear.z = dot(row[1], row[2]);
-		row[2] = row[2] - shear.z * row[1];
-
-		/* Next, get Z scale and normalize 3rd row. */
-		scale.z = sqrtf(row[2].sqnorm());
-		row[2].normalize();
-		shear.y /= scale.z;
-		shear.z /= scale.z;
-
-		/* At this point, the matrix (in rows[]) is orthonormal.
-		* Check for a coordinate system flip.  If the determinant
-		* is -1, then negate the matrix and the scaling factors.
-		*/
-		float3 r0 = float3(row[0].x, row[0].y, row[0].z);
-		float3 r1 = float3(row[1].x, row[1].y, row[1].z);
-		float3 r2 = float3(row[2].x, row[2].y, row[2].z);
-		if (dot(r0, cross(r1, r2)) < 0)
-		{
-			for (i = 0; i < 3; i++) {
-				row[i].x *= -1;
-				row[i].y *= -1;
-				row[i].z *= -1;
-			}
-			scale *= -1;
-		}
-
-
-		// source : http://www.gregslabaugh.net/publications/euler.pdf
-		const float delta = 0.000001f;
-		if ( fabsf(row[0].z) <  1.0 - delta ) // if  row[0].z is not +1 or -1
-		{
-			rotation.y = asinf(-row[0].z);
-			const float cos_roty = cosf(rotation.y);
-			rotation.x = atan2f(row[1].z / cos_roty, row[2].z / cos_roty);
-			rotation.z = atan2f(row[0].y / cos_roty, row[0].x / cos_roty);
-		}
-		else
-		{
-			rotation.z = 0;
-			if ( row[0].z < - (1.0 - delta) ) // if row[0].z =~ -1
-			{
-				rotation.y = asinf(-row[0].z); // =~  + pi / 2.0;
-				rotation.x = atan2f(row[1].x, row[2].x);
-			}
-			else
-			{
-				rotation.y = asinf(-row[0].z); // =~  - pi / 2.0
-				rotation.x = atan2f(-row[1].x, -row[2].x);
-			}
-		}
-
-
-		/* All done! */
-		return 1;
-	}
 }