mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-20 23:52:40 +08:00
Fix black border for Tilemap
This commit is contained in:
@@ -145,7 +145,8 @@ _ccsg.TMXLayer = _ccsg.Node.extend(/** @lends _ccsg.TMXLayer# */{
|
||||
maxGid = tileset.firstGid + count,
|
||||
grids = this._texGrids,
|
||||
grid = null,
|
||||
override = grids[gid] ? true : false;
|
||||
override = grids[gid] ? true : false,
|
||||
texelCorrect = cc.macro.FIX_ARTIFACTS_BY_STRECHING_TEXEL ? 0.5 : 0;
|
||||
|
||||
for (; gid < maxGid; ++gid) {
|
||||
// Avoid overlapping
|
||||
@@ -162,10 +163,10 @@ _ccsg.TMXLayer = _ccsg.Node.extend(/** @lends _ccsg.TMXLayer# */{
|
||||
t: 0, l: 0, r: 0, b: 0
|
||||
};
|
||||
tileset.rectForGID(gid, grid);
|
||||
grid.t = grid.y / imageH;
|
||||
grid.l = grid.x / imageW;
|
||||
grid.r = (grid.x + grid.width) / imageW;
|
||||
grid.b = (grid.y + grid.height) / imageH;
|
||||
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;
|
||||
grids[gid] = grid;
|
||||
}
|
||||
},
|
||||
|
||||
@@ -167,14 +167,16 @@ proto.rendering = function (ctx, scaleX, scaleY) {
|
||||
wrapper.setTransform(wt, scaleX, scaleY);
|
||||
wrapper.setGlobalAlpha(alpha);
|
||||
|
||||
var axis, tileOffset, odd_even, diffX1, diffY1;
|
||||
|
||||
if (layerOrientation === Orientation.HEX) {
|
||||
var axis = node._staggerAxis,
|
||||
index = node._staggerIndex,
|
||||
hexSideLength = node._hexSideLength,
|
||||
tileOffset = node.tileset.tileOffset;
|
||||
var odd_even = (index === StaggerIndex.STAGGERINDEX_ODD) ? 1 : -1;
|
||||
var diffX1 = (axis === StaggerAxis.STAGGERAXIS_X) ? ((maptw - hexSideLength)/2) : 0;
|
||||
var diffY1 = (axis === StaggerAxis.STAGGERAXIS_Y) ? ((mapth - hexSideLength)/2) : 0;
|
||||
var index = node._staggerIndex,
|
||||
hexSideLength = node._hexSideLength;
|
||||
axis = node._staggerAxis;
|
||||
tileOffset = node.tileset.tileOffset;
|
||||
odd_even = (index === StaggerIndex.STAGGERINDEX_ODD) ? 1 : -1;
|
||||
diffX1 = (axis === StaggerAxis.STAGGERAXIS_X) ? ((maptw - hexSideLength)/2) : 0;
|
||||
diffY1 = (axis === StaggerAxis.STAGGERAXIS_Y) ? ((mapth - hexSideLength)/2) : 0;
|
||||
}
|
||||
|
||||
for (row = startRow; row < maxRow; ++row) {
|
||||
|
||||
@@ -121,16 +121,17 @@ proto.uploadData = function (f32buffer, ui32buffer, vertexDataOffset) {
|
||||
w = tilew * a, h = tileh * d, gt, gl, gb, gr,
|
||||
wa = a, wb = b, wc = c, wd = d, wtx = tx, wty = ty, // world
|
||||
flagged = false, flippedX = false, flippedY = false,
|
||||
vertices = this._vertices;
|
||||
vertices = this._vertices,
|
||||
axis, tileOffset, diffX1, diffY1, odd_even;
|
||||
|
||||
if (layerOrientation === Orientation.HEX) {
|
||||
var axis = node._staggerAxis,
|
||||
index = node._staggerIndex,
|
||||
hexSideLength = node._hexSideLength,
|
||||
tileOffset = node.tileset.tileOffset;
|
||||
var odd_even = (index === StaggerIndex.STAGGERINDEX_ODD) ? 1 : -1;
|
||||
var diffX1 = (axis === StaggerAxis.STAGGERAXIS_X) ? ((maptw - hexSideLength)/2) : 0;
|
||||
var diffY1 = (axis === StaggerAxis.STAGGERAXIS_Y) ? ((mapth - hexSideLength)/2) : 0;
|
||||
var index = node._staggerIndex,
|
||||
hexSideLength = node._hexSideLength;
|
||||
axis = node._staggerAxis;
|
||||
tileOffset = node.tileset.tileOffset;
|
||||
odd_even = (index === StaggerIndex.STAGGERINDEX_ODD) ? 1 : -1;
|
||||
diffX1 = (axis === StaggerAxis.STAGGERAXIS_X) ? ((maptw - hexSideLength)/2) : 0;
|
||||
diffY1 = (axis === StaggerAxis.STAGGERAXIS_Y) ? ((mapth - hexSideLength)/2) : 0;
|
||||
}
|
||||
|
||||
for (row = startRow; row < maxRow; ++row) {
|
||||
|
||||
Reference in New Issue
Block a user