-
-
Notifications
You must be signed in to change notification settings - Fork 646
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
small code refactoring to increase readability and "isolate" sprite s…
…heet and/or packed texture parsing
- Loading branch information
Showing
3 changed files
with
129 additions
and
119 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| import pool from "./../../../system/pooling.js"; | ||
| import Vector2d from "./../../../math/vector2.js"; | ||
|
|
||
| /** | ||
| * parse the given data and return a corresponding atlas | ||
| * @param {Object} data - atlas data information. See {@link loader.getJSON} | ||
| * @param {TextureAtlas} textureAtlas - the texture atlas class calling the parser | ||
| * @returns {Object} the corresponding Atlas | ||
| * @ignore | ||
| */ | ||
| export function parseSpriteSheet(data, textureAtlas) { | ||
| let atlas = {}; | ||
| let image = data.image; | ||
| let spacing = data.spacing || 0; | ||
| let margin = data.margin || 0; | ||
|
|
||
| let width = image.width; | ||
| let height = image.height; | ||
|
|
||
| // calculate the sprite count (line, col) | ||
| let spritecount = pool.pull("Vector2d", | ||
| ~~((width - margin + spacing) / (data.framewidth + spacing)), | ||
| ~~((height - margin + spacing) / (data.frameheight + spacing)) | ||
| ); | ||
|
|
||
| // verifying the texture size | ||
| if ((width % (data.framewidth + spacing)) !== 0 || | ||
| (height % (data.frameheight + spacing)) !== 0) { | ||
| let computed_width = spritecount.x * (data.framewidth + spacing); | ||
| let computed_height = spritecount.y * (data.frameheight + spacing); | ||
| if (computed_width - width !== spacing && computed_height - height !== spacing) { | ||
| // "truncate size" if delta is different from the spacing size | ||
| width = computed_width; | ||
| height = computed_height; | ||
| // warning message | ||
| console.warn( | ||
| "Spritesheet Texture for image: " + image.src + | ||
| " is not divisible by " + (data.framewidth + spacing) + | ||
| "x" + (data.frameheight + spacing) + | ||
| ", truncating effective size to " + width + "x" + height | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| // build the local atlas | ||
| for (let frame = 0, count = spritecount.x * spritecount.y; frame < count; frame++) { | ||
| let name = "" + frame; | ||
| atlas[name] = { | ||
| name : name, | ||
| texture : "default", // the source texture | ||
| offset : new Vector2d( | ||
| margin + (spacing + data.framewidth) * (frame % spritecount.x), | ||
| margin + (spacing + data.frameheight) * ~~(frame / spritecount.x) | ||
| ), | ||
| anchorPoint : (data.anchorPoint || null), | ||
| trimmed : false, | ||
| trim : undefined, | ||
| width : data.framewidth, | ||
| height : data.frameheight, | ||
| angle : 0 | ||
| }; | ||
| textureAtlas.addUVs(atlas, name, width, height); | ||
| } | ||
|
|
||
| pool.push(spritecount); | ||
|
|
||
| return atlas; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| import { ETA } from "./../../../math/math.js"; | ||
| import Vector2d from "./../../../math/vector2.js"; | ||
|
|
||
| /** | ||
| * parse the given data and return a corresponding atlas | ||
| * @param {Object} data - atlas data information. See {@link loader.getJSON} | ||
| * @param {TextureAtlas} textureAtlas - the texture atlas class calling the parser | ||
| * @returns {Object} the corresponding Atlas | ||
| * @ignore | ||
| */ | ||
| export function parseTexturePacker(data, textureAtlas) { | ||
| let atlas = {}; | ||
|
|
||
| data.frames.forEach((frame) => { | ||
| // fix wrongly formatted JSON (e.g. last dummy object in ShoeBox) | ||
| if (frame.hasOwnProperty("filename")) { | ||
| // Source coordinates | ||
| let s = frame.frame; | ||
| let trimmed = !!frame.trimmed; | ||
|
|
||
| let trim; | ||
|
|
||
| if (trimmed) { | ||
| trim = { | ||
| x : frame.spriteSourceSize.x, | ||
| y : frame.spriteSourceSize.y, | ||
| w : frame.spriteSourceSize.w, | ||
| h : frame.spriteSourceSize.h | ||
| }; | ||
| } | ||
|
|
||
| let originX, originY; | ||
| // Pixel-based offset origin from the top-left of the source frame | ||
| let hasTextureAnchorPoint = (frame.sourceSize && frame.pivot); | ||
| if (hasTextureAnchorPoint) { | ||
| originX = (frame.sourceSize.w * frame.pivot.x) - ((trimmed) ? trim.x : 0); | ||
| originY = (frame.sourceSize.h * frame.pivot.y) - ((trimmed) ? trim.y : 0); | ||
| } | ||
|
|
||
| atlas[frame.filename] = { | ||
| name : frame.filename, // frame name | ||
| texture : data.meta.image || "default", // the source texture | ||
| offset : new Vector2d(s.x, s.y), | ||
| anchorPoint : (hasTextureAnchorPoint) ? new Vector2d(originX / s.w, originY / s.h) : null, | ||
| trimmed : trimmed, | ||
| trim : trim, | ||
| width : s.w, | ||
| height : s.h, | ||
| angle : (frame.rotated === true) ? -ETA : 0 | ||
| }; | ||
| textureAtlas.addUVs(atlas, frame.filename, data.meta.size.w, data.meta.size.h); | ||
| } | ||
| }); | ||
| return atlas; | ||
| } |