Skip to content

Sync creator improvements to Cocos2d-html5 #3403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Dec 6, 2016
Merged

Sync creator improvements to Cocos2d-html5 #3403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c1d6270
Forbidden screen adaptation during edit box focus
Oct 13, 2016
2ff174e
Improve platform detection
Nov 3, 2016
34715e7
Unify Scheduler:isScheduled behavior with JSB
Nov 3, 2016
6ed695c
Fix wechat touch end/cancel not fired issue
Nov 3, 2016
1d856ef
Improve screen adaptation logic
Nov 3, 2016
0846e9a
Fix skeleton webgl render command
Nov 3, 2016
02e3446
Upgrade EditBox
Nov 3, 2016
6d965db
Remove overwrite in webgl context object
Nov 3, 2016
8075974
Revert "Remove overwrite in webgl context object"
Nov 3, 2016
f60dde1
Fix texture issue on Android browser by always set vertexAttribPointer
Nov 6, 2016
2032c3a
Improve performance for transform by removing recursive logic
Nov 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions CCBoot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1666,7 +1666,7 @@ var _initSys = function () {
* @name isMobile
* @type {Boolean}
*/
sys.isMobile = ua.indexOf('mobile') !== -1 || ua.indexOf('android') !== -1;
sys.isMobile = /mobile|android|iphone|ipad/.test(ua);

/**
* Indicate the running platform
Expand Down Expand Up @@ -1701,6 +1701,11 @@ var _initSys = function () {
iOS = true;
osVersion = uaResult[2] || '';
osMainVersion = parseInt(osVersion) || 0;
}
else if (/(iPhone|iPad|iPod)/.exec(nav.platform)) {
iOS = true;
osVersion = '';
osMainVersion = 0;
}

var osName = sys.OS_UNKNOWN;
Expand Down Expand Up @@ -2015,6 +2020,21 @@ var _initSys = function () {
sys.openURL = function(url){
window.open(url);
};

/**
* Get the number of milliseconds elapsed since 1 January 1970 00:00:00 UTC.
* @memberof cc.sys
* @name now
* @return {Number}
*/
sys.now = function () {
if (Date.now) {
return Date.now();
}
else {
return +(new Date);
}
};
};
_initSys();

Expand Down Expand Up @@ -2089,7 +2109,7 @@ function _afterEngineLoaded(config) {
if (cc._initDebugSetting)
cc._initDebugSetting(config[cc.game.CONFIG_KEY.debugMode]);
cc._engineLoaded = true;
cc.log(cc.ENGINE_VERSION);
console.log(cc.ENGINE_VERSION);
if (_engineLoadedCallback) _engineLoadedCallback();
}

Expand Down
15 changes: 8 additions & 7 deletions cocos2d/core/CCScheduler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,26 +768,27 @@ cc.Scheduler = cc.Class.extend(/** @lends cc.Scheduler# */{
}
},

