mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-03-26 22:49:01 +08:00
Improved rendering performance when an attachment is fully inside a clipping attachment.
Reuse the original vertices rather than clipping's triangle soup.
This commit is contained in:
parent
bd1b98fe97
commit
68d262b531
@ -728,8 +728,7 @@ public class Skeleton {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (vertices != null) {
|
if (vertices != null) {
|
||||||
if (clipper != null && clipper.isClipping()) {
|
if (clipper != null && clipper.isClipping() && clipper.clipTriangles(vertices, triangles, triangles.length)) {
|
||||||
clipper.clipTriangles(vertices, triangles, triangles.length);
|
|
||||||
vertices = clipper.getClippedVertices().items;
|
vertices = clipper.getClippedVertices().items;
|
||||||
verticesLength = clipper.getClippedVertices().size;
|
verticesLength = clipper.getClippedVertices().size;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -150,13 +150,12 @@ public class SkeletonRenderer {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
Texture texture = null;
|
Texture texture = null;
|
||||||
int vertexSize = clipper.isClipping() ? 2 : 5;
|
|
||||||
Attachment attachment = slot.attachment;
|
Attachment attachment = slot.attachment;
|
||||||
if (attachment instanceof RegionAttachment) {
|
if (attachment instanceof RegionAttachment) {
|
||||||
RegionAttachment region = (RegionAttachment)attachment;
|
RegionAttachment region = (RegionAttachment)attachment;
|
||||||
verticesLength = vertexSize << 2;
|
verticesLength = 20;
|
||||||
vertices = this.vertices.items;
|
vertices = this.vertices.items;
|
||||||
region.computeWorldVertices(slot, vertices, 0, vertexSize);
|
region.computeWorldVertices(slot, vertices, 0, 5);
|
||||||
triangles = quadTriangles;
|
triangles = quadTriangles;
|
||||||
texture = region.getRegion().getTexture();
|
texture = region.getRegion().getTexture();
|
||||||
uvs = region.getUVs();
|
uvs = region.getUVs();
|
||||||
@ -165,9 +164,9 @@ public class SkeletonRenderer {
|
|||||||
} else if (attachment instanceof MeshAttachment) {
|
} else if (attachment instanceof MeshAttachment) {
|
||||||
MeshAttachment mesh = (MeshAttachment)attachment;
|
MeshAttachment mesh = (MeshAttachment)attachment;
|
||||||
int count = mesh.getWorldVerticesLength();
|
int count = mesh.getWorldVerticesLength();
|
||||||
verticesLength = (count >> 1) * vertexSize;
|
verticesLength = (count >> 1) * 5;
|
||||||
vertices = this.vertices.setSize(verticesLength);
|
vertices = this.vertices.setSize(verticesLength);
|
||||||
mesh.computeWorldVertices(slot, 0, count, vertices, 0, vertexSize);
|
mesh.computeWorldVertices(slot, 0, count, vertices, 0, 5);
|
||||||
triangles = mesh.getTriangles();
|
triangles = mesh.getTriangles();
|
||||||
texture = mesh.getRegion().getTexture();
|
texture = mesh.getRegion().getTexture();
|
||||||
uvs = mesh.getUVs();
|
uvs = mesh.getUVs();
|
||||||
@ -203,8 +202,7 @@ public class SkeletonRenderer {
|
|||||||
| (int)(g * slotColor.g * color.g * multiplier) << 8 //
|
| (int)(g * slotColor.g * color.g * multiplier) << 8 //
|
||||||
| (int)(r * slotColor.r * color.r * multiplier));
|
| (int)(r * slotColor.r * color.r * multiplier));
|
||||||
|
|
||||||
if (clipper.isClipping()) {
|
if (clipper.isClipping() && clipper.clipTriangles(vertices, triangles, triangles.length, uvs, c, 0, false, 5)) {
|
||||||
clipper.clipTriangles(vertices, triangles, triangles.length, uvs, c, 0, false);
|
|
||||||
FloatArray clippedVertices = clipper.getClippedVertices();
|
FloatArray clippedVertices = clipper.getClippedVertices();
|
||||||
ShortArray clippedTriangles = clipper.getClippedTriangles();
|
ShortArray clippedTriangles = clipper.getClippedTriangles();
|
||||||
batch.draw(texture, clippedVertices.items, 0, clippedVertices.size, clippedTriangles.items, 0,
|
batch.draw(texture, clippedVertices.items, 0, clippedVertices.size, clippedTriangles.items, 0,
|
||||||
@ -249,13 +247,12 @@ public class SkeletonRenderer {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
Texture texture = null;
|
Texture texture = null;
|
||||||
int vertexSize = clipper.isClipping() ? 2 : 6;
|
|
||||||
Attachment attachment = slot.attachment;
|
Attachment attachment = slot.attachment;
|
||||||
if (attachment instanceof RegionAttachment) {
|
if (attachment instanceof RegionAttachment) {
|
||||||
RegionAttachment region = (RegionAttachment)attachment;
|
RegionAttachment region = (RegionAttachment)attachment;
|
||||||
verticesLength = vertexSize << 2;
|
verticesLength = 24;
|
||||||
vertices = this.vertices.items;
|
vertices = this.vertices.items;
|
||||||
region.computeWorldVertices(slot, vertices, 0, vertexSize);
|
region.computeWorldVertices(slot, vertices, 0, 6);
|
||||||
triangles = quadTriangles;
|
triangles = quadTriangles;
|
||||||
texture = region.getRegion().getTexture();
|
texture = region.getRegion().getTexture();
|
||||||
uvs = region.getUVs();
|
uvs = region.getUVs();
|
||||||
@ -264,9 +261,9 @@ public class SkeletonRenderer {
|
|||||||
} else if (attachment instanceof MeshAttachment) {
|
} else if (attachment instanceof MeshAttachment) {
|
||||||
MeshAttachment mesh = (MeshAttachment)attachment;
|
MeshAttachment mesh = (MeshAttachment)attachment;
|
||||||
int count = mesh.getWorldVerticesLength();
|
int count = mesh.getWorldVerticesLength();
|
||||||
verticesLength = (count >> 1) * vertexSize;
|
verticesLength = count * 3;
|
||||||
vertices = this.vertices.setSize(verticesLength);
|
vertices = this.vertices.setSize(verticesLength);
|
||||||
mesh.computeWorldVertices(slot, 0, count, vertices, 0, vertexSize);
|
mesh.computeWorldVertices(slot, 0, count, vertices, 0, 6);
|
||||||
triangles = mesh.getTriangles();
|
triangles = mesh.getTriangles();
|
||||||
texture = mesh.getRegion().getTexture();
|
texture = mesh.getRegion().getTexture();
|
||||||
uvs = mesh.getUVs();
|
uvs = mesh.getUVs();
|
||||||
@ -310,8 +307,7 @@ public class SkeletonRenderer {
|
|||||||
| (int)(green * darkColor.g) << 8 //
|
| (int)(green * darkColor.g) << 8 //
|
||||||
| (int)(red * darkColor.r));
|
| (int)(red * darkColor.r));
|
||||||
|
|
||||||
if (clipper.isClipping()) {
|
if (clipper.isClipping() && clipper.clipTriangles(vertices, triangles, triangles.length, uvs, light, dark, true, 6)) {
|
||||||
clipper.clipTriangles(vertices, triangles, triangles.length, uvs, light, dark, true);
|
|
||||||
FloatArray clippedVertices = clipper.getClippedVertices();
|
FloatArray clippedVertices = clipper.getClippedVertices();
|
||||||
ShortArray clippedTriangles = clipper.getClippedTriangles();
|
ShortArray clippedTriangles = clipper.getClippedTriangles();
|
||||||
batch.drawTwoColor(texture, clippedVertices.items, 0, clippedVertices.size, clippedTriangles.items, 0,
|
batch.drawTwoColor(texture, clippedVertices.items, 0, clippedVertices.size, clippedTriangles.items, 0,
|
||||||
|
|||||||
@ -84,7 +84,7 @@ public class SkeletonClipping {
|
|||||||
return clipAttachment != null;
|
return clipAttachment != null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void clipTriangles (float[] vertices, short[] triangles, int trianglesLength) {
|
public boolean clipTriangles (float[] vertices, short[] triangles, int trianglesLength) {
|
||||||
FloatArray clipOutput = this.clipOutput, clippedVertices = this.clippedVertices;
|
FloatArray clipOutput = this.clipOutput, clippedVertices = this.clippedVertices;
|
||||||
ShortArray clippedTriangles = this.clippedTriangles;
|
ShortArray clippedTriangles = this.clippedTriangles;
|
||||||
Object[] polygons = clippingPolygons.items;
|
Object[] polygons = clippingPolygons.items;
|
||||||
@ -94,24 +94,25 @@ public class SkeletonClipping {
|
|||||||
clippedVertices.clear();
|
clippedVertices.clear();
|
||||||
clippedUvs.clear();
|
clippedUvs.clear();
|
||||||
clippedTriangles.clear();
|
clippedTriangles.clear();
|
||||||
|
float[] clipOutputItems = null;
|
||||||
for (int i = 0; i < trianglesLength; i += 3) {
|
for (int i = 0; i < trianglesLength; i += 3) {
|
||||||
int vertexOffset = triangles[i] << 1;
|
int v = triangles[i] << 1;
|
||||||
float x1 = vertices[vertexOffset], y1 = vertices[vertexOffset + 1];
|
float x1 = vertices[v], y1 = vertices[v + 1];
|
||||||
|
|
||||||
vertexOffset = triangles[i + 1] << 1;
|
v = triangles[i + 1] << 1;
|
||||||
float x2 = vertices[vertexOffset], y2 = vertices[vertexOffset + 1];
|
float x2 = vertices[v], y2 = vertices[v + 1];
|
||||||
|
|
||||||
vertexOffset = triangles[i + 2] << 1;
|
v = triangles[i + 2] << 1;
|
||||||
float x3 = vertices[vertexOffset], y3 = vertices[vertexOffset + 1];
|
float x3 = vertices[v], y3 = vertices[v + 1];
|
||||||
|
|
||||||
for (int p = 0; p < polygonsCount; p++) {
|
for (int p = 0; p < polygonsCount; p++) {
|
||||||
int s = clippedVertices.size;
|
int s = clippedVertices.size;
|
||||||
if (clip(x1, y1, x2, y2, x3, y3, (FloatArray)polygons[p], clipOutput)) {
|
if (clip(x1, y1, x2, y2, x3, y3, (FloatArray)polygons[p], clipOutput)) {
|
||||||
|
clipOutputItems = clipOutput.items;
|
||||||
int clipOutputLength = clipOutput.size;
|
int clipOutputLength = clipOutput.size;
|
||||||
if (clipOutputLength == 0) continue;
|
if (clipOutputLength == 0) continue;
|
||||||
|
|
||||||
int clipOutputCount = clipOutputLength >> 1;
|
int clipOutputCount = clipOutputLength >> 1;
|
||||||
float[] clipOutputItems = clipOutput.items;
|
|
||||||
float[] clippedVerticesItems = clippedVertices.setSize(s + clipOutputCount * 2);
|
float[] clippedVerticesItems = clippedVertices.setSize(s + clipOutputCount * 2);
|
||||||
for (int ii = 0; ii < clipOutputLength; ii += 2, s += 2) {
|
for (int ii = 0; ii < clipOutputLength; ii += 2, s += 2) {
|
||||||
float x = clipOutputItems[ii], y = clipOutputItems[ii + 1];
|
float x = clipOutputItems[ii], y = clipOutputItems[ii + 1];
|
||||||
@ -150,45 +151,46 @@ public class SkeletonClipping {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return clipOutputItems != null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void clipTriangles (float[] vertices, short[] triangles, int trianglesLength, float[] uvs, float light, float dark,
|
public boolean clipTriangles (float[] vertices, short[] triangles, int trianglesLength, float[] uvs, float light, float dark,
|
||||||
boolean twoColor) {
|
boolean twoColor, int stride) {
|
||||||
|
|
||||||
FloatArray clipOutput = this.clipOutput, clippedVertices = this.clippedVertices;
|
FloatArray clipOutput = this.clipOutput, clippedVertices = this.clippedVertices;
|
||||||
ShortArray clippedTriangles = this.clippedTriangles;
|
ShortArray clippedTriangles = this.clippedTriangles;
|
||||||
Object[] polygons = clippingPolygons.items;
|
Object[] polygons = clippingPolygons.items;
|
||||||
int polygonsCount = clippingPolygons.size;
|
int polygonsCount = clippingPolygons.size;
|
||||||
int vertexSize = twoColor ? 6 : 5;
|
|
||||||
|
|
||||||
short index = 0;
|
short index = 0;
|
||||||
clippedVertices.clear();
|
clippedVertices.clear();
|
||||||
clippedUvs.clear();
|
clippedUvs.clear();
|
||||||
clippedTriangles.clear();
|
clippedTriangles.clear();
|
||||||
|
float[] clipOutputItems = null;
|
||||||
for (int i = 0; i < trianglesLength; i += 3) {
|
for (int i = 0; i < trianglesLength; i += 3) {
|
||||||
int vertexOffset = triangles[i] << 1;
|
int t = triangles[i];
|
||||||
float x1 = vertices[vertexOffset], y1 = vertices[vertexOffset + 1];
|
float u1 = uvs[t << 1], v1 = uvs[(t << 1) + 1];
|
||||||
float u1 = uvs[vertexOffset], v1 = uvs[vertexOffset + 1];
|
float x1 = vertices[t * stride], y1 = vertices[t * stride + 1];
|
||||||
|
|
||||||
vertexOffset = triangles[i + 1] << 1;
|
t = triangles[i + 1];
|
||||||
float x2 = vertices[vertexOffset], y2 = vertices[vertexOffset + 1];
|
float u2 = uvs[t << 1], v2 = uvs[(t << 1) + 1];
|
||||||
float u2 = uvs[vertexOffset], v2 = uvs[vertexOffset + 1];
|
float x2 = vertices[t * stride], y2 = vertices[t * stride + 1];
|
||||||
|
|
||||||
vertexOffset = triangles[i + 2] << 1;
|
t = triangles[i + 2];
|
||||||
float x3 = vertices[vertexOffset], y3 = vertices[vertexOffset + 1];
|
float u3 = uvs[t << 1], v3 = uvs[(t << 1) + 1];
|
||||||
float u3 = uvs[vertexOffset], v3 = uvs[vertexOffset + 1];
|
float x3 = vertices[t * stride], y3 = vertices[t * stride + 1];
|
||||||
|
|
||||||
for (int p = 0; p < polygonsCount; p++) {
|
for (int p = 0; p < polygonsCount; p++) {
|
||||||
int s = clippedVertices.size;
|
int s = clippedVertices.size;
|
||||||
if (clip(x1, y1, x2, y2, x3, y3, (FloatArray)polygons[p], clipOutput)) {
|
if (clip(x1, y1, x2, y2, x3, y3, (FloatArray)polygons[p], clipOutput)) {
|
||||||
|
clipOutputItems = clipOutput.items;
|
||||||
int clipOutputLength = clipOutput.size;
|
int clipOutputLength = clipOutput.size;
|
||||||
if (clipOutputLength == 0) continue;
|
if (clipOutputLength == 0) continue;
|
||||||
float d0 = y2 - y3, d1 = x3 - x2, d2 = x1 - x3, d4 = y3 - y1;
|
float d0 = y2 - y3, d1 = x3 - x2, d2 = x1 - x3, d4 = y3 - y1;
|
||||||
float d = 1 / (d0 * d2 + d1 * (y1 - y3));
|
float d = 1 / (d0 * d2 + d1 * (y1 - y3));
|
||||||
|
|
||||||
int clipOutputCount = clipOutputLength >> 1;
|
int clipOutputCount = clipOutputLength >> 1;
|
||||||
float[] clipOutputItems = clipOutput.items;
|
float[] clippedVerticesItems = clippedVertices.setSize(s + clipOutputCount * stride);
|
||||||
float[] clippedVerticesItems = clippedVertices.setSize(s + clipOutputCount * vertexSize);
|
|
||||||
for (int ii = 0; ii < clipOutputLength; ii += 2, s += 2) {
|
for (int ii = 0; ii < clipOutputLength; ii += 2, s += 2) {
|
||||||
float x = clipOutputItems[ii], y = clipOutputItems[ii + 1];
|
float x = clipOutputItems[ii], y = clipOutputItems[ii + 1];
|
||||||
clippedVerticesItems[s] = x;
|
clippedVerticesItems[s] = x;
|
||||||
@ -218,7 +220,7 @@ public class SkeletonClipping {
|
|||||||
index += clipOutputCount + 1;
|
index += clipOutputCount + 1;
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
float[] clippedVerticesItems = clippedVertices.setSize(s + 3 * vertexSize);
|
float[] clippedVerticesItems = clippedVertices.setSize(s + 3 * stride);
|
||||||
clippedVerticesItems[s] = x1;
|
clippedVerticesItems[s] = x1;
|
||||||
clippedVerticesItems[s + 1] = y1;
|
clippedVerticesItems[s + 1] = y1;
|
||||||
clippedVerticesItems[s + 2] = light;
|
clippedVerticesItems[s + 2] = light;
|
||||||
@ -267,6 +269,7 @@ public class SkeletonClipping {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return clipOutputItems != null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void clipTrianglesUnpacked (float[] vertices, int vertexStart, short[] triangles, int trianglesLength, float[] uvs) {
|
public void clipTrianglesUnpacked (float[] vertices, int vertexStart, short[] triangles, int trianglesLength, float[] uvs) {
|
||||||
@ -282,17 +285,17 @@ public class SkeletonClipping {
|
|||||||
clippedUvs.clear();
|
clippedUvs.clear();
|
||||||
clippedTriangles.clear();
|
clippedTriangles.clear();
|
||||||
for (int i = 0; i < trianglesLength; i += 3) {
|
for (int i = 0; i < trianglesLength; i += 3) {
|
||||||
int vertexOffset = triangles[i] << 1;
|
int v = triangles[i] << 1;
|
||||||
float x1 = vertices[vertexStart + vertexOffset], y1 = vertices[vertexStart + vertexOffset + 1];
|
float x1 = vertices[vertexStart + v], y1 = vertices[vertexStart + v + 1];
|
||||||
float u1 = uvs[vertexOffset], v1 = uvs[vertexOffset + 1];
|
float u1 = uvs[v], v1 = uvs[v + 1];
|
||||||
|
|
||||||
vertexOffset = triangles[i + 1] << 1;
|
v = triangles[i + 1] << 1;
|
||||||
float x2 = vertices[vertexStart + vertexOffset], y2 = vertices[vertexStart + vertexOffset + 1];
|
float x2 = vertices[vertexStart + v], y2 = vertices[vertexStart + v + 1];
|
||||||
float u2 = uvs[vertexOffset], v2 = uvs[vertexOffset + 1];
|
float u2 = uvs[v], v2 = uvs[v + 1];
|
||||||
|
|
||||||
vertexOffset = triangles[i + 2] << 1;
|
v = triangles[i + 2] << 1;
|
||||||
float x3 = vertices[vertexStart + vertexOffset], y3 = vertices[vertexStart + vertexOffset + 1];
|
float x3 = vertices[vertexStart + v], y3 = vertices[vertexStart + v + 1];
|
||||||
float u3 = uvs[vertexOffset], v3 = uvs[vertexOffset + 1];
|
float u3 = uvs[v], v3 = uvs[v + 1];
|
||||||
|
|
||||||
for (int p = 0; p < polygonsCount; p++) {
|
for (int p = 0; p < polygonsCount; p++) {
|
||||||
int s = clippedVertices.size;
|
int s = clippedVertices.size;
|
||||||
@ -359,7 +362,7 @@ public class SkeletonClipping {
|
|||||||
|
|
||||||
/** Clips the input triangle against the convex, clockwise clipping area. If the triangle lies entirely within the clipping
|
/** Clips the input triangle against the convex, clockwise clipping area. If the triangle lies entirely within the clipping
|
||||||
* area, false is returned. The clipping area must duplicate the first vertex at the end of the vertices list. */
|
* area, false is returned. The clipping area must duplicate the first vertex at the end of the vertices list. */
|
||||||
boolean clip (float x1, float y1, float x2, float y2, float x3, float y3, FloatArray clippingArea, FloatArray output) {
|
private boolean clip (float x1, float y1, float x2, float y2, float x3, float y3, FloatArray clippingArea, FloatArray output) {
|
||||||
FloatArray originalOutput = output;
|
FloatArray originalOutput = output;
|
||||||
boolean clipped = false;
|
boolean clipped = false;
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user