UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

moved meshBoundsMin/Max.z calculation outside the loop

Browse Source 
pass by ref in LastState.Equals
return true right away in SkeletonRenderer.MustUpdateMeshStructure
This commit is contained in:
ZimM 2015-02-28 05:53:47 +02:00
parent f738ec77b9
commit 3347ffcf86
1 changed files with 25 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
spine-unity/Assets/spine-unity/SkeletonRenderer.cs
View File

@ -283,21 +283,22 @@ public class SkeletonRenderer : MonoBehaviour {
lastState.vertexCount = vertexCount; lastState.vertexCount = vertexCount;
// Setup mesh. // Setup mesh.
Vector3 meshBoundsMin; float zSpacing = this.zSpacing;
meshBoundsMin.x = float.MaxValue;
meshBoundsMin.y = float.MaxValue;
meshBoundsMin.z = float.MaxValue;
Vector3 meshBoundsMax;
meshBoundsMax.x = float.MinValue;
meshBoundsMax.y = float.MinValue;
meshBoundsMax.z = float.MinValue;
float[] tempVertices = this.tempVertices; float[] tempVertices = this.tempVertices;
Vector2[] uvs = this.uvs; Vector2[] uvs = this.uvs;
Color32[] colors = this.colors; Color32[] colors = this.colors;
int vertexIndex = 0; int vertexIndex = 0;
Color32 color = new Color32(); Color32 color;
float zSpacing = this.zSpacing;
float a = skeleton.a * 255, r = skeleton.r, g = skeleton.g, b = skeleton.b; float a = skeleton.a * 255, r = skeleton.r, g = skeleton.g, b = skeleton.b;
Vector3 meshBoundsMin;
meshBoundsMin.x = float.MaxValue;
meshBoundsMin.y = float.MaxValue;
meshBoundsMin.z = zSpacing > 0f ? 0f : zSpacing * (drawOrderCount - 1);
Vector3 meshBoundsMax;
meshBoundsMax.x = float.MinValue;
meshBoundsMax.y = float.MinValue;
meshBoundsMax.z = zSpacing < 0f ? 0f : zSpacing * (drawOrderCount - 1);
for (int i = 0; i < drawOrderCount; i++) { for (int i = 0; i < drawOrderCount; i++) {
Slot slot = drawOrder.Items[i]; Slot slot = drawOrder.Items[i];
Attachment attachment = slot.attachment; Attachment attachment = slot.attachment;
@ -375,12 +376,6 @@ public class SkeletonRenderer : MonoBehaviour {
else if (tempVertices[RegionAttachment.Y4] > meshBoundsMax.y) else if (tempVertices[RegionAttachment.Y4] > meshBoundsMax.y)
meshBoundsMax.y = tempVertices[RegionAttachment.Y4]; meshBoundsMax.y = tempVertices[RegionAttachment.Y4];
// Calculate min/max Z
if (z < meshBoundsMin.z)
meshBoundsMin.z = z;
else if (z > meshBoundsMax.z)
meshBoundsMax.z = z;
vertexIndex += 4; vertexIndex += 4;
} else { } else {
if (!renderMeshes) if (!renderMeshes)
@ -415,10 +410,6 @@ public class SkeletonRenderer : MonoBehaviour {
meshBoundsMin.y = tempVertices[ii + 1]; meshBoundsMin.y = tempVertices[ii + 1];
else if (tempVertices[ii + 1] > meshBoundsMax.y) else if (tempVertices[ii + 1] > meshBoundsMax.y)
meshBoundsMax.y = tempVertices[ii + 1]; meshBoundsMax.y = tempVertices[ii + 1];
if (z < meshBoundsMin.z)
meshBoundsMin.z = z;
else if (z > meshBoundsMax.z)
meshBoundsMax.z = z;
} }
} else { } else {
SkinnedMeshAttachment skinnedMeshAttachment = attachment as SkinnedMeshAttachment; SkinnedMeshAttachment skinnedMeshAttachment = attachment as SkinnedMeshAttachment;
@ -451,10 +442,6 @@ public class SkeletonRenderer : MonoBehaviour {
meshBoundsMin.y = tempVertices[ii + 1]; meshBoundsMin.y = tempVertices[ii + 1];
else if (tempVertices[ii + 1] > meshBoundsMax.y) else if (tempVertices[ii + 1] > meshBoundsMax.y)
meshBoundsMax.y = tempVertices[ii + 1]; meshBoundsMax.y = tempVertices[ii + 1];
if (z < meshBoundsMin.z)
meshBoundsMin.z = z;
else if (z > meshBoundsMax.z)
meshBoundsMax.z = z;
} }
} }
} }
@ -553,34 +540,25 @@ public class SkeletonRenderer : MonoBehaviour {
// Check attachments // Check attachments
int attachmentCount = attachmentsTriangleCountTemp.Count; int attachmentCount = attachmentsTriangleCountTemp.Count;
if (attachmentsTriangleCountCurrentMesh.Count != attachmentCount) { if (attachmentsTriangleCountCurrentMesh.Count != attachmentCount)
mustUpdateMeshStructure = true;
} else {
for (int i = 0; i < attachmentCount; i++) {
if (attachmentsTriangleCountCurrentMesh.Items[i] != attachmentsTriangleCountTemp.Items[i]) {
mustUpdateMeshStructure = true;
break;
}
}
}
if (mustUpdateMeshStructure)
return true; return true;
for (int i = 0; i < attachmentCount; i++) {
if (attachmentsTriangleCountCurrentMesh.Items[i] != attachmentsTriangleCountTemp.Items[i])
return true;
}
// Check submeshes // Check submeshes
int submeshCount = addSubmeshArgumentsTemp.Count; int submeshCount = addSubmeshArgumentsTemp.Count;
if (addSubmeshArgumentsCurrentMesh.Count != submeshCount) { if (addSubmeshArgumentsCurrentMesh.Count != submeshCount)
mustUpdateMeshStructure = true; return true;
} else {
for (int i = 0; i < submeshCount; i++) { for (int i = 0; i < submeshCount; i++) {
if (!addSubmeshArgumentsCurrentMesh.Items[i].Equals(addSubmeshArgumentsTemp.Items[i])) { if (!addSubmeshArgumentsCurrentMesh.Items[i].Equals(ref addSubmeshArgumentsTemp.Items[i]))
mustUpdateMeshStructure = true; return true;
break;
}
}
} }
return mustUpdateMeshStructure; return false;
} }
/** Stores vertices and triangles for a single material. */ /** Stores vertices and triangles for a single material. */
@ -737,7 +715,7 @@ public class SkeletonRenderer : MonoBehaviour {
this.lastSubmesh = lastSubmesh; this.lastSubmesh = lastSubmesh;
} }
public bool Equals(AddSubmeshArguments other) { public bool Equals(ref AddSubmeshArguments other) {
return return
!ReferenceEquals(material, null) && !ReferenceEquals(material, null) &&
!ReferenceEquals(other.material, null) && !ReferenceEquals(other.material, null) &&