diff --git a/CCBoot.js b/CCBoot.js index 98fc89518c..dcf9bc2d51 100644 --- a/CCBoot.js +++ b/CCBoot.js @@ -52,7 +52,6 @@ cc._canvas = null; * @property {HTMLDivElement} container - The element contains the game canvas */ cc.container = null; -cc._gameDiv = null; require('./cocos2d/core/utils'); require('./cocos2d/core/platform/CCSys'); diff --git a/cocos2d/core/CCDirector.js b/cocos2d/core/CCDirector.js index 3bce7e978f..482d843fc7 100644 --- a/cocos2d/core/CCDirector.js +++ b/cocos2d/core/CCDirector.js @@ -295,11 +295,11 @@ cc.Director = Class.extend(/** @lends cc.Director# */{ _visitScene: function () { if (this._runningScene) { - var renderer = cc.renderer; + var renderer = cc.rendererWebGL; if (renderer.childrenOrderDirty) { // update the whole scene renderer.clearRenderCommands(); - cc.renderer.assignedZ = 0; + cc.rendererWebGL.assignedZ = 0; this._runningScene._renderCmd._curLevel = 0; //level start from 0; this._runningScene.visit(); renderer.resetFlag(); @@ -452,7 +452,7 @@ cc.Director = Class.extend(/** @lends cc.Director# */{ this._runningScene.performRecursive(_ccsg.Node.performType.onExit); this._runningScene.performRecursive(_ccsg.Node.performType.cleanup); - cc.renderer.clearRenderCommands(); + cc.rendererWebGL.clearRenderCommands(); } this._runningScene = null; @@ -877,6 +877,7 @@ cc.Director = Class.extend(/** @lends cc.Director# */{ * !#zh 启用/禁用深度测试(在 Canvas 渲染模式下不会生效)。 * @method setDepthTest * @param {Boolean} on + * @deprecated */ setDepthTest: null, @@ -889,6 +890,7 @@ cc.Director = Class.extend(/** @lends cc.Director# */{ * 支持全透明,但不支持透明度为中间值。要支持全透明需手工开启 cc.macro.ENABLE_TRANSPARENT_CANVAS。 * @method setClearColor * @param {Color} clearColor + * @deprecated */ setClearColor: null, /** @@ -931,7 +933,7 @@ cc.Director = Class.extend(/** @lends cc.Director# */{ } this._runningScene = this._nextScene; - cc.renderer.childrenOrderDirty = true; + cc.rendererWebGL.childrenOrderDirty = true; this._nextScene = null; if ((!runningIsTransition) && (this._runningScene !== null)) { @@ -1443,8 +1445,8 @@ cc.DisplayLinkDirector = cc.Director.extend(/** @lends cc.Director# */{ // Render cc.g_NumberOfDraws = 0; - // cc.renderer.clear(); - // cc.renderer.rendering(cc._renderContext); + // cc.rendererWebGL.clear(); + // cc.rendererWebGL.rendering(cc._renderContext); renderer.render(); this._totalFrames++; @@ -1488,8 +1490,8 @@ cc.DisplayLinkDirector = cc.Director.extend(/** @lends cc.Director# */{ // Render cc.g_NumberOfDraws = 0; - // cc.renderer.clear(); - // cc.renderer.rendering(cc._renderContext); + // cc.rendererWebGL.clear(); + // cc.rendererWebGL.rendering(cc._renderContext); renderer.render(); this._totalFrames++; diff --git a/cocos2d/core/CCDirectorCanvas.js b/cocos2d/core/CCDirectorCanvas.js index 773a612d3d..01a73e27d8 100644 --- a/cocos2d/core/CCDirectorCanvas.js +++ b/cocos2d/core/CCDirectorCanvas.js @@ -45,8 +45,8 @@ cc.game.once(cc.game.EVENT_RENDERER_INITED, function () { }; _p.setClearColor = function (clearColor) { - cc.renderer._clearColor = clearColor; - cc.renderer._clearFillStyle = 'rgb(' + clearColor.r + ',' + clearColor.g + ',' + clearColor.b +')' ; + cc.rendererWebGL._clearColor = clearColor; + cc.rendererWebGL._clearFillStyle = 'rgb(' + clearColor.r + ',' + clearColor.g + ',' + clearColor.b +')' ; }; _p.setOpenGLView = function (openGLView) { diff --git a/cocos2d/core/CCDirectorWebGL.js b/cocos2d/core/CCDirectorWebGL.js index 0b9c9cc347..2c64127d93 100644 --- a/cocos2d/core/CCDirectorWebGL.js +++ b/cocos2d/core/CCDirectorWebGL.js @@ -27,6 +27,7 @@ require('./CCDirector'); require('./CCGame'); require('../kazmath'); +const renderer = require('./renderer'); var math = cc.math; @@ -123,19 +124,18 @@ cc.game.once(cc.game.EVENT_RENDERER_INITED, function () { _t._projection = projection; _t.emit(cc.Director.EVENT_PROJECTION_CHANGED, _t); cc.gl.setProjectionMatrixDirty(); - cc.renderer.childrenOrderDirty = true; }; _p.setDepthTest = function (on) { - cc.renderer.setDepthTest(on); }; _p.setClearColor = function (clearColor) { - var locClearColor = cc.renderer._clearColor; - locClearColor.r = clearColor.r / 255; - locClearColor.g = clearColor.g / 255; - locClearColor.b = clearColor.b / 255; - locClearColor.a = clearColor.a / 255; + renderer._camera.setColor( + clearColor.r / 255, + clearColor.g / 255, + clearColor.b / 255, + clearColor.a / 255 + ); }; _p.setOpenGLView = function (openGLView) { diff --git a/cocos2d/core/CCGame.js b/cocos2d/core/CCGame.js index c1de654fdc..d5f76a37c8 100644 --- a/cocos2d/core/CCGame.js +++ b/cocos2d/core/CCGame.js @@ -708,7 +708,6 @@ var game = { // WebGL context created successfully if (cc._renderType === game.RENDER_TYPE_WEBGL) { - cc.renderer = cc.rendererWebGL; win.gl = this._renderContext; // global variable declared in CCMacro.js renderer.init(localCanvas, { 'stencil': true, @@ -718,12 +717,11 @@ var game = { } if (!this._renderContext) { cc._renderType = game.RENDER_TYPE_CANVAS; - cc.renderer = cc.rendererCanvas; renderer.init(localCanvas); this._renderContext = cc._renderContext = renderer.device._ctx; } + cc.renderer = renderer; - cc._gameDiv = localContainer; game.canvas.oncontextmenu = function () { if (!cc._isContextMenuEnable) return false; }; diff --git a/cocos2d/core/CCNode.js b/cocos2d/core/CCNode.js index dcdfb18477..2ddbe612c0 100644 --- a/cocos2d/core/CCNode.js +++ b/cocos2d/core/CCNode.js @@ -871,7 +871,6 @@ var Node = cc.Class({ sibling._updateOrderOfArrival(); cc.eventManager._setDirtyForNode(sibling); } - cc.renderer.childrenOrderDirty = true; parent._delaySort(); }, diff --git a/cocos2d/core/base-nodes/CCSGNode.js b/cocos2d/core/base-nodes/CCSGNode.js index 76782a42bb..79454dac43 100644 --- a/cocos2d/core/base-nodes/CCSGNode.js +++ b/cocos2d/core/base-nodes/CCSGNode.js @@ -645,7 +645,7 @@ _ccsg.Node = cc.Class({ if (this._visible !== visible) { this._visible = visible; this._renderCmd.setDirtyFlag(_ccsg.Node._dirtyFlags.transformDirty); - cc.renderer.childrenOrderDirty = true; + cc.rendererWebGL.childrenOrderDirty = true; } }, @@ -1109,7 +1109,7 @@ _ccsg.Node = cc.Class({ this._detachChild(child, cleanup); //this._renderCmd.setDirtyFlag(_ccsg.Node._dirtyFlags.visibleDirty); - cc.renderer.childrenOrderDirty = true; + cc.rendererWebGL.childrenOrderDirty = true; }, /** @@ -1169,7 +1169,7 @@ _ccsg.Node = cc.Class({ } } this._children.length = 0; - cc.renderer.childrenOrderDirty = true; + cc.rendererWebGL.childrenOrderDirty = true; } }, diff --git a/cocos2d/core/base-nodes/CCSGNodeBaseRenderCmd.js b/cocos2d/core/base-nodes/CCSGNodeBaseRenderCmd.js index acba7e79c2..94564841e6 100644 --- a/cocos2d/core/base-nodes/CCSGNodeBaseRenderCmd.js +++ b/cocos2d/core/base-nodes/CCSGNodeBaseRenderCmd.js @@ -119,7 +119,7 @@ _ccsg.Node.RenderCmd = function (renderable) { this._inverse = {a: 1, b: 0, c: 0, d: 1, tx: 0, ty: 0}; this._transformUpdated = false; - cc.renderer.pushDirtyNode(this); + cc.rendererWebGL.pushDirtyNode(this); }; _ccsg.Node.RenderCmd.prototype = { @@ -168,7 +168,7 @@ _ccsg.Node.RenderCmd.prototype = { setDirtyFlag: function(dirtyFlag){ if (this._dirtyFlag === 0 && dirtyFlag !== 0) - cc.renderer.pushDirtyNode(this); + cc.rendererWebGL.pushDirtyNode(this); this._dirtyFlag |= dirtyFlag; }, @@ -384,7 +384,7 @@ _ccsg.Node.RenderCmd.prototype = { }, visit: function (parentCmd) { - var node = this._node, renderer = cc.renderer; + var node = this._node, renderer = cc.rendererWebGL; if (parentCmd) { this._curLevel = parentCmd._curLevel + 1; diff --git a/cocos2d/core/camera/CCCamera.js b/cocos2d/core/camera/CCCamera.js index f5d18d8a07..d969a9cf8a 100644 --- a/cocos2d/core/camera/CCCamera.js +++ b/cocos2d/core/camera/CCCamera.js @@ -141,7 +141,7 @@ let Camera = cc.Class({ cmd.setDirtyFlag(cullingDirtyFlag); cmd._cameraFlag = Camera.flags.InCamera; - cc.renderer.childrenOrderDirty = true; + cc.rendererWebGL.childrenOrderDirty = true; } }, @@ -166,7 +166,7 @@ let Camera = cc.Class({ cmd.setDirtyFlag(cullingDirtyFlag); cmd._cameraFlag = 0; - cc.renderer.childrenOrderDirty = true; + cc.rendererWebGL.childrenOrderDirty = true; } }, diff --git a/cocos2d/core/camera/CCSGCameraNode.js b/cocos2d/core/camera/CCSGCameraNode.js index 5522d9c461..6cbaa8fddf 100644 --- a/cocos2d/core/camera/CCSGCameraNode.js +++ b/cocos2d/core/camera/CCSGCameraNode.js @@ -38,13 +38,13 @@ let CameraNode = _ccsg.Node.extend({ let info = this._cameraInfo; let sgCameraNode = info.sgCameraNode; - cc.renderer.pushRenderCommand(sgCameraNode._beforeVisitCmd); + cc.rendererWebGL.pushRenderCommand(sgCameraNode._beforeVisitCmd); info.originVisit.call(this, parent); - cc.renderer.pushRenderCommand(sgCameraNode._afterVisitCmd); + cc.rendererWebGL.pushRenderCommand(sgCameraNode._afterVisitCmd); }, _onBeforeVisit: function () { - cc.renderer._breakBatch(); + cc.rendererWebGL._breakBatch(); cc.math.glMatrixMode(cc.math.KM_GL_PROJECTION); @@ -54,7 +54,7 @@ let CameraNode = _ccsg.Node.extend({ }, _onAfterVisit: function () { - cc.renderer._breakBatch(); + cc.rendererWebGL._breakBatch(); cc.math.glMatrixMode(cc.math.KM_GL_PROJECTION); cc.current_stack.pop(); diff --git a/cocos2d/core/platform/CCMacro.js b/cocos2d/core/platform/CCMacro.js index cec60923da..c231fe3dfd 100644 --- a/cocos2d/core/platform/CCMacro.js +++ b/cocos2d/core/platform/CCMacro.js @@ -1946,7 +1946,7 @@ cc.defineGetterSetter(cc.macro, 'ENABLE_CULLING', } else { scene._sgNode._renderCmd.setDirtyFlag(_ccsg.Node._dirtyFlags.cullingDirty); - cc.renderer.childrenOrderDirty = true; + cc.rendererWebGL.childrenOrderDirty = true; } } ) diff --git a/cocos2d/core/sprites/CCSGSpriteWebGLRenderCmd.js b/cocos2d/core/sprites/CCSGSpriteWebGLRenderCmd.js index d78f86c5ef..075560273e 100644 --- a/cocos2d/core/sprites/CCSGSpriteWebGLRenderCmd.js +++ b/cocos2d/core/sprites/CCSGSpriteWebGLRenderCmd.js @@ -100,7 +100,7 @@ proto._textureLoadedCallback = function (event) { node.emit("load"); // Force refresh the render command list - cc.renderer.childrenOrderDirty = true; + cc.rendererWebGL.childrenOrderDirty = true; }; proto._setTextureCoords = function (rect) { @@ -210,7 +210,7 @@ proto._setTexture = function (texture) { if (node._textureLoaded) { // Force refresh the render command list - cc.renderer.childrenOrderDirty = true; + cc.rendererWebGL.childrenOrderDirty = true; } } }; diff --git a/cocos2d/core/sprites/CCScale9SpriteWebGLRenderCmd.js b/cocos2d/core/sprites/CCScale9SpriteWebGLRenderCmd.js index b31d417330..0e2c526238 100644 --- a/cocos2d/core/sprites/CCScale9SpriteWebGLRenderCmd.js +++ b/cocos2d/core/sprites/CCScale9SpriteWebGLRenderCmd.js @@ -33,7 +33,7 @@ cc.Scale9Sprite.WebGLRenderCmd = function (renderable) { this._needDraw = false; } - this.vertexType = cc.renderer.VertexType.QUAD; + this.vertexType = cc.rendererWebGL.VertexType.QUAD; this._dirty = false; this._shaderProgram = cc.shaderCache.programForKey(cc.macro.SHADER_SPRITE_POSITION_TEXTURECOLOR); }; @@ -144,7 +144,7 @@ proto.uploadData = function (f32buffer, ui32buffer, vertexDataOffset){ Scale9Sprite.WebGLRenderCmd._distortionTiling, node._distortionTiling.x, node._distortionTiling.y ); - cc.renderer._breakBatch(); + cc.rendererWebGL._breakBatch(); } // Color & z @@ -191,13 +191,13 @@ proto.uploadData = function (f32buffer, ui32buffer, vertexDataOffset){ } if (node._renderingType === types.MESH ) { - this.vertexType = cc.renderer.VertexType.CUSTOM; + this.vertexType = cc.rendererWebGL.VertexType.CUSTOM; } else if (node._renderingType === types.FILLED && node._fillType === Scale9Sprite.FillType.RADIAL) { - this.vertexType = cc.renderer.VertexType.TRIANGLE; + this.vertexType = cc.rendererWebGL.VertexType.TRIANGLE; } else { - this.vertexType = cc.renderer.VertexType.QUAD; + this.vertexType = cc.rendererWebGL.VertexType.QUAD; } return len; }; diff --git a/cocos2d/render-texture/CCRenderTexture.js b/cocos2d/render-texture/CCRenderTexture.js index 72f8b336bc..328cfdb256 100644 --- a/cocos2d/render-texture/CCRenderTexture.js +++ b/cocos2d/render-texture/CCRenderTexture.js @@ -107,7 +107,7 @@ cc.RenderTexture = _ccsg.Node.extend(/** @lends cc.RenderTexture# */{ return; } - var renderer = cc.renderer; + var renderer = cc.rendererWebGL; cmd.visit(parentCmd); renderer.pushRenderCommand(cmd); @@ -168,7 +168,7 @@ cc.RenderTexture = _ccsg.Node.extend(/** @lends cc.RenderTexture# */{ * @function */ begin: function () { - cc.renderer._turnToCacheMode(this.__instanceId); + cc.rendererWebGL._turnToCacheMode(this.__instanceId); this._renderCmd.begin(); }, /** diff --git a/cocos2d/render-texture/CCRenderTextureCanvasRenderCmd.js b/cocos2d/render-texture/CCRenderTextureCanvasRenderCmd.js index 71e1262f75..0e5cb53ae4 100644 --- a/cocos2d/render-texture/CCRenderTextureCanvasRenderCmd.js +++ b/cocos2d/render-texture/CCRenderTextureCanvasRenderCmd.js @@ -85,7 +85,7 @@ proto._beginWithClear = function(r, g, b, a, depthValue, stencilValue, flags){ proto.end = function(){ var node = this._node; - cc.renderer._renderingToCacheCanvas(this._cacheContext, node.__instanceId); + cc.rendererWebGL._renderingToCacheCanvas(this._cacheContext, node.__instanceId); var spriteRenderCmd = node.sprite._renderCmd; spriteRenderCmd._notifyRegionStatus && spriteRenderCmd._notifyRegionStatus(_ccsg.Node.CanvasRenderCmd.RegionStatus.Dirty); }; diff --git a/cocos2d/render-texture/CCRenderTextureWebGLRenderCmd.js b/cocos2d/render-texture/CCRenderTextureWebGLRenderCmd.js index e2768b6a7d..6e02f07d59 100644 --- a/cocos2d/render-texture/CCRenderTextureWebGLRenderCmd.js +++ b/cocos2d/render-texture/CCRenderTextureWebGLRenderCmd.js @@ -318,7 +318,7 @@ proto._beginWithClear = function(r, g, b, a, depthValue, stencilValue, flags){ proto.end = function(){ var node = this._node; - cc.renderer._renderingToBuffer(node.__instanceId); + cc.rendererWebGL._renderingToBuffer(node.__instanceId); var gl = cc._renderContext; var director = cc.director;