diff --git a/cocos2d/core/assets/CCTexture2D.js b/cocos2d/core/assets/CCTexture2D.js index 4e702b7ea0..35bfc797cb 100644 --- a/cocos2d/core/assets/CCTexture2D.js +++ b/cocos2d/core/assets/CCTexture2D.js @@ -373,7 +373,7 @@ var Texture2D = cc.Class({ if (!element) return; this._image = element; - if (element.complete || element instanceof HTMLCanvasElement) { + if (CC_WECHATGAME || CC_QQPLAY || element.complete || element instanceof HTMLCanvasElement) { this.handleLoadedTexture(); } else { diff --git a/cocos2d/core/components/CCCanvas.js b/cocos2d/core/components/CCCanvas.js index 056cf3b0ba..84f37a2691 100644 --- a/cocos2d/core/components/CCCanvas.js +++ b/cocos2d/core/components/CCCanvas.js @@ -23,7 +23,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ + var eventManager = require('../event-manager'); +var Camera = require('../camera/CCCamera'); +var Component = require('./CCComponent'); /** * !#zh: 作为 UI 根节点,为所有子节点提供视窗四边的位置信息以供对齐,另外提供屏幕适配策略接口,方便从编辑器设置。 @@ -33,7 +36,8 @@ var eventManager = require('../event-manager'); * @extends Component */ var Canvas = cc.Class({ - name: 'cc.Canvas', extends: require('./CCComponent'), + name: 'cc.Canvas', + extends: Component, editor: CC_EDITOR && { menu: 'i18n:MAIN_MENU.component.ui/Canvas', @@ -170,15 +174,15 @@ var Canvas = cc.Class({ cameraNode.parent = this.node; cameraNode.setSiblingIndex(0); } - let camera = cameraNode.getComponent(cc.Camera); + let camera = cameraNode.getComponent(Camera); if (!camera) { - camera = cameraNode.addComponent(cc.Camera); + camera = cameraNode.addComponent(Camera); - let ClearFlags = cc.Camera.ClearFlags; + let ClearFlags = Camera.ClearFlags; camera.clearFlags = ClearFlags.COLOR | ClearFlags.DEPTH; camera.depth = -1; } - cc.Camera.main = camera; + Camera.main = camera; }, onDestroy: function () { diff --git a/cocos2d/core/load-pipeline/loader.js b/cocos2d/core/load-pipeline/loader.js index 670873a773..d0d255d3c4 100644 --- a/cocos2d/core/load-pipeline/loader.js +++ b/cocos2d/core/load-pipeline/loader.js @@ -61,7 +61,6 @@ function loadImage (item, callback) { tex.url = rawUrl; tex._nativeAsset = image; tex.initWithElement(item.content); - tex.handleLoadedTexture(); return tex; } diff --git a/cocos2d/core/renderer/index.js b/cocos2d/core/renderer/index.js index 3200905b64..10189392d7 100644 --- a/cocos2d/core/renderer/index.js +++ b/cocos2d/core/renderer/index.js @@ -30,20 +30,8 @@ const math = renderEngine.math; let _pos = math.vec3.create(); function _initBuiltins(device) { - let canvas = document.createElement('canvas'); - let context = canvas.getContext('2d'); - - // default texture - canvas.width = canvas.height = 128; - context.fillStyle = '#ddd'; - context.fillRect(0, 0, 128, 128); - context.fillStyle = '#555'; - context.fillRect(0, 0, 64, 64); - context.fillStyle = '#555'; - context.fillRect(64, 64, 64, 64); - let defaultTexture = new renderEngine.Texture2D(device, { - images: [canvas], + images: [], width: 128, height: 128, wrapS: renderEngine.gfx.WRAP_REPEAT, diff --git a/cocos2d/core/renderer/render-engine.js b/cocos2d/core/renderer/render-engine.js index dc87184b92..8faf983a8e 100644 --- a/cocos2d/core/renderer/render-engine.js +++ b/cocos2d/core/renderer/render-engine.js @@ -8316,6 +8316,7 @@ module.exports = (function () { let img = options.image; if ( + CC_QQPLAY || img instanceof HTMLCanvasElement || img instanceof HTMLImageElement || img instanceof HTMLVideoElement @@ -8379,6 +8380,7 @@ module.exports = (function () { let img = options.image; if ( + CC_QQPLAY || img instanceof HTMLCanvasElement || img instanceof HTMLImageElement || img instanceof HTMLVideoElement @@ -8683,6 +8685,7 @@ module.exports = (function () { } if ( + CC_QQPLAY || img instanceof HTMLCanvasElement || img instanceof HTMLImageElement || img instanceof HTMLVideoElement @@ -8734,6 +8737,7 @@ module.exports = (function () { gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, premultiplyAlpha); } if ( + CC_QQPLAY || img instanceof HTMLCanvasElement || img instanceof HTMLImageElement || img instanceof HTMLVideoElement diff --git a/modules.json b/modules.json index 2334307d03..dc4fde30c1 100644 --- a/modules.json +++ b/modules.json @@ -220,12 +220,6 @@ "./cocos2d/core/components/CCStudioComponent.js" ] }, - { - "name": "Camera", - "entries": [ - "./cocos2d/core/camera/CCCamera.js" - ] - }, { "name": "Intersection", "entries": [