Skip to content

Commit 01a5423

Browse files
committed
Config based SS rip.
1 parent 4b4ef1d commit 01a5423

2 files changed

Lines changed: 11 additions & 2 deletions

File tree

v3/src/checksum.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
var CHECKSUM = {
2-
build: '17c49dd0-1e5e-11e7-a489-ff140a784e90'
2+
build: '3cdef7a0-1ec7-11e7-a131-f3c6d91827e1'
33
};
44
module.exports = CHECKSUM;

v3/src/textures/TextureManager.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
var Parser = require('./parsers');
88
var Texture = require('./Texture');
99
var CanvasPool = require('../dom/CanvasPool');
10+
var GetObjectValue = require('../utils/object/GetObjectValue');
1011

1112
/**
1213
* Textures are managed by the global TextureManager. This is a singleton class that is
@@ -152,8 +153,16 @@ TextureManager.prototype = {
152153
return texture;
153154
},
154155

155-
addSpriteSheetFromAtlas: function (key, atlasKey, atlasFrame, config)
156+
addSpriteSheetFromAtlas: function (key, config)
156157
{
158+
var atlasKey = GetObjectValue(config, 'atlas', null);
159+
var atlasFrame = GetObjectValue(config, 'frame', null);
160+
161+
if (!atlasKey || !atlasFrame)
162+
{
163+
return;
164+
}
165+
157166
var atlas = this.get(atlasKey);
158167
var sheet = atlas.get(atlasFrame);
159168

0 commit comments

Comments
 (0)