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

[unity] Fix tintBlack data applied in wrong order.

Browse Source
This commit is contained in:
pharan 2017-05-18 11:18:07 +08:00
parent 4872bf0f6a
commit 6756f01557
1 changed files with 49 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
spine-unity/Assets/spine-unity/Mesh Generation/SpineMesh.cs
View File

@ -653,6 +653,55 @@ namespace Spine.Unity {
int startSlot = submesh.startSlot; int startSlot = submesh.startSlot;
lastSlotIndex = endSlot; lastSlotIndex = endSlot;
if (settings.tintBlack) {
Vector2 rg, b2;
int vi = vertexIndex;
b2.y = 1f;
{
if (uv2 == null) {
uv2 = new ExposedList<Vector2>();
uv3 = new ExposedList<Vector2>();
}
if (totalVertexCount > uv2.Items.Length) { // Manual ExposedList.Resize()
Array.Resize(ref uv2.Items, totalVertexCount);
Array.Resize(ref uv3.Items, totalVertexCount);
}
Debug.Log(totalVertexCount);
uv2.Count = uv3.Count = totalVertexCount;
}
var uv2i = uv2.Items;
var uv3i = uv3.Items;
for (int slotIndex = startSlot; slotIndex < endSlot; slotIndex++) {
var slot = skeletonDrawOrderItems[slotIndex];
var attachment = slot.attachment;
rg.x = slot.r2; //r
rg.y = slot.g2; //g
b2.x = slot.b2; //b
var regionAttachment = attachment as RegionAttachment;
if (regionAttachment != null) {
Debug.Log(vi);
uv2i[vi] = rg; uv2i[vi + 1] = rg; uv2i[vi + 2] = rg; uv2i[vi + 3] = rg;
uv3i[vi] = b2; uv3i[vi + 1] = b2; uv3i[vi + 2] = b2; uv3i[vi + 3] = b2;
vi += 4;
} else { //} if (settings.renderMeshes) {
var meshAttachment = attachment as MeshAttachment;
if (meshAttachment != null) {
int meshVertexCount = meshAttachment.worldVerticesLength;
for (int iii = 0; iii < meshVertexCount; iii += 2) {
uv2i[vi] = rg;
uv3i[vi] = b2;
vi++;
}
}
}
}
}
for (int slotIndex = startSlot; slotIndex < endSlot; slotIndex++) { for (int slotIndex = startSlot; slotIndex < endSlot; slotIndex++) {
var slot = skeletonDrawOrderItems[slotIndex]; var slot = skeletonDrawOrderItems[slotIndex];
var attachment = slot.attachment; var attachment = slot.attachment;
@ -761,53 +810,6 @@ namespace Spine.Unity {
} }
} }
} }
if (settings.tintBlack) {
Vector2 rg, b2;
int vi = vertexIndex;
b2.y = 1f;
{
if (uv2 == null) {
uv2 = new ExposedList<Vector2>();
uv3 = new ExposedList<Vector2>();
}
if (totalVertexCount > uv2.Items.Length) { // Manual ExposedList.Resize()
Array.Resize(ref uv2.Items, totalVertexCount);
Array.Resize(ref uv3.Items, totalVertexCount);
}
uv2.Count = uv3.Count = totalVertexCount;
}
var uv2i = uv2.Items;
var uv3i = uv3.Items;
for (int slotIndex = startSlot; slotIndex < endSlot; slotIndex++) {
var slot = skeletonDrawOrderItems[slotIndex];
var attachment = slot.attachment;
rg.x = slot.r2; //r
rg.y = slot.g2; //g
b2.x = slot.b2; //b
var regionAttachment = attachment as RegionAttachment;
if (regionAttachment != null) {
uv2i[vi] = rg; uv2i[vi + 1] = rg; uv2i[vi + 2] = rg; uv2i[vi + 3] = rg;
uv3i[vi] = b2; uv3i[vi + 1] = b2; uv3i[vi + 2] = b2; uv3i[vi + 3] = b2;
vi += 4;
} else { //} if (settings.renderMeshes) {
var meshAttachment = attachment as MeshAttachment;
if (meshAttachment != null) {
int meshVertexCount = meshAttachment.worldVerticesLength;
for (int iii = 0; iii < meshVertexCount; iii += 2) {
uv2i[vi] = rg;
uv3i[vi] = b2;
vi++;
}
}
}
}
}
} }
this.meshBoundsMin = bmin; this.meshBoundsMin = bmin;