diff --git a/cocos2d/core/graphics/index.js b/cocos2d/core/graphics/index.js index 85b69fd1de..22540071ed 100644 --- a/cocos2d/core/graphics/index.js +++ b/cocos2d/core/graphics/index.js @@ -26,7 +26,7 @@ 'use strict'; var GraphicsNode; -if (!cc.sys.isNative) { +if (!CC_JSB) { GraphicsNode = _ccsg.GraphicsNode = require('./graphics-node'); } else { diff --git a/gulp/tasks/engine.js b/gulp/tasks/engine.js index 39477de6e4..f8f0e9829d 100644 --- a/gulp/tasks/engine.js +++ b/gulp/tasks/engine.js @@ -41,6 +41,62 @@ const Chalk = require('chalk'); const HandleErrors = require('../util/handleErrors'); const Optimizejs = require('gulp-optimize-js'); +var jsbSkipModules = [ + '../../cocos2d/core/CCGame', + '../../cocos2d/core/CCDrawingPrimitives.js', + '../../cocos2d/core/textures/CCTexture2D', + '../../cocos2d/core/sprites/CCSpriteFrame', + '../../cocos2d/core/load-pipeline/audio-downloader', + '../../cocos2d/core/physics/platform/CCPhysicsDebugDraw.js', + '../../cocos2d/core/physics/platform/CCPhysicsUtils.js', + '../../cocos2d/core/physics/platform/CCPhysicsAABBQueryCallback.js', + '../../cocos2d/core/physics/platform/CCPhysicsRayCastCallback.js', + '../../cocos2d/core/physics/platform/CCPhysicsContactListner.js', + '../../cocos2d/core/camera/CCSGCameraNode.js', + '../../cocos2d/core/label/CCSGLabel.js', + '../../cocos2d/core/label/CCSGLabelCanvasRenderCmd.js', + '../../cocos2d/core/label/CCSGLabelWebGLRenderCmd.js', + '../../cocos2d/core/videoplayer/CCSGVideoPlayer.js', + '../../cocos2d/core/webview/CCSGWebView.js', + '../../cocos2d/core/editbox/CCSGEditBox.js', + '../../cocos2d/core/graphics/graphics-node.js', + '../../cocos2d/core/graphics/graphics-webgl-cmd.js', + '../../cocos2d/core/graphics/graphics-canvas-cmd.js', + '../../cocos2d/core/graphics/earcut.js', + '../../cocos2d/core/graphics/helper.js', + '../../cocos2d/audio/CCAudio', + '../../cocos2d/shape-nodes/CCDrawNode.js', + '../../cocos2d/clipping-nodes/CCClippingNode.js', + '../../cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js', + '../../cocos2d/clipping-nodes/CCClippingNodeWebGLRenderCmd.js', + '../../cocos2d/particle/CCSGParticleSystem.js', + '../../cocos2d/particle/CCSGParticleSystemCanvasRenderCmd.js', + '../../cocos2d/particle/CCSGParticleSystemWebGLRenderCmd.js', + '../../cocos2d/tilemap/CCSGTMXTiledMap.js', + '../../cocos2d/tilemap/CCTMXXMLParser.js', + '../../cocos2d/tilemap/CCSGTMXObjectGroup.js', + '../../cocos2d/tilemap/CCSGTMXObject.js', + '../../cocos2d/tilemap/CCSGTMXLayer.js', + '../../cocos2d/tilemap/CCTMXLayerCanvasRenderCmd.js', + '../../cocos2d/tilemap/CCTMXLayerWebGLRenderCmd.js', + '../../cocos2d/motion-streak/CCSGMotionStreak.js', + '../../cocos2d/motion-streak/CCSGMotionStreakWebGLRenderCmd.js', + '../../cocos2d/render-texture/CCRenderTexture.js', + '../../cocos2d/render-texture/CCRenderTextureCanvasRenderCmd.js', + '../../cocos2d/render-texture/CCRenderTextureWebGLRenderCmd.js', + '../../extensions/spine/SGSkeleton', + '../../extensions/spine/SGSkeletonAnimation', + '../../extensions/spine/SGSkeletonCanvasRenderCmd', + '../../extensions/spine/SGSkeletonWebGLRenderCmd', + '../../extensions/spine/lib/spine', + '../../extensions/dragonbones/lib/dragonBones', + '../../extensions/dragonbones/CCFactory', + '../../extensions/dragonbones/CCArmatureDisplay', + '../../extensions/dragonbones/CCSlot', + '../../extensions/dragonbones/CCTextureData', + '../../external/box2d/box2d.js', +]; + exports.buildCocosJs = function (sourceFile, outputFile, excludes, callback) { var outDir = Path.dirname(outputFile); var outFile = Path.basename(outputFile); @@ -150,14 +206,16 @@ exports.buildPreview = function (sourceFile, outputFile, callback) { .on('end', callback); }; -exports.buildJsbPreview = function (sourceFile, outputFile, jsbSkipModules, callback) { +exports.buildJsbPreview = function (sourceFile, outputFile, excludes, callback) { var FixJavaScriptCore = require('../util/fix-jsb-javascriptcore'); var outFile = Path.basename(outputFile); var outDir = Path.dirname(outputFile); + excludes = excludes.concat(jsbSkipModules); + var bundler = createBundler(sourceFile); - jsbSkipModules.forEach(function (module) { + excludes.forEach(function (module) { bundler.ignore(require.resolve(module)); }); bundler.bundle() @@ -174,14 +232,16 @@ exports.buildJsbPreview = function (sourceFile, outputFile, jsbSkipModules, call .on('end', callback); }; -exports.buildJsb = function (sourceFile, outputFile, jsbSkipModules, callback) { +exports.buildJsb = function (sourceFile, outputFile, excludes, callback) { var FixJavaScriptCore = require('../util/fix-jsb-javascriptcore'); var outFile = Path.basename(outputFile); var outDir = Path.dirname(outputFile); + excludes = excludes.concat(jsbSkipModules); + var bundler = createBundler(sourceFile); - jsbSkipModules.forEach(function (module) { + excludes.forEach(function (module) { bundler.ignore(require.resolve(module)); }); bundler.bundle() @@ -198,14 +258,16 @@ exports.buildJsb = function (sourceFile, outputFile, jsbSkipModules, callback) { .on('end', callback); }; -exports.buildJsbMin = function (sourceFile, outputFile, jsbSkipModules, callback) { +exports.buildJsbMin = function (sourceFile, outputFile, excludes, callback) { var FixJavaScriptCore = require('../util/fix-jsb-javascriptcore'); var outFile = Path.basename(outputFile); var outDir = Path.dirname(outputFile); + excludes = excludes.concat(jsbSkipModules); + var bundler = createBundler(sourceFile); - jsbSkipModules.forEach(function (module) { + excludes.forEach(function (module) { bundler.ignore(require.resolve(module)); }); bundler.bundle() @@ -221,3 +283,5 @@ exports.buildJsbMin = function (sourceFile, outputFile, jsbSkipModules, callback .pipe(Gulp.dest(outDir)) .on('end', callback); }; + +exports.jsbSkipModules = jsbSkipModules; diff --git a/gulp/tasks/watch.js b/gulp/tasks/watch.js index 091bb11d7d..c71fa2d504 100644 --- a/gulp/tasks/watch.js +++ b/gulp/tasks/watch.js @@ -5,6 +5,8 @@ var Fs = require('fs'); var Path = require('path'); var through = require('through'); +var Engine = require('./engine'); + // var source = require('vinyl-source-stream'); // var buffer = require('vinyl-buffer'); // var sourcemaps = require('gulp-sourcemaps'); @@ -91,7 +93,7 @@ exports.preview = function (sourceFile, outputFile) { }); }; -exports.jsbPolyfill = function (sourceFile, outputFile, skipModules) { +exports.jsbPolyfill = function (sourceFile, outputFile) { return watchFile({ entries: sourceFile, dest: outputFile, @@ -101,6 +103,6 @@ exports.jsbPolyfill = function (sourceFile, outputFile, skipModules) { return prefix; }, - skips: skipModules + skips: Engine.jsbSkipModules }); }; \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index fe7c7150b5..7667e7ea61 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -52,73 +52,22 @@ gulp.task('build-html5-preview', function (done) { gulp.task('build-html5', ['build-html5-preview', 'build-html5-dev', 'build-html5-min']); -var jsbSkipModules = [ - '../../cocos2d/core/CCGame', - '../../cocos2d/core/CCDrawingPrimitives.js', - '../../cocos2d/core/textures/CCTexture2D', - '../../cocos2d/core/sprites/CCSpriteFrame', - '../../cocos2d/core/load-pipeline/audio-downloader', - '../../cocos2d/core/physics/platform/CCPhysicsDebugDraw.js', - '../../cocos2d/core/physics/platform/CCPhysicsUtils.js', - '../../cocos2d/core/physics/platform/CCPhysicsAABBQueryCallback.js', - '../../cocos2d/core/physics/platform/CCPhysicsRayCastCallback.js', - '../../cocos2d/core/physics/platform/CCPhysicsContactListner.js', - '../../cocos2d/core/camera/CCSGCameraNode.js', - '../../cocos2d/core/label/CCSGLabel.js', - '../../cocos2d/core/label/CCSGLabelCanvasRenderCmd.js', - '../../cocos2d/core/label/CCSGLabelWebGLRenderCmd.js', - '../../cocos2d/core/videoplayer/CCSGVideoPlayer.js', - '../../cocos2d/core/webview/CCSGWebView.js', - '../../cocos2d/core/editbox/CCSGEditBox.js', - '../../cocos2d/audio/CCAudio', - '../../cocos2d/shape-nodes/CCDrawNode.js', - '../../cocos2d/clipping-nodes/CCClippingNode.js', - '../../cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js', - '../../cocos2d/clipping-nodes/CCClippingNodeWebGLRenderCmd.js', - '../../cocos2d/particle/CCSGParticleSystem.js', - '../../cocos2d/particle/CCSGParticleSystemCanvasRenderCmd.js', - '../../cocos2d/particle/CCSGParticleSystemWebGLRenderCmd.js', - '../../cocos2d/tilemap/CCSGTMXTiledMap.js', - '../../cocos2d/tilemap/CCTMXXMLParser.js', - '../../cocos2d/tilemap/CCSGTMXObjectGroup.js', - '../../cocos2d/tilemap/CCSGTMXObject.js', - '../../cocos2d/tilemap/CCSGTMXLayer.js', - '../../cocos2d/tilemap/CCTMXLayerCanvasRenderCmd.js', - '../../cocos2d/tilemap/CCTMXLayerWebGLRenderCmd.js', - '../../cocos2d/motion-streak/CCSGMotionStreak.js', - '../../cocos2d/motion-streak/CCSGMotionStreakWebGLRenderCmd.js', - '../../cocos2d/render-texture/CCRenderTexture.js', - '../../cocos2d/render-texture/CCRenderTextureCanvasRenderCmd.js', - '../../cocos2d/render-texture/CCRenderTextureWebGLRenderCmd.js', - '../../extensions/spine/SGSkeleton', - '../../extensions/spine/SGSkeletonAnimation', - '../../extensions/spine/SGSkeletonCanvasRenderCmd', - '../../extensions/spine/SGSkeletonWebGLRenderCmd', - '../../extensions/spine/lib/spine', - '../../extensions/dragonbones/lib/dragonBones', - '../../extensions/dragonbones/CCFactory', - '../../extensions/dragonbones/CCArmatureDisplay', - '../../extensions/dragonbones/CCSlot', - '../../extensions/dragonbones/CCTextureData', - '../../external/box2d/box2d.js', -]; - gulp.task('build-jsb-dev', function (done) { Engine.buildJsb([ './jsb/index.js', - ], './bin/jsb_polyfill.dev.js', jsbSkipModules, done); + ], './bin/jsb_polyfill.dev.js', [], done); }); gulp.task('build-jsb-min', function (done) { Engine.buildJsbMin([ './jsb/index.js', - ], './bin/jsb_polyfill.js', jsbSkipModules, done); + ], './bin/jsb_polyfill.js', [], done); }); gulp.task('build-jsb-preview', function (done) { Engine.buildJsbPreview([ './jsb/index.js', - ], './bin/jsb_polyfill-for-preview.js', jsbSkipModules, done); + ], './bin/jsb_polyfill-for-preview.js', [], done); }); gulp.task('build-jsb', ['build-jsb-preview', 'build-jsb-dev', 'build-jsb-min']); @@ -203,7 +152,7 @@ gulp.task('watch-preview', function () { gulp.task('watch-jsb-polyfill', function () { Watch.jsbPolyfill([ './jsb/index.js', - ], './bin/jsb_polyfill.dev.js', jsbSkipModules); + ], './bin/jsb_polyfill.dev.js'); }); gulp.task('watch-dev-files', ['watch-preview', 'watch-jsb-polyfill']); diff --git a/modules.json b/modules.json index 018b90f95f..b8f992ee40 100644 --- a/modules.json +++ b/modules.json @@ -59,7 +59,8 @@ { "name": "Spine Skeleton", "entries": [ - "./extensions/spine/index.js" + "./extensions/spine/index.js", + "./jsb/jsb-spine.js" ] }, { @@ -131,19 +132,22 @@ { "name": "EditorBox", "entries": [ - "./cocos2d/core/components/CCEditBox.js" + "./cocos2d/core/components/CCEditBox.js", + "./jsb/jsb-editbox.js" ] }, { "name": "VideoPlayer", "entries": [ - "./cocos2d/core/components/CCVideoPlayer.js" + "./cocos2d/core/components/CCVideoPlayer.js", + "./jsb/jsb-videoplayer.js" ] }, { "name": "WebView", "entries": [ - "./cocos2d/core/components/CCWebView.js" + "./cocos2d/core/components/CCWebView.js", + "./jsb/jsb-webview.js" ] }, { @@ -155,7 +159,8 @@ { "name": "AudioSource", "entries": [ - "./cocos2d/core/components/CCAudioSource.js" + "./cocos2d/core/components/CCAudioSource.js", + "./jsb/jsb-audio.js" ] }, { @@ -198,13 +203,15 @@ { "name": "DragonBones", "entries": [ - "./extensions/dragonbones/index.js" + "./extensions/dragonbones/index.js", + "./jsb/jsb-dragonbones.js" ] }, { "name": "Physics", "entries": [ - "./cocos2d/core/physics/index.js" + "./cocos2d/core/physics/index.js", + "./jsb/jsb-box2d.js" ], "dependencies": ["Collider"] },