Skip to content

Scale9Sprite size, RenderTexture size, colorized progress timer fix on canvas renderer #2454

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

Merged
dingpinglv merged 1 commit into from
Nov 17, 2014
Merged

Scale9Sprite size, RenderTexture size, colorized progress timer fix on canvas renderer #2454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 27 additions & 11 deletions cocos2d/core/renderer/RendererCanvas.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,19 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
* drawing all renderer command to cache canvas' context
* @param {CanvasRenderingContext2D} ctx
* @param {Number} [instanceID]
* @param {Number} [scaleX]
* @param {Number} [scaleY]
*/
_renderingToCacheCanvas: function (ctx, instanceID) {
_renderingToCacheCanvas: function (ctx, instanceID, scaleX, scaleY) {
if (!ctx)
cc.log("The context of RenderTexture is invalid.");

scaleX = cc.isUndefined(scaleX) ? 1 : scaleX;
scaleY = cc.isUndefined(scaleY) ? 1 : scaleY;
instanceID = instanceID || this._currentID;
var locCmds = this._cacheToCanvasCmds[instanceID], i, len;
for (i = 0, len = locCmds.length; i < len; i++) {
locCmds[i].rendering(ctx, 1, 1);
locCmds[i].rendering(ctx, scaleX, scaleY);
}
locCmds.length = 0;
var locIDs = this._cacheInstanceIds;
Expand Down Expand Up @@ -530,15 +534,27 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {

//draw sprite
var image = locSprite._texture.getHtmlElementObj();
context.drawImage(image,
locTextureCoord.renderX,
locTextureCoord.renderY,
locTextureCoord.width,
locTextureCoord.height,
flipXOffset, flipYOffset,
locDrawSizeCanvas.width,
locDrawSizeCanvas.height
);
if (locSprite._colorized) {
context.drawImage(image,
0,
0,
locTextureCoord.width,
locTextureCoord.height,
flipXOffset, flipYOffset,
locDrawSizeCanvas.width,
locDrawSizeCanvas.height
);
} else {
context.drawImage(image,
locTextureCoord.renderX,
locTextureCoord.renderY,
locTextureCoord.width,
locTextureCoord.height,
flipXOffset, flipYOffset,
locDrawSizeCanvas.width,
locDrawSizeCanvas.height
);
}

context.restore();
cc.g_NumberOfDraws++;
Expand Down
3 changes: 2 additions & 1 deletion cocos2d/render-texture/CCRenderTexture.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,8 @@ cc.RenderTexture = cc.Node.extend(/** @lends cc.RenderTexture# */{
//cc._renderContext = cc._mainRenderContextBackup;
//cc.view._resetScale();

cc.renderer._renderingToCacheCanvas(this._cacheContext, this.__instanceId);
var scale = cc.contentScaleFactor();
cc.renderer._renderingToCacheCanvas(this._cacheContext, this.__instanceId, scale, scale);

//TODO
/*//restore viewport
Expand Down
19 changes: 12 additions & 7 deletions extensions/ccui/base-classes/UIScale9Sprite.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,12 +203,17 @@ ccui.Scale9Sprite = cc.Node.extend(/** @lends ccui.Scale9Sprite# */{
_cacheScale9Sprite: function(){
if(!this._scale9Image)
return;
var size = this._contentSize, locCanvas = this._cacheCanvas;

var locScaleFactor = cc.contentScaleFactor();
var size = this._contentSize;
var sizeInPixels = cc.size(size.width * locScaleFactor, size.height * locScaleFactor);

var locCanvas = this._cacheCanvas;
var contentSizeChanged = false;
if(locCanvas.width != size.width || locCanvas.height != size.height){
locCanvas.width = size.width;
locCanvas.height = size.height;
this._cacheContext.translate(0, size.height);
if(locCanvas.width != sizeInPixels.width || locCanvas.height != sizeInPixels.height){
locCanvas.width = sizeInPixels.width;
locCanvas.height = sizeInPixels.height;
this._cacheContext.translate(0, sizeInPixels.height);
contentSizeChanged = true;
}

Expand All @@ -217,8 +222,8 @@ ccui.Scale9Sprite = cc.Node.extend(/** @lends ccui.Scale9Sprite# */{
this._scale9Image.visit();

//draw to cache canvas
this._cacheContext.clearRect(0, 0, size.width, -size.height);
cc.renderer._renderingToCacheCanvas(this._cacheContext, this.__instanceId);
this._cacheContext.clearRect(0, 0, sizeInPixels.width, -sizeInPixels.height);
cc.renderer._renderingToCacheCanvas(this._cacheContext, this.__instanceId, locScaleFactor, locScaleFactor);

if(contentSizeChanged)
this._cacheSprite.setTextureRect(cc.rect(0,0, size.width, size.height));
Expand Down
2 changes: 1 addition & 1 deletion extensions/gui/control-extension/CCScale9Sprite.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ cc.Scale9Sprite = cc.Node.extend(/** @lends cc.Scale9Sprite# */{

//draw to cache canvas
this._cacheContext.clearRect(0, 0, sizeInPixels.width, -sizeInPixels.height);
cc.renderer._renderingToCacheCanvas(this._cacheContext, this.__instanceId);
cc.renderer._renderingToCacheCanvas(this._cacheContext, this.__instanceId, locScaleFactor, locScaleFactor);

if(contentSizeChanged)
this._cacheSprite.setTextureRect(cc.rect(0,0, size.width, size.height));
Expand Down