isScheduled: function(key, target){
isScheduled: function(callback, target){
//key, target
//selector, target
cc.assert(key, "Argument key must not be empty");
cc.assert(callback, "Argument callback must not be empty");
cc.assert(target, "Argument target must be non-nullptr");

var element = this._hashForUpdates[target.__instanceId];
var element = this._hashForTimers[target.__instanceId];

if (!element){
if (!element) {
return false;
}

if (element.timers == null){
return false;
}else{
}
else {
var timers = element.timers;
for (var i = 0; i < timers.length; ++i){
for (var i = 0; i < timers.length; ++i) {
var timer = timers[i];

if (key === timer.getKey()){
if (callback === timer._selector){
return true;
}
}
Expand Down
107 changes: 66 additions & 41 deletions cocos2d/core/base-nodes/CCNodeCanvasRenderCmd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,40 @@ cc.CustomRenderCmd = function (target, func) {
};
};

cc.Node._dirtyFlags = {
var dirtyFlags = cc.Node._dirtyFlags = {
transformDirty: 1 << 0, visibleDirty: 1 << 1, colorDirty: 1 << 2, opacityDirty: 1 << 3, cacheDirty: 1 << 4,
orderDirty: 1 << 5, textDirty: 1 << 6, gradientDirty: 1 << 7, textureDirty: 1 << 8,
contentDirty: 1 << 9,
COUNT: 10,
all: (1 << 10) - 1
};

var ONE_DEGREE = Math.PI / 180;
var stack = new Array(50);

function transformChildTree (root) {
var index = 1;
var children, child, curr, parentCmd, i, len;
stack[0] = root;
while (index) {
index--;
curr = stack[index];
// Avoid memory leak
stack[index] = null;
if (!curr) continue;
children = curr._children;
if (children && children.length > 0) {
parentCmd = curr._renderCmd;
for (i = 0, len = children.length; i < len; ++i) {
child = children[i];
stack[index] = child;
index++;
child._renderCmd.transform(parentCmd);
}
}
}
}

//-------------------------Base -------------------------
cc.Node.RenderCmd = function (renderable) {
this._dirtyFlag = 1; //need update the transform at first.
Expand Down Expand Up @@ -150,15 +176,15 @@ cc.Node.RenderCmd.prototype = {

// rotation
if (hasRotation) {
var rotationRadiansX = node._rotationX * 0.017453292519943295; //0.017453292519943295 = (Math.PI / 180); for performance
var rotationRadiansX = node._rotationX * ONE_DEGREE;
c = Math.sin(rotationRadiansX);
d = Math.cos(rotationRadiansX);
if (node._rotationY === node._rotationX) {
a = d;
b = -c;
}
else {
var rotationRadiansY = node._rotationY * 0.017453292519943295; //0.017453292519943295 = (Math.PI / 180); for performance
var rotationRadiansY = node._rotationY * ONE_DEGREE;
a = Math.cos(rotationRadiansY);
b = -Math.sin(rotationRadiansY);
}
Expand All @@ -172,8 +198,8 @@ cc.Node.RenderCmd.prototype = {

// skew
if (hasSkew) {
var skx = Math.tan(node._skewX * Math.PI / 180);
var sky = Math.tan(node._skewY * Math.PI / 180);
var skx = Math.tan(node._skewX * ONE_DEGREE);
var sky = Math.tan(node._skewY * ONE_DEGREE);
if (skx === Infinity)
skx = 99999999;
if (sky === Infinity)
Expand Down Expand Up @@ -250,17 +276,13 @@ cc.Node.RenderCmd.prototype = {
this._transform = cc.affineTransformConcat(t, node._additionalTransform);
}

this._updateCurrentRegions && this._updateCurrentRegions();
this._notifyRegionStatus && this._notifyRegionStatus(cc.Node.CanvasRenderCmd.RegionStatus.DirtyDouble);
if (this._updateCurrentRegions) {
this._updateCurrentRegions();
this._notifyRegionStatus && this._notifyRegionStatus(cc.Node.CanvasRenderCmd.RegionStatus.DirtyDouble);
}

if (recursive) {
var locChildren = this._node._children;
if (!locChildren || locChildren.length === 0)
return;
var i, len;
for (i = 0, len = locChildren.length; i < len; i++) {
locChildren[i]._renderCmd.transform(this, recursive);
}
transformChildTree(node);
}

this._cacheDirty = true;
Expand Down Expand Up @@ -331,7 +353,7 @@ cc.Node.RenderCmd.prototype = {
}
}
}
this._dirtyFlag = this._dirtyFlag & cc.Node._dirtyFlags.colorDirty ^ this._dirtyFlag;
this._dirtyFlag &= ~dirtyFlags.colorDirty;
},

_updateDisplayOpacity: function (parentOpacity) {
Expand Down Expand Up @@ -366,7 +388,7 @@ cc.Node.RenderCmd.prototype = {
}
}
}
this._dirtyFlag = this._dirtyFlag & cc.Node._dirtyFlags.opacityDirty ^ this._dirtyFlag;
this._dirtyFlag &= ~dirtyFlags.opacityDirty;
},

_syncDisplayColor: function (parentColor) {
Expand Down Expand Up @@ -394,14 +416,17 @@ cc.Node.RenderCmd.prototype = {
this._displayedOpacity = node._realOpacity * parentOpacity / 255.0;
},

_updateColor: function () {
},
_updateColor: function(){},

updateStatus: function () {
var flags = cc.Node._dirtyFlags, locFlag = this._dirtyFlag;
var colorDirty = locFlag & flags.colorDirty,
opacityDirty = locFlag & flags.opacityDirty;
this._savedDirtyFlag = this._savedDirtyFlag || locFlag;
var locFlag = this._dirtyFlag;
var colorDirty = locFlag & dirtyFlags.colorDirty,
opacityDirty = locFlag & dirtyFlags.opacityDirty;

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

if (colorDirty)
this._updateDisplayColor();
Expand All @@ -412,20 +437,20 @@ cc.Node.RenderCmd.prototype = {
if (colorDirty || opacityDirty)
this._updateColor();

if (locFlag & flags.transformDirty) {
if (locFlag & dirtyFlags.transformDirty) {
//update the transform
this.transform(this.getParentRenderCmd(), true);
this._dirtyFlag = this._dirtyFlag & flags.transformDirty ^ this._dirtyFlag;
this._dirtyFlag &= ~dirtyFlags.transformDirty;
}

if (locFlag & flags.orderDirty)
this._dirtyFlag = this._dirtyFlag & flags.orderDirty ^ this._dirtyFlag;
if (locFlag & dirtyFlags.orderDirty)
this._dirtyFlag &= ~dirtyFlags.orderDirty;
},

_syncStatus: function (parentCmd) {
// In the visit logic does not restore the _dirtyFlag
// Because child elements need parent's _dirtyFlag to change himself
var flags = cc.Node._dirtyFlags, locFlag = this._dirtyFlag, parentNode = null;
var locFlag = this._dirtyFlag, parentNode = null;
if (parentCmd) {
parentNode = parentCmd._node;
this._savedDirtyFlag = this._savedDirtyFlag || parentCmd._savedDirtyFlag || locFlag;
Expand All @@ -440,37 +465,37 @@ cc.Node.RenderCmd.prototype = {
// But while the child element does not enter the circulation
// Here will be reset state in last
// In order the child elements get the parent state
if (parentNode && parentNode._cascadeColorEnabled && (parentCmd._dirtyFlag & flags.colorDirty))
locFlag |= flags.colorDirty;
if (parentNode && parentNode._cascadeColorEnabled && (parentCmd._dirtyFlag & dirtyFlags.colorDirty))
locFlag |= dirtyFlags.colorDirty;

if (parentNode && parentNode._cascadeOpacityEnabled && (parentCmd._dirtyFlag & flags.opacityDirty))
locFlag |= flags.opacityDirty;
if (parentNode && parentNode._cascadeOpacityEnabled && (parentCmd._dirtyFlag & dirtyFlags.opacityDirty))
locFlag |= dirtyFlags.opacityDirty;

if (parentCmd && (parentCmd._dirtyFlag & flags.transformDirty))
locFlag |= flags.transformDirty;
if (parentCmd && (parentCmd._dirtyFlag & dirtyFlags.transformDirty))
locFlag |= dirtyFlags.transformDirty;

var colorDirty = locFlag & flags.colorDirty,
opacityDirty = locFlag & flags.opacityDirty;
var colorDirty = locFlag & dirtyFlags.colorDirty,
opacityDirty = locFlag & dirtyFlags.opacityDirty;

this._dirtyFlag = locFlag;

if (colorDirty)
//update the color
//update the color
this._syncDisplayColor();

if (opacityDirty)
//update the opacity
//update the opacity
this._syncDisplayOpacity();

if (colorDirty || opacityDirty)
this._updateColor();

if (locFlag & flags.transformDirty)
if (locFlag & dirtyFlags.transformDirty)
//update the transform
this.transform(parentCmd);

if (locFlag & flags.orderDirty)
this._dirtyFlag = this._dirtyFlag & flags.orderDirty ^ this._dirtyFlag;
if (locFlag & dirtyFlags.orderDirty)
this._dirtyFlag &= ~dirtyFlags.orderDirty;
},

visitChildren: function () {
Expand Down Expand Up @@ -612,4 +637,4 @@ cc.Node.RenderCmd.prototype.originTransform = cc.Node.RenderCmd.prototype.transf
return "source-over";
}
};
})();
})();
1 change: 1 addition & 0 deletions cocos2d/core/event-manager/CCTouch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
* @param {Number} id
*/
cc.Touch = cc.Class.extend(/** @lends cc.Touch# */{
_lastModified: 0,
_point:null,
_prevPoint:null,
_id:0,
Expand Down
Loading