Skip to content

Commit

Permalink
remove modular engine code
Browse files Browse the repository at this point in the history
  • Loading branch information
@zilongshanren
zilongshanren committed Apr 24, 2017
1 parent f43005f commit 462714b
Show file tree
Hide file tree
Showing 11 changed files with 95 additions and 121 deletions.
2 changes: 1 addition & 1 deletion cocos2d/core/editbox/CCSGEditBox.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
var SCROLLY = 40;
var TIMER_NAME = 400;
var LEFT_PADDING = 2;
var Utils = require('../cocos2d/core/platform/utils');
var Utils = require('../platform/utils');

function adjustEditBoxPosition (editBox) {
var worldPos = editBox.convertToWorldSpace(cc.p(0,0));
Expand Down
2 changes: 1 addition & 1 deletion cocos2d/core/label/CCSGLabel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
THE SOFTWARE.
****************************************************************************/

var EventTarget = require("../cocos2d/core/event/event-target");
var EventTarget = require("../event/event-target");

var FntLoader = {
INFO_EXP: /info [^\n]*(\n|$)/gi,
Expand Down
6 changes: 2 additions & 4 deletions cocos2d/core/label/CCSGLabelCanvasRenderCmd.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/*global dirtyFlags */

/****************************************************************************
Copyright (c) 2008-2010 Ricardo Quesada
Copyright (c) 2011-2012 cocos2d-x.org
Expand Down Expand Up @@ -45,9 +43,9 @@
this._notifyRegionStatus && this._notifyRegionStatus(_ccsg.Node.CanvasRenderCmd.RegionStatus.Dirty);
}

if(locFlag & dirtyFlags.contentDirty) {
if(locFlag & flags.contentDirty) {
this._notifyRegionStatus && this._notifyRegionStatus(_ccsg.Node.CanvasRenderCmd.RegionStatus.Dirty);
this._dirtyFlag &= ~dirtyFlags.contentDirty;
this._dirtyFlag &= ~flags.contentDirty;
}

if (colorDirty || (locFlag & flags.textDirty)) {
Expand Down
2 changes: 1 addition & 1 deletion cocos2d/core/sprites/CCSGSprite.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
THE SOFTWARE.
****************************************************************************/

var EventTarget = require("../cocos2d/core/event/event-target");
var EventTarget = require("../event/event-target");

/**
* <p>_ccsg.Sprite is a 2d image ( http://en.wikipedia.org/wiki/Sprite_(computer_graphics) ) <br/>
Expand Down
2 changes: 1 addition & 1 deletion cocos2d/core/sprites/CCScale9Sprite.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
THE SOFTWARE.
****************************************************************************/

var EventTarget = require("../cocos2d/core/event/event-target");
var EventTarget = require("../event/event-target");

var dataPool = {
_pool: {},
Expand Down
4 changes: 2 additions & 2 deletions cocos2d/particle/CCSGParticleSystem.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
THE SOFTWARE.
****************************************************************************/

var PNGReader = require('../cocos2d/particle/CCPNGReader');
var tiffReader = require('../cocos2d/particle/CCTIFFReader');
var PNGReader = require('./CCPNGReader');
var tiffReader = require('./CCTIFFReader');

// ideas taken from:
// . The ocean spray in your face [Jeff Lander]
Expand Down
2 changes: 1 addition & 1 deletion cocos2d/render-texture/CCRenderTextureWebGLRenderCmd.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
THE SOFTWARE.
****************************************************************************/

var misc = require('../cocos2d/core/utils/misc');
var misc = require('../core/utils/misc');

cc.RenderTexture.WebGLRenderCmd = function(renderableObject){
this._rootCtor(renderableObject);
Expand Down
5 changes: 2 additions & 3 deletions gulp/tasks/engine.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,7 @@ exports.buildPreview = function (sourceFile, outputFile, callback) {
var outDir = Path.dirname(outputFile);

var bundler = Utils.createBundler(sourceFile);
bundler
.ignore('./bin/modular-cocos2d-cut.js')
bundler.ignore('./bin/modular-cocos2d-cut.js')
.bundle()
.on('error', HandleErrors.handler)
.pipe(HandleErrors())
Expand Down Expand Up @@ -195,4 +194,4 @@ exports.buildJsbMin = function (sourceFile, outputFile, jsbSkipModules, callback
}), UglifyHarmony))
.pipe(Gulp.dest(outDir))
.on('end', callback);
};
};
152 changes: 76 additions & 76 deletions gulp/tasks/modular.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,82 +34,82 @@ const es = require('event-stream');
const sourcemaps = require('gulp-sourcemaps');

