Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust Sprite region and pivot origin to left-bottom #809

Merged
merged 3 commits into from
Jun 2, 2022
Merged

Adjust Sprite region and pivot origin to left-bottom #809

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9ba1bb
fix:update region
cptbtptpbcptdtptp May 26, 2022
fb3df79
fix:update code.
cptbtptpbcptdtptp May 27, 2022
8ca8172
fix:update code.
cptbtptpbcptdtptp May 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
153 changes: 42 additions & 111 deletions packages/core/src/2d/sprite/Sprite.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,8 @@ export class Sprite extends RefObject {

set pivot(value: Vector2) {
const pivot = this._pivot;
const x = MathUtil.clamp(value.x, 0, 1);
const y = MathUtil.clamp(value.y, 0, 1);
if (pivot === value || pivot.x !== x || pivot.y !== y) {
pivot.setValue(x, y);
if (pivot === value || pivot.x !== value.x || pivot.y !== value.y) {
pivot.setValue(value.x, value.y);
this._setDirtyFlagTrue(DirtyFlag.positions);
}
}
Expand Down Expand Up @@ -220,59 +218,35 @@ export class Sprite extends RefObject {
private _updatePositionsAndBounds(): void {
const { _texture: texture, _bounds: bounds } = this;
if (texture) {
const { _atlasRegion: atlasRegion, _pivot: pivot, _atlasRegionOffset: atlasRegionOffset } = this;
const { _atlasRegion: atlasRegion, _pivot: pivot } = this;
const { x: blankLeft, y: blankTop, z: blankRight, w: blankBottom } = this._atlasRegionOffset;
const { x: regionX, y: regionY, width: regionW, height: regionH } = this._region;
const pPUReciprocal = 1.0 / this._pixelsPerUnit;
const regionRight = 1 - regionX - regionW;
const regionBottom = 1 - regionY - regionH;
// Real rendering size.
const realRenderW =
(texture.width * atlasRegion.width * regionW) / ((1 - blankLeft - blankRight) * this._pixelsPerUnit);
const realRenderH =
(texture.height * atlasRegion.height * regionH) / ((1 - blankTop - blankBottom) * this._pixelsPerUnit);
// Coordinates of the four boundaries.
let lx: number, ty: number, rx: number, by: number;
// TextureSize
let textureW: number, textureH: number;
if (this._atlasRotated) {
textureW = texture.height * atlasRegion.height * pPUReciprocal;
textureH = texture.width * atlasRegion.width * pPUReciprocal;
} else {
textureW = texture.width * atlasRegion.width * pPUReciprocal;
textureH = texture.height * atlasRegion.height * pPUReciprocal;
}
// Determine whether it has been trimmed.
if (
atlasRegionOffset.x == 0 &&
atlasRegionOffset.y == 0 &&
atlasRegionOffset.z == 0 &&
atlasRegionOffset.w == 0
) {
// Real rendering size.
const realRenderW = textureW * regionW;
const realRenderH = textureH * regionH;
lx = -pivot.x * realRenderW;
by = -pivot.y * realRenderH;
rx = realRenderW + lx;
ty = realRenderH + by;
} else {
const { x: blankLeft, y: blankTop, z: blankRight, w: blankBottom } = atlasRegionOffset;
const oriWidth = textureW / (1 - blankRight - blankLeft);
const oriHeight = textureH / (1 - blankBottom - blankTop);
// The size of the real rendering.
lx = (-pivot.x * regionW + Math.max(blankLeft, regionX) - regionX) * oriWidth;
ty = (pivot.y * regionH - Math.max(blankTop, regionY) + regionY) * oriHeight;
rx = (-pivot.x * regionW + Math.min(1 - blankRight, regionX + regionW) - regionX) * oriWidth;
by = (pivot.y * regionH - Math.min(1 - blankBottom, regionY + regionH) + regionY) * oriHeight;
}

const left = (Math.max(blankLeft - regionX, 0) / regionW - pivot.x) * realRenderW;
const right = (1 - Math.max(blankRight - regionRight, 0) / regionW - pivot.x) * realRenderW;
const top = (1 - Math.max(blankTop - regionBottom, 0) / regionH - pivot.y) * realRenderH;
const bottom = (Math.max(blankBottom - regionY, 0) / regionH - pivot.y) * realRenderH;
// Assign values ​​to _positions
const positions = this._positions;
// Top-left.
positions[0].setValue(lx, ty);
positions[0].setValue(left, top);
// Top-right.
positions[1].setValue(rx, ty);
positions[1].setValue(right, top);
// Bottom-right.
positions[2].setValue(rx, by);
positions[2].setValue(right, bottom);
// Bottom-left.
positions[3].setValue(lx, by);
positions[3].setValue(left, bottom);

// Update bounds.
bounds.min.setValue(lx, by, 0);
bounds.max.setValue(rx, ty, 0);
bounds.min.setValue(left, bottom, 0);
bounds.max.setValue(right, top, 0);
} else {
// Update bounds.
bounds.min.setValue(0, 0, 0);
Expand All @@ -289,71 +263,28 @@ export class Sprite extends RefObject {
}

if (this._isContainDirtyFlag(DirtyFlag.uv)) {
const { _atlasRegion, _uv: uv, _region: region, _atlasRotated, _atlasRegionOffset: atlasRegionOffset } = this;
let left: number, top: number, right: number, bottom: number;
// Determine whether it has been trimmed.
if (
atlasRegionOffset.x == 0 &&
atlasRegionOffset.y == 0 &&
atlasRegionOffset.z == 0 &&
atlasRegionOffset.w == 0
) {
const { width: atlasRegionW, height: atlasRegionH } = _atlasRegion;
if (_atlasRotated) {
left = atlasRegionW * (1 - region.y - region.height) + _atlasRegion.x;
top = atlasRegionH * region.x + _atlasRegion.y;
right = atlasRegionW * region.height + left;
bottom = atlasRegionH * region.width + top;
} else {
left = atlasRegionW * region.x + _atlasRegion.x;
top = atlasRegionH * region.y + _atlasRegion.y;
right = atlasRegionW * region.width + left;
bottom = atlasRegionH * region.height + top;
}
} else {
const { x: regionX, y: regionY } = region;
const { x: atlasRegionX, y: atlasRegionY } = _atlasRegion;
const { x: blankLeft, y: blankTop, z: blankRight, w: blankBottom } = atlasRegionOffset;
// Proportion of the original sprite size in the atlas.
if (_atlasRotated) {
const textureW = _atlasRegion.width / (1 - blankBottom - blankTop);
const textureH = _atlasRegion.height / (1 - blankRight - blankLeft);
left = (Math.max(blankBottom, 1 - regionY - region.height) - blankBottom) * textureW + atlasRegionX;
top = (Math.max(blankLeft, regionX) - blankLeft) * textureH + atlasRegionY;
right = (Math.min(1 - blankTop, 1 - regionY) - blankBottom) * textureW + atlasRegionX;
bottom = (Math.min(1 - blankRight, regionX + region.width) - blankLeft) * textureH + atlasRegionY;
} else {
const textureW = _atlasRegion.width / (1 - blankRight - blankLeft);
const textureH = _atlasRegion.height / (1 - blankBottom - blankTop);
left = (Math.max(blankLeft, regionX) - blankLeft) * textureW + atlasRegionX;
top = (Math.max(blankTop, regionY) - blankTop) * textureH + atlasRegionY;
right = (Math.min(1 - blankRight, regionX + region.width) - blankLeft) * textureW + atlasRegionX;
bottom = (Math.min(1 - blankBottom, regionY + region.height) - blankTop) * textureH + atlasRegionY;
}
}

if (_atlasRotated) {
// If it is rotated, we need to rotate the UV 90 degrees counterclockwise to correct it.
// Top-right.
uv[0].setValue(right, top);
// Bottom-right.
uv[1].setValue(right, bottom);
// Bottom-left.
uv[2].setValue(left, bottom);
// Top-left.
uv[3].setValue(left, top);
} else {
// Top-left.
uv[0].setValue(left, top);
// Top-right.
uv[1].setValue(right, top);
// Bottom-right.
uv[2].setValue(right, bottom);
// Bottom-left.
uv[3].setValue(left, bottom);
}
const { _uv: uv, _atlasRegionOffset: atlasRegionOffset } = this;
const { x: regionX, y: regionY, width: regionW, height: regionH } = this._region;
const regionRight = 1 - regionX - regionW;
const regionBottom = 1 - regionY - regionH;
const { x: atlasRegionX, y: atlasRegionY, width: atlasRegionW, height: atlasRegionH } = this._atlasRegion;
const { x: offsetLeft, y: offsetTop, z: offsetRight, w: offsetBottom } = atlasRegionOffset;
const realWidth = atlasRegionW / (1 - offsetLeft - offsetRight);
const realHeight = atlasRegionH / (1 - offsetTop - offsetBottom);
// Coordinates of the four boundaries.
const left = Math.max(regionX - offsetLeft, 0) * realWidth + atlasRegionX;
const top = Math.max(regionBottom - offsetTop, 0) * realHeight + atlasRegionY;
const right = atlasRegionW + atlasRegionX - Math.max(regionRight - offsetRight, 0) * realWidth;
const bottom = atlasRegionH + atlasRegionY - Math.max(regionY - offsetBottom, 0) * realHeight;
// Top-left.
uv[0].setValue(left, top);
// Top-right.
uv[1].setValue(right, top);
// Bottom-right.
uv[2].setValue(right, bottom);
// Bottom-left.
uv[3].setValue(left, bottom);
}

this._setDirtyFlagFalse(DirtyFlag.all);
}

Expand Down