code cleanup, better performance

KosRud · May 4, 2020 · aaad402 · aaad402
1 parent 078e90c
commit aaad402
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 18 deletions.
diff --git a/Code/AssetPostProcessorReorderBones.cs b/Code/AssetPostProcessorReorderBones.cs
@@ -3,6 +3,8 @@
 using System.Collections.Generic;
 using System.Linq;
 
+#if UNITY_EDITOR
+
 /// <summary>
 /// Sorts bone indexes in imported meshes.<br>
 /// SkinnedMeshRenderer requires bone indexes to be sorted based on hierarchy.
@@ -75,4 +77,6 @@ private static int CompareTransform(Transform A, Transform B)
 
         return 0;
 	}
-}
+}
+
+#endif
diff --git a/Code/DQ skinning/DualQuaternionSkinner.cs b/Code/DQ skinning/DualQuaternionSkinner.cs
@@ -78,7 +78,6 @@ struct DualQuaternion
 	/// </summary>
 	public bool started { get; private set; } = false;
 
-	DualQuaternion[] poseDualQuaternions;
 	Matrix4x4[] poseMatrices;
 
 	ComputeBuffer bufPoseMatrices;
@@ -360,7 +359,6 @@ void GrabMeshFromSkinnedMeshRenderer()
 
 		this.shaderDQBlend.SetInt("textureWidth", textureWidth);
 
-		this.poseDualQuaternions = new DualQuaternion[this.mf.mesh.bindposes.Length];
 		this.poseMatrices = new Matrix4x4[this.mf.mesh.bindposes.Length];
 
 		// initiate textures and buffers
@@ -415,8 +413,6 @@ void GrabMeshFromSkinnedMeshRenderer()
 		for (int i = 0; i < vertInfos.Length; i++)
 		{
 			vertInfos[i].position = vertices[i];
-			vertInfos[i].normal = normals[i];
-			vertInfos[i].tangent = tangents[i];
 
 			vertInfos[i].boneIndex0 = boneWeights[i].boneIndex0;
 			vertInfos[i].boneIndex1 = boneWeights[i].boneIndex1;
@@ -439,6 +435,22 @@ void GrabMeshFromSkinnedMeshRenderer()
 			vertInfos[i].compensation_coef = Vector3.Cross(toBone, boneDirection).magnitude;
 		}
 
+		if (normals.Length > 0)
+		{
+			for (int i = 0; i < vertInfos.Length; i++)
+			{
+				vertInfos[i].normal = normals[i];
+			}
+		}
+
+		if (tangents.Length > 0)
+		{
+			for (int i = 0; i < vertInfos.Length; i++)
+			{
+				vertInfos[i].tangent = tangents[i];
+			}
+		}
+
 		this.bufVertInfo.SetData(vertInfos);
 		this.shaderDQBlend.SetBuffer(this.kernelHandleDQBlend, "vertex_infos", this.bufVertInfo);
 
@@ -579,19 +591,6 @@ void Update()
 
 		for (int i = 0; i < this.bones.Length; i++)
 		{
-			this.poseDualQuaternions[i].rotationQuaternion = this.bones[i].rotation;
-
-			Vector3 pos = this.bones[i].position;
-
-			// could use float3 instead of float4 for position but NVidia says structures not aligned to 128 bits are slow
-			// https://developer.nvidia.com/content/understanding-structured-buffer-performance
-			this.poseDualQuaternions[i].position = new Vector4(
-				pos.x,
-				pos.y,
-				pos.z,
-				0
-			);	// not a proper quaternion, just a position. shader handles the rest
-
 			this.poseMatrices[i] = this.bones[i].localToWorldMatrix;
 		}
 

diff --git a/Code/DQ skinning/Inspector/DualQuaternionSkinnerEditor.cs b/Code/DQ skinning/Inspector/DualQuaternionSkinnerEditor.cs
@@ -3,6 +3,8 @@
 
 using System.Collections.Generic;
 
+#if UNITY_EDITOR
+
 /// <summary>
 /// Provides custom inspector for {@link DualQuaternionSkinner}
 /// </summary>
@@ -178,3 +180,5 @@ bool CheckProblems()
 		return false;
 	}
 }
+
+#endif