Skip to content

issue #3251 improve code for cocostudio #1302

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 5 commits into from
Dec 6, 2013
Merged

issue #3251 improve code for cocostudio #1302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b902f58
issue #3251 improve code
xingsenma Dec 5, 2013
2b43e17
issue #3251 improve code for cocostudio
xingsenma Dec 6, 2013
b724b63
issue #3251 improve code for cocostudio
xingsenma Dec 6, 2013
4ed5d93
issue #3251 add call function for cocostudio action
xingsenma Dec 6, 2013
ebe2b3c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 in…
xingsenma Dec 6, 2013
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
5 changes: 3 additions & 2 deletions extensions/CocoStudio/Action/CCActionManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,12 @@ ccs.ActionManager = ccs.Class.extend(/** @lends ccs.ActionManager# */{
* Play an Action with a name.
* @param {String} jsonName
* @param {String} actionName
* @param {cc.CallFunc} fun
*/
playActionByName: function (jsonName, actionName) {
playActionByName: function (jsonName, actionName, fun) {
var action = this.getActionByName(jsonName, actionName);
if (action) {
action.play();
action.play(fun);
}
},

Expand Down
10 changes: 7 additions & 3 deletions extensions/CocoStudio/Action/CCActionNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,13 +279,17 @@ ccs.ActionNode = ccs.Class.extend({
/**
* Play the action.
* @param {Boolean} loop
* @param {cc.CallFunc} fun
*/
playAction: function () {
playAction: function (fun) {
if (this._object == null || this._actionSpawn == null) {
return;
}
this._action = cc.Sequence.create(this._actionSpawn, null);
this._action.retain();
if(fun){
this._action = cc.Sequence.create(this._actionSpawn,fun);
}else{
this._action = cc.Sequence.create(this._actionSpawn);
}
this.runAction();
},

Expand Down
9 changes: 5 additions & 4 deletions extensions/CocoStudio/Action/CCActionObject.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,18 +170,19 @@ ccs.ActionObject = ccs.Class.extend({

/**
* Play the action.
* @param {cc.CallFunc} fun
*/
play: function () {
play: function (fun) {
this.stop();
this.updateToFrameByTime(0);
var frameNum = this._actionNodeList.length;
for (var i = 0; i < frameNum; i++) {
var locActionNode = this._actionNodeList[i];
locActionNode.playAction(this.getLoop());
locActionNode.playAction(fun);
}
if (this._loop) {
this._scheduler.scheduleCallbackForTarget(this, this.simulationActionUpdate, this, 0., cc.REPEAT_FOREVER, 0, false);
}
this._scheduler.scheduleCallbackForTarget(this, this.simulationActionUpdate, 0, cc.REPEAT_FOREVER, 0, false);
}
},

/**
Expand Down
14 changes: 4 additions & 10 deletions extensions/CocoStudio/GUI/BaseClasses/UIWidget.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,7 @@ ccs.UIWidget = ccs.Class.extend(/** @lends ccs.UIWidget# */{
var locChild;
for (var i = 0; i < this._children.length; i++) {
locChild = this._children[i];
if (locChild instanceof ccs.UIWidget)
locChild.onEnter();
locChild.onEnter();
}
this._isRunning = true;
this.updateSizeAndPosition();
Expand All @@ -212,8 +211,7 @@ ccs.UIWidget = ccs.Class.extend(/** @lends ccs.UIWidget# */{
var locChild;
for (var i = 0; i < this._children.length; i++) {
locChild = this._children[i];
if (locChild instanceof ccs.UIWidget)
locChild.onExit();
locChild.onExit();
}
},

Expand Down Expand Up @@ -631,14 +629,10 @@ ccs.UIWidget = ccs.Class.extend(/** @lends ccs.UIWidget# */{
}
this._updateEnabled = enable;
if (enable) {
if (this._scheduler) {
this._scheduler.scheduleUpdateForTarget(this, 0, false);
}
this._scheduler.scheduleUpdateForTarget(this, 0, false);
}
else {
if (this._scheduler) {
this._scheduler.unscheduleUpdateForTarget(this);
}
this._scheduler.unscheduleUpdateForTarget(this);
}
},

Expand Down
87 changes: 44 additions & 43 deletions extensions/CocoStudio/GUI/Layouts/UILayout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,10 +750,11 @@ ccs.UILayout = ccs.UIWidget.extend(/** @lends ccs.UILayout# */{
default:
break;
}
var locRelativeWidgetMargin;
var locRelativeWidgetMargin,locRelativeWidgetLPAlign;
var locMargin = locLayoutParameter.getMargin();
if (locRelativeWidgetLP) {
locRelativeWidgetMargin = locRelativeWidgetLP.getMargin();
locRelativeWidgetLPAlign = locRelativeWidgetLP.getAlign();
}
//handle margin
switch (locAlign) {
Expand Down Expand Up @@ -791,63 +792,63 @@ ccs.UILayout = ccs.UIWidget.extend(/** @lends ccs.UILayout# */{

case ccs.UIRelativeAlign.locationAboveLeftAlign:
locFinalPosY += locMargin.bottom;
if (locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentTopCenterHorizontal
&& locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentTopLeft
&& locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignNone
&& locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentTopRight)
if (locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentTopCenterHorizontal
&& locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentTopLeft
&& locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignNone
&& locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentTopRight)
{
locFinalPosY += locRelativeWidgetMargin.top;
}
locFinalPosY += locMargin.left;
break;
case ccs.UIRelativeAlign.locationAboveCenter:
locFinalPosY += locMargin.bottom;
if (locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentTopCenterHorizontal
&& locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentTopLeft
&& locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignNone
&& locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentTopRight)
if (locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentTopCenterHorizontal
&& locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentTopLeft
&& locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignNone
&& locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentTopRight)
{
locFinalPosY += locRelativeWidgetMargin.top;
}
break;
case ccs.UIRelativeAlign.locationAboveRightAlign:
locFinalPosY += locMargin.bottom;
if (locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentTopCenterHorizontal
&& locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentTopLeft
&& locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignNone
&& locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentTopRight)
if (locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentTopCenterHorizontal
&& locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentTopLeft
&& locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignNone
&& locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentTopRight)
{
locFinalPosY += locRelativeWidgetMargin.top;
}
locFinalPosX -= locMargin.right;
break;
case ccs.UIRelativeAlign.locationLeftOfTopAlign:
locFinalPosX -= locMargin.right;
if (locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentTopLeft
&& locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignNone
&& locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentLeftBottom
&& locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentLeftCenterVertical)
if (locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentTopLeft
&& locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignNone
&& locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentLeftBottom
&& locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentLeftCenterVertical)
{
locFinalPosX -= locRelativeWidgetMargin.left;
}
locFinalPosY -= locMargin.top;
break;
case ccs.UIRelativeAlign.locationLeftOfCenter:
locFinalPosX -= locMargin.right;
if (locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentTopLeft
&& locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignNone
&& locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentLeftBottom
&& locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentLeftCenterVertical)
if (locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentTopLeft
&& locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignNone
&& locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentLeftBottom
&& locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentLeftCenterVertical)
{
locFinalPosX -= locRelativeWidgetMargin.left;
}
break;
case ccs.UIRelativeAlign.locationLeftOfBottomAlign:
locFinalPosX -= locMargin.right;
if (locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentTopLeft
&& locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignNone
&& locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentLeftBottom
&& locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentLeftCenterVertical)
if (locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentTopLeft
&& locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignNone
&& locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentLeftBottom
&& locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentLeftCenterVertical)
{
locFinalPosX -= locRelativeWidgetMargin.left;
}
Expand All @@ -856,28 +857,28 @@ ccs.UILayout = ccs.UIWidget.extend(/** @lends ccs.UILayout# */{
break;
case ccs.UIRelativeAlign.locationRightOfTopAlign:
locFinalPosX += locMargin.left;
if (locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentTopRight
&& locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentRightBottom
&& locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentRightCenterVertical)
if (locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentTopRight
&& locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentRightBottom
&& locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentRightCenterVertical)
{
locFinalPosX += locRelativeWidgetMargin.right;
}
locFinalPosY -= locMargin.top;
break;
case ccs.UIRelativeAlign.locationRightOfCenter:
locFinalPosX += locMargin.left;
if (locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentTopRight
&& locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentRightBottom
&& locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentRightCenterVertical)
if (locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentTopRight
&& locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentRightBottom
&& locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentRightCenterVertical)
{
locFinalPosX += locRelativeWidgetMargin.right;
}
break;
case ccs.UIRelativeAlign.locationRightOfBottomAlign:
locFinalPosX += locMargin.left;
if (locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentTopRight
&& locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentRightBottom
&& locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentRightCenterVertical)
if (locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentTopRight
&& locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentRightBottom
&& locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentRightCenterVertical)
{
locFinalPosX += locRelativeWidgetMargin.right;
}
Expand All @@ -886,28 +887,28 @@ ccs.UILayout = ccs.UIWidget.extend(/** @lends ccs.UILayout# */{
break;
case ccs.UIRelativeAlign.locationBelowLeftAlign:
locFinalPosY -= locMargin.top;
if (locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentLeftBottom
&& locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentRightBottom
&& locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentBottomCenterHorizontal)
if (locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentLeftBottom
&& locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentRightBottom
&& locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentBottomCenterHorizontal)
{
locFinalPosY -= locRelativeWidgetMargin.bottom;
}
locFinalPosX += locMargin.left;
break;
case ccs.UIRelativeAlign.locationBelowCenter:
locFinalPosY -= locMargin.top;
if (locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentLeftBottom
&& locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentRightBottom
&& locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentBottomCenterHorizontal)
if (locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentLeftBottom
&& locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentRightBottom
&& locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentBottomCenterHorizontal)
{
locFinalPosY -= locRelativeWidgetMargin.bottom;
}
break;
case ccs.UIRelativeAlign.locationBelowRightAlign:
locFinalPosY -= locMargin.top;
if (locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentLeftBottom
&& locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentRightBottom
&& locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentBottomCenterHorizontal)
if (locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentLeftBottom
&& locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentRightBottom
&& locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentBottomCenterHorizontal)
{
locFinalPosY -= locRelativeWidgetMargin.bottom;
}
Expand Down
30 changes: 0 additions & 30 deletions extensions/CocoStudio/GUI/System/UIInputManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
* @extends ccs.Class
*/
ccs.UIInputManager = ccs.Class.extend({
_manageredWidget: null,
_selectedWidgets: null,
_touchBeganedPoint: null,
_touchMovedPoint: null,
Expand All @@ -40,7 +39,6 @@ ccs.UIInputManager = ccs.Class.extend({
_checkedDoubleClickWidget: null,
_rootWidget: null,
ctor: function () {
this._manageredWidget = null;
this._selectedWidgets = [];
this._touchBeganedPoint = cc.p(0, 0);
this._touchMovedPoint = cc.p(0, 0);
Expand All @@ -53,20 +51,6 @@ ccs.UIInputManager = ccs.Class.extend({
this._rootWidget = null;
},

/**
* Regist a widget to input manager.
* @param {ccs.UIWidget} widget
*/
registWidget: function (widget) {
if (!widget) {
return;
}
if (cc.ArrayContainsObject(this._manageredWidget, widget)) {
return;
}
this._manageredWidget.push(widget);
},

/**
* Check touch event
* @param {ccs.UIWidget} root
Expand All @@ -90,20 +74,6 @@ ccs.UIInputManager = ccs.Class.extend({
return false;
},

/**
* Remove a registed widget from input manager.
* @param {ccs.UIWidget} widget
*/
removeManageredWidget: function (widget) {
if (!widget) {
return;
}
if (!cc.ArrayContainsObject(this._manageredWidget, widget)) {
return;
}
cc.ArrayRemoveObject(this._manageredWidget, widget);
},

/**
* Finds a widget which is selected and call it's "onTouchBegan" method.
* @param {cc.Point} touchPoint
Expand Down
6 changes: 1 addition & 5 deletions extensions/CocoStudio/GUI/System/UILayer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,6 @@ ccs.UILayer = cc.Layer.extend(/** @lends ccs.UILayer# */{
cc.Layer.prototype.onExit.call(this);
},

onEnterTransitionDidFinish: function () {
cc.Layer.prototype.onEnterTransitionDidFinish.call(this);
},

/**
* add widget
* @param {ccs.Widget} widget
Expand Down Expand Up @@ -130,7 +126,7 @@ ccs.UILayer = cc.Layer.extend(/** @lends ccs.UILayer# */{
},

onTouchBegan: function (touch, event) {
if (this._inputManager && this._inputManager.onTouchBegan(touch)) {
if (this._inputManager.onTouchBegan(touch)) {
return true;
}
return false;
Expand Down
Loading