diff --git a/cocos2d/core/platform/CCEGLView.js b/cocos2d/core/platform/CCEGLView.js
index 949fd6e6b1..045f56e531 100644
--- a/cocos2d/core/platform/CCEGLView.js
+++ b/cocos2d/core/platform/CCEGLView.js
@@ -35,7 +35,7 @@ cc.DENSITYDPI_HIGH = "high-dpi";
cc.DENSITYDPI_MEDIUM = "medium-dpi";
cc.DENSITYDPI_LOW = "low-dpi";
-cc.__BrowserGetter = {
+var __BrowserGetter = {
init: function(){
this.html = document.getElementsByTagName("html")[0];
},
@@ -58,36 +58,36 @@ cc.__BrowserGetter = {
};
if(window.navigator.userAgent.indexOf("OS 8_1_") > -1) //this mistake like MIUI, so use of MIUI treatment method
- cc.__BrowserGetter.adaptationType = cc.sys.BROWSER_TYPE_MIUI;
+ __BrowserGetter.adaptationType = cc.sys.BROWSER_TYPE_MIUI;
if(cc.sys.os === cc.sys.OS_IOS) // All browsers are WebView
- cc.__BrowserGetter.adaptationType = cc.sys.BROWSER_TYPE_SAFARI;
+ __BrowserGetter.adaptationType = cc.sys.BROWSER_TYPE_SAFARI;
-switch(cc.__BrowserGetter.adaptationType){
+switch(__BrowserGetter.adaptationType){
case cc.sys.BROWSER_TYPE_SAFARI:
- cc.__BrowserGetter.meta["minimal-ui"] = "true";
- cc.__BrowserGetter.availWidth = function(frame){
+ __BrowserGetter.meta["minimal-ui"] = "true";
+ __BrowserGetter.availWidth = function(frame){
return frame.clientWidth;
};
- cc.__BrowserGetter.availHeight = function(frame){
+ __BrowserGetter.availHeight = function(frame){
return frame.clientHeight;
};
break;
case cc.sys.BROWSER_TYPE_CHROME:
- cc.__BrowserGetter.__defineGetter__("target-densitydpi", function(){
+ __BrowserGetter.__defineGetter__("target-densitydpi", function(){
return cc.view._targetDensityDPI;
});
case cc.sys.BROWSER_TYPE_SOUGOU:
case cc.sys.BROWSER_TYPE_UC:
- cc.__BrowserGetter.availWidth = function(frame){
+ __BrowserGetter.availWidth = function(frame){
return frame.clientWidth;
};
- cc.__BrowserGetter.availHeight = function(frame){
+ __BrowserGetter.availHeight = function(frame){
return frame.clientHeight;
};
break;
case cc.sys.BROWSER_TYPE_MIUI:
- cc.__BrowserGetter.init = function(view){
+ __BrowserGetter.init = function(view){
if(view.__resizeWithBrowserSize) return;
var resize = function(){
view.setDesignResolutionSize(
@@ -102,6 +102,8 @@ switch(cc.__BrowserGetter.adaptationType){
break;
}
+var _scissorRect = cc.rect();
+
/**
* cc.view is the singleton object which represents the game window.
* It's main task include:
@@ -167,7 +169,7 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{
ctor: function () {
var _t = this, d = document, _strategyer = cc.ContainerStrategy, _strategy = cc.ContentStrategy;
- cc.__BrowserGetter.init(this);
+ __BrowserGetter.init(this);
_t._frame = (cc.container.parentNode === d.body) ? d.documentElement : cc.container.parentNode;
_t._frameSize = cc.size(0, 0);
@@ -299,8 +301,8 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{
_initFrameSize: function () {
var locFrameSize = this._frameSize;
- var w = cc.__BrowserGetter.availWidth(this._frame);
- var h = cc.__BrowserGetter.availHeight(this._frame);
+ var w = __BrowserGetter.availWidth(this._frame);
+ var h = __BrowserGetter.availHeight(this._frame);
var isLandscape = w >= h;
if (!cc.sys.isMobile ||
@@ -369,7 +371,7 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{
_adjustViewportMeta: function () {
if (this._isAdjustViewPort) {
- this._setViewportMeta(cc.__BrowserGetter.meta, false);
+ this._setViewportMeta(__BrowserGetter.meta, false);
// Only adjust viewport once
this._isAdjustViewPort = false;
}
@@ -768,11 +770,15 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{
* @param {Number} h
*/
setScissorInPoints: function (x, y, w, h) {
- var locFrameZoomFactor = this._frameZoomFactor, locScaleX = this._scaleX, locScaleY = this._scaleY;
- cc._renderContext.scissor((x * locScaleX * locFrameZoomFactor + this._viewPortRect.x * locFrameZoomFactor),
- (y * locScaleY * locFrameZoomFactor + this._viewPortRect.y * locFrameZoomFactor),
- (w * locScaleX * locFrameZoomFactor),
- (h * locScaleY * locFrameZoomFactor));
+ var zoomFactor = this._frameZoomFactor, scaleX = this._scaleX, scaleY = this._scaleY;
+ _scissorRect.x = x;
+ _scissorRect.y = y;
+ _scissorRect.width = w;
+ _scissorRect.height = h;
+ cc._renderContext.scissor(x * scaleX * zoomFactor + this._viewPortRect.x * zoomFactor,
+ y * scaleY * zoomFactor + this._viewPortRect.y * zoomFactor,
+ w * scaleX * zoomFactor,
+ h * scaleY * zoomFactor);
},
/**
@@ -780,8 +786,7 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{
* @return {Boolean}
*/
isScissorEnabled: function () {
- var gl = cc._renderContext;
- return gl.isEnabled(gl.SCISSOR_TEST);
+ return cc._renderContext.isEnabled(gl.SCISSOR_TEST);
},
/**
@@ -789,10 +794,7 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{
* @return {cc.Rect}
*/
getScissorRect: function () {
- var gl = cc._renderContext, scaleX = this._scaleX, scaleY = this._scaleY;
- var boxArr = gl.getParameter(gl.SCISSOR_BOX);
- return cc.rect((boxArr[0] - this._viewPortRect.x) / scaleX, (boxArr[1] - this._viewPortRect.y) / scaleY,
- boxArr[2] / scaleX, boxArr[3] / scaleY);
+ return cc.rect(_scissorRect);
},
/**
diff --git a/cocos2d/core/platform/CCInputManager.js b/cocos2d/core/platform/CCInputManager.js
index 1bbb1677d2..7d655130f7 100644
--- a/cocos2d/core/platform/CCInputManager.js
+++ b/cocos2d/core/platform/CCInputManager.js
@@ -232,21 +232,12 @@ cc.inputManager = /** @lends cc.inputManager# */{
if (cc.isFunction(element.getBoundingClientRect)) {
box = element.getBoundingClientRect();
} else {
- if (element instanceof HTMLCanvasElement) {
- box = {
- left: 0,
- top: 0,
- width: element.width,
- height: element.height
- };
- } else {
- box = {
- left: 0,
- top: 0,
- width: parseInt(element.style.width),
- height: parseInt(element.style.height)
- };
- }
+ box = {
+ left: 0,
+ top: 0,
+ width: parseInt(element.style.width),
+ height: parseInt(element.style.height)
+ };
}
return {
left: box.left + win.pageXOffset - docElem.clientLeft,
diff --git a/cocos2d/core/renderer/RendererWebGL.js b/cocos2d/core/renderer/RendererWebGL.js
index 05b0a346ff..a0c3a5ec7e 100644
--- a/cocos2d/core/renderer/RendererWebGL.js
+++ b/cocos2d/core/renderer/RendererWebGL.js
@@ -24,22 +24,9 @@
cc.rendererWebGL = (function () {
-function removeByLastSwap (array, i) {
- var len = array.length;
- if (len > 0 && i >= 0 && i < len) {
- array[i] = array[len - 1];
- array.length--;
- }
-}
-
-var CACHING_BUFFER = true;
-var ACTIVATE_AUTO_BATCH = true;
-
// Internal variables
- // Global vertex buffers, shared by sprites
-var _gbuffers = [],
// Batching general informations
- _batchedInfo = {
+var _batchedInfo = {
// The batched texture, all batching element should have the same texture
texture: null,
// The batched blend source, all batching element should have the same blend source
@@ -49,89 +36,71 @@ var _gbuffers = [],
// The batched shader, all batching element should have the same shader
shader: null
},
- // to compare with the batched info
- _currentInfo = {
- texture: null,
- blendSrc: null,
- blendDst: null,
- shader: null
- },
- // The current virtual buffer
- _currentBuffer = null,
- _batchBufferPool = new cc.SimplePool(),
- _orderDirtyInFrame = false,
- _bufferError = false,
- _prevRenderCmds = [],
- _quadIndexBuffer = {
- buffer: null,
- maxQuads: 0
- };
+
+ _quadIndexBuffer = null,
+ _quadVertexBuffer = null,
+ // Total vertex size
+ _vertexSize = 0,
+ // Current batching vertex size
+ _batchingSize = 0,
+ _sizePerVertex = 6,
+ // buffer data and views
+ _vertexData = null,
+ _vertexDataSize = 0,
+ _vertexDataF32 = null,
+ _vertexDataUI32 = null,
+ _IS_IOS = false;
+
// Inspired from @Heishe's gotta-batch-them-all branch
// https://github.com/Talisca/cocos2d-html5/commit/de731f16414eb9bcaa20480006897ca6576d362c
-function updateQuadIndexBuffer (numQuads) {
- if (!_quadIndexBuffer.buffer) {
- return;
- }
+function updateQuadBuffer (numQuads) {
var gl = cc._renderContext;
- gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, _quadIndexBuffer.buffer);
-
- var indices = new Uint16Array(numQuads * 6);
- var currentQuad = 0;
- for (var i = 0, len = numQuads * 6; i < len; i += 6) {
- indices[i] = currentQuad + 0;
- indices[i + 1] = currentQuad + 1;
- indices[i + 2] = currentQuad + 2;
- indices[i + 3] = currentQuad + 1;
- indices[i + 4] = currentQuad + 2;
- indices[i + 5] = currentQuad + 3;
- currentQuad += 4;
+ // Update index buffer and fill up
+ if (_quadIndexBuffer) {
+ gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, _quadIndexBuffer);
+
+ var indices = new Uint16Array(numQuads * 6);
+ var currentQuad = 0;
+ for (var i = 0, len = numQuads * 6; i < len; i += 6) {
+ indices[i] = currentQuad + 0;
+ indices[i + 1] = currentQuad + 1;
+ indices[i + 2] = currentQuad + 2;
+ indices[i + 3] = currentQuad + 1;
+ indices[i + 4] = currentQuad + 2;
+ indices[i + 5] = currentQuad + 3;
+ currentQuad += 4;
+ }
+ gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, indices, gl.STATIC_DRAW);
+ }
+
+ if (_quadVertexBuffer) {
+ _vertexDataSize = numQuads * 4 * _sizePerVertex;
+ var byteLength = _vertexDataSize * 4;
+ _vertexData = new ArrayBuffer(byteLength);
+ _vertexDataF32 = new Float32Array(_vertexData);
+ _vertexDataUI32 = new Uint32Array(_vertexData);
+ // Init buffer data
+ gl.bindBuffer(gl.ARRAY_BUFFER, _quadVertexBuffer);
+ gl.bufferData(gl.ARRAY_BUFFER, _vertexDataF32, gl.DYNAMIC_DRAW);
}
- gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, indices, gl.STATIC_DRAW);
- _quadIndexBuffer.maxQuads = numQuads;
+ _vertexSize = numQuads * 4;
}
// Inspired from @Heishe's gotta-batch-them-all branch
// https://github.com/Talisca/cocos2d-html5/commit/de731f16414eb9bcaa20480006897ca6576d362c
-function getQuadIndexBuffer (numQuads) {
- if (_quadIndexBuffer.buffer === null) {
- _quadIndexBuffer.buffer = cc._renderContext.createBuffer();
- }
-
- if (_quadIndexBuffer.maxQuads < numQuads) {
- updateQuadIndexBuffer(numQuads);
- }
-
- return _quadIndexBuffer.buffer;
-}
+function initQuadBuffer (numQuads) {
+ var gl = cc._renderContext;
+ if (_quadIndexBuffer === null) {
+ // TODO do user need to release the memory ?
+ _quadVertexBuffer = gl.createBuffer();
+ _quadIndexBuffer = gl.createBuffer();
-function createVirtualBuffer (buffer, vertexOffset, totalBufferSize, count, data) {
- var float32View, uint32View;
- if (data) {
- float32View = new Float32Array(data, vertexOffset, totalBufferSize / 4);
- uint32View = new Uint32Array(data, vertexOffset, totalBufferSize / 4);
+ updateQuadBuffer(numQuads);
}
else {
- float32View = new Float32Array(totalBufferSize / 4);
- uint32View = new Uint32Array(float32View.buffer);
+ updateQuadBuffer(numQuads);
}
- var vBuf = {
- // The object contains real WebGL buffers, it's created or retrieved via getBatchBuffer
- buffer: buffer,
- // The vertex data array (Float32Array)
- float32View: float32View,
- // Uint32 view
- uint32View: uint32View,
- // The start offset in the vertex buffer, in bytes
- vertexOffset: vertexOffset,
- // Total vertex array buffer size, including vertex data, in bytes
- totalBufferSize: totalBufferSize,
- // Render command count
- count: count,
- // Valid flag, indicate whether the buffer is valid or not
- valid: true
- };
- return vBuf;
}
return {
@@ -139,7 +108,7 @@ return {
childrenOrderDirty: true,
assignedZ: 0,
- assignedZStep: 1/10000,
+ assignedZStep: 1/100,
_transformNodePool: [], //save nodes transform dirty
_renderCmds: [], //save renderer commands
@@ -151,34 +120,20 @@ return {
_clearColor: cc.color(), //background color,default BLACK
init: function () {
+ var gl = cc._renderContext;
+ gl.disable(gl.CULL_FACE);
+ gl.disable(gl.DEPTH_TEST);
+
this.mat4Identity = new cc.math.Matrix4();
this.mat4Identity.identity();
- getQuadIndexBuffer(1000);
- },
-
- requestBuffer: function (size) {
- var i, len = _gbuffers.length, buffer,
- gl = cc._renderContext,
- result;
- for (i = 0; i < len; ++i) {
- buffer = _gbuffers[i];
- if (buffer.gl === gl) {
- result = buffer.requestBuffer(size);
- if (result) {
- return result;
- }
- }
+ initQuadBuffer(2000);
+ if (cc.sys.os === cc.sys.OS_IOS) {
+ _IS_IOS = true;
}
+ },
- if (!result) {
- buffer = new GlobalVertexBuffer(gl);
- _gbuffers.push(buffer);
- result = buffer.requestBuffer(size);
- }
- if (!result) {
- cc.error('Request WebGL buffer failed');
- }
- return result;
+ getVertexSize: function () {
+ return _vertexSize;
},
getRenderCmd: function (renderableObject) {
@@ -189,8 +144,15 @@ return {
_turnToCacheMode: function (renderTextureID) {
this._isCacheToBufferOn = true;
renderTextureID = renderTextureID || 0;
- this._cacheToBufferCmds[renderTextureID] = [];
- this._cacheInstanceIds.push(renderTextureID);
+ if (!this._cacheToBufferCmds[renderTextureID]) {
+ this._cacheToBufferCmds[renderTextureID] = [];
+ }
+ else {
+ this._cacheToBufferCmds[renderTextureID].length = 0;
+ }
+ if (this._cacheInstanceIds.indexOf(renderTextureID) === -1) {
+ this._cacheInstanceIds.push(renderTextureID);
+ }
this._currentID = renderTextureID;
},
@@ -218,15 +180,7 @@ return {
renderTextureId = renderTextureId || this._currentID;
var locCmds = this._cacheToBufferCmds[renderTextureId], i, len;
var ctx = cc._renderContext;
- // Update all global buffers (only invoke bufferSubData when buffer is dirty)
- for (i = 0, len = _gbuffers.length; i < len; ++i) {
- _gbuffers[i].update();
- }
- // Reset buffer cache to avoid issue
- gl.bindBuffer(gl.ARRAY_BUFFER, null);
- for (i = 0, len = locCmds.length; i < len; i++) {
- locCmds[i].rendering(ctx);
- }
+ this.rendering(ctx, locCmds);
this._removeCache(renderTextureId);
var locIDs = this._cacheInstanceIds;
@@ -239,7 +193,6 @@ return {
//reset renderer's flag
resetFlag: function () {
if (this.childrenOrderDirty) {
- _orderDirtyInFrame = true;
this.childrenOrderDirty = false;
}
this._transformNodePool.length = 0;
@@ -274,16 +227,6 @@ return {
clearRenderCommands: function () {
// Copy previous command list for late check in rendering
- if (CACHING_BUFFER) {
- var locCmds = this._renderCmds;
- var i, len = locCmds.length, cmd;
- for (i = 0; i < len; ++i) {
- cmd = locCmds[i];
- cmd._currId = -1;
- _prevRenderCmds[i] = cmd;
- }
- _prevRenderCmds.length = len;
- }
this._renderCmds.length = 0;
},
@@ -321,399 +264,111 @@ return {
}
},
- // Auto batch implementation inspired from @Heishe 's PR
- // Ref: https://github.com/cocos2d/cocos2d-html5/pull/3248
- createBatchBuffer: function (bufferSize) {
- var arrayBuffer = gl.createBuffer();
-
- this.initBatchBuffers(arrayBuffer, bufferSize);
-
- return {arrayBuffer: arrayBuffer, bufferSize: bufferSize};
- },
-
- // Auto batch implementation inspired from @Heishe 's PR
- // Ref: https://github.com/cocos2d/cocos2d-html5/pull/3248
- initBatchBuffers: function (arrayBuffer, bufferSize) {
- gl.bindBuffer(gl.ARRAY_BUFFER, arrayBuffer);
- gl.bufferData(gl.ARRAY_BUFFER, bufferSize, gl.DYNAMIC_DRAW);
+ _increaseBatchingSize: function (increment) {
+ _batchingSize += increment;
},
- // Auto batch implementation inspired from @Heishe 's PR
- // Ref: https://github.com/cocos2d/cocos2d-html5/pull/3248
-
- // Returns an object with {arrayBuffer, size},
- // where size denotes how many unit fit in the buffer (no need for bufferData if it's already big enough, bufferSubData enough)
- getBatchBuffer: function(bufferSize)
- {
- if (_batchBufferPool.size() > 0) {
- var minSize = Number.MAX_VALUE;
- var minBufIndex = -1;
-
- var buf = _batchBufferPool.find(function (i, buf) {
- // Find available buffer with suitable size
- if (buf.bufferSize >= bufferSize) {
- return true;
- }
-
- // Track the smallest found buffer because that one will be re-initialized and returned if no fitting buffer can be found
- if (buf.bufferSize < minSize)
- {
- minSize = buf.bufferSize;
- minBufIndex = i;
- }
- }, function () {
- return minBufIndex;
- });
-
- if (buf) {
- this.initBatchBuffers(buf.arrayBuffer, bufferSize);
- buf.bufferSize = bufferSize;
- return buf;
- }
+ _uploadBufferData: function (cmd) {
+ if (_batchingSize >= _vertexSize) {
+ this._batchRendering();
}
- return this.createBatchBuffer(bufferSize);
- },
-
- _refreshVirtualBuffers: function () {
- var renderCmds = this._renderCmds,
- len = _prevRenderCmds.length,
- currLen = renderCmds.length,
- i = 0, j = 0, end, cmd1, cmd2, next,
- newBuf, currBuf,
- startId, count, size;
-
- // Loop previous render command list to compare with current command list
- for (; i < len; ++i) {
- cmd1 = _prevRenderCmds[i];
- currBuf = cmd1._vBuffer;
- matched = false;
- // Check to update virtual buffer
- if (currBuf && currBuf.valid) {
- j = cmd1._currId;
- // Removed from the command list
- if (j < 0 || j >= currLen) {
- cmd1._vBuffer = null;
- continue;
- }
-
- cmd1.getBatchInfo(_batchedInfo);
- startId = i;
- count = 0;
- // Remains in the command list
- cmd2 = renderCmds[j];
- while (cmd1 && cmd1 === cmd2 && cmd1._vBuffer === currBuf) {
- ++count;
- ++j;
- cmd1 = _prevRenderCmds[i+count];
- cmd2 = renderCmds[j];
- }
- end = i + count;
-
- // No valid batch
- if (count <= 1) {
- cmd1 = _prevRenderCmds[i];
- cmd1._vBuffer = null;
- if (cmd2) {
- cmd2._vBuffer = null;
- }
- continue;
- }
-
- // The next command in the current list support batch
- if (cmd2 && cmd2._supportBatch) {
- cmd2.getBatchInfo(_currentInfo);
- if (_currentInfo.texture === _batchedInfo.texture &&
- _currentInfo.blendSrc === _batchedInfo.blendSrc &&
- _currentInfo.blendDst === _batchedInfo.blendDst &&
- _currentInfo.shader === _batchedInfo.shader) {
- // Old batch dirty, clean up v buffer properties
- for (; i < end; ++i) {
- _prevRenderCmds[i]._vBuffer = null;
- }
- // keeping i correct, it should run through all elements
- i--;
- continue;
- }
- }
-
- // Perfect match
- if (currBuf.count === count) {
- i = i + count - 1;
- }
- // Sub match
- else if (count > 1) {
- // First command in buffer
- cmd1 = _prevRenderCmds[i];
- // cmd2 = _prevRenderCmds[i+count-1];
- size = count * cmd1.bytesPerUnit;
- newBuf = createVirtualBuffer(currBuf.buffer,
- cmd1._vertexOffset * 4,
- size,
- count,
- currBuf.float32View.buffer);
- for (; i < end; ++i) {
- _prevRenderCmds[i]._vBuffer = newBuf;
- }
- // keeping i correct, it should run through all elements
- i--;
- }
- }
+ // Check batching
+ var texture = cmd._node._texture;
+ var blendSrc = cmd._node._blendFunc.src;
+ var blendDst = cmd._node._blendFunc.dst;
+ var shader = cmd._shaderProgram;
+ if (_batchedInfo.texture !== texture ||
+ _batchedInfo.blendSrc !== blendSrc ||
+ _batchedInfo.blendDst !== blendDst ||
+ _batchedInfo.shader !== shader) {
+ // Draw batched elements
+ this._batchRendering();
+ // Update _batchedInfo
+ _batchedInfo.texture = texture;
+ _batchedInfo.blendSrc = blendSrc;
+ _batchedInfo.blendDst = blendDst;
+ _batchedInfo.shader = shader;
}
- // Forward batch other commands
- len = renderCmds.length;
- for (i = 0; i < len; ++i) {
- cmd1 = renderCmds[i];
- // Already batched command, do not update
- if (cmd1._vBuffer) {
- continue;
- }
-
- next = renderCmds[i+1];
- // Batching
- if (cmd1._supportBatch && next && next._supportBatch) {
- count = this._forwardBatch(i);
- if (count > 1) {
- // i will increase by 1 each loop
- i += count - 1;
- continue;
- }
- }
- }
- _prevRenderCmds.length = 0;
- _bufferError = false;
- },
-
- // Forward search commands that are in the same virtual buffer,
- // If size match then no problem to render
- // Otherwise, the virtual buffer need to be updated
- _forwardCheck: function (first) {
- var renderCmds = this._renderCmds,
- cmd = renderCmds[first],
- last = first, length = renderCmds.length,
- vbuffer = cmd._vBuffer;
-
- // Reset current buffer and batched info
- cmd.getBatchInfo(_batchedInfo);
- _currentBuffer = null;
-
- // Protection, vbuffer invalid or doesn't match the command
- if (cmd._vertexOffset !== vbuffer.vertexOffset || !vbuffer.valid || !vbuffer.buffer) {
- _bufferError = true;
- return 0;
- }
-
- // Forward check
- var vertexBuffer;
- for (; last < length; ++last) {
- cmd = renderCmds[last];
- if (vbuffer !== cmd._vBuffer) {
- break;
- }
-
- // Lazy update vertex in buffer
- if (cmd._bufferDirty) {
- if (!vertexBuffer) {
- // Bind buffer
- vertexBuffer = vbuffer;
- gl.bindBuffer(gl.ARRAY_BUFFER, vertexBuffer.buffer.arrayBuffer);
- }
- cmd.batchVertexBuffer(vertexBuffer.float32View, vertexBuffer.uint32View, cmd._vertexOffset);
- cmd._bufferDirty = false;
- }
- }
- // Send last buffer to WebGLBuffer
- if (vertexBuffer) {
- gl.bufferSubData(gl.ARRAY_BUFFER, 0, vertexBuffer.float32View);
- }
-
- var size = last - first;
- // no problem
- if (vbuffer.count === size) {
- _currentBuffer = vbuffer;
- return size;
- }
- // buffer errored
- // need to update virtual buffers in next frame
- else {
- for (last = first; last < first + size; ++last) {
- cmd = renderCmds[last];
- cmd._vBuffer = null;
- }
- _bufferError = true;
- return 0;
+ // Upload vertex data
+ var len = cmd.uploadData(_vertexDataF32, _vertexDataUI32, _batchingSize * _sizePerVertex);
+ if (len > 0) {
+ _batchingSize += len;
}
},
- // Auto batch implementation inspired from @Heishe 's PR
- // Ref: https://github.com/cocos2d/cocos2d-html5/pull/3248
- // Forward search commands that can be batched together
- _forwardBatch: function (first) {
- var renderCmds = this._renderCmds,
- cmd = renderCmds[first],
- last = first + 1, length = renderCmds.length;
-
- if (!cmd || !cmd._supportBatch)
- return 0;
-
- // Initialize batched info
- cmd.getBatchInfo(_batchedInfo);
- if (!_batchedInfo.texture)
- return 0;
-
- var totalBufferSize = cmd.bytesPerUnit;
-
- // Forward search and collect batch informations
- cmd = renderCmds[last];
- while (cmd) {
- if (cmd._supportBatch) {
- cmd.getBatchInfo(_currentInfo);
- }
- else {
- break;
- }
- // Batch info don't match, break batching
- if (_currentInfo.texture !== _batchedInfo.texture ||
- _currentInfo.blendSrc !== _batchedInfo.blendSrc ||
- _currentInfo.blendDst !== _batchedInfo.blendDst ||
- _currentInfo.shader !== _batchedInfo.shader) {
- break;
- }
- else {
- totalBufferSize += cmd.bytesPerUnit;
- }
- ++last;
- cmd = renderCmds[last];
- }
-
- var count = last - first;
- // Can't batch, fall back to original render command
- if (count <= 1) {
- return count;
- }
-
- var buffer = this.getBatchBuffer(totalBufferSize);
-
- // Create a virtual buffer
- var vbuffer = createVirtualBuffer(buffer,
- 0,
- totalBufferSize,
- count);
- _currentBuffer = vbuffer;
- var uploadBuffer = vbuffer.float32View;
-
- //all of the divisions by 4 are just because we work with Float32Arrays instead of uint8 arrays so all indexes need to be shortened by the factor of 4
- var vertexDataOffset = 0;
-
- // Bind vertex data buffer
- gl.bindBuffer(gl.ARRAY_BUFFER, vbuffer.buffer.arrayBuffer);
-
- // Fill in vertex data command by command
- var i;
- for (i = first; i < last; ++i) {
- cmd = renderCmds[i];
- cmd.batchVertexBuffer(uploadBuffer, vbuffer.uint32View, vertexDataOffset);
-
- if (CACHING_BUFFER) {
- cmd._vBuffer = vbuffer;
- cmd._vertexOffset = vertexDataOffset;
- }
- if (cmd._savedDirtyFlag) {
- cmd._savedDirtyFlag = false;
- }
-
- vertexDataOffset += cmd.vertexBytesPerUnit / 4;
- }
-
- // Submit vertex data in one bufferSubData call
- gl.bufferSubData(gl.ARRAY_BUFFER, 0, uploadBuffer);
-
- if (!CACHING_BUFFER) {
- _batchBufferPool.put(buffer);
+ _batchRendering: function () {
+ if (_batchingSize === 0 || !_batchedInfo.texture) {
+ return;
}
- return count;
- },
- // Auto batch implementation inspired from @Heishe 's PR
- // Ref: https://github.com/cocos2d/cocos2d-html5/pull/3248
- // Batch rendering using result collected in `_forwardBatch`
- _batchRendering: function () {
- // var node = this._node;
var texture = _batchedInfo.texture;
var shader = _batchedInfo.shader;
- var count = _currentBuffer.count;
+ var count = _batchingSize / 4;
- var bytesPerRow = 16; //4 floats with 4 bytes each
-
- shader.use();
- shader._updateProjectionUniform();
+ if (shader) {
+ shader.use();
+ shader._updateProjectionUniform();
+ }
cc.glBlendFunc(_batchedInfo.blendSrc, _batchedInfo.blendDst);
cc.glBindTexture2DN(0, texture); // = cc.glBindTexture2D(texture);
- gl.bindBuffer(gl.ARRAY_BUFFER, _currentBuffer.buffer.arrayBuffer);
-
- gl.enableVertexAttribArray(cc.VERTEX_ATTRIB_POSITION);
- gl.enableVertexAttribArray(cc.VERTEX_ATTRIB_COLOR);
- gl.enableVertexAttribArray(cc.VERTEX_ATTRIB_TEX_COORDS);
+ var _bufferchanged = !gl.bindBuffer(gl.ARRAY_BUFFER, _quadVertexBuffer);
+ // upload the vertex data to the gl buffer
+ if (_batchingSize > _vertexSize * 0.5) {
+ gl.bufferData(gl.ARRAY_BUFFER, _vertexDataF32, gl.DYNAMIC_DRAW);
+ }
+ else {
+ var view = _vertexDataF32.subarray(0, _batchingSize * _sizePerVertex);
+ gl.bufferData(gl.ARRAY_BUFFER, view, gl.DYNAMIC_DRAW);
+ }
- var vertexOffset = _currentBuffer.vertexOffset;
- gl.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 3, gl.FLOAT, false, 24, vertexOffset);
- gl.vertexAttribPointer(cc.VERTEX_ATTRIB_COLOR, 4, gl.UNSIGNED_BYTE, true, 24, vertexOffset + 12);
- gl.vertexAttribPointer(cc.VERTEX_ATTRIB_TEX_COORDS, 2, gl.FLOAT, false, 24, vertexOffset + 16);
+ if (_bufferchanged) {
+ gl.enableVertexAttribArray(cc.VERTEX_ATTRIB_POSITION);
+ gl.enableVertexAttribArray(cc.VERTEX_ATTRIB_COLOR);
+ gl.enableVertexAttribArray(cc.VERTEX_ATTRIB_TEX_COORDS);
+ gl.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 3, gl.FLOAT, false, 24, 0);
+ gl.vertexAttribPointer(cc.VERTEX_ATTRIB_COLOR, 4, gl.UNSIGNED_BYTE, true, 24, 12);
+ gl.vertexAttribPointer(cc.VERTEX_ATTRIB_TEX_COORDS, 2, gl.FLOAT, false, 24, 16);
+ }
- var elemBuffer = getQuadIndexBuffer(count);
- gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, elemBuffer);
+ gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, _quadIndexBuffer);
gl.drawElements(gl.TRIANGLES, count * 6, gl.UNSIGNED_SHORT, 0);
cc.g_NumberOfDraws++;
+
+ _batchingSize = 0;
},
/**
* drawing all renderer command to context (default is cc._renderContext)
* @param {WebGLRenderingContext} [ctx=cc._renderContext]
*/
- rendering: function (ctx) {
- var locCmds = this._renderCmds,
+ rendering: function (ctx, cmds) {
+ var locCmds = cmds || this._renderCmds,
i, len, cmd, next, batchCount,
context = ctx || cc._renderContext;
- // Update all global buffers (only invoke bufferData when buffer is dirty)
- for (i = 0, len = _gbuffers.length; i < len; ++i) {
- _gbuffers[i].update();
- }
-
- // Only update virtual buffers if children order dirty in the current frame
- if (ACTIVATE_AUTO_BATCH && (_orderDirtyInFrame || _bufferError)) {
- this._refreshVirtualBuffers();
- }
-
// Reset buffer for rendering
context.bindBuffer(gl.ARRAY_BUFFER, null);
for (i = 0, len = locCmds.length; i < len; ++i) {
cmd = locCmds[i];
- next = locCmds[i+1];
-
- if (ACTIVATE_AUTO_BATCH) {
- // Already batched in buffer
- if (cmd._vBuffer) {
- batchCount = this._forwardCheck(i);
- if (batchCount > 1) {
- this._batchRendering();
- // i will increase by 1 each loop
- i += batchCount - 1;
- continue;
- }
+
+ if (cmd.uploadData) {
+ this._uploadBufferData(cmd);
+ }
+ else {
+ if (_batchingSize > 0) {
+ this._batchRendering();
}
+ cmd.rendering(context);
}
-
- cmd.rendering(context);
- }
- if (_orderDirtyInFrame) {
- _orderDirtyInFrame = false;
}
+ this._batchRendering();
+ _batchedInfo.texture = null;
}
};
})();
\ No newline at end of file
diff --git a/cocos2d/core/sprites/CCSprite.js b/cocos2d/core/sprites/CCSprite.js
index dc4b35a637..1c6c8f03a2 100644
--- a/cocos2d/core/sprites/CCSprite.js
+++ b/cocos2d/core/sprites/CCSprite.js
@@ -132,20 +132,6 @@ cc.Sprite = cc.Node.extend(/** @lends cc.Sprite# */{
self._softInit(fileName, rect, rotated);
},
- onEnter: function () {
- this._super();
- if (cc._renderType === cc.game.RENDER_TYPE_WEBGL) {
- this._renderCmd.updateBuffer();
- }
- },
-
- cleanup: function () {
- if (cc._renderType === cc.game.RENDER_TYPE_WEBGL) {
- this._renderCmd.freeBuffer();
- }
- this._super();
- },
-
/**
* Returns whether the texture have been loaded
* @returns {boolean}
@@ -584,7 +570,7 @@ cc.Sprite = cc.Node.extend(/** @lends cc.Sprite# */{
* @return {cc.V3F_C4B_T2F_Quad|null} Returns a cc.V3F_C4B_T2F_Quad object when render mode is WebGL, returns null when render mode is Canvas.
*/
getQuad:function () {
- return this._renderCmd.getQuad();
+ return null;
},
/**
@@ -634,7 +620,6 @@ cc.Sprite = cc.Node.extend(/** @lends cc.Sprite# */{
_t._offsetPosition.y = 0;
_t._hasChildren = false;
- this._renderCmd._init();
// updated in "useSelfRender"
// Atlas: TexCoords
_t.setTextureRect(cc.rect(0, 0, 0, 0), false, cc.size(0, 0));
@@ -709,8 +694,6 @@ cc.Sprite = cc.Node.extend(/** @lends cc.Sprite# */{
_t._offsetPosition.y = 0;
_t._hasChildren = false;
- this._renderCmd._init();
-
var locTextureLoaded = texture.isLoaded();
_t._textureLoaded = locTextureLoaded;
@@ -767,26 +750,9 @@ cc.Sprite = cc.Node.extend(/** @lends cc.Sprite# */{
var locRect = _t._rect;
_t._offsetPosition.x = relativeOffsetX + (_t._contentSize.width - locRect.width) / 2;
_t._offsetPosition.y = relativeOffsetY + (_t._contentSize.height - locRect.height) / 2;
-
- // rendering using batch node
- if (_t._batchNode) {
- // update dirty, don't update _recursiveDirty
- _t.dirty = true;
- } else {
- // self rendering
- // Atlas: Vertex
- this._renderCmd._resetForBatchNode();
- }
},
// BatchNode methods
- /**
- * Updates the quad according the the rotation, position, scale values.
- * @function
- */
- updateTransform: function(){
- this._renderCmd.updateTransform();
- },
/**
* Add child to sprite (override cc.Node)
@@ -917,8 +883,6 @@ cc.Sprite = cc.Node.extend(/** @lends cc.Sprite# */{
_t.textureAtlas = null;
_t._recursiveDirty = false;
_t.dirty = false;
-
- this._renderCmd._resetForBatchNode();
} else {
// using batch
_t._transformToBatch = cc.affineTransformIdentity();
diff --git a/cocos2d/core/sprites/CCSpriteBatchNode.js b/cocos2d/core/sprites/CCSpriteBatchNode.js
index 2cf7e5791c..d8044af074 100644
--- a/cocos2d/core/sprites/CCSpriteBatchNode.js
+++ b/cocos2d/core/sprites/CCSpriteBatchNode.js
@@ -42,15 +42,14 @@
* @extends cc.Node
*
* @param {String|cc.Texture2D} fileImage
- * @param {Number} capacity
* @example
*
* // 1. create a SpriteBatchNode with image path
- * var spriteBatchNode = new cc.SpriteBatchNode("res/animations/grossini.png", 50);
+ * var spriteBatchNode = new cc.SpriteBatchNode("res/animations/grossini.png");
*
* // 2. create a SpriteBatchNode with texture
* var texture = cc.textureCache.addImage("res/animations/grossini.png");
- * var spriteBatchNode = new cc.SpriteBatchNode(texture,50);
+ * var spriteBatchNode = new cc.SpriteBatchNode(texture);
*
* @property {cc.TextureAtlas} textureAtlas - The texture atlas
* @property {Array} descendants - <@readonly> Descendants of sprite batch node
@@ -58,16 +57,14 @@
cc.SpriteBatchNode = cc.Node.extend(/** @lends cc.SpriteBatchNode# */{
_blendFunc: null,
// all descendants: chlidren, gran children, etc...
- _descendants: null,
+ _texture: null,
_className: "SpriteBatchNode",
- ctor: function (fileImage, capacity) {
+ ctor: function (fileImage) {
cc.Node.prototype.ctor.call(this);
- this._descendants = [];
this._blendFunc = new cc.BlendFunc(cc.BLEND_SRC, cc.BLEND_DST);
var texture2D;
- capacity = capacity || cc.SpriteBatchNode.DEFAULT_CAPACITY;
if (cc.isString(fileImage)) {
texture2D = cc.textureCache.getTextureForKey(fileImage);
if (!texture2D)
@@ -75,72 +72,48 @@ cc.SpriteBatchNode = cc.Node.extend(/** @lends cc.SpriteBatchNode# */{
}else if (fileImage instanceof cc.Texture2D)
texture2D = fileImage;
- texture2D && this.initWithTexture(texture2D, capacity);
+ texture2D && this.initWithTexture(texture2D);
},
/**
*
- * This is the opposite of "addQuadFromSprite.
- * It add the sprite to the children and descendants array, but it doesn't update add it to the texture atlas
+ * Same as addChild
*
* initializes a cc.SpriteBatchNode with a file image (.png, .jpeg, .pvr, etc) and a capacity of children.
@@ -185,11 +153,10 @@ cc.SpriteBatchNode = cc.Node.extend(/** @lends cc.SpriteBatchNode# */{
},
/**
- * Increase Atlas Capacity
+ * Do nothing
+ * @deprecated since v3.12
*/
- increaseAtlasCapacity: function () {
- this._renderCmd.increaseAtlasCapacity();
- },
+ increaseAtlasCapacity: function () {},
/**
* Removes a child given a certain index. It will also cleanup the running actions depending on the cleanup parameter.
@@ -202,32 +169,13 @@ cc.SpriteBatchNode = cc.Node.extend(/** @lends cc.SpriteBatchNode# */{
},
/**
- * Rebuild index in order for child
+ * Do nothing
* @param {cc.Sprite} pobParent
* @param {Number} index
* @return {Number}
+ * @deprecated since v3.12
*/
rebuildIndexInOrder: function (pobParent, index) {
- var children = pobParent.children;
- if (children && children.length > 0) {
- for (var i = 0; i < children.length; i++) {
- var obj = children[i];
- if (obj && (obj.zIndex < 0))
- index = this.rebuildIndexInOrder(obj, index);
- }
- }
- // ignore self (batch node)
- if (!pobParent === this) {
- pobParent.atlasIndex = index;
- index++;
- }
- if (children && children.length > 0) {
- for (i = 0; i < children.length; i++) {
- obj = children[i];
- if (obj && (obj.zIndex >= 0))
- index = this.rebuildIndexInOrder(obj, index);
- }
- }
return index;
},
@@ -235,12 +183,12 @@ cc.SpriteBatchNode = cc.Node.extend(/** @lends cc.SpriteBatchNode# */{
* Returns highest atlas index in child
* @param {cc.Sprite} sprite
* @return {Number}
+ * @deprecated since v3.12
*/
highestAtlasIndexInChild: function (sprite) {
var children = sprite.children;
-
if (!children || children.length === 0)
- return sprite.atlasIndex;
+ return sprite.zIndex;
else
return this.highestAtlasIndexInChild(children[children.length - 1]);
},
@@ -249,60 +197,30 @@ cc.SpriteBatchNode = cc.Node.extend(/** @lends cc.SpriteBatchNode# */{
* Returns lowest atlas index in child
* @param {cc.Sprite} sprite
* @return {Number}
+ * @deprecated since v3.12
*/
lowestAtlasIndexInChild: function (sprite) {
var children = sprite.children;
if (!children || children.length === 0)
- return sprite.atlasIndex;
+ return sprite.zIndex;
else
return this.lowestAtlasIndexInChild(children[children.length - 1]);
},
/**
- * Returns atlas index for child
+ * Returns index for child
* @param {cc.Sprite} sprite
- * @param {Number} nZ
* @return {Number}
+ * @deprecated since v3.12
*/
- atlasIndexForChild: function (sprite, nZ) {
- var selParent = sprite.parent;
- var brothers = selParent.children;
- var childIndex = brothers.indexOf(sprite);
-
- // ignore parent Z if parent is spriteSheet
- var ignoreParent = selParent === this;
- var previous = null;
- if (childIndex > 0 && childIndex < cc.UINT_MAX)
- previous = brothers[childIndex - 1];
-
- // first child of the sprite sheet
- if (ignoreParent) {
- if (childIndex === 0)
- return 0;
- return this.highestAtlasIndexInChild(previous) + 1;
- }
-
- // parent is a cc.Sprite, so, it must be taken into account
- // first child of an cc.Sprite ?
- if (childIndex === 0) {
- // less than parent and brothers
- if (nZ < 0)
- return selParent.atlasIndex;
- else
- return selParent.atlasIndex + 1;
- } else {
- // previous & sprite belong to the same branch
- if ((previous.zIndex < 0 && nZ < 0) || (previous.zIndex >= 0 && nZ >= 0))
- return this.highestAtlasIndexInChild(previous) + 1;
-
- // else (previous < 0 and sprite >= 0 )
- return selParent.atlasIndex + 1;
- }
+ atlasIndexForChild: function (sprite) {
+ return sprite.zIndex;
},
/**
* Sprites use this to start sortChildren, don't call this manually
* @param {Boolean} reorder
+ * @deprecated since v3.12
*/
reorderBatch: function (reorder) {
this._reorderChildDirty = reorder;
@@ -328,45 +246,6 @@ cc.SpriteBatchNode = cc.Node.extend(/** @lends cc.SpriteBatchNode# */{
return new cc.BlendFunc(this._blendFunc.src,this._blendFunc.dst);
},
- /**
- * Reorder children (override reorderChild of cc.Node)
- * @override
- * @param {cc.Sprite} child
- * @param {Number} zOrder
- */
- reorderChild: function (child, zOrder) {
- cc.assert(child, cc._LogInfos.SpriteBatchNode_reorderChild_2);
- if (this._children.indexOf(child) === -1) {
- cc.log(cc._LogInfos.SpriteBatchNode_reorderChild);
- return;
- }
- if (zOrder === child.zIndex)
- return;
-
- //set the z-order and sort later
- cc.Node.prototype.reorderChild.call(this, child, zOrder);
- //this.setNodeDirty();
- },
-
- /**
- * Removes a child from cc.SpriteBatchNode (override removeChild of cc.Node)
- * @param {cc.Sprite} child
- * @param {Boolean} cleanup
- */
- removeChild: function (child, cleanup) {
- // explicit null handling
- if (child == null)
- return;
- if (this._children.indexOf(child) === -1) {
- cc.log(cc._LogInfos.SpriteBatchNode_removeChild);
- return;
- }
-
- // cleanup before removing
- this.removeSpriteFromAtlas(child);
- cc.Node.prototype.removeChild.call(this, child, cleanup);
- },
-
/**
*
* Updates a quad at a certain index into the texture atlas. The CCSprite won't be added into the children array.
@@ -383,155 +262,71 @@ cc.SpriteBatchNode = cc.Node.extend(/** @lends cc.SpriteBatchNode# */{
cc.log(cc._LogInfos.CCSpriteBatchNode_updateQuadFromSprite);
return;
}
- this._renderCmd.checkAtlasCapacity();
//
// update the quad directly. Don't add the sprite to the scene graph
//
- sprite.batchNode = this;
- sprite.atlasIndex = index;
sprite.dirty = true;
// UpdateTransform updates the textureAtlas quad
- sprite.updateTransform();
+ sprite._renderCmd.transform(this._renderCmd, true);
},
/**
*
- * Inserts a quad at a certain index into the texture atlas. The cc.Sprite won't be added into the children array.
- * This method should be called only when you are dealing with very big AtlasSprite and when most of the cc.Sprite won't be updated.
- * For example: a tile map (cc.TMXMap) or a label with lots of characters (cc.LabelBMFont)
+ * Same as addChild(sprite, index)
*
- * Initializes a cc.SpriteBatchNode with a texture2d and capacity of children.
- * The capacity will be increased in 33% in runtime if it run out of space.
- * Please pass parameters to constructor to initialize the sprite batch node, do not call this function yourself.
- *
* creates a cc.SpriteBatchNodeCanvas with a file image (.png, .jpg etc) with a default capacity of 29 children.
@@ -661,11 +422,10 @@ cc.SpriteBatchNode.DEFAULT_CAPACITY = 29;
* @deprecated since v3.0, please use new construction instead
* @see cc.SpriteBatchNode
* @param {String|cc.Texture2D} fileImage
- * @param {Number} capacity
* @return {cc.SpriteBatchNode}
*/
-cc.SpriteBatchNode.create = function (fileImage, capacity) {
- return new cc.SpriteBatchNode(fileImage, capacity);
+cc.SpriteBatchNode.create = function (fileImage) {
+ return new cc.SpriteBatchNode(fileImage);
};
/**
diff --git a/cocos2d/core/sprites/CCSpriteBatchNodeCanvasRenderCmd.js b/cocos2d/core/sprites/CCSpriteBatchNodeCanvasRenderCmd.js
deleted file mode 100644
index facfbb0277..0000000000
--- a/cocos2d/core/sprites/CCSpriteBatchNodeCanvasRenderCmd.js
+++ /dev/null
@@ -1,100 +0,0 @@
-/****************************************************************************
- Copyright (c) 2013-2014 Chukong Technologies Inc.
-
- http://www.cocos2d-x.org
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- ****************************************************************************/
-
-(function(){
- //SpriteBatchNode's canvas render command
- cc.SpriteBatchNode.CanvasRenderCmd = function(renderable){
- cc.Node.CanvasRenderCmd.call(this, renderable);
-
- this._texture = null;
- this._textureToRender = null;
- };
-
- var proto = cc.SpriteBatchNode.CanvasRenderCmd.prototype = Object.create(cc.Node.CanvasRenderCmd.prototype);
- proto.constructor = cc.SpriteBatchNode.CanvasRenderCmd;
-
- proto.checkAtlasCapacity = function(){};
-
- proto.isValidChild = function(child){
- if (!(child instanceof cc.Sprite)) {
- cc.log(cc._LogInfos.Sprite_addChild_4);
- return false;
- }
- return true;
- };
-
- proto.initWithTexture = function(texture, capacity){
- this._textureToRender = this._texture = texture;
- };
-
- proto.insertQuad = function(sprite, index){};
-
- proto.increaseAtlasCapacity = function(){};
-
- proto.removeQuadAtIndex = function(){};
-
- proto.removeAllQuads = function(){};
-
- proto.getTexture = function(){
- return this._texture;
- };
-
- proto.setTexture = function(texture){
- this._texture = texture;
- var locChildren = this._node._children;
- for (var i = 0; i < locChildren.length; i++)
- locChildren[i].setTexture(texture);
- };
-
- proto.updateChildrenAtlasIndex = function(children){
- this._node._descendants.length = 0;
- //update _descendants after sortAllChildren
- for (var i = 0, len = children.length; i < len; i++)
- this._updateAtlasIndex(children[i]);
- };
-
- proto._updateAtlasIndex = function (sprite) {
- var locDescendants = this._node._descendants;
- var pArray = sprite.children, i, len = pArray.length;
- for (i = 0; i < len; i++) {
- if (pArray[i]._localZOrder < 0) {
- locDescendants.push(pArray[i]);
- } else
- break
- }
- locDescendants.push(sprite);
- for (; i < len; i++) {
- locDescendants.push(pArray[i]);
- }
- };
-
- proto.getTextureAtlas = function(){};
-
- proto.setTextureAtlas = function(textureAtlas){};
-
- proto.cutting = function(sprite, index){
- var node = this._node;
- node._children.splice(index, 0, sprite);
- }
-})();
\ No newline at end of file
diff --git a/cocos2d/core/sprites/CCSpriteBatchNodeWebGLRenderCmd.js b/cocos2d/core/sprites/CCSpriteBatchNodeWebGLRenderCmd.js
deleted file mode 100644
index d61973d7e7..0000000000
--- a/cocos2d/core/sprites/CCSpriteBatchNodeWebGLRenderCmd.js
+++ /dev/null
@@ -1,243 +0,0 @@
-/****************************************************************************
- Copyright (c) 2013-2014 Chukong Technologies Inc.
-
- http://www.cocos2d-x.org
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- ****************************************************************************/
-
-(function(){
- //SpriteBatchNode's WebGL render command
- cc.SpriteBatchNode.WebGLRenderCmd = function(renderable){
- cc.Node.WebGLRenderCmd.call(this, renderable);
- this._needDraw = true;
-
- this._textureAtlas = null;
- };
-
- var proto = cc.SpriteBatchNode.WebGLRenderCmd.prototype = Object.create(cc.Node.WebGLRenderCmd.prototype);
- proto.constructor = cc.SpriteBatchNode.WebGLRenderCmd;
-
- proto.isValidChild = function(child){
- if (!(child instanceof cc.Sprite)) {
- cc.log(cc._LogInfos.Sprite_addChild_4);
- return false;
- }
- if (child.texture != this.getTexture()) {
- cc.log(cc._LogInfos.Sprite_addChild_5);
- return false;
- }
- return true;
- };
-
- proto.rendering = function () {
- var node = this._node;
- if (this._textureAtlas.totalQuads === 0)
- return;
-
- this._shaderProgram.use();
- this._shaderProgram._setUniformForMVPMatrixWithMat4(this._stackMatrix);
- node._arrayMakeObjectsPerformSelector(node._children, cc.Node._stateCallbackType.updateTransform);
- cc.glBlendFunc(node._blendFunc.src, node._blendFunc.dst);
-
- this._textureAtlas.drawQuads();
- };
-
- proto.visit = function(parentCmd){
- var node = this._node;
- // quick return if not visible
- if (!node._visible)
- return;
-
- if (node._parent && node._parent._renderCmd)
- this._curLevel = node._parent._renderCmd._curLevel + 1;
-
- var currentStack = cc.current_stack;
-
- //optimize performance for javascript
- currentStack.stack.push(currentStack.top);
-
- if(!(this._dirtyFlag & cc.Node._dirtyFlags.transformDirty)) //batchNode's transform must update in visit
- this.transform(parentCmd);
- this.updateStatus(parentCmd); //because batchNode doesn't visit its children.
- currentStack.top = this._stackMatrix;
-
- node.sortAllChildren();
-
- cc.renderer.pushRenderCommand(this);
-
- this._dirtyFlag = 0;
- //optimize performance for javascript
- currentStack.top = currentStack.stack.pop();
- };
-
- proto.checkAtlasCapacity = function(index){
- // make needed room
- var locAtlas = this._textureAtlas;
- while (index >= locAtlas.capacity || locAtlas.capacity === locAtlas.totalQuads) {
- this.increaseAtlasCapacity();
- }
- };
-
- proto.increaseAtlasCapacity = function(){
- // if we're going beyond the current TextureAtlas's capacity,
- // all the previously initialized sprites will need to redo their texture coords
- // this is likely computationally expensive
- var locCapacity = this._textureAtlas.capacity;
- var quantity = Math.floor((locCapacity + 1) * 4 / 3);
-
- cc.log(cc._LogInfos.SpriteBatchNode_increaseAtlasCapacity, locCapacity, quantity);
-
- if (!this._textureAtlas.resizeCapacity(quantity)) {
- // serious problems
- cc.log(cc._LogInfos.SpriteBatchNode_increaseAtlasCapacity_2);
- }
- };
-
- proto.initWithTexture = function(texture, capacity){
- this._textureAtlas = new cc.TextureAtlas();
- this._textureAtlas.initWithTexture(texture, capacity);
- this._updateBlendFunc();
- this._shaderProgram = cc.shaderCache.programForKey(cc.SHADER_POSITION_TEXTURECOLOR);
- };
-
- proto.insertQuad = function(sprite, index){
- var locTextureAtlas = this._textureAtlas;
- if (locTextureAtlas.totalQuads >= locTextureAtlas.capacity)
- this.increaseAtlasCapacity();
- locTextureAtlas.insertQuad(sprite.quad, index);
- };
-
- proto.removeQuadAtIndex = function(index){
- this._textureAtlas.removeQuadAtIndex(index); // remove from TextureAtlas
- };
-
- proto.getTexture = function(){
- return this._textureAtlas.texture;
- };
-
- proto.setTexture = function(texture){
- this._textureAtlas.setTexture(texture);
- if(texture)
- this._updateBlendFunc();
- };
-
- proto.removeAllQuads = function(){
- this._textureAtlas.removeAllQuads();
- };
-
- proto._swap = function (oldIndex, newIndex) {
- var locDescendants = this._node._descendants;
- var locTextureAtlas = this._textureAtlas;
- var quads = locTextureAtlas.quads;
- var tempItem = locDescendants[oldIndex];
- var tempIteQuad = cc.V3F_C4B_T2F_QuadCopy(quads[oldIndex]);
-
- //update the index of other swapped item
- locDescendants[newIndex].atlasIndex = oldIndex;
- locDescendants[oldIndex] = locDescendants[newIndex];
-
- locTextureAtlas.updateQuad(quads[newIndex], oldIndex);
- locDescendants[newIndex] = tempItem;
- locTextureAtlas.updateQuad(tempIteQuad, newIndex);
- };
-
- proto._updateAtlasIndex = function (sprite, curIndex) {
- var count = 0;
- var pArray = sprite.children;
- if (pArray)
- count = pArray.length;
-
- var oldIndex = 0;
- if (count === 0) {
- oldIndex = sprite.atlasIndex;
- sprite.atlasIndex = curIndex;
- sprite.arrivalOrder = 0;
- if (oldIndex !== curIndex)
- this._swap(oldIndex, curIndex);
- curIndex++;
- } else {
- var needNewIndex = true;
- if (pArray[0].zIndex >= 0) {
- //all children are in front of the parent
- oldIndex = sprite.atlasIndex;
- sprite.atlasIndex = curIndex;
- sprite.arrivalOrder = 0;
- if (oldIndex !== curIndex)
- this._swap(oldIndex, curIndex);
- curIndex++;
- needNewIndex = false;
- }
- for (var i = 0; i < pArray.length; i++) {
- var child = pArray[i];
- if (needNewIndex && child.zIndex >= 0) {
- oldIndex = sprite.atlasIndex;
- sprite.atlasIndex = curIndex;
- sprite.arrivalOrder = 0;
- if (oldIndex !== curIndex) {
- this._swap(oldIndex, curIndex);
- }
- curIndex++;
- needNewIndex = false;
- }
- curIndex = this._updateAtlasIndex(child, curIndex);
- }
-
- if (needNewIndex) {
- //all children have a zOrder < 0)
- oldIndex = sprite.atlasIndex;
- sprite.atlasIndex = curIndex;
- sprite.arrivalOrder = 0;
- if (oldIndex !== curIndex) {
- this._swap(oldIndex, curIndex);
- }
- curIndex++;
- }
- }
- return curIndex;
- };
-
- proto.updateChildrenAtlasIndex = function(children){
- var index = 0;
- //fast dispatch, give every child a new atlasIndex based on their relative zOrder (keep parent -> child relations intact)
- // and at the same time reorder descedants and the quads to the right index
- for (var i = 0; i < children.length; i++)
- index = this._updateAtlasIndex(children[i], index);
- };
-
- proto._updateBlendFunc = function () {
- if (!this._textureAtlas.texture.hasPremultipliedAlpha()) {
- var blendFunc = this._node._blendFunc;
- blendFunc.src = cc.SRC_ALPHA;
- blendFunc.dst = cc.ONE_MINUS_SRC_ALPHA;
- }
- };
-
- proto.getTextureAtlas = function(){
- return this._textureAtlas;
- };
-
- proto.setTextureAtlas = function(textureAtlas){
- if (textureAtlas !== this._textureAtlas) {
- this._textureAtlas = textureAtlas;
- }
- };
-
- proto.cutting = function(){};
-})();
diff --git a/cocos2d/core/sprites/CCSpriteCanvasRenderCmd.js b/cocos2d/core/sprites/CCSpriteCanvasRenderCmd.js
index 572141bb16..2401418b58 100644
--- a/cocos2d/core/sprites/CCSpriteCanvasRenderCmd.js
+++ b/cocos2d/core/sprites/CCSpriteCanvasRenderCmd.js
@@ -44,12 +44,8 @@
var proto = cc.Sprite.CanvasRenderCmd.prototype = Object.create(cc.Node.CanvasRenderCmd.prototype);
proto.constructor = cc.Sprite.CanvasRenderCmd;
- proto._init = function () {};
-
proto.setDirtyRecursively = function (value) {};
- proto._resetForBatchNode = function () {};
-
proto._setTexture = function (texture) {
var node = this._node;
if (node._texture !== texture) {
@@ -189,11 +185,6 @@
}
};
- proto.getQuad = function () {
- //throw an error. it doesn't support this function.
- return null;
- };
-
proto._updateForSetSpriteFrame = function (pNewTexture, textureLoaded){
this._colorized = false;
this._textureCoord.renderX = this._textureCoord.x;
@@ -206,34 +197,6 @@
}
};
- proto.updateTransform = function () { //TODO need delete, because Canvas needn't
- var _t = this, node = this._node;
-
- // re-calculate matrix only if it is dirty
- if (node.dirty) {
- // If it is not visible, or one of its ancestors is not visible, then do nothing:
- var locParent = node._parent;
- if (!node._visible || ( locParent && locParent !== node._batchNode && locParent._shouldBeHidden)) {
- node._shouldBeHidden = true;
- } else {
- node._shouldBeHidden = false;
-
- if (!locParent || locParent === node._batchNode) {
- node._transformToBatch = _t.getNodeToParentTransform();
- } else {
- //cc.assert(_t._parent instanceof cc.Sprite, "Logic error in CCSprite. Parent must be a CCSprite");
- node._transformToBatch = cc.affineTransformConcat(_t.getNodeToParentTransform(), locParent._transformToBatch);
- }
- }
- node._recursiveDirty = false;
- node.dirty = false;
- }
-
- // recursively iterate over children
- if (node._hasChildren)
- node._arrayMakeObjectsPerformSelector(node._children, cc.Node._stateCallbackType.updateTransform);
- };
-
proto._spriteFrameLoadedCallback = function (spriteFrame) {
var node = this;
node.setTextureRect(spriteFrame.getRect(), spriteFrame.isRotated(), spriteFrame.getOriginalSize());
diff --git a/cocos2d/core/sprites/CCSpriteWebGLRenderCmd.js b/cocos2d/core/sprites/CCSpriteWebGLRenderCmd.js
index 35fac68ccb..a5ef8b4057 100644
--- a/cocos2d/core/sprites/CCSpriteWebGLRenderCmd.js
+++ b/cocos2d/core/sprites/CCSpriteWebGLRenderCmd.js
@@ -25,100 +25,26 @@
//Sprite's WebGL render command
(function() {
- var _resetPointers = true;
-
cc.Sprite.WebGLRenderCmd = function (renderable) {
cc.Node.WebGLRenderCmd.call(this, renderable);
this._needDraw = true;
this._vertices = [
- {x: 0, y: 0, z: 0}, // tl
- {x: 0, y: 0, z: 0}, // bl
- {x: 0, y: 0, z: 0}, // tr
- {x: 0, y: 0, z: 0} // br
+ {x: 0, y: 0, u: 0, v: 0}, // tl
+ {x: 0, y: 0, u: 0, v: 0}, // bl
+ {x: 0, y: 0, u: 0, v: 0}, // tr
+ {x: 0, y: 0, u: 0, v: 0} // br
];
- var length = this.vertexBytesPerUnit;
- var bufInfo = cc.renderer.requestBuffer(length);
- this._buffer = bufInfo.buffer;
- this._bufferOffset = bufInfo.offset;
- this._quad = new cc.V3F_C4B_T2F_Quad(null, null, null, null, this._buffer.data, this._bufferOffset);
- this._float32View = new Float32Array(this._buffer.data, this._bufferOffset, length / 4);
- this._uint32View = new Uint32Array(this._buffer.data, this._bufferOffset, length / 4);
-
- // Separated webgl buffer implementation
- // this._buffer = new ArrayBuffer(length);
- // this._bufferOffset = 0;
- // this._quad = new cc.V3F_C4B_T2F_Quad(null, null, null, null, this._buffer, this._bufferOffset);
- // this._float32View = new Float32Array(this._buffer, this._bufferOffset, length / 4);
- // this._uint32View = new Uint32Array(this._buffer, this._bufferOffset, length / 4);
- // // Init buffer
- // var gl = cc._renderContext;
- // this._glBuffer = gl.createBuffer();
- // gl.bindBuffer(gl.ARRAY_BUFFER, this._glBuffer);
- // gl.bufferData(gl.ARRAY_BUFFER, length, gl.DYNAMIC_DRAW);
-
+ this._color = new Uint32Array(1);
this._dirty = false;
- this._bufferDirty = false;
this._recursiveDirty = false;
- this._vBuffer = null;
- this._vertexOffset = 0;
- if (!proto.batchShader) {
- proto.batchShader = cc.shaderCache.programForKey(cc.SHADER_SPRITE_POSITION_TEXTURECOLORALPHATEST);
- }
+ this._shaderProgram = cc.shaderCache.programForKey(cc.SHADER_SPRITE_POSITION_TEXTURECOLORALPHATEST);
};
var proto = cc.Sprite.WebGLRenderCmd.prototype = Object.create(cc.Node.WebGLRenderCmd.prototype);
proto.constructor = cc.Sprite.WebGLRenderCmd;
- // The following static properties must be provided for a auto batchable command
- proto.vertexBytesPerUnit = cc.V3F_C4B_T2F_Quad.BYTES_PER_ELEMENT;
- proto.bytesPerUnit = proto.vertexBytesPerUnit;
- proto.indicesPerUnit = 6;
- proto.verticesPerUnit = 4;
- proto._supportBatch = true;
-
- proto.batchShader = null;
-
- proto.getBatchInfo = function (info) {
- info.texture = this._node._texture;
- info.blendSrc = this._node._blendFunc.src;
- info.blendDst = this._node._blendFunc.dst;
- info.shader = this.batchShader;
- };
-
- proto._invalidBatch = function () {
- if (this._vBuffer) {
- this._vBuffer.valid = false;
- }
- };
-
- proto.updateBuffer = function () {
- if (!this._buffer) {
- var length = this.vertexBytesPerUnit;
- var bufInfo = cc.renderer.requestBuffer(length);
- this._buffer = bufInfo.buffer;
- this._bufferOffset = bufInfo.offset;
- this._quad = new cc.V3F_C4B_T2F_Quad(null, null, null, null, this._buffer.data, this._bufferOffset);
- this._float32View = new Float32Array(this._quad.arrayBuffer, this._bufferOffset, length / 4);
- this._uint32View = new Uint32Array(this._quad.arrayBuffer, this._bufferOffset, length / 4);
-
- this._setTextureCoords(this._node._rect);
- this._updateColor();
- this._updateVertexBuffer();
- }
- };
-
- proto.freeBuffer = function () {
- if (this._buffer) {
- this._buffer.freeBuffer(this._bufferOffset, this.vertexBytesPerUnit);
- this._buffer = null;
- this._bufferOffset = 0;
- this._quad = null;
- this._float32View = null;
- }
- };
-
proto.updateBlendFunc = function (blendFunc) {};
proto.setDirtyFlag = function(dirtyFlag){
@@ -165,38 +91,6 @@
&& cc.pointEqualToPoint(frame.getOffset(), node._unflippedOffsetPositionFromCenter));
};
- proto._init = function () {
- this.updateBuffer();
- var tempColor = {r: 255, g: 255, b: 255, a: 255}, quad = this._quad;
- quad.bl.colors = tempColor;
- quad.br.colors = tempColor;
- quad.tl.colors = tempColor;
- quad.tr.colors = tempColor;
- this._bufferDirty = true;
- this._buffer.setDirty();
- };
-
- proto._resetForBatchNode = function () {
- var node = this._node;
- var x1 = node._offsetPosition.x;
- var y1 = node._offsetPosition.y;
- var x2 = x1 + node._rect.width;
- var y2 = y1 + node._rect.height;
- var vertices = this._vertices;
- vertices[0].x = x1; vertices[0].y = y2; // tl
- vertices[1].x = x1; vertices[1].y = y1; // bl
- vertices[2].x = x2; vertices[2].y = y2; // tr
- vertices[3].x = x2; vertices[3].y = y1; // br
- this._bufferDirty = true;
- if (this._buffer) {
- this._buffer.setDirty();
- }
- };
-
- proto.getQuad = function () {
- return this._quad;
- };
-
proto._updateForSetSpriteFrame = function () {};
proto._spriteFrameLoadedCallback = function (spriteFrame) {
@@ -205,7 +99,6 @@
};
proto._textureLoadedCallback = function (sender) {
- var renderCmd = this._renderCmd;
if (this._textureLoaded)
return;
@@ -225,6 +118,9 @@
// if the sprite is added to a batchnode, then it will automatically switch to "batchnode Render"
this.setBatchNode(this._batchNode);
this.dispatchEvent("load");
+
+ // Force refresh the render command list
+ cc.renderer.childrenOrderDirty = true;
};
proto._setTextureCoords = function (rect, needConvert) {
@@ -232,10 +128,11 @@
needConvert = true;
if (needConvert)
rect = cc.rectPointsToPixels(rect);
- var node = this._node, locQuad = this._quad;
+ var node = this._node;
var tex = node._batchNode ? node.textureAtlas.texture : node._texture;
- if (!tex || !locQuad)
+ var uvs = this._vertices;
+ if (!tex)
return;
var atlasWidth = tex.pixelsWidth;
@@ -267,14 +164,14 @@
right = tempSwap;
}
- locQuad.bl.texCoords.u = left;
- locQuad.bl.texCoords.v = top;
- locQuad.br.texCoords.u = left;
- locQuad.br.texCoords.v = bottom;
- locQuad.tl.texCoords.u = right;
- locQuad.tl.texCoords.v = top;
- locQuad.tr.texCoords.u = right;
- locQuad.tr.texCoords.v = bottom;
+ uvs[0].u = right; // tl
+ uvs[0].v = top; // tl
+ uvs[1].u = left; // bl
+ uvs[1].v = top; // bl
+ uvs[2].u = right; // tr
+ uvs[2].v = bottom; // tr
+ uvs[3].u = left; // br
+ uvs[3].v = bottom; // br
} else {
if (cc.FIX_ARTIFACTS_BY_STRECHING_TEXEL) {
left = (2 * rect.x + 1) / (2 * atlasWidth);
@@ -300,82 +197,19 @@
bottom = tempSwap;
}
- locQuad.bl.texCoords.u = left;
- locQuad.bl.texCoords.v = bottom;
- locQuad.br.texCoords.u = right;
- locQuad.br.texCoords.v = bottom;
- locQuad.tl.texCoords.u = left;
- locQuad.tl.texCoords.v = top;
- locQuad.tr.texCoords.u = right;
- locQuad.tr.texCoords.v = top;
- }
- this._bufferDirty = true;
- this._buffer.setDirty();
- };
-
- proto._updateVertexBuffer = function () {
- if (this._buffer) {
- var mat = this._stackMatrix.mat,
- vertices = this._vertices,
- buffer = this._float32View,
- i, x, y, offset = 0,
- row = cc.V3F_C4B_T2F_Quad.BYTES_PER_ELEMENT / 16;
-
- for (i = 0; i < 4; ++i) {
- x = vertices[i].x;
- y = vertices[i].y;
- buffer[offset] = x * mat[0] + y * mat[4] + mat[12];
- buffer[offset+1] = x * mat[1] + y * mat[5] + mat[13];
- buffer[offset+2] = mat[14];
- offset += row;
- }
-
- this._bufferDirty = true;
- this._buffer.setDirty();
+ uvs[0].u = left; // tl
+ uvs[0].v = top; // tl
+ uvs[1].u = left; // bl
+ uvs[1].v = bottom; // bl
+ uvs[2].u = right; // tr
+ uvs[2].v = top; // tr
+ uvs[3].u = right; // br
+ uvs[3].v = bottom; // br
}
};
- proto.transform = function (parentCmd, recursive) {
- cc.Node.WebGLRenderCmd.prototype.transform.call(this, parentCmd, recursive);
-
- this._updateVertexBuffer();
- this._dirty = true; //use for batching
- this._savedDirtyFlag = true;
- };
-
proto._setColorDirty = function () {};
- proto._updateColor = function () {
- var locDisplayedColor = this._displayedColor, locDisplayedOpacity = this._displayedOpacity, node = this._node;
- var color4 = {r: locDisplayedColor.r, g: locDisplayedColor.g, b: locDisplayedColor.b, a: locDisplayedOpacity};
- // special opacity for premultiplied textures
- if (node._opacityModifyRGB) {
- color4.r *= locDisplayedOpacity / 255.0;
- color4.g *= locDisplayedOpacity / 255.0;
- color4.b *= locDisplayedOpacity / 255.0;
- }
- var locQuad = this._quad;
- if (locQuad) {
- locQuad.bl.colors = color4;
- locQuad.br.colors = color4;
- locQuad.tl.colors = color4;
- locQuad.tr.colors = color4;
- this._buffer.setDirty();
- }
-
- // renders using Sprite Manager
- if (node._batchNode) {
- if (node.atlasIndex !== cc.Sprite.INDEX_NOT_INITIALIZED) {
- node.textureAtlas.updateQuad(locQuad, node.atlasIndex);
- } else {
- // no need to set it recursively
- // update dirty_, don't update recursiveDirty_
- this._dirty = true;
- }
- }
- this._bufferDirty = true;
- };
-
proto._updateBlendFunc = function () {
if (this._batchNode) {
cc.log(cc._LogInfos.Sprite__updateBlendFunc);
@@ -396,7 +230,6 @@
}
node.opacityModifyRGB = true;
}
- this._invalidBatch();
};
proto._setTexture = function (texture) {
@@ -413,102 +246,13 @@
node._texture = texture;
// This will invalid current batch
this._updateBlendFunc();
- }
- }
-
- if (texture)
- this._shaderProgram = cc.shaderCache.programForKey(cc.SHADER_SPRITE_POSITION_TEXTURECOLORALPHATEST);
- else
- this._shaderProgram = cc.shaderCache.programForKey(cc.SHADER_SPRITE_POSITION_COLOR);
- };
- proto.updateTransform = function () { //called only at batching.
- var _t = this, node = this._node;
-
- // recalculate matrix only if it is dirty
- if (this._dirty) {
- var locQuad = _t._quad, locParent = node._parent;
- // If it is not visible, or one of its ancestors is not visible, then do nothing:
- if (!node._visible || ( locParent && locParent !== node._batchNode && locParent._shouldBeHidden)) {
- locQuad.br.vertices = locQuad.tl.vertices = locQuad.tr.vertices = locQuad.bl.vertices = {x: 0, y: 0, z: 0};
- node._shouldBeHidden = true;
- } else {
- node._shouldBeHidden = false;
- if(this._dirtyFlag !== 0){ //because changing color and opacity uses dirty flag at visit, but visit doesn't call at batching.
- this.updateStatus();
- this._dirtyFlag = 0;
- }
-
- if (!locParent || locParent === node._batchNode) {
- node._transformToBatch = _t.getNodeToParentTransform();
- } else {
- node._transformToBatch = cc.affineTransformConcat(_t.getNodeToParentTransform(), locParent._transformToBatch);
- }
-
- //
- // calculate the Quad based on the Affine Matrix
- //
- var locTransformToBatch = node._transformToBatch;
- var rect = node._rect;
- var x1 = node._offsetPosition.x;
- var y1 = node._offsetPosition.y;
-
- var x2 = x1 + rect.width;
- var y2 = y1 + rect.height;
- var x = locTransformToBatch.tx;
- var y = locTransformToBatch.ty;
-
- var cr = locTransformToBatch.a;
- var sr = locTransformToBatch.b;
- var cr2 = locTransformToBatch.d;
- var sr2 = -locTransformToBatch.c;
- var ax = x1 * cr - y1 * sr2 + x;
- var ay = x1 * sr + y1 * cr2 + y;
-
- var bx = x2 * cr - y1 * sr2 + x;
- var by = x2 * sr + y1 * cr2 + y;
-
- var cx = x2 * cr - y2 * sr2 + x;
- var cy = x2 * sr + y2 * cr2 + y;
-
- var dx = x1 * cr - y2 * sr2 + x;
- var dy = x1 * sr + y2 * cr2 + y;
-
- var locVertexZ = node._vertexZ;
- if (!cc.SPRITEBATCHNODE_RENDER_SUBPIXEL) {
- ax = 0 | ax;
- ay = 0 | ay;
- bx = 0 | bx;
- by = 0 | by;
- cx = 0 | cx;
- cy = 0 | cy;
- dx = 0 | dx;
- dy = 0 | dy;
+ if (node._textureLoaded) {
+ // Force refresh the render command list
+ cc.renderer.childrenOrderDirty = true;
}
- locQuad.bl.vertices = {x: ax, y: ay, z: locVertexZ};
- locQuad.br.vertices = {x: bx, y: by, z: locVertexZ};
- locQuad.tl.vertices = {x: dx, y: dy, z: locVertexZ};
- locQuad.tr.vertices = {x: cx, y: cy, z: locVertexZ};
}
- node.textureAtlas.updateQuad(locQuad, node.atlasIndex);
- node._recursiveDirty = false;
- this._dirty = false;
}
-
- // recursively iterate over children
- if (node._hasChildren)
- node._arrayMakeObjectsPerformSelector(node._children, cc.Node._stateCallbackType.updateTransform);
-
- /*if (cc.SPRITE_DEBUG_DRAW) { //TODO
- // draw bounding box
- var vertices = [
- cc.p(_t._quad.bl.vertices.x, _t._quad.bl.vertices.y),
- cc.p(_t._quad.br.vertices.x, _t._quad.br.vertices.y),
- cc.p(_t._quad.tr.vertices.x, _t._quad.tr.vertices.y),
- cc.p(_t._quad.tl.vertices.x, _t._quad.tl.vertices.y)
- ];
- cc._drawingUtil.drawPoly(vertices, 4, true);
- }*/
};
proto._checkTextureBoundary = function (texture, rect, rotated) {
@@ -530,107 +274,62 @@
}
};
+ proto.transform = function (parentCmd, recursive) {
+ this.originTransform(parentCmd, recursive);
+
+ var node = this._node,
+ lx = node._offsetPosition.x, rx = lx + node._rect.width,
+ by = node._offsetPosition.y, ty = by + node._rect.height,
+ wt = this._worldTransform;
+
+ var vertices = this._vertices;
+ vertices[0].x = lx * wt.a + ty * wt.c + wt.tx; // tl
+ vertices[0].y = lx * wt.b + ty * wt.d + wt.ty;
+ vertices[1].x = lx * wt.a + by * wt.c + wt.tx; // bl
+ vertices[1].y = lx * wt.b + by * wt.d + wt.ty;
+ vertices[2].x = rx * wt.a + ty * wt.c + wt.tx; // tr
+ vertices[2].y = rx * wt.b + ty * wt.d + wt.ty;
+ vertices[3].x = rx * wt.a + by * wt.c + wt.tx; // br
+ vertices[3].y = rx * wt.b + by * wt.d + wt.ty;
+ };
+
proto.needDraw = function () {
- return (this._buffer && this._needDraw);
+ var node = this._node, locTexture = node._texture;
+ return (this._needDraw && locTexture);
};
- proto.rendering = function (ctx) {
+ proto.uploadData = function (f32buffer, ui32buffer, vertexDataOffset) {
var node = this._node, locTexture = node._texture;
- if (!this._buffer || (locTexture && (!locTexture._textureLoaded || !node._rect.width || !node._rect.height)) || !this._displayedOpacity)
- return;
+ if (!(locTexture && locTexture._textureLoaded && node._rect.width && node._rect.height) || !this._displayedOpacity)
+ return false;
- var gl = ctx || cc._renderContext;
- //cc.assert(!_t._batchNode, "If cc.Sprite is being rendered by cc.SpriteBatchNode, cc.Sprite#draw SHOULD NOT be called");
-
- var program = this._shaderProgram;
- if (locTexture) {
- if (locTexture._textureLoaded) {
- program.use();
- program._updateProjectionUniform();
-
- cc.glBlendFunc(node._blendFunc.src, node._blendFunc.dst);
- //optimize performance for javascript
- cc.glBindTexture2DN(0, locTexture);
-
- var _bufferchanged = !gl.bindBuffer(gl.ARRAY_BUFFER, this._buffer.vertexBuffer);
- // if (this._bufferDirty) {
- // gl.bufferSubData(gl.ARRAY_BUFFER, this._bufferOffset, this._float32View);
- // this._bufferDirty = false;
- // }
- if (_resetPointers || _bufferchanged) {
- gl.enableVertexAttribArray(cc.VERTEX_ATTRIB_POSITION);
- gl.enableVertexAttribArray(cc.VERTEX_ATTRIB_COLOR);
- gl.enableVertexAttribArray(cc.VERTEX_ATTRIB_TEX_COORDS);
- gl.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 3, gl.FLOAT, false, 24, 0);
- gl.vertexAttribPointer(cc.VERTEX_ATTRIB_COLOR, 4, gl.UNSIGNED_BYTE, true, 24, 12);
- gl.vertexAttribPointer(cc.VERTEX_ATTRIB_TEX_COORDS, 2, gl.FLOAT, false, 24, 16);
- _resetPointers = false;
- }
- gl.drawArrays(gl.TRIANGLE_STRIP, this._bufferOffset / (this.vertexBytesPerUnit/4), 4);
- }
- } else {
- program.use();
- program._updateProjectionUniform();
-
- cc.glBlendFunc(node._blendFunc.src, node._blendFunc.dst);
-
- gl.bindBuffer(gl.ARRAY_BUFFER, this._buffer.vertexBuffer);
- // if (this._bufferDirty) {
- // gl.bufferSubData(gl.ARRAY_BUFFER, this._bufferOffset, this._float32View);
- // this._bufferDirty = false;
- // }
- gl.enableVertexAttribArray(cc.VERTEX_ATTRIB_POSITION);
- gl.enableVertexAttribArray(cc.VERTEX_ATTRIB_COLOR);
- gl.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 3, gl.FLOAT, false, 24, 0);
- gl.vertexAttribPointer(cc.VERTEX_ATTRIB_COLOR, 4, gl.UNSIGNED_BYTE, true, 24, 12);
- gl.drawArrays(gl.TRIANGLE_STRIP, this._bufferOffset / (this.vertexBytesPerUnit/4), 4);
- _resetPointers = true;
+ // Fill in vertex data with quad information (4 vertices for sprite)
+ var opacity = this._displayedOpacity;
+ var r = this._displayedColor.r,
+ g = this._displayedColor.g,
+ b = this._displayedColor.b;
+ if (node._opacityModifyRGB) {
+ var a = opacity / 255;
+ r *= a;
+ g *= a;
+ b *= a;
}
- cc.g_NumberOfDraws++;
-
- if (cc.SPRITE_DEBUG_DRAW === 0 && !node._showNode)
- return;
-
- cc.kmGLMatrixMode(cc.KM_GL_MODELVIEW);
- //cc.kmGLPushMatrixWitMat4(node._stackMatrix);
- cc.current_stack.stack.push(cc.current_stack.top);
- cc.current_stack.top = this._stackMatrix;
-
- if (cc.SPRITE_DEBUG_DRAW === 1 || node._showNode) {
- // draw bounding box
- var vertices = this._vertices;
- var verticesG1 = [
- cc.p(vertices[0].x, vertices[0].y),
- cc.p(vertices[2].x, vertices[2].y),
- cc.p(vertices[3].x, vertices[3].y),
- cc.p(vertices[1].x, vertices[1].y)
- ];
- cc._drawingUtil.drawPoly(verticesG1, 4, true);
- } else if (cc.SPRITE_DEBUG_DRAW === 2) {
- // draw texture box
- var drawRectG2 = node.getTextureRect();
- var offsetPixG2 = node.getOffsetPosition();
- var verticesG2 = [cc.p(offsetPixG2.x, offsetPixG2.y), cc.p(offsetPixG2.x + drawRectG2.width, offsetPixG2.y),
- cc.p(offsetPixG2.x + drawRectG2.width, offsetPixG2.y + drawRectG2.height), cc.p(offsetPixG2.x, offsetPixG2.y + drawRectG2.height)];
- cc._drawingUtil.drawPoly(verticesG2, 4, true);
- } // CC_SPRITE_DEBUG_DRAW
- cc.current_stack.top = cc.current_stack.stack.pop();
- };
+ this._color[0] = ((opacity<<24) | (b<<16) | (g<<8) | r);
+ var z = node._vertexZ;
- proto.batchVertexBuffer = function (f32buffer, int32buffer, vertexDataOffset) {
- // Fill in vertex data with quad information (4 vertices for sprite)
- var float32Data = this._float32View;
- var uint32Data = this._uint32View;
- var i, len = float32Data.length, colorId = 3;
+ var vertices = this._vertices;
+ var i, len = vertices.length, vertex, offset = vertexDataOffset;
for (i = 0; i < len; ++i) {
- if (i === colorId) {
- int32buffer[vertexDataOffset + i] = uint32Data[i];
- // 6 data per index
- colorId += 6;
- }
- else {
- f32buffer[vertexDataOffset + i] = float32Data[i];
- }
+ vertex = vertices[i];
+ f32buffer[offset] = vertex.x;
+ f32buffer[offset + 1] = vertex.y;
+ f32buffer[offset + 2] = z;
+ ui32buffer[offset + 3] = this._color[0];
+ f32buffer[offset + 4] = vertex.u;
+ f32buffer[offset + 5] = vertex.v;
+ offset += 6;
}
+
+ return len;
};
})();
\ No newline at end of file
diff --git a/cocos2d/core/textures/CCTextureCache.js b/cocos2d/core/textures/CCTextureCache.js
index a0763e209d..dcef25dc39 100644
--- a/cocos2d/core/textures/CCTextureCache.js
+++ b/cocos2d/core/textures/CCTextureCache.js
@@ -358,7 +358,8 @@ cc.game.addEventListener(cc.game.EVENT_RENDERER_INITED, function () {
tex = locTexs[url] = new cc.Texture2D();
tex.url = url;
- cc.loader.loadImg(url, function (err, img) {
+ var basePath = cc.loader.getBasePath ? cc.loader.getBasePath() : cc.loader.resPath;
+ cc.loader.loadImg(cc.path.join(basePath || "", url), function (err, img) {
if (err)
return cb && cb.call(target, err);
diff --git a/cocos2d/core/textures/TexturesWebGL.js b/cocos2d/core/textures/TexturesWebGL.js
index 21a1097724..dc92de6636 100644
--- a/cocos2d/core/textures/TexturesWebGL.js
+++ b/cocos2d/core/textures/TexturesWebGL.js
@@ -914,7 +914,8 @@ cc._tmp.WebGLTextureCache = function () {
tex = locTexs[url] = new cc.Texture2D();
tex.url = url;
- cc.loader.loadImg(url, function (err, img) {
+ var basePath = cc.loader.getBasePath ? cc.loader.getBasePath() : cc.loader.resPath;
+ cc.loader.loadImg(cc.path.join(basePath || "", url), function (err, img) {
if (err)
return cb && cb.call(target, err);
diff --git a/cocos2d/core/utils/CCProfiler.js b/cocos2d/core/utils/CCProfiler.js
index e84c76dec1..704f8697eb 100644
--- a/cocos2d/core/utils/CCProfiler.js
+++ b/cocos2d/core/utils/CCProfiler.js
@@ -1,5 +1,6 @@
cc.profiler = (function () {
- var _inited = false, _showFPS = false;
+ var _showFPS = false;
+ var _inited = false;
var _frames = 0, _frameRate = 0, _lastSPF = 0, _accumDt = 0;
var _afterVisitListener = null,
_FPSLabel = document.createElement('div'),
diff --git a/cocos2d/effects/CCGrid.js b/cocos2d/effects/CCGrid.js
index e58352707f..8c5cd08a22 100644
--- a/cocos2d/effects/CCGrid.js
+++ b/cocos2d/effects/CCGrid.js
@@ -250,26 +250,6 @@ cc.GridBase = cc.Class.extend(/** @lends cc.GridBase# */{
//cc.director.setProjection(this._directorProjection);
cc.director.setViewport();
- if (target && target.getCamera().isDirty()) {
- var offset = target.getAnchorPointInPoints();
-
- //TODO hack
- var stackMatrix = target._renderCmd._stackMatrix;
- //
- // XXX: Camera should be applied in the AnchorPoint
- //
- //cc.kmGLTranslatef(offset.x, offset.y, 0);
- var translation = cc.math.Matrix4.createByTranslation(offset.x, offset.y, 0);
- stackMatrix.multiply(translation);
-
- //target.getCamera().locate();
- target._camera._locateForRenderer(stackMatrix);
-
- //cc.kmGLTranslatef(-offset.x, -offset.y, 0);
- translation = cc.math.Matrix4.createByTranslation(-offset.x, -offset.y, 0, translation);
- stackMatrix.multiply(translation);
- }
-
cc.glBindTexture2D(this._texture);
this.beforeBlit();
this.blit(target);
@@ -362,6 +342,9 @@ cc.Grid3D = cc.GridBase.extend(/** @lends cc.Grid3D# */{
this._verticesBuffer=null;
this._indicesBuffer=null;
+ this._matrix = new cc.math.Matrix4();
+ this._matrix.identity();
+
if(gridSize !== undefined)
this.initWithSize(gridSize, texture, flipped, rect);
},
@@ -452,9 +435,18 @@ cc.Grid3D = cc.GridBase.extend(/** @lends cc.Grid3D# */{
blit:function (target) {
var n = this._gridSize.width * this._gridSize.height;
+
+ var wt = target._renderCmd._worldTransform;
+ this._matrix.mat[0] = wt.a;
+ this._matrix.mat[4] = wt.c;
+ this._matrix.mat[12] = wt.tx;
+ this._matrix.mat[1] = wt.b;
+ this._matrix.mat[5] = wt.d;
+ this._matrix.mat[13] = wt.ty;
+
this._shaderProgram.use();
//this._shaderProgram.setUniformsForBuiltins();
- this._shaderProgram._setUniformForMVPMatrixWithMat4(target._renderCmd._stackMatrix);
+ this._shaderProgram._setUniformForMVPMatrixWithMat4(this._matrix);
var gl = cc._renderContext, locDirty = this._dirty;
@@ -625,6 +617,9 @@ cc.TiledGrid3D = cc.GridBase.extend(/** @lends cc.TiledGrid3D# */{
this._verticesBuffer=null;
this._indicesBuffer=null;
+ this._matrix = new cc.math.Matrix4();
+ this._matrix.identity();
+
if(gridSize !== undefined)
this.initWithSize(gridSize, texture, flipped, rect);
},
@@ -712,8 +707,16 @@ cc.TiledGrid3D = cc.GridBase.extend(/** @lends cc.TiledGrid3D# */{
blit: function (target) {
var n = this._gridSize.width * this._gridSize.height;
+ var wt = target._renderCmd._worldTransform;
+ this._matrix.mat[0] = wt.a;
+ this._matrix.mat[4] = wt.c;
+ this._matrix.mat[12] = wt.tx;
+ this._matrix.mat[1] = wt.b;
+ this._matrix.mat[5] = wt.d;
+ this._matrix.mat[13] = wt.ty;
+
this._shaderProgram.use();
- this._shaderProgram._setUniformForMVPMatrixWithMat4(target._renderCmd._stackMatrix);
+ this._shaderProgram._setUniformForMVPMatrixWithMat4(this._matrix);
//this._shaderProgram.setUniformsForBuiltins();
//
diff --git a/cocos2d/labels/CCLabelAtlasWebGLRenderCmd.js b/cocos2d/labels/CCLabelAtlasWebGLRenderCmd.js
index ca1eded21d..9a7484d1ba 100644
--- a/cocos2d/labels/CCLabelAtlasWebGLRenderCmd.js
+++ b/cocos2d/labels/CCLabelAtlasWebGLRenderCmd.js
@@ -31,6 +31,25 @@
var proto = cc.LabelAtlas.WebGLRenderCmd.prototype = Object.create(cc.AtlasNode.WebGLRenderCmd.prototype);
proto.constructor = cc.LabelAtlas.WebGLRenderCmd;
+ proto._updateColor = function () {
+ if (this._colorF32Array) {
+ var locDisplayedColor = this._displayedColor;
+ var a = this._displayedOpacity / 255;
+ if (this._node._opacityModifyRGB) {
+ this._colorF32Array[0] = locDisplayedColor.r * a / 255;
+ this._colorF32Array[1] = locDisplayedColor.g * a / 255;
+ this._colorF32Array[2] = locDisplayedColor.b * a / 255;
+ this._colorF32Array[3] = a;
+ }
+ else {
+ this._colorF32Array[0] = locDisplayedColor.r / 255;
+ this._colorF32Array[1] = locDisplayedColor.g / 255;
+ this._colorF32Array[2] = locDisplayedColor.b / 255;
+ this._colorF32Array[3] = a;
+ }
+ }
+ };
+
proto.setCascade = function(){
var node = this._node;
node._cascadeOpacityEnabled = true;
@@ -71,8 +90,6 @@
if (n > locTextureAtlas.getCapacity())
cc.log("cc.LabelAtlas._updateAtlasValues(): Invalid String length");
var quads = locTextureAtlas.quads;
- var locDisplayedColor = this._displayedColor;
- var curColor = {r: locDisplayedColor.r, g: locDisplayedColor.g, b: locDisplayedColor.b, a: node._displayedOpacity};
var locItemWidth = node._itemWidth;
var locItemHeight = node._itemHeight;
for (var i = 0, cr = -1; i < n; i++) {
@@ -121,11 +138,10 @@
locQuadTR.vertices.x = cr * locItemWidth + locItemWidth;
locQuadTR.vertices.y = node._itemHeight;
locQuadTR.vertices.z = 0.0;
- locQuadTL.colors = curColor;
- locQuadTR.colors = curColor;
- locQuadBL.colors = curColor;
- locQuadBR.colors = curColor;
}
+
+ this._updateColor();
+
this.updateContentSize(i, cr+1);
if (n > 0) {
locTextureAtlas.dirty = true;
diff --git a/cocos2d/labels/CCLabelBMFont.js b/cocos2d/labels/CCLabelBMFont.js
index 474eb0067a..0dd628e128 100644
--- a/cocos2d/labels/CCLabelBMFont.js
+++ b/cocos2d/labels/CCLabelBMFont.js
@@ -29,11 +29,6 @@
http://slick.cokeandcode.com/demos/hiero.jnlp (Free, Java)
http://www.angelcode.com/products/bmfont/ (Free, Windows only)
****************************************************************************/
-/**
- * @constant
- * @type Number
- */
-cc.LABEL_AUTOMATIC_WIDTH = -1;
/**
*
cc.LabelBMFont is a subclass of cc.SpriteBatchNode.
@@ -108,8 +103,6 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ _lineBreakWithoutSpaces: false, _imageOffset: null, - _reusedChar: null, - _textureLoaded: false, _className: "LabelBMFont", @@ -153,7 +146,6 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ ctor: function (str, fntFile, width, alignment, imageOffset) { cc.SpriteBatchNode.prototype.ctor.call(this); this._imageOffset = cc.p(0, 0); - this._reusedChar = []; this._cascadeColorEnabled = true; this._cascadeOpacityEnabled = true; this.initWithString(str, fntFile, width, alignment, imageOffset); @@ -224,7 +216,6 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ */ initWithString: function (str, fntFile, width, alignment, imageOffset) { var self = this, theString = str || ""; - var cmd = this._renderCmd; if (self._config) cc.log("cc.LabelBMFont.initWithString(): re-init is no longer supported"); @@ -262,7 +253,7 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ if (self.initWithTexture(texture, theString.length)) { self._alignment = alignment || cc.TEXT_ALIGNMENT_LEFT; self._imageOffset = imageOffset || cc.p(0, 0); - self._width = (width == null) ? -1 : width; + self._width = (width === undefined) ? -1 : width; self._realOpacity = 255; self._realColor = cc.color(255, 255, 255, 255); @@ -272,8 +263,6 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ self.setAnchorPoint(0.5, 0.5); - this._renderCmd._initBatchTexture(); - self.setString(theString, true); return true; } @@ -286,7 +275,7 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ createFontChars: function () { var self = this; var cmd = this._renderCmd; - var locTexture = cmd._texture || self.textureAtlas.texture; + var locTexture = cmd._texture || this._texture; var nextFontPositionX = 0; @@ -312,6 +301,7 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ var nextFontPositionY = -(locCommonH - locCommonH * quantityOfLines); var prev = -1; + var fontDef; for (i = 0; i < stringLen; i++) { var key = locStr.charCodeAt(i); if (key === 0) continue; @@ -324,7 +314,7 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ } var kerningAmount = locKerningDict[(prev << 16) | (key & 0xffff)] || 0; - var fontDef = locFontDict[key]; + fontDef = locFontDict[key]; if (!fontDef) { cc.log("cocos2d: LabelBMFont: character not found " + locStr[i]); @@ -348,18 +338,18 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ var fontChar = self.getChildByTag(i); - if(!fontChar){ + if (!fontChar) { fontChar = new cc.Sprite(); fontChar.initWithTexture(locTexture, rect, false); fontChar._newTextureWhenChangeColor = true; this.addChild(fontChar, 0, i); - }else{ - this._renderCmd._updateCharTexture(fontChar, rect, key); + } else { + cmd._updateCharTexture(fontChar, rect, key); } // Apply label properties fontChar.opacityModifyRGB = this._opacityModifyRGB; - this._renderCmd._updateCharColorAndOpacity(fontChar); + cmd._updateCharColorAndOpacity(fontChar); var yOffset = locCfg.commonHeight - fontDef.yOffset; var fontPos = cc.p(nextFontPositionX + fontDef.xOffset + fontDef.rect.width * 0.5 + kerningAmount, @@ -723,12 +713,11 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ var texture = cc.textureCache.addImage(newConf.atlasName); var locIsLoaded = texture.isLoaded(); self._textureLoaded = locIsLoaded; - self.texture = texture; if (!locIsLoaded) { texture.addEventListener("load", function (sender) { var self1 = this; self1._textureLoaded = true; - self1.texture = sender; + self1.setTexture(sender); self1.createFontChars(); self1._changeTextureColor(); self1.updateLabel(); @@ -736,6 +725,7 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ self1.dispatchEvent("load"); }, self); } else { + self.setTexture(texture); self.createFontChars(); } } @@ -750,6 +740,7 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ }, setTexture: function(texture){ + this._texture = texture; this._renderCmd.setTexture(texture); }, @@ -849,6 +840,9 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ /** @expose */ p.textAlign; cc.defineGetterSetter(p, "textAlign", p._getAlignment, p.setAlignment); + + // Override properties + cc.defineGetterSetter(p, "texture", p.getTexture, p.setTexture); })(); /** @@ -865,7 +859,7 @@ cc.LabelBMFont.create = function (str, fntFile, width, alignment, imageOffset) { return new cc.LabelBMFont(str, fntFile, width, alignment, imageOffset); }; -cc._fntLoader = { +var _fntLoader = { INFO_EXP: /info [^\n]*(\n|$)/gi, COMMON_EXP: /common [^\n]*(\n|$)/gi, PAGE_EXP: /page [^\n]*(\n|$)/gi, @@ -965,4 +959,4 @@ cc._fntLoader = { }); } }; -cc.loader.register(["fnt"], cc._fntLoader); +cc.loader.register(["fnt"], _fntLoader); diff --git a/cocos2d/labels/CCLabelBMFontCanvasRenderCmd.js b/cocos2d/labels/CCLabelBMFontCanvasRenderCmd.js index 1d43842993..1f34cd6cb4 100644 --- a/cocos2d/labels/CCLabelBMFontCanvasRenderCmd.js +++ b/cocos2d/labels/CCLabelBMFontCanvasRenderCmd.js @@ -32,17 +32,12 @@ (function(){ cc.LabelBMFont.CanvasRenderCmd = function(renderableObject){ - cc.SpriteBatchNode.CanvasRenderCmd.call(this, renderableObject); - this._needDraw = true; + cc.Node.CanvasRenderCmd.call(this, renderableObject); }; - var proto = cc.LabelBMFont.CanvasRenderCmd.prototype = Object.create(cc.SpriteBatchNode.CanvasRenderCmd.prototype); + var proto = cc.LabelBMFont.CanvasRenderCmd.prototype = Object.create(cc.Node.CanvasRenderCmd.prototype); proto.constructor = cc.LabelBMFont.CanvasRenderCmd; - proto.rendering = function(){ - void 0; - }; - proto._updateCharTexture = function(fontChar, rect, key){ if (key === 32) { fontChar.setTextureRect(rect, false, cc.size(0, 0)); @@ -70,27 +65,28 @@ var selChild = locChildren[i]; var cm = selChild._renderCmd; var childDColor = cm._displayedColor; - if (this._texture !== cm._texture && (childDColor.r !== locDisplayedColor.r || + if (node._texture !== cm._texture && (childDColor.r !== locDisplayedColor.r || childDColor.g !== locDisplayedColor.g || childDColor.b !== locDisplayedColor.b)) continue; selChild.texture = texture; } - this._texture = texture; + node._texture = texture; }; proto._changeTextureColor = function(){ var node = this._node; - var texture = this._textureToRender, + var texture = node._texture, contentSize = texture.getContentSize(); var oTexture = node._texture, oElement = oTexture.getHtmlElementObj(); var disColor = this._displayedColor; var textureRect = cc.rect(0, 0, oElement.width, oElement.height); - if(texture && contentSize.width > 0){ + if (texture && contentSize.width > 0) { if(!oElement) return; - this._textureToRender = oTexture._generateColorTexture(disColor.r, disColor.g, disColor.b, textureRect); + var textureToRender = oTexture._generateColorTexture(disColor.r, disColor.g, disColor.b, textureRect); + node.setTexture(textureToRender); } }; @@ -102,6 +98,4 @@ cc.Node.prototype.updateDisplayedColor.call(locChild, this._displayedColor); }; - proto._initBatchTexture = function(){}; - })(); \ No newline at end of file diff --git a/cocos2d/labels/CCLabelBMFontWebGLRenderCmd.js b/cocos2d/labels/CCLabelBMFontWebGLRenderCmd.js index 69c126cf6d..68d5c374a7 100644 --- a/cocos2d/labels/CCLabelBMFontWebGLRenderCmd.js +++ b/cocos2d/labels/CCLabelBMFontWebGLRenderCmd.js @@ -32,13 +32,16 @@ (function(){ cc.LabelBMFont.WebGLRenderCmd = function(renderableObject){ - cc.SpriteBatchNode.WebGLRenderCmd.call(this, renderableObject); - this._needDraw = true; + cc.Node.WebGLRenderCmd.call(this, renderableObject); }; - var proto = cc.LabelBMFont.WebGLRenderCmd.prototype = Object.create(cc.SpriteBatchNode.WebGLRenderCmd.prototype); + var proto = cc.LabelBMFont.WebGLRenderCmd.prototype = Object.create(cc.Node.WebGLRenderCmd.prototype); proto.constructor = cc.LabelBMFont.WebGLRenderCmd; + proto.setTexture = function (texture) { + this._node.setOpacityModifyRGB(this._node._texture.hasPremultipliedAlpha()); + }; + proto._updateCharTexture = function(fontChar, rect, key){ // updating previous sprite fontChar.setTextureRect(rect, false); @@ -48,37 +51,5 @@ proto._changeTextureColor = function(){}; - proto._updateChildrenDisplayedOpacity = function(locChild){ - locChild.updateDisplayedOpacity(this._displayedOpacity); - }; - - proto._updateChildrenDisplayedColor = function(locChild){ - locChild.updateDisplayedColor(this._displayedColor); - }; - - proto._initBatchTexture = function(){ - var node = this._node; - var locTexture = node.textureAtlas.texture; - node._opacityModifyRGB = locTexture.hasPremultipliedAlpha(); - - var reusedChar = node._reusedChar = new cc.Sprite(); - reusedChar.initWithTexture(locTexture, cc.rect(0, 0, 0, 0), false); - reusedChar.batchNode = node; - }; - - proto.rendering = function(ctx){ - cc.SpriteBatchNode.WebGLRenderCmd.prototype.rendering.call(this, ctx); - - var node = this._node; - //LabelBMFont - Debug draw - if (cc.LABELBMFONT_DEBUG_DRAW) { - var size = node.getContentSize(); - var pos = cc.p(0 | ( -this._anchorPointInPoints.x), 0 | ( -this._anchorPointInPoints.y)); - var vertices = [cc.p(pos.x, pos.y), cc.p(pos.x + size.width, pos.y), cc.p(pos.x + size.width, pos.y + size.height), cc.p(pos.x, pos.y + size.height)]; - cc._drawingUtil.setDrawColor(0, 255, 0, 255); - cc._drawingUtil.drawPoly(vertices, 4, true); - } - }; - proto._updateCharColorAndOpacity = function(){}; })(); \ No newline at end of file diff --git a/cocos2d/motion-streak/CCMotionStreakWebGLRenderCmd.js b/cocos2d/motion-streak/CCMotionStreakWebGLRenderCmd.js index 7e04f94bc0..69f4f12f5f 100644 --- a/cocos2d/motion-streak/CCMotionStreakWebGLRenderCmd.js +++ b/cocos2d/motion-streak/CCMotionStreakWebGLRenderCmd.js @@ -25,6 +25,8 @@ cc.MotionStreak.WebGLRenderCmd = function(renderableObject){ cc.Node.WebGLRenderCmd.call(this, renderableObject); this._needDraw = true; + this._matrix = new cc.math.Matrix4(); + this._matrix.identity(); this._shaderProgram = cc.shaderCache.programForKey(cc.SHADER_POSITION_TEXTURECOLOR); }; @@ -38,8 +40,17 @@ cc.MotionStreak.WebGLRenderCmd.prototype.rendering = function(ctx){ if (node.texture && node.texture.isLoaded()) { ctx = ctx || cc._renderContext; + + var wt = this._worldTransform; + this._matrix.mat[0] = wt.a; + this._matrix.mat[4] = wt.c; + this._matrix.mat[12] = wt.tx; + this._matrix.mat[1] = wt.b; + this._matrix.mat[5] = wt.d; + this._matrix.mat[13] = wt.ty; + this._shaderProgram.use(); - this._shaderProgram._setUniformForMVPMatrixWithMat4(this._stackMatrix); + this._shaderProgram._setUniformForMVPMatrixWithMat4(this._matrix); cc.glBlendFunc(node._blendFunc.src, node._blendFunc.dst); cc.glBindTexture2D(node.texture); diff --git a/cocos2d/parallax/CCParallaxNodeRenderCmd.js b/cocos2d/parallax/CCParallaxNodeRenderCmd.js index 8a248b737e..572c10e3e1 100644 --- a/cocos2d/parallax/CCParallaxNodeRenderCmd.js +++ b/cocos2d/parallax/CCParallaxNodeRenderCmd.js @@ -41,7 +41,7 @@ proto._syncStatus = function(parentCmd){ this._node._updateParallaxPosition(); cc.Node.CanvasRenderCmd.prototype._syncStatus.call(this, parentCmd); - } + }; })(); cc.game.addEventListener(cc.game.EVENT_RENDERER_INITED, function () { @@ -64,6 +64,6 @@ cc.game.addEventListener(cc.game.EVENT_RENDERER_INITED, function () { proto._syncStatus = function(parentCmd){ this._node._updateParallaxPosition(); cc.Node.WebGLRenderCmd.prototype._syncStatus.call(this, parentCmd); - } + }; }); diff --git a/cocos2d/particle/CCParticleBatchNodeWebGLRenderCmd.js b/cocos2d/particle/CCParticleBatchNodeWebGLRenderCmd.js index 16da24b496..44cea2f052 100644 --- a/cocos2d/particle/CCParticleBatchNodeWebGLRenderCmd.js +++ b/cocos2d/particle/CCParticleBatchNodeWebGLRenderCmd.js @@ -29,6 +29,8 @@ cc.ParticleBatchNode.WebGLRenderCmd = function(renderable){ cc.Node.WebGLRenderCmd.call(this, renderable); this._needDraw = true; + this._matrix = new cc.math.Matrix4(); + this._matrix.identity(); }; var proto = cc.ParticleBatchNode.WebGLRenderCmd.prototype = Object.create(cc.Node.WebGLRenderCmd.prototype); @@ -39,8 +41,16 @@ if (_t.textureAtlas.totalQuads === 0) return; + var wt = this._worldTransform; + this._matrix.mat[0] = wt.a; + this._matrix.mat[4] = wt.c; + this._matrix.mat[12] = wt.tx; + this._matrix.mat[1] = wt.b; + this._matrix.mat[5] = wt.d; + this._matrix.mat[13] = wt.ty; + this._shaderProgram.use(); - this._shaderProgram._setUniformForMVPMatrixWithMat4(this._stackMatrix); + this._shaderProgram._setUniformForMVPMatrixWithMat4(this._matrix); cc.glBlendFuncForParticle(_t._blendFunc.src, _t._blendFunc.dst); _t.textureAtlas.drawQuads(); }; @@ -61,14 +71,13 @@ if (!node._visible) return; - var currentStack = cc.current_stack; - currentStack.stack.push(currentStack.top); + parentCmd = parentCmd || this.getParentRenderCmd(); + if (parentCmd) + this._curLevel = parentCmd._curLevel + 1; this._syncStatus(parentCmd); - currentStack.top = this._stackMatrix; - //this.draw(ctx); + cc.renderer.pushRenderCommand(this); this._dirtyFlag = 0; - cc.kmGLPopMatrix(); }; })(); \ No newline at end of file diff --git a/cocos2d/particle/CCParticleSystemWebGLRenderCmd.js b/cocos2d/particle/CCParticleSystemWebGLRenderCmd.js index 4a398fe70f..8e684256d3 100644 --- a/cocos2d/particle/CCParticleSystemWebGLRenderCmd.js +++ b/cocos2d/particle/CCParticleSystemWebGLRenderCmd.js @@ -30,6 +30,9 @@ cc.Node.WebGLRenderCmd.call(this, renderable); this._needDraw = true; + this._matrix = new cc.math.Matrix4(); + this._matrix.identity(); + this._buffersVBO = [0, 0]; this._quads = []; this._indices = []; @@ -186,8 +189,16 @@ var gl = ctx || cc._renderContext; + var wt = this._worldTransform; + this._matrix.mat[0] = wt.a; + this._matrix.mat[4] = wt.c; + this._matrix.mat[12] = wt.tx; + this._matrix.mat[1] = wt.b; + this._matrix.mat[5] = wt.d; + this._matrix.mat[13] = wt.ty; + this._shaderProgram.use(); - this._shaderProgram._setUniformForMVPMatrixWithMat4(this._stackMatrix); //; + this._shaderProgram._setUniformForMVPMatrixWithMat4(this._matrix); //; cc.glBindTexture2D(node._texture); cc.glBlendFuncForParticle(node._blendFunc.src, node._blendFunc.dst); diff --git a/cocos2d/physics/CCPhysicsDebugNodeWebGLRenderCmd.js b/cocos2d/physics/CCPhysicsDebugNodeWebGLRenderCmd.js index 38ddf9f630..e2f16f8560 100644 --- a/cocos2d/physics/CCPhysicsDebugNodeWebGLRenderCmd.js +++ b/cocos2d/physics/CCPhysicsDebugNodeWebGLRenderCmd.js @@ -29,6 +29,8 @@ cc.PhysicsDebugNode.WebGLRenderCmd = function (renderableObject) { cc.Node.WebGLRenderCmd.call(this, renderableObject); this._needDraw = true; + this._matrix = new cc.math.Matrix4(); + this._matrix.identity(); }; cc.PhysicsDebugNode.WebGLRenderCmd.prototype = Object.create(cc.Node.WebGLRenderCmd.prototype); @@ -42,10 +44,18 @@ node._space.eachShape(cc.DrawShape.bind(node)); node._space.eachConstraint(cc.DrawConstraint.bind(node)); + var wt = this._worldTransform; + this._matrix.mat[0] = wt.a; + this._matrix.mat[4] = wt.c; + this._matrix.mat[12] = wt.tx; + this._matrix.mat[1] = wt.b; + this._matrix.mat[5] = wt.d; + this._matrix.mat[13] = wt.ty; + //cc.DrawNode.prototype.draw.call(node); cc.glBlendFunc(node._blendFunc.src, node._blendFunc.dst); this._shaderProgram.use(); - this._shaderProgram._setUniformForMVPMatrixWithMat4(this._stackMatrix); + this._shaderProgram._setUniformForMVPMatrixWithMat4(this._matrix); node._render(); node.clear(); diff --git a/cocos2d/physics/CCPhysicsSprite.js b/cocos2d/physics/CCPhysicsSprite.js index 442c416236..80df018400 100644 --- a/cocos2d/physics/CCPhysicsSprite.js +++ b/cocos2d/physics/CCPhysicsSprite.js @@ -174,28 +174,22 @@ } this.setNodeDirty(); }, + _syncPosition:function () { - var pos = this._body.GetPosition(); - this._position.x = pos.x * this._PTMRatio; - this._position.y = pos.y * this._PTMRatio; - this._rotationRadians = this._rotation * (Math.PI / 180); + var locPosition = this._position, + pos = this._body.GetPosition(), + x = pos.x * this._PTMRatio, + y = pos.y * this._PTMRatio; + if (locPosition.x !== pos.x || locPosition.y !== pos.y) { + cc.Sprite.prototype.setPosition.call(this, x, y); + } }, _syncRotation:function () { this._rotationRadians = this._body.GetAngle(); - }, - /** - * visit - */ - visit:function () { - if (this._body && this._PTMRatio) { - this._syncPosition(); - if (!this._ignoreBodyRotation) - this._syncRotation(); - } - else { - cc.log("PhysicsSprite body or PTIMRatio was not set"); + var a = cc.radiansToDegrees(this._rotationRadians); + if (this._rotationX !== a) { + cc.Sprite.prototype.setRotation.call(this, a); } - this._super(); }, /** @@ -324,7 +318,6 @@ this._body.p.x = newPosOrxValue; this._body.p.y = yValue; } - //this._syncPosition(); }, /** @@ -333,7 +326,6 @@ */ setPositionX:function (xValue) { this._body.p.x = xValue; - //this._syncPosition(); }, /** @@ -342,7 +334,6 @@ */ setPositionY:function (yValue) { this._body.p.y = yValue; - //this._syncPosition(); }, _syncPosition:function () { @@ -369,12 +360,12 @@ cc.Sprite.prototype.setRotation.call(this, r); } else { this._body.a = -cc.degreesToRadians(r); - //this._syncRotation(); } }, _syncRotation:function () { - if (this._rotationX !== -cc.radiansToDegrees(this._body.a)) { - cc.Sprite.prototype.setRotation.call(this, -cc.radiansToDegrees(this._body.a)); + var a = -cc.radiansToDegrees(this._body.a); + if (this._rotationX !== a) { + cc.Sprite.prototype.setRotation.call(this, a); } }, diff --git a/cocos2d/physics/CCPhysicsSpriteCanvasRenderCmd.js b/cocos2d/physics/CCPhysicsSpriteCanvasRenderCmd.js index ae95d94df9..705749d259 100644 --- a/cocos2d/physics/CCPhysicsSpriteCanvasRenderCmd.js +++ b/cocos2d/physics/CCPhysicsSpriteCanvasRenderCmd.js @@ -47,47 +47,4 @@ cc.Sprite.CanvasRenderCmd.prototype.rendering.call(this, ctx, scaleX, scaleY); }; - proto.getNodeToParentTransform = function(){ - var node = this._node; - - var t = this._transform;// quick reference - // base position - var locBody = node._body, locScaleX = node._scaleX, locScaleY = node._scaleY, locAnchorPIP = this._anchorPointInPoints; - t.tx = locBody.p.x; - t.ty = locBody.p.y; - - // rotation Cos and Sin - var radians = -locBody.a; - var Cos = 1, Sin = 0; - if (radians && !node._ignoreBodyRotation) { - Cos = Math.cos(radians); - Sin = Math.sin(radians); - } - - // base abcd - t.a = t.d = Cos; - t.b = -Sin; - t.c = Sin; - - // scale - if (locScaleX !== 1 || locScaleY !== 1) { - t.a *= locScaleX; - t.c *= locScaleX; - t.b *= locScaleY; - t.d *= locScaleY; - } - - // adjust anchorPoint - t.tx += Cos * -locAnchorPIP.x * locScaleX + -Sin * locAnchorPIP.y * locScaleY; - t.ty -= Sin * -locAnchorPIP.x * locScaleX + Cos * locAnchorPIP.y * locScaleY; - - // if ignore anchorPoint - if (this._ignoreAnchorPointForPosition) { - t.tx += locAnchorPIP.x; - t.ty += locAnchorPIP.y; - } - - return this._transform; - }; - })(); \ No newline at end of file diff --git a/cocos2d/physics/CCPhysicsSpriteWebGLRenderCmd.js b/cocos2d/physics/CCPhysicsSpriteWebGLRenderCmd.js index 339610ed36..d2e6b25c25 100644 --- a/cocos2d/physics/CCPhysicsSpriteWebGLRenderCmd.js +++ b/cocos2d/physics/CCPhysicsSpriteWebGLRenderCmd.js @@ -34,7 +34,9 @@ var proto = cc.PhysicsSprite.WebGLRenderCmd.prototype = Object.create(cc.Sprite.WebGLRenderCmd.prototype); proto.constructor = cc.PhysicsSprite.WebGLRenderCmd; - proto.rendering = function(ctx){ + proto.spUploadData = cc.Sprite.WebGLRenderCmd.prototype.uploadData; + + proto.uploadData = function (f32buffer, ui32buffer, vertexDataOffset) { // This is a special class // Sprite can not obtain sign // So here must to calculate of each frame @@ -44,49 +46,6 @@ node._syncRotation(); this.transform(this.getParentRenderCmd(), true); - cc.Sprite.WebGLRenderCmd.prototype.rendering.call(this, ctx); - }; - - proto.getNodeToParentTransform = function(){ - var node = this._node; - var locBody = node._body, locAnchorPIP = this._anchorPointInPoints, locScaleX = node._scaleX, locScaleY = node._scaleY; - var x = locBody.p.x; - var y = locBody.p.y; - - if (this._ignoreAnchorPointForPosition) { - x += locAnchorPIP.x; - y += locAnchorPIP.y; - } - - // Make matrix - var radians = locBody.a, c = 1, s=0; - if (radians && !node._ignoreBodyRotation) { - c = Math.cos(radians); - s = Math.sin(radians); - } - - // Although scale is not used by physics engines, it is calculated just in case - // the sprite is animated (scaled up/down) using actions. - // For more info see: http://www.cocos2d-iphone.org/forum/topic/68990 - if (!cc._rectEqualToZero(locAnchorPIP)) { - x += c * -locAnchorPIP.x * locScaleX + -s * -locAnchorPIP.y * locScaleY; - y += s * -locAnchorPIP.x * locScaleX + c * -locAnchorPIP.y * locScaleY; - } - - // Rot, Translate Matrix - this._transform = cc.affineTransformMake(c * locScaleX, s * locScaleX, - -s * locScaleY, c * locScaleY, x, y); - - return this._transform; - }; - - proto.updateTransform = function(){ - var node = this._node; - var dirty = node.isDirty(); - if(dirty){ - var cmd = node._renderCmd; - cmd && cmd.setDirtyRecursively(true); - } - cc.Sprite.WebGLRenderCmd.prototype.updateTransform.call(this); + return this.spUploadData(f32buffer, ui32buffer, vertexDataOffset); }; })(); \ No newline at end of file diff --git a/cocos2d/progress-timer/CCProgressTimerCanvasRenderCmd.js b/cocos2d/progress-timer/CCProgressTimerCanvasRenderCmd.js index 689cbf76fb..0df263bf28 100644 --- a/cocos2d/progress-timer/CCProgressTimerCanvasRenderCmd.js +++ b/cocos2d/progress-timer/CCProgressTimerCanvasRenderCmd.js @@ -192,8 +192,6 @@ } }; - proto._updateColor = function(){}; - proto._syncStatus = function (parentCmd) { var node = this._node; if(!node._sprite) @@ -220,15 +218,18 @@ if (colorDirty){ spriteCmd._syncDisplayColor(); + spriteCmd._dirtyFlag = spriteCmd._dirtyFlag & flags.colorDirty ^ spriteCmd._dirtyFlag; + this._dirtyFlag = this._dirtyFlag & flags.colorDirty ^ this._dirtyFlag; } if (opacityDirty){ spriteCmd._syncDisplayOpacity(); + spriteCmd._dirtyFlag = spriteCmd._dirtyFlag & flags.opacityDirty ^ spriteCmd._dirtyFlag; + this._dirtyFlag = this._dirtyFlag & flags.opacityDirty ^ this._dirtyFlag; } if(colorDirty || opacityDirty){ spriteCmd._updateColor(); - //this._updateColor(); } if (locFlag & flags.transformDirty) { @@ -254,15 +255,18 @@ if(colorDirty){ spriteCmd._updateDisplayColor(); + spriteCmd._dirtyFlag = spriteCmd._dirtyFlag & flags.colorDirty ^ spriteCmd._dirtyFlag; + this._dirtyFlag = this._dirtyFlag & flags.colorDirty ^ this._dirtyFlag; } if(opacityDirty){ spriteCmd._updateDisplayOpacity(); + spriteCmd._dirtyFlag = spriteCmd._dirtyFlag & flags.opacityDirty ^ spriteCmd._dirtyFlag; + this._dirtyFlag = this._dirtyFlag & flags.opacityDirty ^ this._dirtyFlag; } if(colorDirty || opacityDirty){ spriteCmd._updateColor(); - //this._updateColor(); } if(locFlag & flags.transformDirty){ diff --git a/cocos2d/progress-timer/CCProgressTimerWebGLRenderCmd.js b/cocos2d/progress-timer/CCProgressTimerWebGLRenderCmd.js index e903e7f12b..cf20db187f 100644 --- a/cocos2d/progress-timer/CCProgressTimerWebGLRenderCmd.js +++ b/cocos2d/progress-timer/CCProgressTimerWebGLRenderCmd.js @@ -33,6 +33,9 @@ this._needDraw = true; this._progressDirty = true; + this._bl = cc.p(); + this._tr = cc.p(); + this.initCmd(); }; @@ -41,7 +44,16 @@ proto.transform = function (parentCmd, recursive) { cc.Node.WebGLRenderCmd.prototype.transform.call(this, parentCmd, recursive); - this._node._sprite._renderCmd.transform(this, recursive); + var sp = this._node._sprite; + sp._renderCmd.transform(this, recursive); + + var lx = sp._offsetPosition.x, rx = lx + sp._rect.width, + by = sp._offsetPosition.y, ty = by + sp._rect.height, + wt = this._worldTransform; + this._bl.x = lx * wt.a + by * wt.c + wt.tx; + this._bl.y = lx * wt.b + by * wt.d + wt.ty; + this._tr.x = rx * wt.a + ty * wt.c + wt.tx; + this._tr.y = rx * wt.b + ty * wt.d + wt.ty; }; proto.rendering = function (ctx) { @@ -104,19 +116,22 @@ var spriteCmd = node._sprite._renderCmd; var spriteFlag = spriteCmd._dirtyFlag; - var colorDirty = spriteFlag & flags.colorDirty, - opacityDirty = spriteFlag & flags.opacityDirty; + var colorDirty = (locFlag | spriteFlag) & flags.colorDirty, + opacityDirty = (locFlag | spriteFlag) & flags.opacityDirty; if (colorDirty){ spriteCmd._syncDisplayColor(); + spriteCmd._dirtyFlag = spriteCmd._dirtyFlag & flags.colorDirty ^ spriteCmd._dirtyFlag; + this._dirtyFlag = this._dirtyFlag & flags.colorDirty ^ this._dirtyFlag; } if (opacityDirty){ spriteCmd._syncDisplayOpacity(); + spriteCmd._dirtyFlag = spriteCmd._dirtyFlag & flags.opacityDirty ^ spriteCmd._dirtyFlag; + this._dirtyFlag = this._dirtyFlag & flags.opacityDirty ^ this._dirtyFlag; } if(colorDirty || opacityDirty){ - spriteCmd._updateColor(); this._updateColor(); } @@ -141,21 +156,22 @@ var spriteCmd = node._sprite._renderCmd; var spriteFlag = spriteCmd._dirtyFlag; - var colorDirty = spriteFlag & flags.colorDirty, - opacityDirty = spriteFlag & flags.opacityDirty; + var colorDirty = (locFlag | spriteFlag) & flags.colorDirty, + opacityDirty = (locFlag | spriteFlag) & flags.opacityDirty; if(colorDirty){ spriteCmd._updateDisplayColor(); + spriteCmd._dirtyFlag = spriteCmd._dirtyFlag & flags.colorDirty ^ spriteCmd._dirtyFlag; this._dirtyFlag = this._dirtyFlag & flags.colorDirty ^ this._dirtyFlag; } if(opacityDirty){ spriteCmd._updateDisplayOpacity(); + spriteCmd._dirtyFlag = spriteCmd._dirtyFlag & flags.opacityDirty ^ spriteCmd._dirtyFlag; this._dirtyFlag = this._dirtyFlag & flags.opacityDirty ^ this._dirtyFlag; } if(colorDirty || opacityDirty){ - spriteCmd._updateColor(); this._updateColor(); } @@ -470,44 +486,52 @@ coords.v = 0; return; } - var quad = locSprite.quad; - var min = cc.p(quad.bl.texCoords.u, quad.bl.texCoords.v); - var max = cc.p(quad.tr.texCoords.u, quad.tr.texCoords.v); + var uvs = locSprite._renderCmd._vertices, + bl = uvs[1], + tr = uvs[2]; + var min = cc.p(bl.u, bl.v); + var max = cc.p(tr.u, tr.v); // Fix bug #1303 so that progress timer handles sprite frame texture rotation if (locSprite.textureRectRotated) { - var temp = alpha.x; - alpha.x = alpha.y; - alpha.y = temp; + var temp = ax; + ax = ay; + ay = temp; } coords.u = min.x * (1 - ax) + max.x * ax; coords.v = min.y * (1 - ay) + max.y * ay; }; proto._vertexFromAlphaPoint = function (vertex, ax, ay) { - var spriteCmd = this._node._sprite._renderCmd; - if (!spriteCmd) { - vertex.x = 0; - vertex.y = 0; - return; - } - var quad = spriteCmd._quad; - var min = cc.p(quad.bl.vertices.x, quad.bl.vertices.y); - var max = cc.p(quad.tr.vertices.x, quad.tr.vertices.y); - vertex.x = min.x * (1 - ax) + max.x * ax; - vertex.y = min.y * (1 - ay) + max.y * ay; - vertex.z = quad.bl.vertices.z; + vertex.x = this._bl.x * (1 - ax) + this._tr.x * ax; + vertex.y = this._bl.y * (1 - ay) + this._tr.y * ay; + vertex.z = this._node._vertexZ; }; proto._updateColor = function(){ - var node = this._node; - if (!node._sprite || !this._vertexDataCount) + var sp = this._node._sprite; + if (!this._vertexDataCount || !sp) return; - var sc = node._sprite.quad.tl.colors; + var color = this._displayedColor; + var spColor = sp._renderCmd._displayedColor; + var r = spColor.r; + var g = spColor.g; + var b = spColor.b; + var a = sp._renderCmd._displayedOpacity / 255; + if (sp._opacityModifyRGB) { + r *= a; + g *= a; + b *= a; + } + color.r = r; + color.g = g; + color.b = b; + color.a = sp._renderCmd._displayedOpacity; var locVertexData = this._vertexData; - for (var i = 0, len = this._vertexDataCount; i < len; ++i) - locVertexData[i].colors = sc; + for (var i = 0, len = this._vertexDataCount; i < len; ++i) { + locVertexData[i].colors = color; + } this._vertexDataDirty = true; }; })(); \ No newline at end of file diff --git a/cocos2d/shaders/CCGLStateCache.js b/cocos2d/shaders/CCGLStateCache.js index a5a4e7acb0..cb1aa164e2 100644 --- a/cocos2d/shaders/CCGLStateCache.js +++ b/cocos2d/shaders/CCGLStateCache.js @@ -38,17 +38,12 @@ if (cc.ENABLE_GL_STATE_CACHE) { cc._uVAO = 0; var _currBuffers = {}; - var _currBuffer; WebGLRenderingContext.prototype.glBindBuffer = WebGLRenderingContext.prototype.bindBuffer; WebGLRenderingContext.prototype.bindBuffer = function (target, buffer) { if (_currBuffers[target] !== buffer) { - _currBuffers[target] = buffer; this.glBindBuffer(target, buffer); - } - - if (!_currBuffer || _currBuffer !== buffer) { - _currBuffer = buffer; + _currBuffers[target] = buffer; return false; } else { diff --git a/cocos2d/shape-nodes/CCDrawNodeWebGLRenderCmd.js b/cocos2d/shape-nodes/CCDrawNodeWebGLRenderCmd.js index e9f65f4765..55c2457772 100644 --- a/cocos2d/shape-nodes/CCDrawNodeWebGLRenderCmd.js +++ b/cocos2d/shape-nodes/CCDrawNodeWebGLRenderCmd.js @@ -26,6 +26,8 @@ cc.DrawNode.WebGLRenderCmd = function (renderableObject) { cc.Node.WebGLRenderCmd.call(this, renderableObject); this._needDraw = true; + this._matrix = new cc.math.Matrix4(); + this._matrix.identity(); }; cc.DrawNode.WebGLRenderCmd.prototype = Object.create(cc.Node.WebGLRenderCmd.prototype); @@ -34,9 +36,17 @@ cc.DrawNode.WebGLRenderCmd.prototype.rendering = function (ctx) { var node = this._node; if (node._buffer.length > 0) { + var wt = this._worldTransform; + this._matrix.mat[0] = wt.a; + this._matrix.mat[4] = wt.c; + this._matrix.mat[12] = wt.tx; + this._matrix.mat[1] = wt.b; + this._matrix.mat[5] = wt.d; + this._matrix.mat[13] = wt.ty; + cc.glBlendFunc(node._blendFunc.src, node._blendFunc.dst); this._shaderProgram.use(); - this._shaderProgram._setUniformForMVPMatrixWithMat4(this._stackMatrix); + this._shaderProgram._setUniformForMVPMatrixWithMat4(this._matrix); node._render(); } }; diff --git a/cocos2d/tilemap/CCTMXLayer.js b/cocos2d/tilemap/CCTMXLayer.js index 99f05c192f..cc9cb6b555 100644 --- a/cocos2d/tilemap/CCTMXLayer.js +++ b/cocos2d/tilemap/CCTMXLayer.js @@ -56,11 +56,15 @@ * @property {Number} tileHeight - Height of a tile */ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ - tiles: null, - tileset: null, - layerOrientation: null, - properties: null, - layerName: "", + tiles: null, + tileset: null, + layerOrientation: null, + properties: null, + layerName: "", + + _textures: null, + _texGrids: null, + _spriteTiles: null, //size of the layer in tiles _layerSize: null, @@ -93,6 +97,7 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ this._layerSize = cc.size(0, 0); this._mapTileSize = cc.size(0, 0); + this._spriteTiles = {}; if(mapInfo !== undefined) this.initWithTilesetInfo(tilesetInfo, layerInfo, mapInfo); @@ -105,24 +110,115 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ return new cc.TMXLayer.WebGLRenderCmd(this); }, - /** - * Sets the untransformed size of the TMXLayer. - * @override - * @param {cc.Size|Number} size The untransformed size of the TMXLayer or The untransformed size's width of the TMXLayer. - * @param {Number} [height] The untransformed size's height of the TMXLayer. - */ - setContentSize:function (size, height) { - cc.Node.prototype.setContentSize.call(this, size, height); - this._renderCmd._updateCacheContext(size, height); + _fillTextureGrids: function (tileset, texId) { + var tex = this._textures[texId]; + if (!tex.isLoaded()) { + tex.addEventListener("load", function () { + this._fillTextureGrids(tileset, tex); + }, this); + return; + } + if (!tileset.imageSize.width || !tileset.imageSize.height) { + tileset.imageSize.width = tex.width; + tileset.imageSize.height = tex.height; + } + var tw = tileset._tileSize.width, + th = tileset._tileSize.height, + imageW = tex._contentSize.width, + imageH = tex._contentSize.height, + spacing = tileset.spacing, + margin = tileset.margin, + + cols = Math.floor((imageW - margin*2 + spacing) / (tw + spacing)), + rows = Math.floor((imageH - margin*2 + spacing) / (th + spacing)), + count = rows * cols, + + gid = tileset.firstGid, + maxGid = tileset.firstGid + count, + grids = this._texGrids, + grid = null, + override = grids[gid] ? true : false, + + t, l, r, b; + + for (; gid < maxGid; ++gid) { + // Avoid overlapping + if (override && !grids[gid]) { + override = false; + } + if (!override && grids[gid]) { + break; + } + + grid = { + texId: texId, + x: 0, y: 0, width: 0, height: 0, + t: 0, l: 0, r: 0, b: 0 + }; + tileset.rectForGID(gid, grid); + grid.t = grid.y / imageH; + grid.l = grid.x / imageW; + grid.r = (grid.x + grid.width) / imageW; + grid.b = (grid.y + grid.height) / imageH; + grids[gid] = grid; + } }, /** - * Return texture of cc.SpriteBatchNode - * @function - * @return {cc.Texture2D} + * Initializes a cc.TMXLayer with a tileset info, a layer info and a map info + * @param {cc.TMXTilesetInfo} tilesetInfo + * @param {cc.TMXLayerInfo} layerInfo + * @param {cc.TMXMapInfo} mapInfo + * @return {Boolean} */ - getTexture: function(){ - return this._renderCmd.getTexture(); + initWithTilesetInfo:function (tilesetInfo, layerInfo, mapInfo) { + var size = layerInfo._layerSize; + var totalNumberOfTiles = parseInt(size.width * size.height); + + // layerInfo + this.layerName = layerInfo.name; + this.tiles = layerInfo._tiles; + this.properties = layerInfo.properties; + this._layerSize = size; + this._minGID = layerInfo._minGID; + this._maxGID = layerInfo._maxGID; + this._opacity = layerInfo._opacity; + + // tilesetInfo + this.tileset = tilesetInfo; + + // mapInfo + this.layerOrientation = mapInfo.orientation; + this._mapTileSize = mapInfo.getTileSize(); + + var tilesets = mapInfo._tilesets; + if (tilesets) { + this._textures = []; + this._texGrids = []; + var i, len = tilesets.length, tileset, tex; + for (i = 0; i < len; ++i) { + tileset = tilesets[i]; + tex = cc.textureCache.addImage(tileset.sourceImage); + this._textures.push(tex); + this._fillTextureGrids(tileset, i); + if (tileset === tilesetInfo) { + this._texture = tex; + } + } + } + + // offset (after layer orientation is set); + var offset = this._calculateLayerOffset(layerInfo.offset); + this.setPosition(cc.pointPixelsToPoints(offset)); + + // Parse cocos2d properties + this._parseInternalProperties(); + + this.setContentSize(cc.sizePixelsToPoints(cc.size(this._layerSize.width * this._mapTileSize.width, + this._layerSize.height * this._mapTileSize.height))); + this._useAutomaticVertexZ = false; + this._vertexZvalue = 0; + return true; }, /** @@ -142,18 +238,18 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ this._layerSize.height = Var.height; }, - _getLayerWidth: function () { - return this._layerSize.width; - }, - _setLayerWidth: function (width) { - this._layerSize.width = width; - }, - _getLayerHeight: function () { - return this._layerSize.height; - }, - _setLayerHeight: function (height) { - this._layerSize.height = height; - }, + _getLayerWidth: function () { + return this._layerSize.width; + }, + _setLayerWidth: function (width) { + this._layerSize.width = width; + }, + _getLayerHeight: function () { + return this._layerSize.height; + }, + _setLayerHeight: function (height) { + this._layerSize.height = height; + }, /** * Size of the map's tile (could be different from the tile's size) @@ -172,18 +268,18 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ this._mapTileSize.height = Var.height; }, - _getTileWidth: function () { - return this._mapTileSize.width; - }, - _setTileWidth: function (width) { - this._mapTileSize.width = width; - }, - _getTileHeight: function () { - return this._mapTileSize.height; - }, - _setTileHeight: function (height) { - this._mapTileSize.height = height; - }, + _getTileWidth: function () { + return this._mapTileSize.width; + }, + _setTileWidth: function (width) { + this._mapTileSize.width = width; + }, + _getTileHeight: function () { + return this._mapTileSize.height; + }, + _setTileHeight: function (height) { + this._mapTileSize.height = height; + }, /** * Pointer to the map of tiles @@ -250,51 +346,28 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ }, /** - * Initializes a cc.TMXLayer with a tileset info, a layer info and a map info - * @param {cc.TMXTilesetInfo} tilesetInfo - * @param {cc.TMXLayerInfo} layerInfo - * @param {cc.TMXMapInfo} mapInfo - * @return {Boolean} + * Return the value for the specific property name + * @param {String} propertyName + * @return {*} */ - initWithTilesetInfo:function (tilesetInfo, layerInfo, mapInfo) { - // XXX: is 35% a good estimate ? - var size = layerInfo._layerSize; - var totalNumberOfTiles = parseInt(size.width * size.height); - var capacity = totalNumberOfTiles * 0.35 + 1; // 35 percent is occupied ? - var texture; - if (tilesetInfo) - texture = cc.textureCache.addImage(tilesetInfo.sourceImage); - - if (this.initWithTexture(texture, capacity)) { - // layerInfo - this.layerName = layerInfo.name; - this._layerSize = size; - this.tiles = layerInfo._tiles; - this._minGID = layerInfo._minGID; - this._maxGID = layerInfo._maxGID; - this._opacity = layerInfo._opacity; - this.properties = layerInfo.properties; - this._contentScaleFactor = cc.director.getContentScaleFactor(); - - // tilesetInfo - this.tileset = tilesetInfo; - - // mapInfo - this._mapTileSize = mapInfo.getTileSize(); - this.layerOrientation = mapInfo.orientation; - - // offset (after layer orientation is set); - var offset = this._calculateLayerOffset(layerInfo.offset); - this.setPosition(cc.pointPixelsToPoints(offset)); - - this._atlasIndexArray = []; - this.setContentSize(cc.sizePixelsToPoints(cc.size(this._layerSize.width * this._mapTileSize.width, - this._layerSize.height * this._mapTileSize.height))); - this._useAutomaticVertexZ = false; - this._vertexZvalue = 0; - return true; - } - return false; + getProperty:function (propertyName) { + return this.properties[propertyName]; + }, + + /** + * Gets the layer name + * @return {String} + */ + getLayerName:function () { + return this.layerName; + }, + + /** + * Set the layer name + * @param {String} layerName + */ + setLayerName:function (layerName) { + this.layerName = layerName; }, /** @@ -303,11 +376,7 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ * If you are going to call layer.getTileGIDAt() then, don't release the map */ releaseMap:function () { - if (this.tiles) - this.tiles = null; - - if (this._atlasIndexArray) - this._atlasIndexArray = null; + this._spriteTiles = {}; }, /** @@ -322,41 +391,45 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ * @return {cc.Sprite} */ getTileAt: function (pos, y) { - if(!pos) + if (pos === undefined) { throw new Error("cc.TMXLayer.getTileAt(): pos should be non-null"); - if(y !== undefined) - pos = cc.p(pos, y); - if(pos.x >= this._layerSize.width || pos.y >= this._layerSize.height || pos.x < 0 || pos.y < 0) + } + var x = pos; + if (y === undefined) { + x = pos.x; + y = pos.y; + } + if (x >= this._layerSize.width || y >= this._layerSize.height || x < 0 || y < 0) { throw new Error("cc.TMXLayer.getTileAt(): invalid position"); - if(!this.tiles || !this._atlasIndexArray){ + } + if (!this.tiles) { cc.log("cc.TMXLayer.getTileAt(): TMXLayer: the tiles map has been released"); return null; } - var tile = null, gid = this.getTileGIDAt(pos); + var tile = null, gid = this.getTileGIDAt(x, y); // if GID == 0, then no tile is present - if (gid === 0) + if (gid === 0) { return tile; + } - var z = 0 | (pos.x + pos.y * this._layerSize.width); - tile = this.getChildByTag(z); + var z = 0 | (x + y * this._layerSize.width); + tile = this._spriteTiles[z]; // tile not created yet. create it if (!tile) { - var rect = this.tileset.rectForGID(gid); + var rect = this._texGrids[gid]; + var tex = this._textures[rect.texId]; rect = cc.rectPixelsToPoints(rect); - tile = new cc.Sprite(); - tile.initWithTexture(this.texture, rect); - tile.batchNode = this; - tile.setPosition(this.getPositionAt(pos)); - tile.vertexZ = this._vertexZForPos(pos); - tile.anchorX = 0; - tile.anchorY = 0; - tile.opacity = this._opacity; + tile = new cc.Sprite(tex, rect); + tile.setPosition(this.getPositionAt(x, y)); + var vertexZ = this._vertexZForPos(x, y); + tile.setVertexZ(vertexZ); + tile.setAnchorPoint(0, 0); + tile.setOpacity(this._opacity); - var indexForZ = this._atlasIndexForExistantZ(z); - this.addSpriteWithoutQuad(tile, indexForZ, z); + this.addChild(tile, vertexZ, z); } return tile; }, @@ -370,18 +443,23 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ * @return {Number} */ getTileGIDAt:function (pos, y) { - if(pos == null) + if (pos === undefined) { throw new Error("cc.TMXLayer.getTileGIDAt(): pos should be non-null"); - if(y !== undefined) - pos = cc.p(pos, y); - if(pos.x >= this._layerSize.width || pos.y >= this._layerSize.height || pos.x < 0 || pos.y < 0) + } + var x = pos; + if (y === undefined) { + x = pos.x; + y = pos.y; + } + if (x >= this._layerSize.width || y >= this._layerSize.height || x < 0 || y < 0) { throw new Error("cc.TMXLayer.getTileGIDAt(): invalid position"); - if(!this.tiles || !this._atlasIndexArray){ + } + if (!this.tiles) { cc.log("cc.TMXLayer.getTileGIDAt(): TMXLayer: the tiles map has been released"); return null; } - var idx = 0 | (pos.x + pos.y * this._layerSize.width); + var idx = 0 | (x + y * this._layerSize.width); // Bits on the far end of the 32-bit global tile ID are used for tile flags var tile = this.tiles[idx]; @@ -390,33 +468,6 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{ // XXX: deprecated // tileGIDAt:getTileGIDAt, - /** - * lipped tiles can be changed dynamically - * @param {cc.Point|Number} pos or x - * @param {Number} [y] - * @return {Number} - */ - getTileFlagsAt:function (pos, y) { - if(!pos) - throw new Error("cc.TMXLayer.getTileFlagsAt(): pos should be non-null"); - if(y !== undefined) - pos = cc.p(pos, y); - if(pos.x >= this._layerSize.width || pos.y >= this._layerSize.height || pos.x < 0 || pos.y < 0) - throw new Error("cc.TMXLayer.getTileFlagsAt(): invalid position"); - if(!this.tiles || !this._atlasIndexArray){ - cc.log("cc.TMXLayer.getTileFlagsAt(): TMXLayer: the tiles map has been released"); - return null; - } - - var idx = 0 | (pos.x + pos.y * this._layerSize.width); - // Bits on the far end of the 32-bit global tile ID are used for tile flags - var tile = this.tiles[idx]; - - return (tile & cc.TMX_TILE_FLIPPED_ALL) >>> 0; - }, - // XXX: deprecated - // tileFlagAt:getTileFlagsAt, - /** *Sets the tile gid (gid = tile global id) at a given tile coordinate.
* The Tile GID can be obtained by using the method "tileGIDAt" or by using the TMX editor . Tileset Mgr +1.
@@ -427,8 +478,9 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{
* @param {Number} [flags]
*/
setTileGID: function(gid, posOrX, flagsOrY, flags) {
- if(!posOrX)
+ if (posOrX === undefined) {
throw new Error("cc.TMXLayer.setTileGID(): pos should be non-null");
+ }
var pos;
if (flags !== undefined) {
pos = cc.p(posOrX, flagsOrY);
@@ -436,19 +488,19 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{
pos = posOrX;
flags = flagsOrY;
}
- if(pos.x >= this._layerSize.width || pos.y >= this._layerSize.height || pos.x < 0 || pos.y < 0)
+ if (pos.x >= this._layerSize.width || pos.y >= this._layerSize.height || pos.x < 0 || pos.y < 0) {
throw new Error("cc.TMXLayer.setTileGID(): invalid position");
- if(!this.tiles || !this._atlasIndexArray){
+ }
+ if (!this.tiles) {
cc.log("cc.TMXLayer.setTileGID(): TMXLayer: the tiles map has been released");
return;
}
- if(gid !== 0 && gid < this.tileset.firstGid){
+ if (gid !== 0 && gid < this.tileset.firstGid) {
cc.log( "cc.TMXLayer.setTileGID(): invalid gid:" + gid);
return;
}
flags = flags || 0;
- this._setNodeDirtyForCache();
var currentFlags = this.getTileFlagsAt(pos);
var currentGID = this.getTileGIDAt(pos);
@@ -458,75 +510,101 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{
if (gid === 0)
this.removeTileAt(pos);
else if (currentGID === 0) // empty tile. create a new one
- this._insertTileForGID(gidAndFlags, pos);
+ this._updateTileForGID(gidAndFlags, pos);
else { // modifying an existing tile with a non-empty tile
var z = pos.x + pos.y * this._layerSize.width;
var sprite = this.getChildByTag(z);
if (sprite) {
- var rect = this.tileset.rectForGID(gid);
+ var rect = this._texGrids[gid];
+ var tex = this._textures[rect.texId];
rect = cc.rectPixelsToPoints(rect);
-
+ sprite.setTexture(tex);
sprite.setTextureRect(rect, false);
if (flags != null)
this._setupTileSprite(sprite, pos, gidAndFlags);
this.tiles[z] = gidAndFlags;
- } else
+ } else {
this._updateTileForGID(gidAndFlags, pos);
+ }
}
}
},
+ addChild: function (child, localZOrder, tag) {
+ cc.Node.prototype.addChild.call(this, child, localZOrder, tag);
+ if (tag !== undefined) {
+ this._spriteTiles[tag] = child;
+ child._vertexZ = this._vertexZ + cc.renderer.assignedZStep * tag / this.tiles.length;
+ // child._renderCmd._needDraw = false;
+ }
+ },
+
+ removeChild: function (child, cleanup) {
+ if (this._spriteTiles[child.tag]) {
+ this._spriteTiles[child.tag] = null;
+ // child._renderCmd._needDraw = true;
+ }
+ cc.Node.prototype.removeChild.call(this, child, cleanup);
+ },
+
+ /**
+ * lipped tiles can be changed dynamically
+ * @param {cc.Point|Number} pos or x
+ * @param {Number} [y]
+ * @return {Number}
+ */
+ getTileFlagsAt:function (pos, y) {
+ if(!pos)
+ throw new Error("cc.TMXLayer.getTileFlagsAt(): pos should be non-null");
+ if(y !== undefined)
+ pos = cc.p(pos, y);
+ if(pos.x >= this._layerSize.width || pos.y >= this._layerSize.height || pos.x < 0 || pos.y < 0)
+ throw new Error("cc.TMXLayer.getTileFlagsAt(): invalid position");
+ if(!this.tiles){
+ cc.log("cc.TMXLayer.getTileFlagsAt(): TMXLayer: the tiles map has been released");
+ return null;
+ }
+
+ var idx = 0 | (pos.x + pos.y * this._layerSize.width);
+ // Bits on the far end of the 32-bit global tile ID are used for tile flags
+ var tile = this.tiles[idx];
+
+ return (tile & cc.TMX_TILE_FLIPPED_ALL) >>> 0;
+ },
+ // XXX: deprecated
+ // tileFlagAt:getTileFlagsAt,
+
/**
* Removes a tile at given tile coordinate
* @param {cc.Point|Number} pos position or x
* @param {Number} [y]
*/
removeTileAt:function (pos, y) {
- if(!pos)
+ if (!pos) {
throw new Error("cc.TMXLayer.removeTileAt(): pos should be non-null");
- if(y !== undefined)
+ }
+ if (y !== undefined) {
pos = cc.p(pos, y);
- if(pos.x >= this._layerSize.width || pos.y >= this._layerSize.height || pos.x < 0 || pos.y < 0)
+ }
+ if (pos.x >= this._layerSize.width || pos.y >= this._layerSize.height || pos.x < 0 || pos.y < 0) {
throw new Error("cc.TMXLayer.removeTileAt(): invalid position");
- if(!this.tiles || !this._atlasIndexArray){
+ }
+ if (!this.tiles) {
cc.log("cc.TMXLayer.removeTileAt(): TMXLayer: the tiles map has been released");
return;
}
var gid = this.getTileGIDAt(pos);
if (gid !== 0) {
- if (cc._renderType === cc.game.RENDER_TYPE_CANVAS)
- this._setNodeDirtyForCache();
var z = 0 | (pos.x + pos.y * this._layerSize.width);
- var atlasIndex = this._atlasIndexForExistantZ(z);
// remove tile from GID map
this.tiles[z] = 0;
- // remove tile from atlas position array
- this._atlasIndexArray.splice(atlasIndex, 1);
-
// remove it from sprites and/or texture atlas
- var sprite = this.getChildByTag(z);
-
- if (sprite)
- cc.SpriteBatchNode.prototype.removeChild.call(this, sprite, true); //this.removeChild(sprite, true);
- else {
- if(cc._renderType === cc.game.RENDER_TYPE_WEBGL)
- this.textureAtlas.removeQuadAtIndex(atlasIndex);
-
- // update possible children
- if (this._children) {
- var locChildren = this._children;
- for (var i = 0, len = locChildren.length; i < len; i++) {
- var child = locChildren[i];
- if (child) {
- var ai = child.atlasIndex;
- if (ai >= atlasIndex)
- child.atlasIndex = ai - 1;
- }
- }
- }
+ var sprite = this._spriteTiles[z];
+ if (sprite) {
+ this.removeChild(sprite, true);
}
}
},
@@ -557,100 +635,6 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{
// XXX: Deprecated. For backward compatibility only
// positionAt:getPositionAt,
- /**
- * Return the value for the specific property name
- * @param {String} propertyName
- * @return {*}
- */
- getProperty:function (propertyName) {
- return this.properties[propertyName];
- },
-
- /**
- * Creates the tiles
- */
- setupTiles:function () {
- // Optimization: quick hack that sets the image size on the tileset
- this._renderCmd.initImageSize();
-
- // Parse cocos2d properties
- this._parseInternalProperties();
- if (cc._renderType === cc.game.RENDER_TYPE_CANVAS)
- this._setNodeDirtyForCache();
-
- var locLayerHeight = this._layerSize.height, locLayerWidth = this._layerSize.width;
- for (var y = 0; y < locLayerHeight; y++) {
- for (var x = 0; x < locLayerWidth; x++) {
- var pos = x + locLayerWidth * y;
- var gid = this.tiles[pos];
-
- // XXX: gid == 0 -. empty tile
- if (gid !== 0) {
- this._appendTileForGID(gid, cc.p(x, y));
- // Optimization: update min and max GID rendered by the layer
- this._minGID = Math.min(gid, this._minGID);
- this._maxGID = Math.max(gid, this._maxGID);
- }
- }
- }
-
- if (!((this._maxGID >= this.tileset.firstGid) && (this._minGID >= this.tileset.firstGid))) {
- cc.log("cocos2d:TMX: Only 1 tileset per layer is supported");
- }
- },
-
- /**
- * cc.TMXLayer doesn't support adding a cc.Sprite manually.
- * @warning addChild(child); is not supported on cc.TMXLayer. Instead of setTileGID.
- * @param {cc.Node} child
- * @param {number} zOrder
- * @param {number} tag
- */
- addChild:function (child, zOrder, tag) {
- cc.log("addChild: is not supported on cc.TMXLayer. Instead use setTileGID or tileAt.");
- },
-
- /**
- * Remove child
- * @param {cc.Sprite} sprite
- * @param {Boolean} cleanup
- */
- removeChild:function (sprite, cleanup) {
- // allows removing nil objects
- if (!sprite)
- return;
-
- if(this._children.indexOf(sprite) === -1){
- cc.log("cc.TMXLayer.removeChild(): Tile does not belong to TMXLayer");
- return;
- }
-
- if (cc._renderType === cc.game.RENDER_TYPE_CANVAS)
- this._setNodeDirtyForCache();
- var atlasIndex = sprite.atlasIndex;
- var zz = this._atlasIndexArray[atlasIndex];
- this.tiles[zz] = 0;
- this._atlasIndexArray.splice(atlasIndex, 1);
- cc.SpriteBatchNode.prototype.removeChild.call(this, sprite, cleanup);
- cc.renderer.childrenOrderDirty = true;
- },
-
- /**
- * Gets the layer name
- * @return {String}
- */
- getLayerName:function () {
- return this.layerName;
- },
-
- /**
- * Set the layer name
- * @param {String} layerName
- */
- setLayerName:function (layerName) {
- this.layerName = layerName;
- },
-
_positionForIsoAt:function (pos) {
return cc.p(this._mapTileSize.width / 2 * ( this._layerSize.width + pos.x - pos.y - 1),
this._mapTileSize.height / 2 * (( this._layerSize.height * 2 - pos.x - pos.y) - 2));
@@ -685,76 +669,15 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{
return ret;
},
- _appendTileForGID:function (gid, pos) {
- var rect = this.tileset.rectForGID(gid);
- rect = cc.rectPixelsToPoints(rect);
-
- var z = 0 | (pos.x + pos.y * this._layerSize.width);
- var tile = this._renderCmd._reusedTileWithRect(rect);
- this._setupTileSprite(tile, pos, gid);
-
- // optimization:
- // The difference between appendTileForGID and insertTileforGID is that append is faster, since
- // it appends the tile at the end of the texture atlas
- var indexForZ = this._atlasIndexArray.length;
-
- // don't add it using the "standard" way.
- this.insertQuadFromSprite(tile, indexForZ);
-
- // append should be after addQuadFromSprite since it modifies the quantity values
- this._atlasIndexArray.splice(indexForZ, 0, z);
- return tile;
- },
-
- _insertTileForGID:function (gid, pos) {
- var rect = this.tileset.rectForGID(gid);
- rect = cc.rectPixelsToPoints(rect);
-
- var z = 0 | (pos.x + pos.y * this._layerSize.width);
- var tile = this._renderCmd._reusedTileWithRect(rect);
- this._setupTileSprite(tile, pos, gid);
-
- // get atlas index
- var indexForZ = this._atlasIndexForNewZ(z);
-
- // Optimization: add the quad without adding a child
- this.insertQuadFromSprite(tile, indexForZ);
-
- // insert it into the local atlasindex array
- this._atlasIndexArray.splice(indexForZ, 0, z);
- // update possible children
- if (this._children) {
- var locChildren = this._children;
- for (var i = 0, len = locChildren.length; i < len; i++) {
- var child = locChildren[i];
- if (child) {
- var ai = child.atlasIndex;
- if (ai >= indexForZ)
- child.atlasIndex = ai + 1;
- }
- }
- }
- this.tiles[z] = gid;
- return tile;
- },
-
_updateTileForGID:function (gid, pos) {
- var rect = this.tileset.rectForGID(gid);
- var locScaleFactor = this._contentScaleFactor;
- rect = cc.rect(rect.x / locScaleFactor, rect.y / locScaleFactor,
- rect.width / locScaleFactor, rect.height / locScaleFactor);
- var z = pos.x + pos.y * this._layerSize.width;
-
- var tile = this._renderCmd._reusedTileWithRect(rect);
- this._setupTileSprite(tile, pos, gid);
-
- // get atlas index
- tile.atlasIndex = this._atlasIndexForExistantZ(z);
- tile.dirty = true;
- tile.updateTransform();
- this.tiles[z] = gid;
+ if (!this._texGrids[gid]) {
+ return;
+ }
- return tile;
+ var idx = 0 | (pos.x + pos.y * this._layerSize.width);
+ if (idx < this.tiles.length) {
+ this.tiles[idx] = gid;
+ }
},
//The layer recognizes some special properties, like cc_vertez
@@ -770,7 +693,7 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{
alphaFuncValue = parseFloat(alphaFuncVal);
if (cc._renderType === cc.game.RENDER_TYPE_WEBGL) { //todo: need move to WebGL render cmd
- this.shaderProgram = cc.shaderCache.programForKey(cc.SHADER_POSITION_TEXTURECOLORALPHATEST);
+ this.shaderProgram = cc.shaderCache.programForKey(cc.SHADER_SPRITE_POSITION_TEXTURECOLORALPHATEST);
// NOTE: alpha test shader is hard-coded to use the equivalent of a glAlphaFunc(GL_GREATER) comparison
this.shaderProgram.use();
this.shaderProgram.setUniformLocationWith1f(cc.UNIFORM_ALPHA_TEST_VALUE_S, alphaFuncValue);
@@ -782,65 +705,59 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{
_setupTileSprite:function (sprite, pos, gid) {
var z = pos.x + pos.y * this._layerSize.width;
- sprite.setPosition(this.getPositionAt(pos));
- if (cc._renderType === cc.game.RENDER_TYPE_WEBGL)
- sprite.vertexZ = this._vertexZForPos(pos);
- else
- sprite.tag = z;
-
- sprite.anchorX = 0;
- sprite.anchorY = 0;
- sprite.opacity = this._opacity;
- if (cc._renderType === cc.game.RENDER_TYPE_WEBGL) {
- sprite.rotation = 0.0;
- }
-
+ var posInPixel = this.getPositionAt(pos);
+ sprite.setPosition(posInPixel);
+ sprite.setVertexZ(this._vertexZForPos(pos));
+ sprite.setAnchorPoint(0, 0);
+ sprite.setOpacity(this._opacity);
sprite.setFlippedX(false);
sprite.setFlippedY(false);
+ sprite.setRotation(0.0);
// Rotation in tiled is achieved using 3 flipped states, flipping across the horizontal, vertical, and diagonal axes of the tiles.
if ((gid & cc.TMX_TILE_DIAGONAL_FLAG) >>> 0) {
// put the anchor in the middle for ease of rotation.
- sprite.anchorX = 0.5;
- sprite.anchorY = 0.5;
- sprite.x = this.getPositionAt(pos).x + sprite.width / 2;
- sprite.y = this.getPositionAt(pos).y + sprite.height / 2;
+ sprite.setAnchorPoint(0.5, 0.5);
+ sprite.setPosition(posInPixel.x + sprite.width/2, posInPixel.y + sprite.height/2);
var flag = (gid & (cc.TMX_TILE_HORIZONTAL_FLAG | cc.TMX_TILE_VERTICAL_FLAG) >>> 0) >>> 0;
// handle the 4 diagonally flipped states.
if (flag === cc.TMX_TILE_HORIZONTAL_FLAG)
- sprite.rotation = 90;
+ sprite.setRotation(90);
else if (flag === cc.TMX_TILE_VERTICAL_FLAG)
- sprite.rotation = 270;
+ sprite.setRotation(270);
else if (flag === (cc.TMX_TILE_VERTICAL_FLAG | cc.TMX_TILE_HORIZONTAL_FLAG) >>> 0) {
- sprite.rotation = 90;
- sprite.setFlippedX(true);
+ sprite.setRotation(90);
+ sprite.setFlippedX(true);
} else {
- sprite.rotation = 270;
- sprite.setFlippedX(true);
+ sprite.setRotation(270);
+ sprite.setFlippedX(true);
}
} else {
if ((gid & cc.TMX_TILE_HORIZONTAL_FLAG) >>> 0) {
sprite.setFlippedX(true);
}
-
if ((gid & cc.TMX_TILE_VERTICAL_FLAG) >>> 0) {
sprite.setFlippedY(true);
}
}
},
- _vertexZForPos:function (pos) {
+ _vertexZForPos:function (x, y) {
+ if (y === undefined) {
+ y = x.y;
+ x = x.x;
+ }
var ret = 0;
var maxVal = 0;
if (this._useAutomaticVertexZ) {
switch (this.layerOrientation) {
case cc.TMX_ORIENTATION_ISO:
maxVal = this._layerSize.width + this._layerSize.height;
- ret = -(maxVal - (pos.x + pos.y));
+ ret = -(maxVal - (x + y));
break;
case cc.TMX_ORIENTATION_ORTHO:
- ret = -(this._layerSize.height - pos.y);
+ ret = -(this._layerSize.height - y);
break;
case cc.TMX_ORIENTATION_HEX:
cc.log("TMX Hexa zOrder not supported");
@@ -853,39 +770,11 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{
ret = this._vertexZvalue;
}
return ret;
- },
-
- _atlasIndexForExistantZ:function (z) {
- var item;
- if (this._atlasIndexArray) {
- var locAtlasIndexArray = this._atlasIndexArray;
- for (var i = 0, len = locAtlasIndexArray.length; i < len; i++) {
- item = locAtlasIndexArray[i];
- if (item === z)
- break;
- }
- }
- if(!cc.isNumber(item))
- cc.log("cc.TMXLayer._atlasIndexForExistantZ(): TMX atlas index not found. Shall not happen");
- return i;
- },
-
- _atlasIndexForNewZ:function (z) {
- var locAtlasIndexArray = this._atlasIndexArray;
- for (var i = 0, len = locAtlasIndexArray.length; i < len; i++) {
- var val = locAtlasIndexArray[i];
- if (z < val)
- break;
- }
- return i;
}
});
var _p = cc.TMXLayer.prototype;
-/** @expose */
-cc.defineGetterSetter(_p, "texture", _p.getTexture, _p.setTexture);
-
// Extended properties
/** @expose */
_p.layerWidth;
diff --git a/cocos2d/tilemap/CCTMXLayerCanvasRenderCmd.js b/cocos2d/tilemap/CCTMXLayerCanvasRenderCmd.js
index 79a1ff197d..6f7d6c7882 100644
--- a/cocos2d/tilemap/CCTMXLayerCanvasRenderCmd.js
+++ b/cocos2d/tilemap/CCTMXLayerCanvasRenderCmd.js
@@ -24,7 +24,7 @@
(function(){
cc.TMXLayer.CanvasRenderCmd = function(renderable){
- cc.SpriteBatchNode.CanvasRenderCmd.call(this, renderable);
+ cc.Node.CanvasRenderCmd.call(this, renderable);
this._needDraw = true;
this._realWorldTransform = {a: 1, b: 0, c: 0, d: 1, tx: 0, ty: 0};
@@ -42,7 +42,7 @@
this._cacheDirty = false;
};
- var proto = cc.TMXLayer.CanvasRenderCmd.prototype = Object.create(cc.SpriteBatchNode.CanvasRenderCmd.prototype);
+ var proto = cc.TMXLayer.CanvasRenderCmd.prototype = Object.create(cc.Node.CanvasRenderCmd.prototype);
proto.constructor = cc.TMXLayer.CanvasRenderCmd;
//set the cache dirty flag for canvas
diff --git a/cocos2d/tilemap/CCTMXLayerWebGLRenderCmd.js b/cocos2d/tilemap/CCTMXLayerWebGLRenderCmd.js
index 8c1906f640..0568ac8925 100644
--- a/cocos2d/tilemap/CCTMXLayerWebGLRenderCmd.js
+++ b/cocos2d/tilemap/CCTMXLayerWebGLRenderCmd.js
@@ -24,44 +24,214 @@
(function(){
cc.TMXLayer.WebGLRenderCmd = function(renderableObject){
- cc.SpriteBatchNode.WebGLRenderCmd.call(this, renderableObject);
+ cc.Node.WebGLRenderCmd.call(this, renderableObject);
this._needDraw = true;
+ this._vertices = [
+ {x:0, y:0},
+ {x:0, y:0},
+ {x:0, y:0},
+ {x:0, y:0}
+ ];
+ this._color = new Uint32Array(1);
+ this._shaderProgram = cc.shaderCache.programForKey(cc.SHADER_SPRITE_POSITION_TEXTURECOLORALPHATEST);
+
+ var radian = Math.PI * 90 / 180;
+ this._sin90 = Math.sin(radian);
+ this._cos90 = Math.cos(radian);
+ radian = radian * 3;
+ this._sin270 = Math.sin(radian);
+ this._cos270 = Math.cos(radian);
};
- var proto = cc.TMXLayer.WebGLRenderCmd.prototype = Object.create(cc.SpriteBatchNode.WebGLRenderCmd.prototype);
+ var proto = cc.TMXLayer.WebGLRenderCmd.prototype = Object.create(cc.Node.WebGLRenderCmd.prototype);
proto.constructor = cc.TMXLayer.WebGLRenderCmd;
- proto._updateCacheContext = function(){};
+ proto.uploadData = function (f32buffer, ui32buffer, vertexDataOffset) {
+ var node = this._node, hasRotation = (node._rotationX || node._rotationY),
+ layerOrientation = node.layerOrientation,
+ tiles = node.tiles;
+
+ if (!tiles) {
+ return 0;
+ }
- proto.initImageSize = function(){
- var node = this._node;
- node.tileset.imageSize = this._textureAtlas.texture.getContentSizeInPixels();
+ var scalex = cc.director._contentScaleFactor * cc.view._scaleX,
+ scaley = cc.director._contentScaleFactor * cc.view._scaleY,
+ tilew = node._mapTileSize.width / scalex,
+ tileh = node._mapTileSize.height / scaley,
+ extw = node.tileset._tileSize.width / scalex - tilew,
+ exth = node.tileset._tileSize.height / scaley - tileh,
+ winw = cc.winSize.width,
+ winh = cc.winSize.height,
+ rows = node._layerSize.height,
+ cols = node._layerSize.width,
+ grids = node._texGrids,
+ spTiles = node._spriteTiles,
+ wt = this._worldTransform,
+ a = wt.a, b = wt.b, c = wt.c, d = wt.d, tx = wt.tx, ty = wt.ty,
+ ox = -node._contentSize.width * node._anchorPoint.x,
+ oy = -node._contentSize.height * node._anchorPoint.y,
+ mapx = ox * a + oy * c + tx,
+ mapy = ox * b + oy * d + ty;
- // By default all the tiles are aliased
- // pros:
- // - easier to render
- // cons:
- // - difficult to scale / rotate / etc.
- this._textureAtlas.texture.setAliasTexParameters();
- };
+ var opacity = this._displayedOpacity,
+ cr = this._displayedColor.r,
+ cg = this._displayedColor.g,
+ cb = this._displayedColor.b;
+ if (node._opacityModifyRGB) {
+ var ca = opacity / 255;
+ cr *= ca;
+ cg *= ca;
+ cb *= ca;
+ }
+ this._color[0] = ((opacity<<24) | (cb<<16) | (cg<<8) | cr);
+
+ // Culling
+ var startCol = 0, startRow = 0,
+ maxCol = cols, maxRow = rows;
+ if (!hasRotation && layerOrientation === cc.TMX_ORIENTATION_ORTHO) {
+ startCol = Math.floor(-(mapx - extw * a) / (tilew * a));
+ startRow = Math.floor((mapy - exth * d + tileh * rows * d - winh) / (tileh * d));
+ maxCol = Math.ceil((winw - mapx + extw * a) / (tilew * a));
+ maxRow = rows - Math.floor(-(mapy + exth * d) / (tileh * d));
+ // Adjustment
+ if (startCol < 0) startCol = 0;
+ if (startRow < 0) startRow = 0;
+ if (maxCol > cols) maxCol = cols;
+ if (maxRow > rows) maxRow = rows;
+ }
+
+ var row, col,
+ offset = vertexDataOffset,
+ colOffset = startRow * cols, z, gid, grid,
+ mask = cc.TMX_TILE_FLIPPED_MASK,
+ i, top, left, bottom, right,
+ wa = a, wb = b, wc = c, wd = d, wtx = tx, wty = ty, // world
+ flagged = false, flippedX = false, flippedY = false,
+ vertices = this._vertices;
+ for (row = startRow; row < maxRow; ++row) {
+ for (col = startCol; col < maxCol; ++col) {
+ // No more buffer
+ if (offset + 24 > f32buffer.length) {
+ cc.renderer._increaseBatchingSize((offset - vertexDataOffset) / 6);
+ cc.renderer._batchRendering();
+ vertexDataOffset = 0;
+ offset = 0;
+ }
+
+ z = colOffset + col;
+ // Skip sprite tiles
+ if (spTiles[z]) {
+ continue;
+ }
+
+ gid = node.tiles[z];
+ grid = grids[(gid & mask) >>> 0];
+ if (!grid) {
+ continue;
+ }
+
+ // Vertices
+ switch (layerOrientation) {
+ case cc.TMX_ORIENTATION_ORTHO:
+ left = col * tilew;
+ bottom = (rows - row - 1) * tileh;
+ z = node._vertexZ + cc.renderer.assignedZStep * z / tiles.length;
+ break;
+ case cc.TMX_ORIENTATION_ISO:
+ left = tilew / 2 * ( cols + col - row - 1);
+ bottom = tileh / 2 * ( rows * 2 - col - row - 2);
+ z = node._vertexZ + cc.renderer.assignedZStep * (node.height - bottom) / node.height;
+ break;
+ case cc.TMX_ORIENTATION_HEX:
+ left = col * tilew * 3 / 4;
+ bottom = (rows - row - 1) * tileh + ((col % 2 === 1) ? (-tileh / 2) : 0);
+ z = node._vertexZ + cc.renderer.assignedZStep * (node.height - bottom) / node.height;
+ break;
+ }
+ right = left + grid.width * scalex;
+ top = bottom + grid.height * scaley;
+ // Rotation and Flip
+ if (gid > cc.TMX_TILE_DIAGONAL_FLAG) {
+ flagged = true;
+ flippedX = (gid & cc.TMX_TILE_HORIZONTAL_FLAG) >>> 0;
+ flippedY = (gid & cc.TMX_TILE_VERTICAL_FLAG) >>> 0;
+ // if ((gid & cc.TMX_TILE_DIAGONAL_FLAG) >>> 0) {
+ // var flag = (gid & (cc.TMX_TILE_HORIZONTAL_FLAG | cc.TMX_TILE_VERTICAL_FLAG) >>> 0) >>> 0;
+ // // handle the 4 diagonally flipped states.
+ // var la, lb, lc, ld;
+ // if (flag === cc.TMX_TILE_HORIZONTAL_FLAG || flag === (cc.TMX_TILE_VERTICAL_FLAG | cc.TMX_TILE_HORIZONTAL_FLAG) >>> 0) {
+ // lb = -(lc = this._sin90);
+ // la = ld = this._cos90;
+ // }
+ // else {
+ // lb = -(lc = this._sin270);
+ // la = ld = this._cos270;
+ // }
+ // left += grid.width * scalex / 2;
+ // bottom += grid.height * scaley / 2;
+ // wa = la * a + lb * c;
+ // wb = la * b + lb * d;
+ // wc = lc * a + ld * c;
+ // wd = lc * b + ld * d;
+ // wtx = a * left + c * bottom + tx;
+ // wty = d * bottom + ty + b * left;
+ // right = right - left;
+ // top = top - bottom;
+ // left = -right;
+ // bottom = -top;
+ // }
+ }
+
+ vertices[0].x = left * wa + top * wc + wtx; // tl
+ vertices[0].y = left * wb + top * wd + wty;
+ vertices[1].x = left * wa + bottom * wc + wtx; // bl
+ vertices[1].y = left * wb + bottom * wd + wty;
+ vertices[2].x = right * wa + top * wc + wtx; // tr
+ vertices[2].y = right * wb + top * wd + wty;
+ vertices[3].x = right * wa + bottom * wc + wtx; // br
+ vertices[3].y = right * wb + bottom * wd + wty;
+
+ for (i = 0; i < 4; ++i) {
+ f32buffer[offset] = vertices[i].x;
+ f32buffer[offset + 1] = vertices[i].y;
+ f32buffer[offset + 2] = z;
+ ui32buffer[offset + 3] = this._color[0];
+ switch (i) {
+ case 0: // tl
+ f32buffer[offset + 4] = flippedX ? grid.r : grid.l;
+ f32buffer[offset + 5] = flippedY ? grid.b : grid.t;
+ break;
+ case 1: // bl
+ f32buffer[offset + 4] = flippedX ? grid.r : grid.l;
+ f32buffer[offset + 5] = flippedY ? grid.t : grid.b;
+ break;
+ case 2: // tr
+ f32buffer[offset + 4] = flippedX ? grid.l : grid.r;
+ f32buffer[offset + 5] = flippedY ? grid.b : grid.t;
+ break;
+ case 3: // br
+ f32buffer[offset + 4] = flippedX ? grid.l : grid.r;
+ f32buffer[offset + 5] = flippedY ? grid.t : grid.b;
+ break;
+ }
- proto._reusedTileWithRect = function(rect){
- var node = this._node;
- if (!node._reusedTile) {
- node._reusedTile = new cc.Sprite();
- node._reusedTile.initWithTexture(node.texture, rect, false);
- node._reusedTile.batchNode = node;
- } else {
- // XXX HACK: Needed because if "batch node" is nil,
- // then the Sprite'squad will be reset
- node._reusedTile.batchNode = null;
-
- // Re-init the sprite
- node._reusedTile.setTextureRect(rect, false);
-
- // restore the batch node
- node._reusedTile.batchNode = node;
+ offset += 6;
+ }
+ if (flagged) {
+ wa = a;
+ wb = b;
+ wc = c;
+ wd = d;
+ wtx = tx;
+ wty = ty;
+ flippedX = false;
+ flippedY = false;
+ flagged = false;
+ }
+ }
+ colOffset += cols;
}
- return node._reusedTile;
+ return (offset - vertexDataOffset) / 6;
};
})();
diff --git a/cocos2d/tilemap/CCTMXTiledMap.js b/cocos2d/tilemap/CCTMXTiledMap.js
index 787b62319a..5ca4107ed2 100644
--- a/cocos2d/tilemap/CCTMXTiledMap.js
+++ b/cocos2d/tilemap/CCTMXTiledMap.js
@@ -414,7 +414,6 @@ cc.TMXTiledMap = cc.Node.extend(/** @lends cc.TMXTiledMap# */{
var layer = new cc.TMXLayer(tileset, layerInfo, mapInfo);
// tell the layerinfo to release the ownership of the tiles map.
layerInfo.ownTiles = false;
- layer.setupTiles();
return layer;
},
diff --git a/cocos2d/tilemap/CCTMXXMLParser.js b/cocos2d/tilemap/CCTMXXMLParser.js
index 5133b09cc5..70509e6802 100644
--- a/cocos2d/tilemap/CCTMXXMLParser.js
+++ b/cocos2d/tilemap/CCTMXXMLParser.js
@@ -123,7 +123,7 @@ cc.TMXLayerInfo = cc.Class.extend(/** @lends cc.TMXLayerInfo# */{
this.properties = [];
this.name = "";
this._layerSize = null;
- this._tiles = [];
+ this._tiles = null;
this.visible = true;
this._opacity = 0;
this.ownTiles = true;
@@ -200,8 +200,8 @@ cc.TMXTilesetInfo = cc.Class.extend(/** @lends cc.TMXTilesetInfo# */{
* @param {Number} gid
* @return {cc.Rect}
*/
- rectForGID:function (gid) {
- var rect = cc.rect(0, 0, 0, 0);
+ rectForGID:function (gid, result) {
+ var rect = result || cc.rect(0, 0, 0, 0);
rect.width = this._tileSize.width;
rect.height = this._tileSize.height;
gid &= cc.TMX_TILE_FLIPPED_MASK;
@@ -682,30 +682,31 @@ cc.TMXMapInfo = cc.SAXParser.extend(/** @lends cc.TMXMapInfo# */{
cc.log("cc.TMXMapInfo.parseXMLFile(): unsupported compression method");
return null;
}
+ var tiles;
switch (compression) {
case 'gzip':
- layer._tiles = cc.unzipBase64AsArray(nodeValue, 4);
+ tiles = cc.unzipBase64AsArray(nodeValue, 4);
break;
case 'zlib':
var inflator = new Zlib.Inflate(cc.Codec.Base64.decodeAsArray(nodeValue, 1));
- layer._tiles = cc.uint8ArrayToUint32Array(inflator.decompress());
+ tiles = cc.uint8ArrayToUint32Array(inflator.decompress());
break;
case null:
case '':
// Uncompressed
if (encoding === "base64")
- layer._tiles = cc.Codec.Base64.decodeAsArray(nodeValue, 4);
+ tiles = cc.Codec.Base64.decodeAsArray(nodeValue, 4);
else if (encoding === "csv") {
- layer._tiles = [];
+ tiles = [];
var csvTiles = nodeValue.split(',');
for (var csvIdx = 0; csvIdx < csvTiles.length; csvIdx++)
- layer._tiles.push(parseInt(csvTiles[csvIdx]));
+ tiles.push(parseInt(csvTiles[csvIdx]));
} else {
//XML format
var selDataTiles = data.getElementsByTagName("tile");
- layer._tiles = [];
+ tiles = [];
for (var xmlIdx = 0; xmlIdx < selDataTiles.length; xmlIdx++)
- layer._tiles.push(parseInt(selDataTiles[xmlIdx].getAttribute("gid")));
+ tiles.push(parseInt(selDataTiles[xmlIdx].getAttribute("gid")));
}
break;
default:
@@ -713,6 +714,9 @@ cc.TMXMapInfo = cc.SAXParser.extend(/** @lends cc.TMXMapInfo# */{
cc.log("cc.TMXMapInfo.parseXMLFile(): Only base64 and/or gzip/zlib maps are supported");
break;
}
+ if (tiles) {
+ layer._tiles = new Uint32Array(tiles);
+ }
// The parent element is the last layer
var layerProps = selLayer.querySelectorAll("properties > property");
diff --git a/cocos2d/transitions/CCTransition.js b/cocos2d/transitions/CCTransition.js
index 529c4dc146..6796074555 100644
--- a/cocos2d/transitions/CCTransition.js
+++ b/cocos2d/transitions/CCTransition.js
@@ -217,8 +217,6 @@ cc.TransitionScene = cc.Scene.extend(/** @lends cc.TransitionScene# */{
scale: 1.0,
rotation: 0.0
});
- if(cc._renderType === cc.game.RENDER_TYPE_WEBGL)
- this._inScene.getCamera().restore();
this._outScene.attr({
visible: false,
@@ -227,8 +225,6 @@ cc.TransitionScene = cc.Scene.extend(/** @lends cc.TransitionScene# */{
scale: 1.0,
rotation: 0.0
});
- if(cc._renderType === cc.game.RENDER_TYPE_WEBGL)
- this._outScene.getCamera().restore();
//[self schedule:@selector(setNewScene:) interval:0];
this.schedule(this._setNewScene, 0);
@@ -903,476 +899,6 @@ cc.TransitionShrinkGrow.create = function (t, scene) {
return new cc.TransitionShrinkGrow(t, scene);
};
-/**
- * Flips the screen horizontally.
- * The front face is the outgoing scene and the back face is the incoming scene.
- * @class
- * @extends cc.TransitionSceneOriented
- * @param {Number} t time in seconds
- * @param {cc.Scene} scene
- * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o
- * @example
- * var trans = new cc.TransitionFlipX(t,scene,o);
- */
-cc.TransitionFlipX = cc.TransitionSceneOriented.extend(/** @lends cc.TransitionFlipX# */{
- /**
- * Constructor of TransitionFlipX
- * @function
- * @param {Number} t time in seconds
- * @param {cc.Scene} scene
- * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o
- */
- ctor:function (t, scene, o) {
- cc.TransitionSceneOriented.prototype.ctor.call(this);
- if(o == null)
- o = cc.TRANSITION_ORIENTATION_RIGHT_OVER;
- scene && this.initWithDuration(t, scene, o);
- },
-
- /**
- * custom on enter
- */
- onEnter:function () {
- cc.TransitionScene.prototype.onEnter.call(this);
-
- var inA, outA;
- this._inScene.visible = false;
-
- var inDeltaZ, inAngleZ, outDeltaZ, outAngleZ;
-
- if (this._orientation === cc.TRANSITION_ORIENTATION_RIGHT_OVER) {
- inDeltaZ = 90;
- inAngleZ = 270;
- outDeltaZ = 90;
- outAngleZ = 0;
- } else {
- inDeltaZ = -90;
- inAngleZ = 90;
- outDeltaZ = -90;
- outAngleZ = 0;
- }
-
- inA = cc.sequence(
- cc.delayTime(this._duration / 2), cc.show(),
- cc.orbitCamera(this._duration / 2, 1, 0, inAngleZ, inDeltaZ, 0, 0),
- cc.callFunc(this.finish, this)
- );
-
- outA = cc.sequence(
- cc.orbitCamera(this._duration / 2, 1, 0, outAngleZ, outDeltaZ, 0, 0),
- cc.hide(), cc.delayTime(this._duration / 2)
- );
-
- this._inScene.runAction(inA);
- this._outScene.runAction(outA);
- }
-});
-
-/**
- * Flips the screen horizontally.
- * The front face is the outgoing scene and the back face is the incoming scene.
- * @deprecated since v3.0,please use new cc.TransitionFlipX(t, scene,o) instead.
- * @param {Number} t time in seconds
- * @param {cc.Scene} scene
- * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o
- * @return {cc.TransitionFlipX}
- */
-cc.TransitionFlipX.create = function (t, scene, o) {
- return new cc.TransitionFlipX(t, scene, o);
-};
-
-/**
- * Flips the screen vertically.
- * The front face is the outgoing scene and the back face is the incoming scene.
- * @class
- * @extends cc.TransitionSceneOriented
- * @param {Number} t time in seconds
- * @param {cc.Scene} scene
- * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o
- * @example
- * var trans = new cc.TransitionFlipY(time,scene,0);
- */
-cc.TransitionFlipY = cc.TransitionSceneOriented.extend(/** @lends cc.TransitionFlipY# */{
-
- /**
- * Constructor of TransitionFlipY
- * @param {Number} t time in seconds
- * @param {cc.Scene} scene
- * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o
- */
- ctor:function (t, scene, o) {
- cc.TransitionSceneOriented.prototype.ctor.call(this);
- if(o == null)
- o = cc.TRANSITION_ORIENTATION_UP_OVER;
- scene && this.initWithDuration(t, scene, o);
- },
- /**
- * custom on enter
- */
- onEnter:function () {
- cc.TransitionScene.prototype.onEnter.call(this);
-
- var inA, outA;
- this._inScene.visible = false;
-
- var inDeltaZ, inAngleZ, outDeltaZ, outAngleZ;
-
- if (this._orientation === cc.TRANSITION_ORIENTATION_UP_OVER) {
- inDeltaZ = 90;
- inAngleZ = 270;
- outDeltaZ = 90;
- outAngleZ = 0;
- } else {
- inDeltaZ = -90;
- inAngleZ = 90;
- outDeltaZ = -90;
- outAngleZ = 0;
- }
-
- inA = cc.sequence(
- cc.delayTime(this._duration / 2), cc.show(),
- cc.orbitCamera(this._duration / 2, 1, 0, inAngleZ, inDeltaZ, 90, 0),
- cc.callFunc(this.finish, this)
- );
- outA = cc.sequence(
- cc.orbitCamera(this._duration / 2, 1, 0, outAngleZ, outDeltaZ, 90, 0),
- cc.hide(), cc.delayTime(this._duration / 2)
- );
-
- this._inScene.runAction(inA);
- this._outScene.runAction(outA);
- }
-});
-
-/**
- * Flips the screen vertically.
- * The front face is the outgoing scene and the back face is the incoming scene.
- * @deprecated since v3.0,please use new cc.TransitionFlipY(t, scene,o) instead.
- * @param {Number} t time in seconds
- * @param {cc.Scene} scene
- * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o
- * @return {cc.TransitionFlipY}
- */
-cc.TransitionFlipY.create = function (t, scene, o) {
- return new cc.TransitionFlipY(t, scene, o);
-};
-
-/**
- * Flips the screen half horizontally and half vertically.
- * The front face is the outgoing scene and the back face is the incoming scene.
- * @class
- * @extends cc.TransitionSceneOriented
- * @param {Number} t time in seconds
- * @param {cc.Scene} scene
- * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o
- * @example
- * var trans = cc.TransitionFlipAngular(time,scene,o);
- */
-cc.TransitionFlipAngular = cc.TransitionSceneOriented.extend(/** @lends cc.TransitionFlipAngular# */{
- /**
- * Constructor of TransitionFlipAngular
- * @param {Number} t time in seconds
- * @param {cc.Scene} scene
- * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o
- */
- ctor:function (t, scene, o) {
- cc.TransitionSceneOriented.prototype.ctor.call(this);
- if(o == null)
- o = cc.TRANSITION_ORIENTATION_RIGHT_OVER;
- scene && this.initWithDuration(t, scene, o);
- },
- /**
- * custom on enter
- */
- onEnter:function () {
- cc.TransitionScene.prototype.onEnter.call(this);
-
- var inA, outA;
- this._inScene.visible = false;
-
- var inDeltaZ, inAngleZ, outDeltaZ, outAngleZ;
-
- if (this._orientation === cc.TRANSITION_ORIENTATION_RIGHT_OVER) {
- inDeltaZ = 90;
- inAngleZ = 270;
- outDeltaZ = 90;
- outAngleZ = 0;
- } else {
- inDeltaZ = -90;
- inAngleZ = 90;
- outDeltaZ = -90;
- outAngleZ = 0;
- }
-
- inA = cc.sequence(
- cc.delayTime(this._duration / 2), cc.show(),
- cc.orbitCamera(this._duration / 2, 1, 0, inAngleZ, inDeltaZ, -45, 0),
- cc.callFunc(this.finish, this)
- );
- outA = cc.sequence(
- cc.orbitCamera(this._duration / 2, 1, 0, outAngleZ, outDeltaZ, 45, 0),
- cc.hide(), cc.delayTime(this._duration / 2)
- );
-
- this._inScene.runAction(inA);
- this._outScene.runAction(outA);
- }
-});
-
-/**
- * Flips the screen half horizontally and half vertically.
- * The front face is the outgoing scene and the back face is the incoming scene.
- * @deprecated since v3.0,please use new new cc.TransitionFlipAngular(t, scene, o) instead
- * @param {Number} t time in seconds
- * @param {cc.Scene} scene
- * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o
- * @return {cc.TransitionFlipAngular}
- */
-cc.TransitionFlipAngular.create = function (t, scene, o) {
- return new cc.TransitionFlipAngular(t, scene, o);
-};
-
-/**
- * Flips the screen horizontally doing a zoom out/in
- * The front face is the outgoing scene and the back face is the incoming scene.
- * @class
- * @extends cc.TransitionSceneOriented
- * @param {Number} t time in seconds
- * @param {cc.Scene} scene
- * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o
- * @example
- * var trans = new cc.TransitionZoomFlipX(time,scene,o);
- */
-cc.TransitionZoomFlipX = cc.TransitionSceneOriented.extend(/** @lends cc.TransitionZoomFlipX# */{
-
- /**
- * Constructor of TransitionZoomFlipX
- * @param {Number} t time in seconds
- * @param {cc.Scene} scene
- * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o
- */
- ctor:function (t, scene, o) {
- cc.TransitionSceneOriented.prototype.ctor.call(this);
- if(o == null)
- o = cc.TRANSITION_ORIENTATION_RIGHT_OVER;
- scene && this.initWithDuration(t, scene, o);
- },
- /**
- * custom on enter
- */
- onEnter:function () {
- cc.TransitionScene.prototype.onEnter.call(this);
-
- var inA, outA;
- this._inScene.visible = false;
-
- var inDeltaZ, inAngleZ, outDeltaZ, outAngleZ;
-
- if (this._orientation === cc.TRANSITION_ORIENTATION_RIGHT_OVER) {
- inDeltaZ = 90;
- inAngleZ = 270;
- outDeltaZ = 90;
- outAngleZ = 0;
- } else {
- inDeltaZ = -90;
- inAngleZ = 90;
- outDeltaZ = -90;
- outAngleZ = 0;
- }
-
- inA = cc.sequence(
- cc.delayTime(this._duration / 2),
- cc.spawn(
- cc.orbitCamera(this._duration / 2, 1, 0, inAngleZ, inDeltaZ, 0, 0),
- cc.scaleTo(this._duration / 2, 1), cc.show()),
- cc.callFunc(this.finish, this)
- );
- outA = cc.sequence(
- cc.spawn(
- cc.orbitCamera(this._duration / 2, 1, 0, outAngleZ, outDeltaZ, 0, 0),
- cc.scaleTo(this._duration / 2, 0.5)),
- cc.hide(),
- cc.delayTime(this._duration / 2)
- );
-
- this._inScene.scale = 0.5;
- this._inScene.runAction(inA);
- this._outScene.runAction(outA);
- }
-});
-
-/**
- * Flips the screen horizontally doing a zoom out/in
- * The front face is the outgoing scene and the back face is the incoming scene.
- * @deprecated since v3.0,please use new new cc.TransitionZoomFlipX(t, scene, o) instead
- * @param {Number} t time in seconds
- * @param {cc.Scene} scene
- * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o
- * @return {cc.TransitionZoomFlipX}
- */
-cc.TransitionZoomFlipX.create = function (t, scene, o) {
- return new cc.TransitionZoomFlipX(t, scene, o);
-};
-
-/**
- * Flips the screen vertically doing a little zooming out/in
- * The front face is the outgoing scene and the back face is the incoming scene.
- * @class
- * @extends cc.TransitionSceneOriented
- * @param {Number} t time in seconds
- * @param {cc.Scene} scene
- * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o
- * @example
- * var trans = new cc.TransitionZoomFlipY(t,scene,o);
- */
-cc.TransitionZoomFlipY = cc.TransitionSceneOriented.extend(/** @lends cc.TransitionZoomFlipY# */{
-
- /**
- * Constructor of TransitionZoomFlipY
- * @param {Number} t time in seconds
- * @param {cc.Scene} scene
- * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o
- */
- ctor:function (t, scene, o) {
- cc.TransitionSceneOriented.prototype.ctor.call(this);
- if(o == null)
- o = cc.TRANSITION_ORIENTATION_UP_OVER;
- scene && this.initWithDuration(t, scene, o);
- },
- /**
- * custom on enter
- */
- onEnter:function () {
- cc.TransitionScene.prototype.onEnter.call(this);
-
- var inA, outA;
- this._inScene.visible = false;
-
- var inDeltaZ, inAngleZ, outDeltaZ, outAngleZ;
-
- if (this._orientation === cc.TRANSITION_ORIENTATION_UP_OVER) {
- inDeltaZ = 90;
- inAngleZ = 270;
- outDeltaZ = 90;
- outAngleZ = 0;
- } else {
- inDeltaZ = -90;
- inAngleZ = 90;
- outDeltaZ = -90;
- outAngleZ = 0;
- }
-
- inA = cc.sequence(
- cc.delayTime(this._duration / 2),
- cc.spawn(
- cc.orbitCamera(this._duration / 2, 1, 0, inAngleZ, inDeltaZ, 90, 0),
- cc.scaleTo(this._duration / 2, 1), cc.show()),
- cc.callFunc(this.finish, this));
-
- outA = cc.sequence(
- cc.spawn(
- cc.orbitCamera(this._duration / 2, 1, 0, outAngleZ, outDeltaZ, 90, 0),
- cc.scaleTo(this._duration / 2, 0.5)),
- cc.hide(), cc.delayTime(this._duration / 2));
-
- this._inScene.scale = 0.5;
- this._inScene.runAction(inA);
- this._outScene.runAction(outA);
- }
-});
-
-/**
- * Flips the screen vertically doing a little zooming out/in
- * The front face is the outgoing scene and the back face is the incoming scene.
- * @deprecated since v3.0,please use new new cc.TransitionZoomFlipY(t, scene, o) instead
- * @param {Number} t time in seconds
- * @param {cc.Scene} scene
- * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o
- * @return {cc.TransitionZoomFlipY}
- */
-cc.TransitionZoomFlipY.create = function (t, scene, o) {
- return new cc.TransitionZoomFlipY(t, scene, o);
-};
-
-/**
- * Flips the screen half horizontally and half vertically doing a little zooming out/in.
- * The front face is the outgoing scene and the back face is the incoming scene.
- * @class
- * @extends cc.TransitionSceneOriented
- * @param {Number} t time in seconds
- * @param {cc.Scene} scene
- * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o
- * @example
- * var trans = new cc.TransitionZoomFlipAngular(time,scene,o);
- */
-cc.TransitionZoomFlipAngular = cc.TransitionSceneOriented.extend(/** @lends cc.TransitionZoomFlipAngular# */{
-
- /**
- * Constructor of TransitionZoomFlipAngular
- * @param {Number} t time in seconds
- * @param {cc.Scene} scene
- * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o
- */
- ctor:function (t, scene, o) {
- cc.TransitionSceneOriented.prototype.ctor.call(this);
- if(o == null)
- o = cc.TRANSITION_ORIENTATION_RIGHT_OVER;
- scene && this.initWithDuration(t, scene, o);
- },
- /**
- * custom on enter
- */
- onEnter:function () {
- cc.TransitionScene.prototype.onEnter.call(this);
-
- var inA, outA;
- this._inScene.visible = false;
-
- var inDeltaZ, inAngleZ, outDeltaZ, outAngleZ;
- if (this._orientation === cc.TRANSITION_ORIENTATION_RIGHT_OVER) {
- inDeltaZ = 90;
- inAngleZ = 270;
- outDeltaZ = 90;
- outAngleZ = 0;
- } else {
- inDeltaZ = -90;
- inAngleZ = 90;
- outDeltaZ = -90;
- outAngleZ = 0;
- }
-
- inA = cc.sequence(
- cc.delayTime(this._duration / 2),
- cc.spawn(
- cc.orbitCamera(this._duration / 2, 1, 0, inAngleZ, inDeltaZ, -45, 0),
- cc.scaleTo(this._duration / 2, 1), cc.show()),
- cc.show(),
- cc.callFunc(this.finish, this));
- outA = cc.sequence(
- cc.spawn(
- cc.orbitCamera(this._duration / 2, 1, 0, outAngleZ, outDeltaZ, 45, 0),
- cc.scaleTo(this._duration / 2, 0.5)),
- cc.hide(), cc.delayTime(this._duration / 2));
-
- this._inScene.scale = 0.5;
- this._inScene.runAction(inA);
- this._outScene.runAction(outA);
- }
-});
-
-/**
- * Flips the screen half horizontally and half vertically doing a little zooming out/in.
- * The front face is the outgoing scene and the back face is the incoming scene.
- * @deprecated since v3.0,please use new new cc.TransitionZoomFlipAngular(t, scene, o) instead
- * @param {Number} t time in seconds
- * @param {cc.Scene} scene
- * @param {cc.TRANSITION_ORIENTATION_LEFT_OVER|cc.TRANSITION_ORIENTATION_RIGHT_OVER|cc.TRANSITION_ORIENTATION_UP_OVER|cc.TRANSITION_ORIENTATION_DOWN_OVER} o
- * @return {cc.TransitionZoomFlipAngular}
- */
-cc.TransitionZoomFlipAngular.create = function (t, scene, o) {
- return new cc.TransitionZoomFlipAngular(t, scene, o);
-};
-
/**
* Fade out the outgoing scene and then fade in the incoming scene.
* @class
diff --git a/cocos2d/transitions/CCTransitionProgress.js b/cocos2d/transitions/CCTransitionProgress.js
index c86dbe7e0b..38e67e2d5f 100644
--- a/cocos2d/transitions/CCTransitionProgress.js
+++ b/cocos2d/transitions/CCTransitionProgress.js
@@ -169,6 +169,9 @@ cc.TransitionProgressRadialCCW = cc.TransitionProgress.extend(/** @lends cc.Tran
var size = cc.director.getWinSize();
var pNode = new cc.ProgressTimer(texture.sprite);
+ // but it is flipped upside down so we flip the sprite
+ if (cc._renderType === cc.game.RENDER_TYPE_WEBGL)
+ pNode.sprite.flippedY = true;
pNode.type = cc.ProgressTimer.TYPE_RADIAL;
// Return the radial type that we want to use
@@ -217,6 +220,9 @@ cc.TransitionProgressRadialCW = cc.TransitionProgress.extend(/** @lends cc.Trans
var size = cc.director.getWinSize();
var pNode = new cc.ProgressTimer(texture.sprite);
+ // but it is flipped upside down so we flip the sprite
+ if (cc._renderType === cc.game.RENDER_TYPE_WEBGL)
+ pNode.sprite.flippedY = true;
pNode.type = cc.ProgressTimer.TYPE_RADIAL;
// Return the radial type that we want to use
@@ -267,6 +273,9 @@ cc.TransitionProgressHorizontal = cc.TransitionProgress.extend(/** @lends cc.Tra
var size = cc.director.getWinSize();
var pNode = new cc.ProgressTimer(texture.sprite);
+ // but it is flipped upside down so we flip the sprite
+ if (cc._renderType === cc.game.RENDER_TYPE_WEBGL)
+ pNode.sprite.flippedY = true;
pNode.type = cc.ProgressTimer.TYPE_BAR;
pNode.midPoint = cc.p(1, 0);
@@ -314,6 +323,9 @@ cc.TransitionProgressVertical = cc.TransitionProgress.extend(/** @lends cc.Trans
var size = cc.director.getWinSize();
var pNode = new cc.ProgressTimer(texture.sprite);
+ // but it is flipped upside down so we flip the sprite
+ if (cc._renderType === cc.game.RENDER_TYPE_WEBGL)
+ pNode.sprite.flippedY = true;
pNode.type = cc.ProgressTimer.TYPE_BAR;
pNode.midPoint = cc.p(0, 0);
@@ -357,6 +369,9 @@ cc.TransitionProgressInOut = cc.TransitionProgress.extend(/** @lends cc.Transiti
_progressTimerNodeWithRenderTexture:function (texture) {
var size = cc.director.getWinSize();
var pNode = new cc.ProgressTimer(texture.sprite);
+ // but it is flipped upside down so we flip the sprite
+ if (cc._renderType === cc.game.RENDER_TYPE_WEBGL)
+ pNode.sprite.flippedY = true;
pNode.type = cc.ProgressTimer.TYPE_BAR;
pNode.midPoint = cc.p(0.5, 0.5);
@@ -409,6 +424,9 @@ cc.TransitionProgressOutIn = cc.TransitionProgress.extend(/** @lends cc.Transiti
_progressTimerNodeWithRenderTexture:function (texture) {
var size = cc.director.getWinSize();
var pNode = new cc.ProgressTimer(texture.sprite);
+ // but it is flipped upside down so we flip the sprite
+ if (cc._renderType === cc.game.RENDER_TYPE_WEBGL)
+ pNode.sprite.flippedY = true;
pNode.type = cc.ProgressTimer.TYPE_BAR;
pNode.midPoint = cc.p(0.5, 0.5);
diff --git a/extensions/ccui/base-classes/CCProtectedNodeCanvasRenderCmd.js b/extensions/ccui/base-classes/CCProtectedNodeCanvasRenderCmd.js
index c3ecd0bb7d..1e36802e0d 100644
--- a/extensions/ccui/base-classes/CCProtectedNodeCanvasRenderCmd.js
+++ b/extensions/ccui/base-classes/CCProtectedNodeCanvasRenderCmd.js
@@ -205,36 +205,16 @@
if(node._changePosition)
node._changePosition();
- var t = node.getNodeToParentTransform(), worldT = this._worldTransform;
- if (parentCmd) {
- var pt = parentCmd._worldTransform;
- // cc.AffineTransformConcat is incorrect at get world transform
- worldT.a = t.a * pt.a + t.b * pt.c; //a
- worldT.b = t.a * pt.b + t.b * pt.d; //b
- worldT.c = t.c * pt.a + t.d * pt.c; //c
- worldT.d = t.c * pt.b + t.d * pt.d; //d
-
- worldT.tx = pt.a * t.tx + pt.c * t.ty + pt.tx;
- worldT.ty = pt.d * t.ty + pt.ty + pt.b * t.tx;
- } else {
- worldT.a = t.a;
- worldT.b = t.b;
- worldT.c = t.c;
- worldT.d = t.d;
- worldT.tx = t.tx;
- worldT.ty = t.ty;
- }
- var i, len, locChildren = node._children;
- if(recursive && locChildren && locChildren.length !== 0){
- for(i = 0, len = locChildren.length; i< len; i++){
- locChildren[i]._renderCmd.transform(this, recursive);
- }
- }
- locChildren = node._protectedChildren;
+ this.originTransform(parentCmd, recursive);
+
+ var i, len, locChildren = node._protectedChildren;
if(recursive && locChildren && locChildren.length !== 0){
for(i = 0, len = locChildren.length; i< len; i++){
locChildren[i]._renderCmd.transform(this, recursive);
}
}
};
+
+ proto.pNodeVisit = proto.visit;
+ proto.pNodeTransform = proto.transform;
})();
\ No newline at end of file
diff --git a/extensions/ccui/base-classes/CCProtectedNodeWebGLRenderCmd.js b/extensions/ccui/base-classes/CCProtectedNodeWebGLRenderCmd.js
index 864ef2ee82..6640c7cf9b 100644
--- a/extensions/ccui/base-classes/CCProtectedNodeWebGLRenderCmd.js
+++ b/extensions/ccui/base-classes/CCProtectedNodeWebGLRenderCmd.js
@@ -38,19 +38,14 @@
// quick return if not visible
if (!node._visible)
return;
- var i, j, currentStack = cc.current_stack;
+ var i, j;
- //optimize performance for javascript
- currentStack.stack.push(currentStack.top);
this._syncStatus(parentCmd);
- currentStack.top = this._stackMatrix;
var locGrid = node.grid;
if (locGrid && locGrid._active)
locGrid.beforeDraw();
- //node.transform(node._parent && node._parent._renderCmd);
-
var locChildren = node._children, locProtectedChildren = node._protectedChildren;
var childLen = locChildren.length, pLen = locProtectedChildren.length;
node.sortAllChildren();
@@ -90,70 +85,20 @@
locGrid.afterDraw(node);
this._dirtyFlag = 0;
- //optimize performance for javascript
- currentStack.top = currentStack.stack.pop();
};
proto.transform = function(parentCmd, recursive){
- var node = this._node;
- var t4x4 = this._transform4x4, stackMatrix = this._stackMatrix,
- parentMatrix = parentCmd ? parentCmd._stackMatrix : cc.current_stack.top;
-
- // Convert 3x3 into 4x4 matrix
- var trans = node.getNodeToParentTransform();
-
- if(node._changePosition)
- node._changePosition();
-
- var t4x4Mat = t4x4.mat;
- t4x4Mat[0] = trans.a;
- t4x4Mat[4] = trans.c;
- t4x4Mat[12] = trans.tx;
- t4x4Mat[1] = trans.b;
- t4x4Mat[5] = trans.d;
- t4x4Mat[13] = trans.ty;
-
- //optimize performance for Javascript
- cc.kmMat4Multiply(stackMatrix, parentMatrix, t4x4);
-
- // Update Z depth
- t4x4Mat[14] = node._vertexZ;
-
- // XXX: Expensive calls. Camera should be integrated into the cached affine matrix
- if (node._camera !== null && !(node.grid !== null && node.grid.isActive())) {
- var apx = this._anchorPointInPoints.x, apy = this._anchorPointInPoints.y;
- var translate = (apx !== 0.0 || apy !== 0.0);
- if (translate){
- if(!cc.SPRITEBATCHNODE_RENDER_SUBPIXEL) {
- apx = 0 | apx;
- apy = 0 | apy;
- }
- //cc.kmGLTranslatef(apx, apy, 0);
- var translation = cc.math.Matrix4.createByTranslation(apx, apy, 0, t4x4); //t4x4 as a temp matrix
- stackMatrix.multiply(translate);
-
- node._camera._locateForRenderer(stackMatrix);
-
- //cc.kmGLTranslatef(-apx, -apy, 0);
- translation = cc.math.Matrix4.createByTranslation(-apx, -apy, 0, translation);
- stackMatrix.multiply(translation);
- t4x4.identity(); //reset t4x4;
- } else {
- node._camera._locateForRenderer(stackMatrix);
- }
- }
+ this.originTransform(parentCmd, recursive);
- var i, len, locChildren = node._children;
- if(recursive && locChildren && locChildren.length !== 0){
- for(i = 0, len = locChildren.length; i< len; i++){
- locChildren[i]._renderCmd.transform(this, recursive);
- }
- }
- locChildren = node._protectedChildren;
+ var i, len,
+ locChildren = this._node._protectedChildren;
if(recursive && locChildren && locChildren.length !== 0){
for(i = 0, len = locChildren.length; i< len; i++){
locChildren[i]._renderCmd.transform(this, recursive);
}
}
};
+
+ proto.pNodeVisit = proto.visit;
+ proto.pNodeTransform = proto.transform;
})();
\ No newline at end of file
diff --git a/extensions/ccui/base-classes/UIScale9Sprite.js b/extensions/ccui/base-classes/UIScale9Sprite.js
index 2a52aec982..dde829eb2e 100644
--- a/extensions/ccui/base-classes/UIScale9Sprite.js
+++ b/extensions/ccui/base-classes/UIScale9Sprite.js
@@ -488,12 +488,16 @@ ccui.Scale9Sprite = cc.Scale9Sprite = cc.Node.extend(/** @lends ccui.Scale9Sprit
this._textureLoaded = locLoaded;
if(!locLoaded){
texture.addEventListener("load", function(sender){
- // the texture is rotated on Canvas render mode, so isRotated always is false.
- var preferredSize = this._preferredSize, restorePreferredSize = preferredSize.width !== 0 && preferredSize.height !== 0;
- if (restorePreferredSize) preferredSize = cc.size(preferredSize.width, preferredSize.height);
+ var preferredSize = this._preferredSize,
+ restorePreferredSize = preferredSize.width !== 0 && preferredSize.height !== 0;
+ if (restorePreferredSize) {
+ preferredSize = cc.size(preferredSize.width, preferredSize.height);
+ }
var size = sender.getContentSize();
this.updateWithBatchNode(this._scale9Image, cc.rect(0,0,size.width,size.height), false, this._capInsets);
- if (restorePreferredSize)this.setPreferredSize(preferredSize);
+ if (restorePreferredSize) {
+ this.setPreferredSize(preferredSize);
+ }
this._positionsAreDirty = true;
this.setNodeDirty();
this.dispatchEvent("load");
@@ -522,11 +526,15 @@ ccui.Scale9Sprite = cc.Scale9Sprite = cc.Node.extend(/** @lends ccui.Scale9Sprit
this._textureLoaded = locLoaded;
if(!locLoaded){
spriteFrame.addEventListener("load", function(sender){
- // the texture is rotated on Canvas render mode, so isRotated always is false.
- var preferredSize = this._preferredSize, restorePreferredSize = preferredSize.width !== 0 && preferredSize.height !== 0;
- if (restorePreferredSize) preferredSize = cc.size(preferredSize.width, preferredSize.height);
+ var preferredSize = this._preferredSize,
+ restorePreferredSize = preferredSize.width !== 0 && preferredSize.height !== 0;
+ if (restorePreferredSize) {
+ preferredSize = cc.size(preferredSize.width, preferredSize.height);
+ }
this.updateWithBatchNode(this._scale9Image, sender.getRect(), cc._renderType === cc.game.RENDER_TYPE_WEBGL && sender.isRotated(), this._capInsets);
- if (restorePreferredSize)this.setPreferredSize(preferredSize);
+ if (restorePreferredSize) {
+ this.setPreferredSize(preferredSize);
+ }
this._positionsAreDirty = true;
this.setNodeDirty();
this.dispatchEvent("load");
@@ -857,8 +865,16 @@ ccui.Scale9Sprite = cc.Scale9Sprite = cc.Node.extend(/** @lends ccui.Scale9Sprit
this._textureLoaded = locLoaded;
if(!locLoaded){
tmpTexture.addEventListener("load", function(sender){
- this._positionsAreDirty = true;
+ var preferredSize = this._preferredSize,
+ restorePreferredSize = preferredSize.width !== 0 && preferredSize.height !== 0;
+ if (restorePreferredSize) {
+ preferredSize = cc.size(preferredSize.width, preferredSize.height);
+ }
this.updateWithSprite(sprite, spriteRect, spriteFrameRotated, offset, originalSize, capInsets);
+ if (restorePreferredSize) {
+ this.setPreferredSize(preferredSize);
+ }
+ this._positionsAreDirty = true;
this.setVisible(true);
this.setNodeDirty();
this.dispatchEvent("load");
@@ -914,8 +930,16 @@ ccui.Scale9Sprite = cc.Scale9Sprite = cc.Node.extend(/** @lends ccui.Scale9Sprit
this._textureLoaded = locLoaded;
if(!locLoaded){
tmpTexture.addEventListener("load", function(sender){
- this._positionsAreDirty = true;
+ var preferredSize = this._preferredSize,
+ restorePreferredSize = preferredSize.width !== 0 && preferredSize.height !== 0;
+ if (restorePreferredSize) {
+ preferredSize = cc.size(preferredSize.width, preferredSize.height);
+ }
this.updateWithBatchNode(batchNode, originalRect, rotated, capInsets);
+ if (restorePreferredSize) {
+ this.setPreferredSize(preferredSize);
+ }
+ this._positionsAreDirty = true;
this.setVisible(true);
this.setNodeDirty();
this.dispatchEvent("load");
@@ -940,11 +964,15 @@ ccui.Scale9Sprite = cc.Scale9Sprite = cc.Node.extend(/** @lends ccui.Scale9Sprit
this._textureLoaded = locLoaded;
if(!locLoaded){
spriteFrame.addEventListener("load", function(sender){
- // the texture is rotated on Canvas render mode, so isRotated always is false.
- var preferredSize = this._preferredSize, restorePreferredSize = preferredSize.width !== 0 && preferredSize.height !== 0;
- if (restorePreferredSize) preferredSize = cc.size(preferredSize.width, preferredSize.height);
+ var preferredSize = this._preferredSize,
+ restorePreferredSize = preferredSize.width !== 0 && preferredSize.height !== 0;
+ if (restorePreferredSize) {
+ preferredSize = cc.size(preferredSize.width, preferredSize.height);
+ }
this.updateWithBatchNode(this._scale9Image, sender.getRect(), cc._renderType === cc.game.RENDER_TYPE_WEBGL && sender.isRotated(), this._capInsets);
- if (restorePreferredSize)this.setPreferredSize(preferredSize);
+ if (restorePreferredSize) {
+ this.setPreferredSize(preferredSize);
+ }
this._positionsAreDirty = true;
this.setNodeDirty();
this.dispatchEvent("load");
diff --git a/extensions/ccui/base-classes/UIScale9SpriteCanvasRenderCmd.js b/extensions/ccui/base-classes/UIScale9SpriteCanvasRenderCmd.js
index e4814ef912..35f940b784 100644
--- a/extensions/ccui/base-classes/UIScale9SpriteCanvasRenderCmd.js
+++ b/extensions/ccui/base-classes/UIScale9SpriteCanvasRenderCmd.js
@@ -55,7 +55,7 @@
node._positionsAreDirty = false;
}
- cc.Node.CanvasRenderCmd.prototype.visit.call(this, parentCmd);
+ this.originVisit(parentCmd);
};
proto.transform = function(parentCmd){
diff --git a/extensions/ccui/base-classes/UIScale9SpriteWebGLRenderCmd.js b/extensions/ccui/base-classes/UIScale9SpriteWebGLRenderCmd.js
index a7b8b7a9fc..4cc744fd00 100644
--- a/extensions/ccui/base-classes/UIScale9SpriteWebGLRenderCmd.js
+++ b/extensions/ccui/base-classes/UIScale9SpriteWebGLRenderCmd.js
@@ -71,13 +71,13 @@
node._scale9Image._renderCmd.visit(this);
}
this._dirtyFlag = 0;
- cc.Node.WebGLRenderCmd.prototype.visit.call(this, parentCmd);
+ this.originVisit(parentCmd);
};
proto.transform = function(parentCmd, recursive){
var node = this._node;
parentCmd = parentCmd || this.getParentRenderCmd();
- cc.Node.WebGLRenderCmd.prototype.transform.call(this, parentCmd, recursive);
+ this.originTransform(parentCmd, recursive);
if (node._positionsAreDirty) {
node._updatePositions();
node._positionsAreDirty = false;
@@ -85,12 +85,14 @@
if(node._scale9Enabled) {
var locRenderers = node._renderers;
var protectChildLen = locRenderers.length;
+ var flags = cc.Node._dirtyFlags;
for(var j=0; j < protectChildLen; j++) {
var pchild = locRenderers[j];
if(pchild) {
pchild._vertexZ = parentCmd._node._vertexZ;
var tempCmd = pchild._renderCmd;
tempCmd.transform(this, true);
+ tempCmd._dirtyFlag = tempCmd._dirtyFlag & flags.transformDirty ^ tempCmd._dirtyFlag;
}
else {
break;
diff --git a/extensions/ccui/base-classes/UIWidgetRenderCmd.js b/extensions/ccui/base-classes/UIWidgetRenderCmd.js
index 07e1a004af..99deeaad51 100644
--- a/extensions/ccui/base-classes/UIWidgetRenderCmd.js
+++ b/extensions/ccui/base-classes/UIWidgetRenderCmd.js
@@ -36,7 +36,7 @@ cc.game.addEventListener(cc.game.EVENT_RENDERER_INITED, function () {
var node = this._node;
if (node._visible) {
node._adaptRenderers();
- cc.ProtectedNode.CanvasRenderCmd.prototype.visit.call(this, parentCmd);
+ this.pNodeVisit(parentCmd);
}
};
@@ -55,9 +55,12 @@ cc.game.addEventListener(cc.game.EVENT_RENDERER_INITED, function () {
}
}
}
- cc.ProtectedNode.CanvasRenderCmd.prototype.transform.call(this, parentCmd, recursive);
+ this.pNodeTransform(parentCmd, recursive);
}
};
+
+ proto.widgetVisit = proto.visit;
+ proto.widgetTransform = proto.transform;
} else {
ccui.Widget.WebGLRenderCmd = function (renderable) {
cc.ProtectedNode.WebGLRenderCmd.call(this, renderable);
@@ -71,7 +74,7 @@ cc.game.addEventListener(cc.game.EVENT_RENDERER_INITED, function () {
var node = this._node;
if (node._visible) {
node._adaptRenderers();
- cc.ProtectedNode.WebGLRenderCmd.prototype.visit.call(this, parentCmd);
+ this.pNodeVisit(parentCmd);
}
};
@@ -90,8 +93,11 @@ cc.game.addEventListener(cc.game.EVENT_RENDERER_INITED, function () {
}
}
}
- cc.ProtectedNode.WebGLRenderCmd.prototype.transform.call(this, parentCmd, recursive);
+ this.pNodeTransform(parentCmd, recursive);
}
};
+
+ proto.widgetVisit = proto.visit;
+ proto.widgetTransform = proto.transform;
}
});
diff --git a/extensions/ccui/layouts/UILayoutCanvasRenderCmd.js b/extensions/ccui/layouts/UILayoutCanvasRenderCmd.js
index ea06506246..1b38960ba7 100644
--- a/extensions/ccui/layouts/UILayoutCanvasRenderCmd.js
+++ b/extensions/ccui/layouts/UILayoutCanvasRenderCmd.js
@@ -58,10 +58,12 @@
break;
}
} else {
- ccui.Widget.CanvasRenderCmd.prototype.visit.call(this, parentCmd);
+ this.widgetVisit(parentCmd);
}
};
+ proto.layoutVisit = proto.visit;
+
proto._onRenderSaveCmd = function(ctx, scaleX, scaleY){
var wrapper = ctx || cc._renderContext, context = wrapper.getContext();
if (this._clipElemType) {
diff --git a/extensions/ccui/layouts/UILayoutWebGLRenderCmd.js b/extensions/ccui/layouts/UILayoutWebGLRenderCmd.js
index 5eec045254..9fd8544f8c 100644
--- a/extensions/ccui/layouts/UILayoutWebGLRenderCmd.js
+++ b/extensions/ccui/layouts/UILayoutWebGLRenderCmd.js
@@ -68,10 +68,13 @@
default:
break;
}
- } else
- ccui.ProtectedNode.WebGLRenderCmd.prototype.visit.call(this, parentCmd);
+ } else {
+ this.pNodeVisit(parentCmd);
+ }
};
+ proto.layoutVisit = proto.visit;
+
proto._onBeforeVisitStencil = function(ctx){
var gl = ctx || cc._renderContext;
@@ -130,32 +133,30 @@
var clippingRect = this._node._getClippingRect();
var gl = ctx || cc._renderContext;
- this._scissorOldState = cc.view.isScissorEnabled();
+ this._scissorOldState = gl.isEnabled(gl.SCISSOR_TEST);
- if(!this._scissorOldState)
+ if (!this._scissorOldState) {
gl.enable(gl.SCISSOR_TEST);
-
- this._clippingOldRect = cc.view.getScissorRect();
-
- if(!cc.rectEqualToRect(this._clippingOldRect, clippingRect))
cc.view.setScissorInPoints(clippingRect.x, clippingRect.y, clippingRect.width, clippingRect.height);
+ }
+ else {
+ this._clippingOldRect = cc.view.getScissorRect();
+ if (!cc.rectEqualToRect(this._clippingOldRect, clippingRect))
+ cc.view.setScissorInPoints(clippingRect.x, clippingRect.y, clippingRect.width, clippingRect.height);
+ }
};
proto._onAfterVisitScissor = function(ctx){
var gl = ctx || cc._renderContext;
- if(this._scissorOldState)
- {
- if(!cc.rectEqualToRect(this._clippingOldRect, this._node._clippingRect))
- {
+ if (this._scissorOldState) {
+ if (!cc.rectEqualToRect(this._clippingOldRect, this._node._clippingRect)) {
cc.view.setScissorInPoints( this._clippingOldRect.x,
this._clippingOldRect.y,
this._clippingOldRect.width,
this._clippingOldRect.height);
}
-
}
- else
- {
+ else {
gl.disable(gl.SCISSOR_TEST);
}
};
@@ -164,7 +165,7 @@
proto.transform = function(parentCmd, recursive){
var node = this._node;
- ccui.ProtectedNode.WebGLRenderCmd.prototype.transform.call(this, parentCmd, recursive);
+ this.pNodeTransform(parentCmd, recursive);
if(node._clippingStencil)
node._clippingStencil._renderCmd.transform(this, recursive);
};
@@ -236,7 +237,7 @@
proto.scissorClippingVisit = function(parentCmd){
cc.renderer.pushRenderCommand(this._beforeVisitCmdScissor);
- ccui.ProtectedNode.WebGLRenderCmd.prototype.visit.call(this, parentCmd);
+ this.pNodeVisit(parentCmd);
cc.renderer.pushRenderCommand(this._afterVisitCmdScissor);
};
diff --git a/extensions/ccui/uiwidgets/scroll-widget/UIScrollViewCanvasRenderCmd.js b/extensions/ccui/uiwidgets/scroll-widget/UIScrollViewCanvasRenderCmd.js
index 81bda66e7f..59feac0c4b 100644
--- a/extensions/ccui/uiwidgets/scroll-widget/UIScrollViewCanvasRenderCmd.js
+++ b/extensions/ccui/uiwidgets/scroll-widget/UIScrollViewCanvasRenderCmd.js
@@ -19,7 +19,7 @@
cc.renderer.pushRenderCommand(this);
cc.renderer._turnToCacheMode(currentID);
- ccui.Layout.CanvasRenderCmd.prototype.visit.call(this, parentCmd);
+ this.layoutVisit(parentCmd);
this._dirtyFlag = 0;
cc.renderer._turnToNormalMode();
diff --git a/extensions/ccui/uiwidgets/scroll-widget/UIScrollViewWebGLRenderCmd.js b/extensions/ccui/uiwidgets/scroll-widget/UIScrollViewWebGLRenderCmd.js
index d7c167656c..413d23aff0 100644
--- a/extensions/ccui/uiwidgets/scroll-widget/UIScrollViewWebGLRenderCmd.js
+++ b/extensions/ccui/uiwidgets/scroll-widget/UIScrollViewWebGLRenderCmd.js
@@ -20,7 +20,7 @@
cc.renderer.pushRenderCommand(this);
cc.renderer._turnToCacheMode(currentID);
- ccui.Layout.WebGLRenderCmd.prototype.visit.call(this, parentCmd);
+ this.layoutVisit(parentCmd);
// Need to update children after do layout
node.updateChildren();
@@ -31,7 +31,7 @@
proto.rendering = function(ctx){
var currentID = this._node.__instanceId,
locCmds = cc.renderer._cacheToBufferCmds[currentID],
- i, len, checkNode,
+ i, len, checkNode, cmd,
context = ctx || cc._renderContext;
if (!locCmds) {
return;
@@ -39,13 +39,27 @@
this._node.updateChildren();
+ // Reset buffer for rendering
+ context.bindBuffer(gl.ARRAY_BUFFER, null);
+
for (i = 0, len = locCmds.length; i < len; i++) {
- checkNode = locCmds[i]._node;
+ cmd = locCmds[i];
+ checkNode = cmd._node;
if(checkNode instanceof ccui.ScrollView)
continue;
if(checkNode && checkNode._parent && checkNode._parent._inViewRect === false)
continue;
- locCmds[i].rendering(context);
+
+ if (cmd.uploadData) {
+ cc.renderer._uploadBufferData(cmd);
+ }
+ else {
+ if (cmd._batchingSize > 0) {
+ cc.renderer._batchRendering();
+ }
+ cmd.rendering(context);
+ }
+ cc.renderer._batchRendering();
}
};
})();
diff --git a/extensions/cocostudio/armature/CCArmatureWebGLRenderCmd.js b/extensions/cocostudio/armature/CCArmatureWebGLRenderCmd.js
index d755cb87b1..17541d6010 100644
--- a/extensions/cocostudio/armature/CCArmatureWebGLRenderCmd.js
+++ b/extensions/cocostudio/armature/CCArmatureWebGLRenderCmd.js
@@ -28,6 +28,7 @@
cc.Node.WebGLRenderCmd.call(this, renderableObject);
this._needDraw = true;
+ this._parentCmd = null;
this._realAnchorPointInPoints = new cc.Point(0,0);
};
@@ -35,14 +36,9 @@
cc.inject(ccs.Armature.RenderCmd, proto);
proto.constructor = ccs.Armature.WebGLRenderCmd;
- proto.rendering = function (ctx, dontChangeMatrix) {
- var node = this._node;
-
- if(!dontChangeMatrix){
- cc.kmGLMatrixMode(cc.KM_GL_MODELVIEW);
- cc.kmGLPushMatrix();
- cc.kmGLLoadMatrix(this._stackMatrix);
- }
+ proto.uploadData = function (f32buffer, ui32buffer, vertexDataOffset) {
+ var node = this._node, cmd;
+ var parentCmd = this._parentCmd || this;
var locChildren = node._children;
var alphaPremultiplied = cc.BlendFunc.ALPHA_PREMULTIPLIED, alphaNonPremultipled = cc.BlendFunc.ALPHA_NON_PREMULTIPLIED;
@@ -52,44 +48,63 @@
var selNode = selBone.getDisplayRenderNode();
if (null === selNode)
continue;
+ cmd = selNode._renderCmd;
switch (selBone.getDisplayRenderNodeType()) {
case ccs.DISPLAY_TYPE_SPRITE:
if (selNode instanceof ccs.Skin) {
selNode.setShaderProgram(this._shaderProgram);
- this._updateColorAndOpacity(selNode._renderCmd, selBone); //because skin didn't call visit()
- selNode.updateTransform();
+ this._updateColorAndOpacity(cmd, selBone); //because skin didn't call visit()
+ cmd.transform(parentCmd);
var func = selBone.getBlendFunc();
if (func.src !== alphaPremultiplied.src || func.dst !== alphaPremultiplied.dst)
selNode.setBlendFunc(selBone.getBlendFunc());
else {
- if ((node._blendFunc.src === alphaPremultiplied.src && node._blendFunc.dst === alphaPremultiplied.dst)
- && !selNode.getTexture().hasPremultipliedAlpha())
+ if (node._blendFunc.src === alphaPremultiplied.src &&
+ node._blendFunc.dst === alphaPremultiplied.dst &&
+ !selNode.getTexture().hasPremultipliedAlpha()) {
selNode.setBlendFunc(alphaNonPremultipled);
- else
+ }
+ else {
selNode.setBlendFunc(node._blendFunc);
+ }
}
- selNode._renderCmd.rendering(ctx);
+ // Support batch for Armature skin
+ cc.renderer._uploadBufferData(cmd);
}
break;
case ccs.DISPLAY_TYPE_ARMATURE:
selNode.setShaderProgram(this._shaderProgram);
- selNode._renderCmd.rendering(ctx, true);
- break;
+ cmd._parentCmd = this;
+ // Continue rendering in default
default:
- selNode._renderCmd.transform();
- selNode._renderCmd.rendering(ctx);
+ if (cmd.uploadData) {
+ cc.renderer._uploadBufferData(cmd);
+ }
+ else {
+ // Finish previous batch
+ cc.renderer._batchRendering();
+ cmd.transform(this);
+ cmd.rendering(cc._renderContext);
+ }
break;
}
} else if (selBone instanceof cc.Node) {
selBone.setShaderProgram(this._shaderProgram);
- selBone._renderCmd.transform();
- if(selBone._renderCmd.rendering)
- selBone._renderCmd.rendering(ctx);
+ cmd = selBone._renderCmd;
+ cmd.transform(this);
+ if (cmd.uploadData) {
+ cc.renderer._uploadBufferData(cmd);
+ }
+ else if (cmd.rendering) {
+ // Finish previous batch
+ cc.renderer._batchRendering();
+ cmd.rendering(cc._renderContext);
+ }
}
}
- if(!dontChangeMatrix)
- cc.kmGLPopMatrix();
+ this._parentCmd = null;
+ return 0;
};
proto.initShaderCache = function(){
@@ -114,53 +129,16 @@
skinRenderCmd._updateColor();
};
- proto.updateChildPosition = function(ctx, dis, selBone, alphaPremultiplied, alphaNonPremultipled){
- var node = this._node;
- dis.updateTransform();
-
- var func = selBone.getBlendFunc();
- if (func.src !== alphaPremultiplied.src || func.dst !== alphaPremultiplied.dst)
- dis.setBlendFunc(selBone.getBlendFunc());
- else {
- if ((node._blendFunc.src === alphaPremultiplied.src && node_blendFunc.dst === alphaPremultiplied.dst)
- && !dis.getTexture().hasPremultipliedAlpha())
- dis.setBlendFunc(alphaNonPremultipled);
- else
- dis.setBlendFunc(node._blendFunc);
- }
- dis.rendering(ctx);
- };
-
- proto.updateStatus = function () {
- var flags = cc.Node._dirtyFlags, locFlag = this._dirtyFlag;
- var colorDirty = locFlag & flags.colorDirty,
- opacityDirty = locFlag & flags.opacityDirty;
- if(colorDirty)
- this._updateDisplayColor();
-
- if(opacityDirty)
- this._updateDisplayOpacity();
-
- if(colorDirty || opacityDirty)
- this._updateColor();
-
- if (locFlag & flags.orderDirty)
- this._dirtyFlag = this._dirtyFlag & flags.orderDirty ^ this._dirtyFlag;
-
- //update the transform every visit, don't need dirty flag,
- this.transform(this.getParentRenderCmd(), true);
- };
-
proto.visit = function(parentCmd){
var node = this._node;
// quick return if not visible. children won't be drawn.
if (!node._visible)
return;
- var currentStack = cc.current_stack;
- currentStack.stack.push(currentStack.top);
+ parentCmd = parentCmd || this.getParentRenderCmd();
+ if (parentCmd)
+ this._curLevel = parentCmd._curLevel + 1;
this.updateStatus(parentCmd);
- currentStack.top = this._stackMatrix;
node.sortAllChildren();
@@ -196,6 +174,5 @@
}
this._dirtyFlag = 0;
- currentStack.top = currentStack.stack.pop();
};
})();
\ No newline at end of file
diff --git a/extensions/cocostudio/armature/display/CCDisplayFactory.js b/extensions/cocostudio/armature/display/CCDisplayFactory.js
index da8f8601df..772bade72c 100644
--- a/extensions/cocostudio/armature/display/CCDisplayFactory.js
+++ b/extensions/cocostudio/armature/display/CCDisplayFactory.js
@@ -60,15 +60,17 @@ ccs.displayFactory = {
},
_helpTransform: {a:1, b:0, c:0, d:1, tx:0, ty:0},
- updateDisplay: function (bone,dt, dirty) {
+ updateDisplay: function (bone, dt, dirty) {
var display = bone.getDisplayRenderNode();
if(!display)
return;
switch (bone.getDisplayRenderNodeType()) {
case ccs.DISPLAY_TYPE_SPRITE:
- if (dirty)
+ if (dirty) {
+ display._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.transformDirty);
display.updateArmatureTransform();
+ }
break;
case ccs.DISPLAY_TYPE_PARTICLE:
this.updateParticleDisplay(bone, display, dt);
diff --git a/extensions/cocostudio/armature/display/CCSkin.js b/extensions/cocostudio/armature/display/CCSkin.js
index 4553cf568b..f391970d25 100644
--- a/extensions/cocostudio/armature/display/CCSkin.js
+++ b/extensions/cocostudio/armature/display/CCSkin.js
@@ -108,14 +108,6 @@ ccs.Skin = ccs.Sprite.extend(/** @lends ccs.Skin# */{
this.setRotationY(cc.radiansToDegrees(-skinData.skewY));
this.setPosition(skinData.x, skinData.y);
- var localTransform = this.getNodeToParentTransform ? this.getNodeToParentTransform() : this.nodeToParentTransform();
- var skinTransform = this._skinTransform;
- skinTransform.a = localTransform.a;
- skinTransform.b = localTransform.b;
- skinTransform.c = localTransform.c;
- skinTransform.d = localTransform.d;
- skinTransform.tx = localTransform.tx;
- skinTransform.ty = localTransform.ty;
this.updateArmatureTransform();
},
@@ -131,7 +123,7 @@ ccs.Skin = ccs.Sprite.extend(/** @lends ccs.Skin# */{
* Updates armature skin's transform with skin transform and bone's transform.
*/
updateArmatureTransform: function () {
- this._renderCmd.updateArmatureTransform();
+ this._renderCmd.transform();
},
/**
diff --git a/extensions/cocostudio/armature/display/CCSkinCanvasRenderCmd.js b/extensions/cocostudio/armature/display/CCSkinRenderCmd.js
similarity index 54%
rename from extensions/cocostudio/armature/display/CCSkinCanvasRenderCmd.js
rename to extensions/cocostudio/armature/display/CCSkinRenderCmd.js
index 83504f8b14..730a57e605 100644
--- a/extensions/cocostudio/armature/display/CCSkinCanvasRenderCmd.js
+++ b/extensions/cocostudio/armature/display/CCSkinRenderCmd.js
@@ -25,13 +25,40 @@
(function(){
ccs.Skin.RenderCmd = {
- updateArmatureTransform: function () {
- var node = this._node;
- this._transform = cc.affineTransformConcat(
- node._skinTransform,
- node.bone.getNodeToArmatureTransform()
- );
- this._dirtyFlag = this._dirtyFlag & cc.Node._dirtyFlags.transformDirty ^ this._dirtyFlag;
+ transform: function (parentCmd, recursive) {
+ var node = this._node,
+ pt = parentCmd ? parentCmd._worldTransform : null,
+ t = this._transform,
+ wt = this._worldTransform,
+ dirty = this._dirtyFlag & cc.Node._dirtyFlags.transformDirty;
+
+ if (dirty || pt) {
+ this.originTransform();
+ cc.affineTransformConcatIn(t, node.bone.getNodeToArmatureTransform());
+ this._dirtyFlag = this._dirtyFlag & cc.Node._dirtyFlags.transformDirty ^ this._dirtyFlag;
+ }
+
+ if (pt) {
+ wt.a = t.a * pt.a + t.b * pt.c;
+ wt.b = t.a * pt.b + t.b * pt.d;
+ wt.c = t.c * pt.a + t.d * pt.c;
+ wt.d = t.c * pt.b + t.d * pt.d;
+ wt.tx = t.tx * pt.a + t.ty * pt.c + pt.tx;
+ wt.ty = t.tx * pt.b + t.ty * pt.d + pt.ty;
+
+ var lx = node._offsetPosition.x, rx = lx + node._rect.width,
+ by = node._offsetPosition.y, ty = by + node._rect.height;
+
+ var vertices = this._vertices;
+ vertices[0].x = lx * wt.a + ty * wt.c + wt.tx; // tl
+ vertices[0].y = lx * wt.b + ty * wt.d + wt.ty;
+ vertices[1].x = lx * wt.a + by * wt.c + wt.tx; // bl
+ vertices[1].y = lx * wt.b + by * wt.d + wt.ty;
+ vertices[2].x = rx * wt.a + ty * wt.c + wt.tx; // tr
+ vertices[2].y = rx * wt.b + ty * wt.d + wt.ty;
+ vertices[3].x = rx * wt.a + by * wt.c + wt.tx; // br
+ vertices[3].y = rx * wt.b + by * wt.d + wt.ty;
+ }
},
getNodeToWorldTransform: function () {
@@ -55,4 +82,12 @@
var proto = ccs.Skin.CanvasRenderCmd.prototype = Object.create(cc.Sprite.CanvasRenderCmd.prototype);
cc.inject(ccs.Skin.RenderCmd, proto);
proto.constructor = ccs.Skin.CanvasRenderCmd;
+
+ ccs.Skin.WebGLRenderCmd = function(renderable){
+ cc.Sprite.WebGLRenderCmd.call(this, renderable);
+ };
+
+ proto = ccs.Skin.WebGLRenderCmd.prototype = Object.create(cc.Sprite.WebGLRenderCmd.prototype);
+ cc.inject(ccs.Skin.RenderCmd, proto);
+ proto.constructor = ccs.Skin.WebGLRenderCmd;
})();
diff --git a/extensions/cocostudio/armature/display/CCSkinWebGLRenderCmd.js b/extensions/cocostudio/armature/display/CCSkinWebGLRenderCmd.js
deleted file mode 100644
index aa493a6ee9..0000000000
--- a/extensions/cocostudio/armature/display/CCSkinWebGLRenderCmd.js
+++ /dev/null
@@ -1,94 +0,0 @@
-/****************************************************************************
- Copyright (c) 2011-2012 cocos2d-x.org
- Copyright (c) 2013-2014 Chukong Technologies Inc.
-
- http://www.cocos2d-x.org
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- ****************************************************************************/
-
-(function(){
- ccs.Skin.WebGLRenderCmd = function(renderable){
- cc.Sprite.WebGLRenderCmd.call(this, renderable);
- };
-
- var proto = ccs.Skin.WebGLRenderCmd.prototype = Object.create(cc.Sprite.WebGLRenderCmd.prototype);
- cc.inject(ccs.Skin.RenderCmd, proto);
- proto.constructor = ccs.Skin.WebGLRenderCmd;
-
- // The following static properties must be provided for a auto batchable command
- proto.vertexBytesPerUnit = cc.V3F_C4B_T2F_Quad.BYTES_PER_ELEMENT;
- proto.bytesPerUnit = proto.vertexBytesPerUnit;
- proto.indicesPerUnit = 6;
- proto.verticesPerUnit = 4;
- proto._supportBatch = true;
-
- proto.batchShader = null;
-
- proto.updateTransform = function(){
- var node = this._node;
- var locQuad = this._quad;
- var vertices = this._vertices;
-
- if (this._buffer) {
- //
- // calculate the Quad based on the Affine Matrix
- //
- var transform = this.getNodeToParentTransform(); //this._transform;
-
- var buffer = this._float32View,
- i, x, y, offset = 0,
- row = cc.V3F_C4B_T2F_Quad.BYTES_PER_ELEMENT / 16,
- parentCmd = this.getParentRenderCmd(),
- parentMatrix = (parentCmd ? parentCmd._stackMatrix : cc.current_stack.top),
- t4x4 = this._transform4x4, stackMatrix = this._stackMatrix,
- mat = t4x4.mat;
-
- mat[0] = transform.a;
- mat[4] = transform.c;
- mat[12] = transform.tx;
- mat[1] = transform.b;
- mat[5] = transform.d;
- mat[13] = transform.ty;
- cc.kmMat4Multiply(stackMatrix, parentMatrix, t4x4);
- mat[14] = node._vertexZ;
-
- mat = stackMatrix.mat;
-
- for (i = 0; i < 4; ++i) {
- x = vertices[i].x;
- y = vertices[i].y;
- z = vertices[i].z;
- buffer[offset] = x * mat[0] + y * mat[4] + mat[12];
- buffer[offset+1] = x * mat[1] + y * mat[5] + mat[13];
- buffer[offset+2] = mat[14];
- offset += row;
- }
- // MARMALADE CHANGE: ADDED CHECK FOR nullptr, TO PERMIT SPRITES WITH NO BATCH NODE / TEXTURE ATLAS
- if (node.textureAtlas) {
- node.textureAtlas.updateQuad(locQuad, node.textureAtlas.getTotalQuads());
- }
-
- // Need manually buffer data because it's invoked during rendering
- cc._renderContext.bindBuffer(gl.ARRAY_BUFFER, this._buffer.vertexBuffer);
- cc._renderContext.bufferSubData(gl.ARRAY_BUFFER, this._bufferOffset, this._float32View);
- cc._renderContext.bindBuffer(gl.ARRAY_BUFFER, null);
- }
- };
-})();
\ No newline at end of file
diff --git a/extensions/spine/CCSkeletonWebGLRenderCmd.js b/extensions/spine/CCSkeletonWebGLRenderCmd.js
index 51d2184caa..9eb185a204 100644
--- a/extensions/spine/CCSkeletonWebGLRenderCmd.js
+++ b/extensions/spine/CCSkeletonWebGLRenderCmd.js
@@ -26,8 +26,10 @@
sp.Skeleton.WebGLRenderCmd = function (renderableObject) {
cc.Node.WebGLRenderCmd.call(this, renderableObject);
this._needDraw = true;
- this.setShaderProgram(cc.shaderCache.programForKey(cc.SHADER_POSITION_TEXTURECOLOR));
+ this._matrix = new cc.math.Matrix4();
+ this._matrix.identity();
this._tmpQuad = new cc.V3F_C4B_T2F_Quad();
+ this.setShaderProgram(cc.shaderCache.programForKey(cc.SHADER_POSITION_TEXTURECOLOR));
};
var proto = sp.Skeleton.WebGLRenderCmd.prototype = Object.create(cc.Node.WebGLRenderCmd.prototype);
@@ -41,8 +43,16 @@
var locBlendFunc = node._blendFunc;
var premultiAlpha = node._premultipliedAlpha;
+ var wt = this._worldTransform;
+ this._matrix.mat[0] = wt.a;
+ this._matrix.mat[4] = wt.c;
+ this._matrix.mat[12] = wt.tx;
+ this._matrix.mat[1] = wt.b;
+ this._matrix.mat[5] = wt.d;
+ this._matrix.mat[13] = wt.ty;
+
this._shaderProgram.use();
- this._shaderProgram._setUniformForMVPMatrixWithMat4(this._stackMatrix);
+ this._shaderProgram._setUniformForMVPMatrixWithMat4(this._matrix);
// cc.glBlendFunc(locBlendFunc.src, locBlendFunc.dst);
locSkeleton.r = color.r / 255;
locSkeleton.g = color.g / 255;
@@ -119,9 +129,8 @@
if (node._debugBones || node._debugSlots) {
cc.kmGLMatrixMode(cc.KM_GL_MODELVIEW);
- //cc.kmGLPushMatrixWitMat4(this._stackMatrix);
cc.current_stack.stack.push(cc.current_stack.top);
- cc.current_stack.top = this._stackMatrix;
+ cc.current_stack.top = this._matrix;
var drawingUtil = cc._drawingUtil;
if (node._debugSlots) {
diff --git a/moduleConfig.json b/moduleConfig.json
index b0498b41be..bd179803ab 100644
--- a/moduleConfig.json
+++ b/moduleConfig.json
@@ -6,7 +6,6 @@
"cocos2d/actions/CCAction.js",
"cocos2d/actions/CCActionInterval.js",
"cocos2d/actions/CCActionInstant.js",
- "cocos2d/actions/CCActionCamera.js",
"cocos2d/actions/CCActionEase.js",
"cocos2d/actions/CCActionCatmullRom.js",
"cocos2d/actions/CCActionTween.js"
@@ -42,7 +41,6 @@
"core" : [
"cocos2d/core/event-manager/CCEventHelper.js",
"CCDebugger.js",
- "cocos2d/core/utils/CCSimplePool.js",
"cocos2d/core/utils/BinaryLoader.js",
"Base64Images.js",
"cocos2d/core/platform/CCClass.js",
@@ -74,7 +72,6 @@
"cocos2d/core/event-manager/CCEventManager.js",
"cocos2d/core/event-manager/CCEventExtension.js",
- "cocos2d/core/renderer/GlobalVertexBuffer.js",
"cocos2d/core/renderer/RendererCanvas.js",
"cocos2d/core/renderer/RendererWebGL.js",
@@ -104,8 +101,6 @@
"cocos2d/core/sprites/CCSpriteCanvasRenderCmd.js",
"cocos2d/core/sprites/CCSpriteWebGLRenderCmd.js",
"cocos2d/core/sprites/CCSpriteBatchNode.js",
- "cocos2d/core/sprites/CCSpriteBatchNodeCanvasRenderCmd.js",
- "cocos2d/core/sprites/CCSpriteBatchNodeWebGLRenderCmd.js",
"cocos2d/core/sprites/CCBakeSprite.js",
"cocos2d/core/sprites/CCAnimation.js",
"cocos2d/core/sprites/CCAnimationCache.js",
@@ -117,7 +112,6 @@
"cocos2d/core/CCDirectorCanvas.js",
"cocos2d/core/CCDirectorWebGL.js",
- "cocos2d/core/CCCamera.js",
"cocos2d/core/CCScheduler.js",
"cocos2d/core/CCDrawingPrimitivesCanvas.js",
"cocos2d/core/CCDrawingPrimitivesWebGL.js",
@@ -366,8 +360,7 @@
"extensions/cocostudio/armature/display/CCDisplayFactory.js",
"extensions/cocostudio/armature/display/CCDisplayManager.js",
"extensions/cocostudio/armature/display/CCSkin.js",
- "extensions/cocostudio/armature/display/CCSkinCanvasRenderCmd.js",
- "extensions/cocostudio/armature/display/CCSkinWebGLRenderCmd.js",
+ "extensions/cocostudio/armature/display/CCSkinRenderCmd.js",
"extensions/cocostudio/armature/animation/CCProcessBase.js",
"extensions/cocostudio/armature/animation/CCArmatureAnimation.js",
"extensions/cocostudio/armature/animation/CCTween.js",
diff --git a/tools/build.xml b/tools/build.xml
index a5a9998872..1c3408f069 100644
--- a/tools/build.xml
+++ b/tools/build.xml
@@ -253,8 +253,7 @@