var modules = {
'Core': [
'./cocos2d/core/base-nodes/BaseNodesPropertyDefine.js',
'./cocos2d/core/base-nodes/CCSGNode.js',
'./cocos2d/core/base-nodes/CCSGNodeCanvasRenderCmd.js',
'./cocos2d/core/base-nodes/CCSGNodeWebGLRenderCmd.js',
'./cocos2d/core/scenes/CCSGScene.js',
'./cocos2d/core/CCConfiguration.js',
'./cocos2d/core/CCDrawingPrimitivesCanvas.js',
'./cocos2d/core/CCDrawingPrimitivesWebGL.js'
],

'Sprite': [
'./cocos2d/core/sprites/SpritesPropertyDefine.js',
'./cocos2d/core/sprites/CCSGSprite.js',
'./cocos2d/core/sprites/CCSGSpriteCanvasRenderCmd.js',
'./cocos2d/core/sprites/CCSGSpriteWebGLRenderCmd.js',
'./cocos2d/core/sprites/CCScale9Sprite.js',
'./cocos2d/core/sprites/CCScale9SpriteCanvasRenderCmd.js',
'./cocos2d/core/sprites/CCScale9SpriteWebGLRenderCmd.js',
'./cocos2d/core/sprites/CCSpriteBatchNode.js'
],

'Label': [
'./cocos2d/core/label/CCTextUtils.js',
'./cocos2d/core/label/CCSGLabel.js',
'./cocos2d/core/label/CCSGLabelCanvasRenderCmd.js',
'./cocos2d/core/label/CCSGLabelWebGLRenderCmd.js'
],

'Mask': [
'./cocos2d/shape-nodes/CCDrawNode.js',
'./cocos2d/shape-nodes/CCDrawNodeCanvasRenderCmd.js',
'./cocos2d/shape-nodes/CCDrawNodeWebGLRenderCmd.js',
'./cocos2d/clipping-nodes/CCClippingNode.js',
'./cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js',
'./cocos2d/clipping-nodes/CCClippingNodeWebGLRenderCmd.js'
],

'ParticleSystem': [
'./cocos2d/particle/CCSGParticleSystem.js',
'./cocos2d/particle/CCSGParticleSystemCanvasRenderCmd.js',
'./cocos2d/particle/CCSGParticleSystemWebGLRenderCmd.js',
'./cocos2d/particle/CCParticleBatchNode.js',
'./cocos2d/particle/CCParticleBatchNodeCanvasRenderCmd.js',
'./cocos2d/particle/CCParticleBatchNodeWebGLRenderCmd.js'
],

'TiledMap': [
'./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'
],

'EditorBox': [
'./cocos2d/core/editbox/CCSGEditBox.js'
],

'VideoPlayer': [
'./cocos2d/core/videoplayer/CCSGVideoPlayer.js'
],

'WebView': [
'./cocos2d/core/webview/CCSGWebView.js'
],

'MotionStreak': [
'./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'
]
// 'Core': [
// './cocos2d/core/base-nodes/BaseNodesPropertyDefine.js',
// './cocos2d/core/base-nodes/CCSGNode.js',
// './cocos2d/core/base-nodes/CCSGNodeCanvasRenderCmd.js',
// './cocos2d/core/base-nodes/CCSGNodeWebGLRenderCmd.js',
// './cocos2d/core/scenes/CCSGScene.js',
// './cocos2d/core/CCConfiguration.js',
// './cocos2d/core/CCDrawingPrimitivesCanvas.js',
// './cocos2d/core/CCDrawingPrimitivesWebGL.js'
// ],

// 'Sprite': [
// './cocos2d/core/sprites/SpritesPropertyDefine.js',
// './cocos2d/core/sprites/CCSGSprite.js',
// './cocos2d/core/sprites/CCSGSpriteCanvasRenderCmd.js',
// './cocos2d/core/sprites/CCSGSpriteWebGLRenderCmd.js',
// './cocos2d/core/sprites/CCScale9Sprite.js',
// './cocos2d/core/sprites/CCScale9SpriteCanvasRenderCmd.js',
// './cocos2d/core/sprites/CCScale9SpriteWebGLRenderCmd.js',
// './cocos2d/core/sprites/CCSpriteBatchNode.js'
// ],

// 'Label': [
// './cocos2d/core/label/CCTextUtils.js',
// './cocos2d/core/label/CCSGLabel.js',
// './cocos2d/core/label/CCSGLabelCanvasRenderCmd.js',
// './cocos2d/core/label/CCSGLabelWebGLRenderCmd.js'
// ],

// 'Mask': [
// './cocos2d/shape-nodes/CCDrawNode.js',
// './cocos2d/shape-nodes/CCDrawNodeCanvasRenderCmd.js',
// './cocos2d/shape-nodes/CCDrawNodeWebGLRenderCmd.js',
// './cocos2d/clipping-nodes/CCClippingNode.js',
// './cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js',
// './cocos2d/clipping-nodes/CCClippingNodeWebGLRenderCmd.js'
// ],

// 'ParticleSystem': [
// './cocos2d/particle/CCSGParticleSystem.js',
// './cocos2d/particle/CCSGParticleSystemCanvasRenderCmd.js',
// './cocos2d/particle/CCSGParticleSystemWebGLRenderCmd.js',
// './cocos2d/particle/CCParticleBatchNode.js',
// './cocos2d/particle/CCParticleBatchNodeCanvasRenderCmd.js',
// './cocos2d/particle/CCParticleBatchNodeWebGLRenderCmd.js'
// ],

// 'TiledMap': [
// './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'
// ],

// 'EditorBox': [
// './cocos2d/core/editbox/CCSGEditBox.js'
// ],

// 'VideoPlayer': [
// './cocos2d/core/videoplayer/CCSGVideoPlayer.js'
// ],

// 'WebView': [
// './cocos2d/core/webview/CCSGWebView.js'
// ],

// 'MotionStreak': [
// './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'
// ]

};

