Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4 from liamcindy/MergeCocos2d_3.0 

modify coco action with new coding rule
This commit is contained in:
cheng.zhang 2013-12-26 00:47:29 -08:00
parent efa7495953 a158e25767
commit b50c3468c1
14 changed files with 970 additions and 962 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

224
cocos/editor-support/cocostudio/CCActionEaseEx.cpp
View File

@ -33,22 +33,22 @@ static inline float bezieratFunction( float a, float b, float c, float d, float
return (powf(1-t,3) * a + 3*t*(powf(1-t,2))*b + 3*powf(t,2)*(1-t)*c + powf(t,3)*d );
}
EaseBezierAction* EaseBezierAction::create(cocos2d::ActionInterval* pAction)
EaseBezierAction* EaseBezierAction::create(cocos2d::ActionInterval* action)
{
EaseBezierAction *pRet = new EaseBezierAction();
if (pRet)
EaseBezierAction *_ret = new EaseBezierAction();
if (_ret)
{
if (pRet->initWithAction(pAction))
if (_ret->initWithAction(action))
{
pRet->autorelease();
_ret->autorelease();
}
else
{
CC_SAFE_RELEASE_NULL(pRet);
CC_SAFE_RELEASE_NULL(_ret);
}
}
return pRet;
return _ret;
}
void EaseBezierAction::setBezierParamer( float p0, float p1, float p2, float p3)
@ -85,22 +85,22 @@ EaseBezierAction* EaseBezierAction::reverse() const
// EaseQuadraticActionIn
//
EaseQuadraticActionIn* EaseQuadraticActionIn::create(ActionInterval* pAction)
EaseQuadraticActionIn* EaseQuadraticActionIn::create(ActionInterval* action)
{
EaseQuadraticActionIn *pRet = new EaseQuadraticActionIn();
if (pRet)
EaseQuadraticActionIn *_ret = new EaseQuadraticActionIn();
if (_ret)
{
if (pRet->initWithAction(pAction))
if (_ret->initWithAction(action))
{
pRet->autorelease();
_ret->autorelease();
}
else
{
CC_SAFE_RELEASE_NULL(pRet);
CC_SAFE_RELEASE_NULL(_ret);
}
}
return pRet;
return _ret;
}
EaseQuadraticActionIn* EaseQuadraticActionIn::clone() const
@ -125,22 +125,22 @@ EaseQuadraticActionIn* EaseQuadraticActionIn::reverse() const
// EaseQuadraticActionOut
//
EaseQuadraticActionOut* EaseQuadraticActionOut::create(ActionInterval* pAction)
EaseQuadraticActionOut* EaseQuadraticActionOut::create(ActionInterval* action)
{
EaseQuadraticActionOut *pRet = new EaseQuadraticActionOut();
if (pRet)
EaseQuadraticActionOut *_ret = new EaseQuadraticActionOut();
if (_ret)
{
if (pRet->initWithAction(pAction))
if (_ret->initWithAction(action))
{
pRet->autorelease();
_ret->autorelease();
}
else
{
CC_SAFE_RELEASE_NULL(pRet);
CC_SAFE_RELEASE_NULL(_ret);
}
}
return pRet;
return _ret;
}
EaseQuadraticActionOut* EaseQuadraticActionOut::clone() const
@ -166,22 +166,22 @@ EaseQuadraticActionOut* EaseQuadraticActionOut::reverse() const
// EaseQuadraticActionInOut
//
EaseQuadraticActionInOut* EaseQuadraticActionInOut::create(ActionInterval* pAction)
EaseQuadraticActionInOut* EaseQuadraticActionInOut::create(ActionInterval* action)
{
EaseQuadraticActionInOut *pRet = new EaseQuadraticActionInOut();
if (pRet)
EaseQuadraticActionInOut *_ret = new EaseQuadraticActionInOut();
if (_ret)
{
if (pRet->initWithAction(pAction))
if (_ret->initWithAction(action))
{
pRet->autorelease();
_ret->autorelease();
}
else
{
CC_SAFE_RELEASE_NULL(pRet);
CC_SAFE_RELEASE_NULL(_ret);
}
}
return pRet;
return _ret;
}
EaseQuadraticActionInOut* EaseQuadraticActionInOut::clone() const
@ -219,22 +219,22 @@ EaseQuadraticActionInOut* EaseQuadraticActionInOut::reverse() const
// EaseQuarticActionIn
//
EaseQuarticActionIn* EaseQuarticActionIn::create(ActionInterval* pAction)
EaseQuarticActionIn* EaseQuarticActionIn::create(ActionInterval* action)
{
EaseQuarticActionIn *pRet = new EaseQuarticActionIn();
if (pRet)
EaseQuarticActionIn *_ret = new EaseQuarticActionIn();
if (_ret)
{
if (pRet->initWithAction(pAction))
if (_ret->initWithAction(action))
{
pRet->autorelease();
_ret->autorelease();
}
else
{
CC_SAFE_RELEASE_NULL(pRet);
CC_SAFE_RELEASE_NULL(_ret);
}
}
return pRet;
return _ret;
}
EaseQuarticActionIn* EaseQuarticActionIn::clone() const
@ -260,22 +260,22 @@ EaseQuarticActionIn* EaseQuarticActionIn::reverse() const
// EaseQuarticActionOut
//
EaseQuarticActionOut* EaseQuarticActionOut::create(ActionInterval* pAction)
EaseQuarticActionOut* EaseQuarticActionOut::create(ActionInterval* action)
{
EaseQuarticActionOut *pRet = new EaseQuarticActionOut();
if (pRet)
EaseQuarticActionOut *_ret = new EaseQuarticActionOut();
if (_ret)
{
if (pRet->initWithAction(pAction))
if (_ret->initWithAction(action))
{
pRet->autorelease();
_ret->autorelease();
}
else
{
CC_SAFE_RELEASE_NULL(pRet);
CC_SAFE_RELEASE_NULL(_ret);
}
}
return pRet;
return _ret;
}
EaseQuarticActionOut* EaseQuarticActionOut::clone() const
@ -302,22 +302,22 @@ EaseQuarticActionOut* EaseQuarticActionOut::reverse() const
// EaseQuarticActionInOut
//
EaseQuarticActionInOut* EaseQuarticActionInOut::create(ActionInterval* pAction)
EaseQuarticActionInOut* EaseQuarticActionInOut::create(ActionInterval* action)
{
EaseQuarticActionInOut *pRet = new EaseQuarticActionInOut();
if (pRet)
EaseQuarticActionInOut *_ret = new EaseQuarticActionInOut();
if (_ret)
{
if (pRet->initWithAction(pAction))
if (_ret->initWithAction(action))
{
pRet->autorelease();
_ret->autorelease();
}
else
{
CC_SAFE_RELEASE_NULL(pRet);
CC_SAFE_RELEASE_NULL(_ret);
}
}
return pRet;
return _ret;
}
EaseQuarticActionInOut* EaseQuarticActionInOut::clone() const
@ -352,22 +352,22 @@ EaseQuarticActionInOut* EaseQuarticActionInOut::reverse() const
// EaseQuinticActionIn
//
EaseQuinticActionIn* EaseQuinticActionIn::create(ActionInterval* pAction)
EaseQuinticActionIn* EaseQuinticActionIn::create(ActionInterval* action)
{
EaseQuinticActionIn *pRet = new EaseQuinticActionIn();
if (pRet)
EaseQuinticActionIn *_ret = new EaseQuinticActionIn();
if (_ret)
{
if (pRet->initWithAction(pAction))
if (_ret->initWithAction(action))
{
pRet->autorelease();
_ret->autorelease();
}
else
{
CC_SAFE_RELEASE_NULL(pRet);
CC_SAFE_RELEASE_NULL(_ret);
}
}
return pRet;
return _ret;
}
EaseQuinticActionIn* EaseQuinticActionIn::clone() const
@ -393,22 +393,22 @@ EaseQuinticActionIn* EaseQuinticActionIn::reverse() const
// EaseQuinticActionOut
//
EaseQuinticActionOut* EaseQuinticActionOut::create(ActionInterval* pAction)
EaseQuinticActionOut* EaseQuinticActionOut::create(ActionInterval* action)
{
EaseQuinticActionOut *pRet = new EaseQuinticActionOut();
if (pRet)
EaseQuinticActionOut *_ret = new EaseQuinticActionOut();
if (_ret)
{
if (pRet->initWithAction(pAction))
if (_ret->initWithAction(action))
{
pRet->autorelease();
_ret->autorelease();
}
else
{
CC_SAFE_RELEASE_NULL(pRet);
CC_SAFE_RELEASE_NULL(_ret);
}
}
return pRet;
return _ret;
}
EaseQuinticActionOut* EaseQuinticActionOut::clone() const
@ -435,22 +435,22 @@ EaseQuinticActionOut* EaseQuinticActionOut::reverse() const
// EaseQuinticActionInOut
//
EaseQuinticActionInOut* EaseQuinticActionInOut::create(ActionInterval* pAction)
EaseQuinticActionInOut* EaseQuinticActionInOut::create(ActionInterval* action)
{
EaseQuinticActionInOut *pRet = new EaseQuinticActionInOut();
if (pRet)
EaseQuinticActionInOut *_ret = new EaseQuinticActionInOut();
if (_ret)
{
if (pRet->initWithAction(pAction))
if (_ret->initWithAction(action))
{
pRet->autorelease();
_ret->autorelease();
}
else
{
CC_SAFE_RELEASE_NULL(pRet);
CC_SAFE_RELEASE_NULL(_ret);
}
}
return pRet;
return _ret;
}
EaseQuinticActionInOut* EaseQuinticActionInOut::clone() const
@ -485,22 +485,22 @@ EaseQuinticActionInOut* EaseQuinticActionInOut::reverse() const
// EaseCircleActionIn
//
EaseCircleActionIn* EaseCircleActionIn::create(ActionInterval* pAction)
EaseCircleActionIn* EaseCircleActionIn::create(ActionInterval* action)
{
EaseCircleActionIn *pRet = new EaseCircleActionIn();
if (pRet)
EaseCircleActionIn *_ret = new EaseCircleActionIn();
if (_ret)
{
if (pRet->initWithAction(pAction))
if (_ret->initWithAction(action))
{
pRet->autorelease();
_ret->autorelease();
}
else
{
CC_SAFE_RELEASE_NULL(pRet);
CC_SAFE_RELEASE_NULL(_ret);
}
}
return pRet;
return _ret;
}
EaseCircleActionIn* EaseCircleActionIn::clone() const
@ -526,22 +526,22 @@ EaseCircleActionIn* EaseCircleActionIn::reverse() const
// EaseCircleActionOut
//
EaseCircleActionOut* EaseCircleActionOut::create(ActionInterval* pAction)
EaseCircleActionOut* EaseCircleActionOut::create(ActionInterval* action)
{
EaseCircleActionOut *pRet = new EaseCircleActionOut();
if (pRet)
EaseCircleActionOut *_ret = new EaseCircleActionOut();
if (_ret)
{
if (pRet->initWithAction(pAction))
if (_ret->initWithAction(action))
{
pRet->autorelease();
_ret->autorelease();
}
else
{
CC_SAFE_RELEASE_NULL(pRet);
CC_SAFE_RELEASE_NULL(_ret);
}
}
return pRet;
return _ret;
}
EaseCircleActionOut* EaseCircleActionOut::clone() const
@ -568,22 +568,22 @@ EaseCircleActionOut* EaseCircleActionOut::reverse() const
// EaseCircleActionInOut
//
EaseCircleActionInOut* EaseCircleActionInOut::create(ActionInterval* pAction)
EaseCircleActionInOut* EaseCircleActionInOut::create(ActionInterval* action)
{
EaseCircleActionInOut *pRet = new EaseCircleActionInOut();
if (pRet)
EaseCircleActionInOut *_ret = new EaseCircleActionInOut();
if (_ret)
{
if (pRet->initWithAction(pAction))
if (_ret->initWithAction(action))
{
pRet->autorelease();
_ret->autorelease();
}
else
{
CC_SAFE_RELEASE_NULL(pRet);
CC_SAFE_RELEASE_NULL(_ret);
}
}
return pRet;
return _ret;
}
EaseCircleActionInOut* EaseCircleActionInOut::clone() const
@ -618,22 +618,22 @@ EaseCircleActionInOut* EaseCircleActionInOut::reverse() const
// EaseCubicActionIn
//
EaseCubicActionIn* EaseCubicActionIn::create(ActionInterval* pAction)
EaseCubicActionIn* EaseCubicActionIn::create(ActionInterval* action)
{
EaseCubicActionIn *pRet = new EaseCubicActionIn();
if (pRet)
EaseCubicActionIn *_ret = new EaseCubicActionIn();
if (_ret)
{
if (pRet->initWithAction(pAction))
if (_ret->initWithAction(action))
{
pRet->autorelease();
_ret->autorelease();
}
else
{
CC_SAFE_RELEASE_NULL(pRet);
CC_SAFE_RELEASE_NULL(_ret);
}
}
return pRet;
return _ret;
}
EaseCubicActionIn* EaseCubicActionIn::clone() const
@ -659,22 +659,22 @@ EaseCubicActionIn* EaseCubicActionIn::reverse() const
// EaseCubicActionOut
//
EaseCubicActionOut* EaseCubicActionOut::create(ActionInterval* pAction)
EaseCubicActionOut* EaseCubicActionOut::create(ActionInterval* action)
{
EaseCubicActionOut *pRet = new EaseCubicActionOut();
if (pRet)
EaseCubicActionOut *_ret = new EaseCubicActionOut();
if (_ret)
{
if (pRet->initWithAction(pAction))
if (_ret->initWithAction(action))
{
pRet->autorelease();
_ret->autorelease();
}
else
{
CC_SAFE_RELEASE_NULL(pRet);
CC_SAFE_RELEASE_NULL(_ret);
}
}
return pRet;
return _ret;
}
EaseCubicActionOut* EaseCubicActionOut::clone() const
@ -700,22 +700,22 @@ EaseCubicActionOut* EaseCubicActionOut::reverse() const
// EaseCubicActionInOut
//
EaseCubicActionInOut* EaseCubicActionInOut::create(ActionInterval* pAction)
EaseCubicActionInOut* EaseCubicActionInOut::create(ActionInterval* action)
{
EaseCubicActionInOut *pRet = new EaseCubicActionInOut();
if (pRet)
EaseCubicActionInOut *_ret = new EaseCubicActionInOut();
if (_ret)
{
if (pRet->initWithAction(pAction))
if (_ret->initWithAction(action))
{
pRet->autorelease();
_ret->autorelease();
}
else
{
CC_SAFE_RELEASE_NULL(pRet);
CC_SAFE_RELEASE_NULL(_ret);
}
}
return pRet;
return _ret;
}
EaseCubicActionInOut* EaseCubicActionInOut::clone() const

