Merge pull request #945 from pandamicro/master

Fix some issues
This commit is contained in:
pandamicro
2016-07-22 15:00:32 +08:00
committed by GitHub
3 changed files with 125 additions and 137 deletions
+3 -3
View File
@@ -437,9 +437,9 @@ var tiledQuadGenerator = {
}
cornerId[0] = 0;
cornerId[1] = 2;
cornerId[2] = 4;
cornerId[3] = 6;
cornerId[1] = col * 8 + 2;
cornerId[2] = dataLength - col * 8 + 4;
cornerId[3] = dataLength - 2;
}
};
+8 -4
View File
@@ -163,10 +163,14 @@ _ccsg.TMXLayer = _ccsg.Node.extend(/** @lends _ccsg.TMXLayer# */{
t: 0, l: 0, r: 0, b: 0
};
tileset.rectForGID(gid, grid);
grid.t = (grid.y + texelCorrect) / imageH;
grid.l = (grid.x + texelCorrect) / imageW;
grid.r = (grid.x + grid.width - texelCorrect) / imageW;
grid.b = (grid.y + grid.height - texelCorrect) / imageH;
grid.x += texelCorrect;
grid.y += texelCorrect;
grid.width -= texelCorrect*2;
grid.height -= texelCorrect*2;
grid.t = (grid.y) / imageH;
grid.l = (grid.x) / imageW;
grid.r = (grid.x + grid.width) / imageW;
grid.b = (grid.y + grid.height) / imageH;
grids[gid] = grid;
}
},
+114 -130
View File
@@ -44,19 +44,20 @@ test('simple spriteQuad trimmed', function () {
s9Sprite.enableTrimmedContentSize(isTrimmed);
s9Sprite.setRenderingType(cc.Scale9Sprite.RenderingType.SIMPLE);
s9Sprite._rebuildQuads();
var quads = s9Sprite._quads;
strictEqual(quads.length, 1, 'quads number[1] success');
strictEqual(quads[0]._bl.vertices.x, 0, 'vertex-bl-x test success');
strictEqual(quads[0]._bl.vertices.y, 0, 'vertex-bl-y test success');
var vertices = s9Sprite._vertices;
var uvs = s9Sprite._uvs;
strictEqual(vertices.length >= 8 && uvs >= 8, true, 'vertices have at least 8 floats');
strictEqual(vertices[0], 0, 'vertex-bl-x test success');
strictEqual(vertices[1], 0, 'vertex-bl-y test success');
strictEqual(quads[0]._tr.vertices.x, contentSize.width, 'vertex-tr-x test success');
strictEqual(quads[0]._tr.vertices.y, contentSize.height, 'vertex-tr-y test success');
strictEqual(vertices[6], contentSize.width, 'vertex-tr-x test success');
strictEqual(vertices[7], contentSize.height, 'vertex-tr-y test success');
deepClose(quads[0]._bl.texCoords.u, 10 / 100, 0.0001, 'texCoords-bl-x test success');
deepClose(quads[0]._bl.texCoords.v, 70 / 100, 0.0001, 'texCoords-bl-y test success');
deepClose(uvs[0], 10 / 100, 0.0001, 'texCoords-bl-x test success');
deepClose(uvs[1], 70 / 100, 0.0001, 'texCoords-bl-y test success');
deepClose(quads[0]._tr.texCoords.u, 50 / 100, 0.0001, 'texCoords-tr-x test success');
deepClose(quads[0]._tr.texCoords.v, 10 / 100, 0.0001, 'texCoords-tr-y test success');
deepClose(uvs[6], 50 / 100, 0.0001, 'texCoords-tr-x test success');
deepClose(uvs[7], 10 / 100, 0.0001, 'texCoords-tr-y test success');
};
if (spriteFrame.textureLoaded()) {
testCallBack();
@@ -76,19 +77,20 @@ test('simple spriteQuad no trimmed', function () {
s9Sprite.enableTrimmedContentSize(isTrimmed);
s9Sprite.setRenderingType(cc.Scale9Sprite.RenderingType.SIMPLE);
s9Sprite._rebuildQuads();
var quads = s9Sprite._quads;
strictEqual(quads.length, 1, 'quads number[1] success');
strictEqual(quads[0]._bl.vertices.x, 10, 'vertex-bl-x test success');
strictEqual(quads[0]._bl.vertices.y, 30, 'vertex-bl-y test success');
var vertices = s9Sprite._vertices;
var uvs = s9Sprite._uvs;
strictEqual(vertices.length >= 8 && uvs >= 8, true, 'vertices have at least 8 floats');
strictEqual(vertices[0], 10, 'vertex-bl-x test success');
strictEqual(vertices[1], 30, 'vertex-bl-y test success');
strictEqual(quads[0]._tr.vertices.x, 50, 'vertex-tr-x test success');
strictEqual(quads[0]._tr.vertices.y, 90, 'vertex-tr-y test success');
strictEqual(vertices[6], 50, 'vertex-tr-x test success');
strictEqual(vertices[7], 90, 'vertex-tr-y test success');
deepClose(quads[0]._bl.texCoords.u, 10 / 100, 0.0001, 'texCoords-bl-x test success');
deepClose(quads[0]._bl.texCoords.v, 70 / 100, 0.0001, 'texCoords-bl-y test success');
deepClose(uvs[0], 10 / 100, 0.0001, 'texCoords-bl-x test success');
deepClose(uvs[1], 70 / 100, 0.0001, 'texCoords-bl-y test success');
deepClose(quads[0]._tr.texCoords.u, 50 / 100, 0.0001, 'texCoords-tr-x test success');
deepClose(quads[0]._tr.texCoords.v, 10 / 100, 0.0001, 'texCoords-tr-y test success');
deepClose(uvs[6], 50 / 100, 0.0001, 'texCoords-tr-x test success');
deepClose(uvs[7], 10 / 100, 0.0001, 'texCoords-tr-y test success');
};
if (spriteFrame.textureLoaded()) {
testCallBack();
@@ -114,31 +116,26 @@ test('scale9 spriteQuad trimmed', function () {
s9Sprite.enableTrimmedContentSize(isTrimmed);
s9Sprite.setRenderingType(cc.Scale9Sprite.RenderingType.SLICED);
s9Sprite._rebuildQuads();
var quads = s9Sprite._quads;
strictEqual(quads.length, 9, 'quads number[9] success');
strictEqual(quads[0]._bl.vertices.x, 0, 'x0 test success');
strictEqual(quads[0]._bl.vertices.y, 0, 'y0 test success');
var vertices = s9Sprite._vertices;
var uvs = s9Sprite._uvs;
strictEqual(vertices.length >= 32 && uvs >= 32, true, 'vertices have at least 32 floats');
strictEqual(vertices[0], 0, 'x0 test success');
strictEqual(vertices[1], 0, 'y0 test success');
strictEqual(vertices[10], 5, 'x1 test success');
strictEqual(vertices[11], 7, 'y1 test success');
strictEqual(vertices[20], 94, 'x2 test success');
strictEqual(vertices[21], 92, 'y2 test success');
strictEqual(vertices[30], 100, 'x3 test success');
strictEqual(vertices[31], 100, 'y3 test success');
strictEqual(quads[4]._bl.vertices.x, 5, 'x1 test success');
strictEqual(quads[4]._bl.vertices.y, 7, 'y1 test success');
strictEqual(quads[8]._bl.vertices.x, 94, 'x2 test success');
strictEqual(quads[8]._bl.vertices.y, 92, 'y2 test success');
strictEqual(quads[8]._tr.vertices.x, 100, 'x3 test success');
strictEqual(quads[8]._tr.vertices.y, 100, 'y3 test success');
deepClose(quads[0]._bl.texCoords.u, 10 / 100, 0.0001, 'u0 test success');
deepClose(quads[0]._bl.texCoords.v, 70 / 100, 0.0001, 'v0 test success');
deepClose(quads[4]._bl.texCoords.u, 15 / 100, 0.0001, 'u1 test success');
deepClose(quads[4]._bl.texCoords.v, 63 / 100, 0.0001, 'v1 test success');
deepClose(quads[8]._bl.texCoords.u, 44 / 100, 0.0001, 'u2 test success');
deepClose(quads[8]._bl.texCoords.v, 18 / 100, 0.0001, 'v2 test success');
deepClose(quads[8]._tr.texCoords.u, 50 / 100, 0.0001, 'u3 test success');
deepClose(quads[8]._tr.texCoords.v, 10 / 100, 0.0001, 'v3 test success');
deepClose(uvs[0], 10 / 100, 0.0001, 'u0 test success');
deepClose(uvs[1], 70 / 100, 0.0001, 'v0 test success');
deepClose(uvs[10], 15 / 100, 0.0001, 'u1 test success');
deepClose(uvs[11], 63 / 100, 0.0001, 'v1 test success');
deepClose(uvs[20], 44 / 100, 0.0001, 'u2 test success');
deepClose(uvs[21], 18 / 100, 0.0001, 'v2 test success');
deepClose(uvs[30], 50 / 100, 0.0001, 'u3 test success');
deepClose(uvs[31], 10 / 100, 0.0001, 'v3 test success');
};
if (spriteFrame.textureLoaded()) {
testCallBack();
@@ -158,33 +155,26 @@ test('tiled spriteQuad trimmed', function () {
s9Sprite.enableTrimmedContentSize(isTrimmed);
s9Sprite.setRenderingType(cc.Scale9Sprite.RenderingType.TILED);
s9Sprite._rebuildQuads();
var quads = s9Sprite._quads;
strictEqual(quads.length, 6, 'quads number[6] success');
strictEqual(quads[0]._bl.vertices.x, 0, 'x0 test success');
strictEqual(quads[2]._bl.vertices.x, 40, 'x1 test success');
strictEqual(quads[4]._bl.vertices.x, 80, 'x2 test success');
strictEqual(quads[4]._tr.vertices.x, 100, 'x3 test success');
var vertices = s9Sprite._vertices;
var uvs = s9Sprite._uvs;
strictEqual(vertices.length >= 48, true, 'vertices have at least 48 floats');
strictEqual(vertices[0], 0, 'x0 test success');
strictEqual(vertices[16], 40, 'x1 test success');
strictEqual(vertices[32], 80, 'x2 test success');
strictEqual(vertices[38], 100, 'x3 test success');
strictEqual(quads[0]._bl.vertices.y, 0, 'y0 test success');
strictEqual(quads[5]._bl.vertices.y, 60, 'y1 test success');
strictEqual(quads[5]._tr.vertices.y, 100, 'y2 test success');
strictEqual(quads[2]._bl.vertices.x, 40, 'x1 test success');
strictEqual(quads[2]._bl.vertices.x, 40, 'x1 test success');
strictEqual(quads[2]._bl.vertices.x, 40, 'x1 test success');
strictEqual(quads[2]._bl.vertices.x, 40, 'x1 test success');
strictEqual(vertices[1], 0, 'y0 test success');
strictEqual(vertices[41], 60, 'y1 test success');
strictEqual(vertices[47], 100, 'y2 test success');
//
deepClose(quads[2]._bl.texCoords.u, 10 / 100, 0.0001, 'full quad u0 test success');
deepClose(quads[2]._bl.texCoords.v, 70 / 100, 0.0001, 'full quad v0 test success');
deepClose(quads[2]._tr.texCoords.u, 50 / 100, 0.0001, 'full quad u1 test success');
deepClose(quads[2]._tr.texCoords.v, 10 / 100, 0.0001, 'full quad v1 test success');
deepClose(quads[5]._bl.texCoords.u, 10 / 100, 0.0001, 'part quad u0 test success');
deepClose(quads[5]._bl.texCoords.v, 70 / 100, 0.0001, 'part quad v0 test success');
deepClose(quads[5]._tr.texCoords.u, 30 / 100, 0.0001, 'part quad u1 test success');
deepClose(quads[5]._tr.texCoords.v, 30 / 100, 0.0001, 'part quad v1 test success');
deepClose(uvs[16], 10 / 100, 0.0001, 'full quad u0 test success');
deepClose(uvs[17], 70 / 100, 0.0001, 'full quad v0 test success');
deepClose(uvs[22], 50 / 100, 0.0001, 'full quad u1 test success');
deepClose(uvs[23], 10 / 100, 0.0001, 'full quad v1 test success');
deepClose(uvs[40], 10 / 100, 0.0001, 'part quad u0 test success');
deepClose(uvs[41], 70 / 100, 0.0001, 'part quad v0 test success');
deepClose(uvs[46], 30 / 100, 0.0001, 'part quad u1 test success');
deepClose(uvs[47], 30 / 100, 0.0001, 'part quad v1 test success');
};
if (spriteFrame.textureLoaded()) {
testCallBack();
@@ -208,36 +198,34 @@ test('filled-bar-horizontal spriteQuad trimmed', function () {
s9Sprite.setFillStart(0.1);
s9Sprite.setFillRange(0.3);
s9Sprite._rebuildQuads();
var quads = s9Sprite._quads;
strictEqual(quads.length, 1, 'quads number[1] success');
strictEqual(quads[0]._bl.vertices.x, 10, 'vertex-bl-x test success');
strictEqual(quads[0]._bl.vertices.y, 0, 'vertex-bl-y test success');
var vertices = s9Sprite._vertices;
var uvs = s9Sprite._uvs;
strictEqual(vertices.length >= 8 && uvs >= 8, true, 'vertices have at least 8 floats');
strictEqual(vertices[0], 10, 'vertex-bl-x test success');
strictEqual(vertices[1], 0, 'vertex-bl-y test success');
strictEqual(vertices[6], 40, 'vertex-tr-x test success');
strictEqual(vertices[7], 100, 'vertex-tr-y test success');
strictEqual(quads[0]._tr.vertices.x, 40, 'vertex-tr-x test success');
strictEqual(quads[0]._tr.vertices.y, 100, 'vertex-tr-y test success');
deepClose(quads[0]._bl.texCoords.u, 14 / 100, 0.0001, 'texCoords-bl-x test success');
deepClose(quads[0]._bl.texCoords.v, 70 / 100, 0.0001, 'texCoords-bl-y test success');
deepClose(quads[0]._tr.texCoords.u, 26 / 100, 0.0001, 'texCoords-tr-x test success');
deepClose(quads[0]._tr.texCoords.v, 10 / 100, 0.0001, 'texCoords-tr-y test success');
deepClose(uvs[0], 14 / 100, 0.0001, 'texCoords-bl-x test success');
deepClose(uvs[1], 70 / 100, 0.0001, 'texCoords-bl-y test success');
deepClose(uvs[6], 26 / 100, 0.0001, 'texCoords-tr-x test success');
deepClose(uvs[7], 10 / 100, 0.0001, 'texCoords-tr-y test success');
s9Sprite.setFillStart(0.3);
s9Sprite.setFillRange(-0.4);
s9Sprite._rebuildQuads();
quads = s9Sprite._quads;
strictEqual(quads.length, 1, 'quads number[1] success');
strictEqual(quads[0]._bl.vertices.x, 0, 'vertex-bl-x test success');
strictEqual(quads[0]._bl.vertices.y, 0, 'vertex-bl-y test success');
vertices = s9Sprite._vertices;
uvs = s9Sprite._uvs;
strictEqual(vertices.length >= 8 && uvs >= 8, true, 'vertices have at least 8 floats');
strictEqual(vertices[0]._bl.vertices.x, 0, 'vertex-bl-x test success');
strictEqual(vertices[1]._bl.vertices.y, 0, 'vertex-bl-y test success');
strictEqual(vertices[6]._tr.vertices.x, 30, 'vertex-tr-x test success');
strictEqual(vertices[7]._tr.vertices.y, 100, 'vertex-tr-y test success');
strictEqual(quads[0]._tr.vertices.x, 30, 'vertex-tr-x test success');
strictEqual(quads[0]._tr.vertices.y, 100, 'vertex-tr-y test success');
deepClose(quads[0]._bl.texCoords.u, 10 / 100, 0.0001, 'texCoords-bl-x test success');
deepClose(quads[0]._bl.texCoords.v, 70 / 100, 0.0001, 'texCoords-bl-y test success');
deepClose(quads[0]._tr.texCoords.u, 22 / 100, 0.0001, 'texCoords-tr-x test success');
deepClose(quads[0]._tr.texCoords.v, 10 / 100, 0.0001, 'texCoords-tr-y test success');
deepClose(uvs[0]._bl.texCoords.u, 10 / 100, 0.0001, 'texCoords-bl-x test success');
deepClose(uvs[1]._bl.texCoords.v, 70 / 100, 0.0001, 'texCoords-bl-y test success');
deepClose(uvs[6]._tr.texCoords.u, 22 / 100, 0.0001, 'texCoords-tr-x test success');
deepClose(uvs[7]._tr.texCoords.v, 10 / 100, 0.0001, 'texCoords-tr-y test success');
};
if (spriteFrame.textureLoaded()) {
testCallBack();
@@ -260,36 +248,34 @@ test('filled-bar-vertical spriteQuad trimmed', function () {
s9Sprite.setFillStart(0.1);
s9Sprite.setFillRange(0.3);
s9Sprite._rebuildQuads();
var quads = s9Sprite._quads;
strictEqual(quads.length, 1, 'quads number[1] success');
strictEqual(quads[0]._bl.vertices.x, 0, 'vertex-bl-x test success');
strictEqual(quads[0]._bl.vertices.y, 10, 'vertex-bl-y test success');
var vertices = s9Sprite._vertices;
var uvs = s9Sprite._uvs;
strictEqual(vertices.length >= 8 && uvs >= 8, true, 'vertices have at least 8 floats');
strictEqual(vertices[0], 0, 'vertex-bl-x test success');
strictEqual(vertices[1], 10, 'vertex-bl-y test success');
strictEqual(vertices[6], 100, 'vertex-tr-x test success');
strictEqual(vertices[7], 40, 'vertex-tr-y test success');
strictEqual(quads[0]._tr.vertices.x, 100, 'vertex-tr-x test success');
strictEqual(quads[0]._tr.vertices.y, 40, 'vertex-tr-y test success');
deepClose(quads[0]._bl.texCoords.u, 10 / 100, 0.0001, 'texCoords-bl-x test success');
deepClose(quads[0]._bl.texCoords.v, 64 / 100, 0.0001, 'texCoords-bl-y test success');
deepClose(quads[0]._tr.texCoords.u, 50 / 100, 0.0001, 'texCoords-tr-x test success');
deepClose(quads[0]._tr.texCoords.v, 46 / 100, 0.0001, 'texCoords-tr-y test success');
deepClose(uvs[0], 10 / 100, 0.0001, 'texCoords-bl-x test success');
deepClose(uvs[1], 64 / 100, 0.0001, 'texCoords-bl-y test success');
deepClose(uvs[6], 50 / 100, 0.0001, 'texCoords-tr-x test success');
deepClose(uvs[7], 46 / 100, 0.0001, 'texCoords-tr-y test success');
s9Sprite.setFillStart(0.3);
s9Sprite.setFillRange(-0.4);
s9Sprite._rebuildQuads();
quads = s9Sprite._quads;
strictEqual(quads.length, 1, 'quads number[1] success');
strictEqual(quads[0]._bl.vertices.x, 0, 'vertex-bl-x test success');
strictEqual(quads[0]._bl.vertices.y, 0, 'vertex-bl-y test success');
vertices = s9Sprite._vertices;
uvs = s9Sprite._uvs;
strictEqual(vertices.length >= 8 && uvs >= 8, true, 'vertices have at least 8 floats');
strictEqual(vertices[0], 0, 'vertex-bl-x test success');
strictEqual(vertices[1], 0, 'vertex-bl-y test success');
strictEqual(vertices[6], 100, 'vertex-tr-x test success');
strictEqual(vertices[7], 30, 'vertex-tr-y test success');
strictEqual(quads[0]._tr.vertices.x, 100, 'vertex-tr-x test success');
strictEqual(quads[0]._tr.vertices.y, 30, 'vertex-tr-y test success');
deepClose(quads[0]._bl.texCoords.u, 10 / 100, 0.0001, 'texCoords-bl-x test success');
deepClose(quads[0]._bl.texCoords.v, 70 / 100, 0.0001, 'texCoords-bl-y test success');
deepClose(quads[0]._tr.texCoords.u, 50 / 100, 0.0001, 'texCoords-tr-x test success');
deepClose(quads[0]._tr.texCoords.v, 52 / 100, 0.0001, 'texCoords-tr-y test success');
deepClose(uvs[0], 10 / 100, 0.0001, 'texCoords-bl-x test success');
deepClose(uvs[1], 70 / 100, 0.0001, 'texCoords-bl-y test success');
deepClose(uvs[6], 50 / 100, 0.0001, 'texCoords-tr-x test success');
deepClose(uvs[7], 52 / 100, 0.0001, 'texCoords-tr-y test success');
};
if (spriteFrame.textureLoaded()) {
testCallBack();
@@ -313,26 +299,24 @@ test('filled-bar-radial spriteQuad trimmed', function () {
s9Sprite.setFillStart(0.0);
s9Sprite.setFillRange(1 / 4);
s9Sprite._rebuildQuads();
var quads = s9Sprite._quads;
var vertices = s9Sprite._vertices;
var uvs = s9Sprite._uvs;
strictEqual(s9Sprite._isTriangle, true, "Triangles used");
strictEqual(quads.length, 2, 'triangles number[2] success');
strictEqual(vertices.length >= 30 && uvs >= 30, true, 'vertices have at least 30 floats');
var center = cc.v2(50, 50);
var p0 = cc.v2(100, 50);
var p1 = cc.v2(100, 100);
var p2 = cc.v2(50, 100);
deepClose(quads[1]._tl.vertices.x, center.x, 0.0001, 'center test success');
deepClose(quads[1]._tl.vertices.y, center.y, 0.0001, 'center test success');
deepClose(quads[0]._bl.vertices.x, p0.x, 0.0001, 'p0 test success');
deepClose(quads[0]._bl.vertices.y, p0.y, 0.0001, 'p0 test success');
deepClose(quads[1]._bl.vertices.x, p1.x, 0.0001, 'p1 test success');
deepClose(quads[1]._bl.vertices.y, p1.y, 0.0001, 'p1 test success');
deepClose(quads[1]._tr.vertices.x, p2.x, 0.0001, 'p2 test success');
deepClose(quads[1]._tr.vertices.y, p2.y, 0.0001, 'p2 test success');
deepClose(vertices[6], center.x, 0.0001, 'center test success');
deepClose(vertices[7], center.y, 0.0001, 'center test success');
deepClose(vertices[2], p0.x, 0.0001, 'p0 test success');
deepClose(vertices[3], p0.y, 0.0001, 'p0 test success');
deepClose(vertices[8], p1.x, 0.0001, 'p1 test success');
deepClose(vertices[9], p1.y, 0.0001, 'p1 test success');
deepClose(vertices[10], p2.x, 0.0001, 'p2 test success');
deepClose(vertices[11], p2.y, 0.0001, 'p2 test success');
};
if (spriteFrame.textureLoaded()) {
testCallBack();