Skip to content

Commit 1dc258f

Browse files
author
pandamicro
committed
Small improvements
1 parent 2ac19ad commit 1dc258f

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Diff for: cocos2d/core/base-nodes/CCNodeCanvasRenderCmd.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ cc.Node.RenderCmd.prototype = {
283283
}
284284

285285
if (node._additionalTransformDirty) {
286-
this._transform = cc.affineTransformConcat(t, node._additionalTransform);
286+
cc.affineTransformConcatIn(t, node._additionalTransform);
287287
}
288288

289289
if (this._updateCurrentRegions) {

Diff for: cocos2d/core/platform/CCConfig.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ cc.DRAWNODE_TOTAL_VERTICES = 20000;
267267
* @constant
268268
* @type {Number}
269269
*/
270-
cc.IS_RETINA_DISPLAY_SUPPORTED = 1;
270+
cc.IS_RETINA_DISPLAY_SUPPORTED = 0;
271271

272272
/**
273273
* Default engine

Diff for: cocos2d/core/platform/CCMacro.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ cc.FLT_EPSILON = 0.0000001192092896;
245245
* @function
246246
*/
247247
cc.contentScaleFactor = cc.IS_RETINA_DISPLAY_SUPPORTED ? function () {
248-
return cc.director.getContentScaleFactor();
248+
return cc.director._contentScaleFactor;
249249
} : function () {
250250
return 1;
251251
};

0 commit comments

Comments
 (0)