Expand Down
32 changes: 6 additions & 26 deletions gulpfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,45 +30,25 @@ const gulp = require('gulp');
const Del = require('del');
const Shell = require('gulp-shell');

const Modular = require('./gulp/tasks/modular');
const Engine = require('./gulp/tasks/engine');
const Test = require('./gulp/tasks/test');
const Watch = require('./gulp/tasks/watch');

///////////////
// modular //
///////////////

//gulp.task('build-file-without-module', function (done) {
// Modular.buildFileWithoutModular(paths.outDir, done);
//});
gulp.task('build-all-modular', function (done) {
Modular.buildModular('modular-cocos2d.js', './bin', [], done);
});
gulp.task('build-cut-modular', function (done) {
Modular.buildModular('modular-cocos2d-cut.js', './bin', [], done);
});

gulp.task('build-modular-cocos2d', ['build-all-modular', 'build-cut-modular'], function (done) {
Del(['./bin/cocos2d-js.js', './bin/cocos2d-js-min.js', './bin/.cache'], done);
});


/////////////
// engine //
/////////////

gulp.task('build-cocos2d-dev', ['build-modular-cocos2d'], function (done) {
Engine.buildCocosJs('./index.js', './bin/cocos2d-js.js', ['./bin/modular-cocos2d-cut.js'], done);
gulp.task('build-cocos2d-dev', function (done) {
Engine.buildCocosJs('./index.js', './bin/cocos2d-js.js', [], done);
});

gulp.task('build-cocos2d-min', ['build-modular-cocos2d'], function (done) {
Engine.buildCocosJsMin('./index.js', './bin/cocos2d-js-min.js', ['./bin/modular-cocos2d-cut.js'], done);
gulp.task('build-cocos2d-min', function (done) {
Engine.buildCocosJsMin('./index.js', './bin/cocos2d-js-min.js', [], done);
});

gulp.task('build-html5', ['build-cocos2d-dev', 'build-cocos2d-min']);

gulp.task('build-preview', ['build-modular-cocos2d'], function (done) {
gulp.task('build-preview', function (done) {
Engine.buildPreview('./index.js', './bin/cocos2d-js-for-preview.js', done);
});

Expand Down Expand Up @@ -136,7 +116,7 @@ gulp.task('build-test-cases', ['clean-test-cases'], function (done) {
Test.buildTestCase('./bin/test/', done);
});

gulp.task('build-test', ['build-modular-cocos2d', 'clean-test', 'build-test-cases'], function (done) {
gulp.task('build-test', ['clean-test', 'build-test-cases'], function (done) {
Test.build('./index.js', './bin/cocos2d-js-for-test.js',
'../editor/test-utils/engine-extends-entry.js', './bin/cocos2d-js-extends-for-test.js',
done);
Expand Down
7 changes: 2 additions & 5 deletions index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ if (!isMainProcess) {
// LOAD ORIGIN COCOS2D
if (CC_EDITOR) {
try {
require('./bin/modular-cocos2d');
require('./cocos2d/index.js');
}
catch (e) {
if (e.code === 'MODULE_NOT_FOUND') {
Expand All @@ -69,10 +69,7 @@ if (!isMainProcess) {
}
}
else {
require('./bin/modular-cocos2d');
if (!CC_TEST) {
require('./bin/modular-cocos2d-cut');
}
require('./cocos2d/index.js');
}
}
else {
Expand Down

0 comments on commit 462714b

Please sign in to comment.