128
cocos/editor-support/cocostudio/CCActionEaseEx.h
View File

@ -31,14 +31,14 @@ THE SOFTWARE.
namespace cocostudio {
/**
@brief Ease Bezier
@ingroup Actions
*/
@brief Ease Bezier
@ingroup Actions
*/
class EaseBezierAction : public cocos2d::ActionEase
{
public:
/** creates the action */
static EaseBezierAction* create(cocos2d::ActionInterval* pAction);
static EaseBezierAction* create(cocos2d::ActionInterval* action);
virtual void update(float time) override;
virtual EaseBezierAction* clone() const override;
@ -60,14 +60,14 @@ private:
};
/**
@brief Ease Quadratic In
@ingroup Actions
*/
@brief Ease Quadratic In
@ingroup Actions
*/
class EaseQuadraticActionIn:public cocos2d::ActionEase
{
public:
/** creates the action */
static EaseQuadraticActionIn* create(cocos2d::ActionInterval* pAction);
static EaseQuadraticActionIn* create(cocos2d::ActionInterval* action);
virtual void update(float time) override;
virtual EaseQuadraticActionIn* clone() const override;
@ -83,14 +83,14 @@ private:
};
/**
@brief Ease Quadratic Out
@ingroup Actions
*/
@brief Ease Quadratic Out
@ingroup Actions
*/
class EaseQuadraticActionOut:public cocos2d::ActionEase
{
public:
/** creates the action */
static EaseQuadraticActionOut* create(cocos2d::ActionInterval* pAction);
static EaseQuadraticActionOut* create(cocos2d::ActionInterval* action);
virtual void update(float time) override;
virtual EaseQuadraticActionOut* clone() const override;
@ -106,14 +106,14 @@ private:
};
/**
@brief Ease Quadratic InOut
@ingroup Actions
*/
@brief Ease Quadratic InOut
@ingroup Actions
*/
class EaseQuadraticActionInOut:public cocos2d::ActionEase
{
public:
/** creates the action */
static EaseQuadraticActionInOut* create(cocos2d::ActionInterval* pAction);
static EaseQuadraticActionInOut* create(cocos2d::ActionInterval* action);
virtual void update(float time) override;
virtual EaseQuadraticActionInOut* clone() const override;
@ -128,14 +128,14 @@ private:
};
/**
@brief Ease Quartic In
@ingroup Actions
*/
@brief Ease Quartic In
@ingroup Actions
*/
class EaseQuarticActionIn:public cocos2d::ActionEase
{
public:
/** creates the action */
static EaseQuarticActionIn* create(cocos2d::ActionInterval* pAction);
static EaseQuarticActionIn* create(cocos2d::ActionInterval* action);
virtual void update(float time) override;
virtual EaseQuarticActionIn* clone() const override;
@ -150,14 +150,14 @@ private:
};
/**
@brief Ease Quartic Out
@ingroup Actions
*/
@brief Ease Quartic Out
@ingroup Actions
*/
class EaseQuarticActionOut:public cocos2d::ActionEase
{
public:
/** creates the action */
static EaseQuarticActionOut* create(cocos2d::ActionInterval* pAction);
static EaseQuarticActionOut* create(cocos2d::ActionInterval* action);
virtual void update(float time) override;
virtual EaseQuarticActionOut* clone() const override;
@ -172,14 +172,14 @@ private:
};
/**
@brief Ease Quartic InOut
@ingroup Actions
*/
@brief Ease Quartic InOut
@ingroup Actions
*/
class EaseQuarticActionInOut:public cocos2d::ActionEase
{
public:
/** creates the action */
static EaseQuarticActionInOut* create(cocos2d::ActionInterval* pAction);
static EaseQuarticActionInOut* create(cocos2d::ActionInterval* action);
virtual void update(float time) override;
virtual EaseQuarticActionInOut* clone() const override;
@ -195,14 +195,14 @@ private:
/**
@brief Ease Quintic In
@ingroup Actions
*/
@brief Ease Quintic In
@ingroup Actions
*/
class EaseQuinticActionIn:public cocos2d::ActionEase
{
public:
/** creates the action */
static EaseQuinticActionIn* create(cocos2d::ActionInterval* pAction);
static EaseQuinticActionIn* create(cocos2d::ActionInterval* action);
virtual void update(float time) override;
virtual EaseQuinticActionIn* clone() const override;
@ -217,14 +217,14 @@ private:
};
/**
@brief Ease Quintic Out
@ingroup Actions
*/
@brief Ease Quintic Out
@ingroup Actions
*/
class EaseQuinticActionOut:public cocos2d::ActionEase
{
public:
/** creates the action */
static EaseQuinticActionOut* create(cocos2d::ActionInterval* pAction);
static EaseQuinticActionOut* create(cocos2d::ActionInterval* action);
virtual void update(float time) override;
virtual EaseQuinticActionOut* clone() const override;
@ -239,14 +239,14 @@ private:
};
/**
@brief Ease Quintic InOut
@ingroup Actions
*/
@brief Ease Quintic InOut
@ingroup Actions
*/
class EaseQuinticActionInOut:public cocos2d::ActionEase
{
public:
/** creates the action */
static EaseQuinticActionInOut* create(cocos2d::ActionInterval* pAction);
static EaseQuinticActionInOut* create(cocos2d::ActionInterval* action);
virtual void update(float time) override;
virtual EaseQuinticActionInOut* clone() const override;
@ -261,14 +261,14 @@ private:
};
/**
@brief Ease Circle In
@ingroup Actions
*/
@brief Ease Circle In
@ingroup Actions
*/
class EaseCircleActionIn:public cocos2d::ActionEase
{
public:
/** creates the action */
static EaseCircleActionIn* create(cocos2d::ActionInterval* pAction);
static EaseCircleActionIn* create(cocos2d::ActionInterval* action);
virtual void update(float time) override;
virtual EaseCircleActionIn* clone() const override;
@ -283,14 +283,14 @@ private:
};
/**
@brief Ease Circle Out
@ingroup Actions
*/
@brief Ease Circle Out
@ingroup Actions
*/
class EaseCircleActionOut:public cocos2d::ActionEase
{
public:
/** creates the action */
static EaseCircleActionOut* create(cocos2d::ActionInterval* pAction);
static EaseCircleActionOut* create(cocos2d::ActionInterval* action);
virtual void update(float time) override;
virtual EaseCircleActionOut* clone() const override;
@ -305,14 +305,14 @@ private:
};
/**
@brief Ease Circle InOut
@ingroup Actions
*/
@brief Ease Circle InOut
@ingroup Actions
*/
class EaseCircleActionInOut:public cocos2d::ActionEase
{
public:
/** creates the action */
static EaseCircleActionInOut* create(cocos2d::ActionInterval* pAction);
static EaseCircleActionInOut* create(cocos2d::ActionInterval* action);
virtual void update(float time) override;
virtual EaseCircleActionInOut* clone() const override;
@ -327,14 +327,14 @@ private:
};
/**
@brief Ease Cubic In
@ingroup Actions
*/
@brief Ease Cubic In
@ingroup Actions
*/
class EaseCubicActionIn:public cocos2d::ActionEase
{
public:
/** creates the action */
static EaseCubicActionIn* create(cocos2d::ActionInterval* pAction);
static EaseCubicActionIn* create(cocos2d::ActionInterval* action);
virtual void update(float time) override;
virtual EaseCubicActionIn* clone() const override;
@ -349,14 +349,14 @@ private:
};
/**
@brief Ease Cubic Out
@ingroup Actions
*/
@brief Ease Cubic Out
@ingroup Actions
*/
class EaseCubicActionOut:public cocos2d::ActionEase
{
public:
/** creates the action */
static EaseCubicActionOut* create(cocos2d::ActionInterval* pAction);
static EaseCubicActionOut* create(cocos2d::ActionInterval* action);
virtual void update(float time) override;
virtual EaseCubicActionOut* clone() const override;
@ -371,14 +371,14 @@ private:
};
/**
@brief Ease Cubic InOut
@ingroup Actions
*/
@brief Ease Cubic InOut
@ingroup Actions
*/
class EaseCubicActionInOut:public cocos2d::ActionEase
{
public:
/** creates the action */
static EaseCubicActionInOut* create(cocos2d::ActionInterval* pAction);
static EaseCubicActionInOut* create(cocos2d::ActionInterval* action);
virtual void update(float time) override;
virtual EaseCubicActionInOut* clone() const override;

124
cocos/editor-support/cocostudio/CCActionFrame.cpp
View File

@ -1,31 +1,31 @@
/****************************************************************************
Copyright (c) 2013 cocos2d-x.org
Copyright (c) 2013 cocos2d-x.org
http://www.cocos2d-x.org
http://www.cocos2d-x.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "CCActionFrame.h"
#include "CCActionEaseEx.h"
using namespace cocos2d;
using namespace cocos2d;
namespace cocostudio {
@ -33,7 +33,7 @@ ActionFrame::ActionFrame()
: _frameType(0)
, _frameIndex(0)
, _fTime(0.0f)
, _easingType(FrameEase_Linear)
, _easingType(FrameEaseType::FrameEase_Linear)
{
}
@ -81,7 +81,7 @@ int ActionFrame::getEasingType()
ActionInterval* ActionFrame::getAction(float fDuration)
{
log("Need a definition of <getAction> for ActionFrame");
return NULL;
return nullptr;
}
ActionInterval* ActionFrame::getAction(float fDuration,ActionFrame* srcFrame)
{
@ -100,123 +100,123 @@ void ActionFrame::setEasingParameter(std::vector<float> parameter)
ActionInterval* ActionFrame::getEasingAction(ActionInterval* action)
{
if (action == NULL)
if (action == nullptr)
{
return NULL;
return nullptr;
}
switch (_easingType)
{
case FrameEase_Custom:
case FrameEaseType::FrameEase_Custom:
{
EaseBezierAction* cAction = EaseBezierAction::create(action);
cAction->setBezierParamer(_Parameter[0],_Parameter[1],_Parameter[2],_Parameter[3]);
return cAction;
}
break;
case FrameEase_Linear:
case FrameEaseType::FrameEase_Linear:
return action;
break;
case FrameEase_Sine_EaseIn:
case FrameEaseType::FrameEase_Sine_EaseIn:
return EaseSineIn::create(action);
break;
case FrameEase_Sine_EaseOut:
case FrameEaseType::FrameEase_Sine_EaseOut:
return EaseSineOut::create(action);
break;
case FrameEase_Sine_EaseInOut:
case FrameEaseType::FrameEase_Sine_EaseInOut:
return EaseSineInOut::create(action);
break;
case FrameEase_Quad_EaseIn:
case FrameEaseType::FrameEase_Quad_EaseIn:
return EaseQuadraticActionIn::create(action);
break;
case FrameEase_Quad_EaseOut:
case FrameEaseType::FrameEase_Quad_EaseOut:
return EaseQuadraticActionOut::create(action);
break;
case FrameEase_Quad_EaseInOut:
case FrameEaseType::FrameEase_Quad_EaseInOut:
return EaseQuadraticActionInOut::create(action);
break;
case FrameEase_Cubic_EaseIn:
case FrameEaseType::FrameEase_Cubic_EaseIn:
return EaseCubicActionIn::create(action);
break;
case FrameEase_Cubic_EaseOut:
case FrameEaseType::FrameEase_Cubic_EaseOut:
return EaseCubicActionOut::create(action);
break;
case FrameEase_Cubic_EaseInOut:
case FrameEaseType::FrameEase_Cubic_EaseInOut:
return EaseCubicActionInOut::create(action);
break;
case FrameEase_Quart_EaseIn:
case FrameEaseType::FrameEase_Quart_EaseIn:
return EaseQuarticActionIn::create(action);
break;
case FrameEase_Quart_EaseOut:
case FrameEaseType::FrameEase_Quart_EaseOut:
return EaseQuadraticActionOut::create(action);
break;
case FrameEase_Quart_EaseInOut:
case FrameEaseType::FrameEase_Quart_EaseInOut:
return EaseQuarticActionInOut::create(action);
break;
case FrameEase_Quint_EaseIn:
case FrameEaseType::FrameEase_Quint_EaseIn:
return EaseQuinticActionIn::create(action);
break;
case FrameEase_Quint_EaseOut:
case FrameEaseType::FrameEase_Quint_EaseOut:
return EaseQuinticActionOut::create(action);
break;
case FrameEase_Quint_EaseInOut:
case FrameEaseType::FrameEase_Quint_EaseInOut:
return EaseQuinticActionInOut::create(action);
break;
case FrameEase_Expo_EaseIn:
case FrameEaseType::FrameEase_Expo_EaseIn:
return EaseExponentialIn::create(action);
break;
case FrameEase_Expo_EaseOut:
case FrameEaseType::FrameEase_Expo_EaseOut:
return EaseExponentialOut::create(action);
break;
case FrameEase_Expo_EaseInOut:
case FrameEaseType::FrameEase_Expo_EaseInOut:
return EaseExponentialInOut::create(action);
break;
case FrameEase_Circ_EaseIn:
case FrameEaseType::FrameEase_Circ_EaseIn:
return EaseCircleActionIn::create(action);
break;
case FrameEase_Circ_EaseOut:
case FrameEaseType::FrameEase_Circ_EaseOut:
return EaseCircleActionOut::create(action);
break;
case FrameEase_Circ_EaseInOut:
case FrameEaseType::FrameEase_Circ_EaseInOut:
return EaseCircleActionInOut::create(action);
break;
case FrameEase_Elastic_EaseIn:
case FrameEaseType::FrameEase_Elastic_EaseIn:
{
EaseElasticIn* cAction = EaseElasticIn::create(action);
cAction->setPeriod(_Parameter[0]);
return cAction;
}
break;
case FrameEase_Elastic_EaseOut:
case FrameEaseType::FrameEase_Elastic_EaseOut:
{
EaseElasticOut* cAction = EaseElasticOut::create(action);
cAction->setPeriod(_Parameter[0]);
return cAction;
}
break;
case FrameEase_Elastic_EaseInOut:
case FrameEaseType::FrameEase_Elastic_EaseInOut:
{
EaseElasticInOut* cAction = EaseElasticInOut::create(action);
cAction->setPeriod(_Parameter[0]);
return cAction;
}
break;
case FrameEase_Back_EaseIn:
case FrameEaseType::FrameEase_Back_EaseIn:
return EaseBackIn::create(action);
break;
case FrameEase_Back_EaseOut:
case FrameEaseType::FrameEase_Back_EaseOut:
return EaseBackOut::create(action);
break;
case FrameEase_Back_EaseInOut:
case FrameEaseType::FrameEase_Back_EaseInOut:
return EaseBackInOut::create(action);
break;
case FrameEase_Bounce_EaseIn:
case FrameEaseType::FrameEase_Bounce_EaseIn:
return EaseBounceIn::create(action);
break;
case FrameEase_Bounce_EaseOut:
case FrameEaseType::FrameEase_Bounce_EaseOut:
return EaseBounceOut::create(action);
break;
case FrameEase_Bounce_EaseInOut:
case FrameEaseType::FrameEase_Bounce_EaseInOut:
return EaseBounceInOut::create(action);
break;
default:
@ -227,7 +227,7 @@ ActionInterval* ActionFrame::getEasingAction(ActionInterval* action)
//////////////////////////////////////////////////////////////////////////
ActionMoveFrame::ActionMoveFrame()
: _position(Point(0.0f,0.0f))
: _position(Point(0.0f,0.0f))
{
_frameType = (int)kKeyframeMove;
}
@ -250,8 +250,8 @@ ActionInterval* ActionMoveFrame::getAction(float fDuration)
//////////////////////////////////////////////////////////////////////////
ActionScaleFrame::ActionScaleFrame()
: _scaleX(1.0f)
, _scaleY(1.0f)
: _scaleX(1.0f)
, _scaleY(1.0f)
{
_frameType = (int)kKeyframeScale;
}
@ -287,7 +287,7 @@ ActionInterval* ActionScaleFrame::getAction(float fDuration)
}
ActionRotationFrame::ActionRotationFrame()
: _rotation(0.0f)
: _rotation(0.0f)
{
_frameType = (int)kKeyframeRotate;
}
@ -314,7 +314,7 @@ ActionInterval* ActionRotationFrame::getAction(float fDuration)
ActionInterval* ActionRotationFrame::getAction(float fDuration,ActionFrame* srcFrame)
{
ActionRotationFrame* srcRotationFrame = static_cast<ActionRotationFrame*>(srcFrame);
if (srcRotationFrame == NULL)
if (srcRotationFrame == nullptr)
{
return this->getAction(fDuration);
}
@ -326,7 +326,7 @@ ActionInterval* ActionRotationFrame::getAction(float fDuration,ActionFrame* srcF
}
ActionFadeFrame::ActionFadeFrame()
: _opacity(255)
: _opacity(255)
{
_frameType = (int)kKeyframeFade;
}
@ -353,7 +353,7 @@ ActionInterval* ActionFadeFrame::getAction(float fDuration)
ActionTintFrame::ActionTintFrame()
: _color(Color3B(255,255,255))
: _color(Color3B(255,255,255))
{
_frameType = (int)kKeyframeTint;
}

74
cocos/editor-support/cocostudio/CCActionFrame.h
View File

@ -1,26 +1,26 @@
/****************************************************************************
Copyright (c) 2013 cocos2d-x.org
Copyright (c) 2013 cocos2d-x.org
http://www.cocos2d-x.org
http://www.cocos2d-x.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#ifndef __ActionFRAME_H__
#define __ActionFRAME_H__
@ -39,7 +39,7 @@ enum FrameType
kKeyframeMax
};
enum FrameEaseType
enum class FrameEaseType
{
FrameEase_Custom = -1,
@ -89,9 +89,9 @@ enum FrameEaseType
FrameEase_TWEEN_EASING_MAX = 10000
};
/**
* @js NA
* @lua NA
*/
* @js NA
* @lua NA
*/
class ActionFrame:public cocos2d::Object
{
@ -207,9 +207,9 @@ protected:
};
/**
* @js NA
* @lua NA
*/
* @js NA
* @lua NA
*/
class ActionMoveFrame:public ActionFrame
{
public:
@ -251,9 +251,9 @@ protected:
};
/**
* @js NA
* @lua NA
*/
* @js NA
* @lua NA
*/
class ActionScaleFrame:public ActionFrame
{
public:
@ -309,9 +309,9 @@ protected:
float _scaleY;
};
/**
* @js NA
* @lua NA
*/
* @js NA
* @lua NA
*/
class ActionRotationFrame:public ActionFrame
{
public:
@ -362,9 +362,9 @@ public:
float _rotation;
};
/**
* @js NA
* @lua NA
*/
* @js NA
* @lua NA
*/
class ActionFadeFrame:public ActionFrame
{
public:
@ -405,9 +405,9 @@ protected:
float _opacity;
};
/**
* @js NA
* @lua NA
*/
* @js NA
* @lua NA
*/
class ActionTintFrame:public ActionFrame
{

36
cocos/editor-support/cocostudio/CCActionFrameEasing.cpp
View File

@ -1,26 +1,26 @@
/****************************************************************************
Copyright (c) 2013 cocos2d-x.org
Copyright (c) 2013 cocos2d-x.org
http://www.cocos2d-x.org
http://www.cocos2d-x.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include <math.h>
#include "cocostudio/CCActionFrameEasing.h"

42
cocos/editor-support/cocostudio/CCActionFrameEasing.h
View File

@ -1,26 +1,26 @@
/****************************************************************************
Copyright (c) 2013 cocos2d-x.org
Copyright (c) 2013 cocos2d-x.org
http://www.cocos2d-x.org
http://www.cocos2d-x.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#ifndef __ActionFrameEasing_H__
#define __ActionFrameEasing_H__
@ -53,9 +53,9 @@ enum FrameEasingType
};
/**
* @js NA
* @lua NA
*/
* @js NA
* @lua NA
*/
class ActionFrameEasing:public cocos2d::Object
{
protected:

38
cocos/editor-support/cocostudio/CCActionManagerEx.cpp
View File

@ -1,31 +1,31 @@
/****************************************************************************
Copyright (c) 2013 cocos2d-x.org
Copyright (c) 2013 cocos2d-x.org
http://www.cocos2d-x.org
http://www.cocos2d-x.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "cocostudio/CCActionManagerEx.h"
#include "cocostudio/DictionaryHelper.h"
using namespace cocos2d;
using namespace cocos2d;
namespace cocostudio {

36
cocos/editor-support/cocostudio/CCActionManagerEx.h
View File

@ -1,26 +1,26 @@
/****************************************************************************
Copyright (c) 2013 cocos2d-x.org
Copyright (c) 2013 cocos2d-x.org
http://www.cocos2d-x.org
http://www.cocos2d-x.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#ifndef __ActionMANAGER_H__
#define __ActionMANAGER_H__

2
cocos/editor-support/cocostudio/CCActionNode.cpp
View File

@ -408,7 +408,7 @@ bool ActionNode::updateActionToTimeLine(float fTime)
bool bFindFrame = false;
ActionFrame* srcFrame = NULL;
// ActionFrame* destFrame = NULL;
// ActionFrame* destFrame = NULL;
for (int n = 0; n < _frameArrayNum; n++)
{

42
cocos/editor-support/cocostudio/CCActionNode.h
View File

@ -1,26 +1,26 @@
/****************************************************************************
Copyright (c) 2013 cocos2d-x.org
Copyright (c) 2013 cocos2d-x.org
http://www.cocos2d-x.org
http://www.cocos2d-x.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#ifndef __ActionNODE_H__
#define __ActionNODE_H__
@ -32,9 +32,9 @@
namespace cocostudio {
/**
* @js NA
* @lua NA
*/
* @js NA
* @lua NA
*/
class ActionNode:public cocos2d::Object
{
public:

36
cocos/editor-support/cocostudio/CCActionObject.cpp
View File

@ -1,26 +1,26 @@
/****************************************************************************
Copyright (c) 2013 cocos2d-x.org
Copyright (c) 2013 cocos2d-x.org
http://www.cocos2d-x.org
http://www.cocos2d-x.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "cocostudio/CCActionObject.h"
#include "cocostudio/DictionaryHelper.h"

42
cocos/editor-support/cocostudio/CCActionObject.h
View File

@ -1,26 +1,26 @@
/****************************************************************************
Copyright (c) 2013 cocos2d-x.org
Copyright (c) 2013 cocos2d-x.org
http://www.cocos2d-x.org
http://www.cocos2d-x.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#ifndef __ActionObject_H__
#define __ActionObject_H__
@ -32,9 +32,9 @@
namespace cocostudio {
/**
* @js NA
* @lua NA
*/
* @js NA
* @lua NA
*/
class ActionObject:public cocos2d::Object
{
public:

2
cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj
View File

@ -11,6 +11,7 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\CCActionEaseEx.cpp" />
<ClCompile Include="..\CCActionFrame.cpp" />
<ClCompile Include="..\CCActionFrameEasing.cpp" />
<ClCompile Include="..\CCActionManagerEx.cpp" />
@ -55,6 +56,7 @@
<ClInclude Include="..\..\..\..\external\json\reader.h" />
<ClInclude Include="..\..\..\..\external\json\stringbuffer.h" />
<ClInclude Include="..\..\..\..\external\json\writer.h" />
<ClInclude Include="..\CCActionEaseEx.h" />
<ClInclude Include="..\CCActionFrame.h" />
<ClInclude Include="..\CCActionFrameEasing.h" />
<ClInclude Include="..\CCActionManagerEx.h" />

6
cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters
View File

@ -135,6 +135,9 @@
<ClCompile Include="..\CCBone.cpp">
<Filter>armature</Filter>
</ClCompile>
<ClCompile Include="..\CCActionEaseEx.cpp">
<Filter>action</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\CCActionFrameEasing.h">
@ -263,5 +266,8 @@
<ClInclude Include="..\..\..\..\external\json\internal\strfunc.h">
<Filter>json\rapidjson\internal</Filter>
</ClInclude>
<ClInclude Include="..\CCActionEaseEx.h">
<Filter>action</Filter>
</ClInclude>
</ItemGroup>
</Project>