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

Merge pull request #7631 from maltium/v3 

added 3D rotation support to the RotateTo action
This commit is contained in:
minggo 2014-08-05 13:30:43 +08:00
parent 376d218ff8 baba808391
commit cd98034f16
2 changed files with 133 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

195
cocos/2d/CCActionInterval.cpp
View File

@ -724,41 +724,57 @@ Spawn* Spawn::reverse() const
// RotateTo // RotateTo
// //
RotateTo* RotateTo::create(float duration, float deltaAngle) RotateTo* RotateTo::create(float duration, float dstAngle)
{ {
RotateTo* rotateTo = new RotateTo(); RotateTo* rotateTo = new RotateTo();
rotateTo->initWithDuration(duration, deltaAngle); rotateTo->initWithDuration(duration, dstAngle, dstAngle);
rotateTo->autorelease(); rotateTo->autorelease();
return rotateTo; return rotateTo;
} }
bool RotateTo::initWithDuration(float duration, float deltaAngle) RotateTo* RotateTo::create(float duration, float dstAngleX, float dstAngleY)
{
RotateTo* rotateTo = new RotateTo();
rotateTo->initWithDuration(duration, dstAngleX, dstAngleY);
rotateTo->autorelease();
return rotateTo;
}
RotateTo* RotateTo::create(float duration, const Vec3& dstAngle3D)
{
RotateTo* rotateTo = new RotateTo();
rotateTo->initWithDuration(duration, dstAngle3D);
rotateTo->autorelease();
return rotateTo;
}
RotateTo::RotateTo()
: _is3D(false)
{
}
bool RotateTo::initWithDuration(float duration, float dstAngleX, float dstAngleY)
{ {
if (ActionInterval::initWithDuration(duration)) if (ActionInterval::initWithDuration(duration))
{ {
_dstAngleX = _dstAngleY = deltaAngle; _dstAngle.x = dstAngleX;
_dstAngle.y = dstAngleY;
return true; return true;
} }
return false; return false;
} }
RotateTo* RotateTo::create(float duration, float deltaAngleX, float deltaAngleY) bool RotateTo::initWithDuration(float duration, const Vec3& dstAngle3D)
{
RotateTo* rotateTo = new RotateTo();
rotateTo->initWithDuration(duration, deltaAngleX, deltaAngleY);
rotateTo->autorelease();
return rotateTo;
}
bool RotateTo::initWithDuration(float duration, float deltaAngleX, float deltaAngleY)
{ {
if (ActionInterval::initWithDuration(duration)) if (ActionInterval::initWithDuration(duration))
{ {
_dstAngleX = deltaAngleX; _dstAngle = dstAngle3D;
_dstAngleY = deltaAngleY; _is3D = true;
return true; return true;
} }
@ -770,85 +786,91 @@ RotateTo* RotateTo::clone(void) const
{ {
// no copy constructor // no copy constructor
auto a = new RotateTo(); auto a = new RotateTo();
a->initWithDuration(_duration, _dstAngleX, _dstAngleY); if(_is3D)
a->initWithDuration(_duration, _dstAngle);
else
a->initWithDuration(_duration, _dstAngle.x, _dstAngle.y);
a->autorelease(); a->autorelease();
return a; return a;
} }
void RotateTo::calculateAngles(float &startAngle, float &diffAngle, float dstAngle)
{
if (startAngle > 0)
{
startAngle = fmodf(startAngle, 360.0f);
}
else
{
startAngle = fmodf(startAngle, -360.0f);
}
diffAngle = dstAngle - startAngle;
if (diffAngle > 180)
{
diffAngle -= 360;
}
if (diffAngle < -180)
{
diffAngle += 360;
}
}
void RotateTo::startWithTarget(Node *target) void RotateTo::startWithTarget(Node *target)
{ {
ActionInterval::startWithTarget(target); ActionInterval::startWithTarget(target);
// Calculate X if (_is3D)
_startAngleX = target->getRotationSkewX();
if (_startAngleX > 0)
{ {
_startAngleX = fmodf(_startAngleX, 360.0f); _startAngle = _target->getRotation3D();
} }
else else
{ {
_startAngleX = fmodf(_startAngleX, -360.0f); _startAngle.x = _target->getRotationSkewX();
_startAngle.y = _target->getRotationSkewY();
} }
_diffAngleX = _dstAngleX - _startAngleX; calculateAngles(_startAngle.x, _diffAngle.x, _dstAngle.x);
if (_diffAngleX > 180) calculateAngles(_startAngle.y, _diffAngle.y, _dstAngle.y);
{ calculateAngles(_startAngle.z, _diffAngle.z, _dstAngle.z);
_diffAngleX -= 360;
}
if (_diffAngleX < -180)
{
_diffAngleX += 360;
}
//Calculate Y: It's duplicated from calculating X since the rotation wrap should be the same
_startAngleY = _target->getRotationSkewY();
if (_startAngleY > 0)
{
_startAngleY = fmodf(_startAngleY, 360.0f);
}
else
{
_startAngleY = fmodf(_startAngleY, -360.0f);
}
_diffAngleY = _dstAngleY - _startAngleY;
if (_diffAngleY > 180)
{
_diffAngleY -= 360;
}
if (_diffAngleY < -180)
{
_diffAngleY += 360;
}
} }
void RotateTo::update(float time) void RotateTo::update(float time)
{ {
if (_target) if (_target)
{ {
#if CC_USE_PHYSICS if(_is3D)
if (_startAngleX == _startAngleY && _diffAngleX == _diffAngleY)
{ {
_target->setRotation(_startAngleX + _diffAngleX * time); _target->setRotation3D(Vec3(
_startAngle.x + _diffAngle.x * time,
_startAngle.y + _diffAngle.y * time,
_startAngle.z + _diffAngle.z * time
));
} }
else else
{ {
// _startAngleX != _startAngleY || _diffAngleX != _diffAngleY #if CC_USE_PHYSICS
if (_startAngle.x == _startAngle.y && _diffAngle.x == _diffAngle.y)
{
_target->setRotation(_startAngle.x + _diffAngle.x * time);
}
else
{
// _startAngle.x != _startAngle.y || _diffAngle.x != _diffAngle.y
if (_target->getPhysicsBody() != nullptr) if (_target->getPhysicsBody() != nullptr)
{ {
CCLOG("RotateTo WARNING: PhysicsBody doesn't support skew rotation"); CCLOG("RotateTo WARNING: PhysicsBody doesn't support skew rotation");
} }
_target->setRotationSkewX(_startAngleX + _diffAngleX * time); _target->setRotationSkewX(_startAngle.x + _diffAngle.x * time);
_target->setRotationSkewY(_startAngleY + _diffAngleY * time); _target->setRotationSkewY(_startAngle.y + _diffAngle.y * time);
} }
#else #else
_target->setRotationSkewX(_startAngleX + _diffAngleX * time); _target->setRotationSkewX(_startAngle.x + _diffAngle.x * time);
_target->setRotationSkewY(_startAngleY + _diffAngleY * time); _target->setRotationSkewY(_startAngle.y + _diffAngle.y * time);
#endif // CC_USE_PHYSICS #endif // CC_USE_PHYSICS
} }
}
} }
RotateTo *RotateTo::reverse() const RotateTo *RotateTo::reverse() const
@ -897,7 +919,7 @@ bool RotateBy::initWithDuration(float duration, float deltaAngle)
{ {
if (ActionInterval::initWithDuration(duration)) if (ActionInterval::initWithDuration(duration))
{ {
_angleZ_X = _angleZ_Y = deltaAngle; _deltaAngle.x = _deltaAngle.y = deltaAngle;
return true; return true;
} }
@ -908,8 +930,8 @@ bool RotateBy::initWithDuration(float duration, float deltaAngleX, float deltaAn
{ {
if (ActionInterval::initWithDuration(duration)) if (ActionInterval::initWithDuration(duration))
{ {
_angleZ_X = deltaAngleX; _deltaAngle.x = deltaAngleX;
_angleZ_Y = deltaAngleY; _deltaAngle.y = deltaAngleY;
return true; return true;
} }
@ -920,7 +942,7 @@ bool RotateBy::initWithDuration(float duration, const Vec3& deltaAngle3D)
{ {
if (ActionInterval::initWithDuration(duration)) if (ActionInterval::initWithDuration(duration))
{ {
_angle3D = deltaAngle3D; _deltaAngle = deltaAngle3D;
_is3D = true; _is3D = true;
return true; return true;
} }
@ -934,9 +956,9 @@ RotateBy* RotateBy::clone() const
// no copy constructor // no copy constructor
auto a = new RotateBy(); auto a = new RotateBy();
if(_is3D) if(_is3D)
a->initWithDuration(_duration, _angle3D); a->initWithDuration(_duration, _deltaAngle);
else else
a->initWithDuration(_duration, _angleZ_X, _angleZ_Y); a->initWithDuration(_duration, _deltaAngle.x, _deltaAngle.y);
a->autorelease(); a->autorelease();
return a; return a;
} }
@ -946,12 +968,12 @@ void RotateBy::startWithTarget(Node *target)
ActionInterval::startWithTarget(target); ActionInterval::startWithTarget(target);
if(_is3D) if(_is3D)
{ {
_startAngle3D = target->getRotation3D(); _startAngle = target->getRotation3D();
} }
else else
{ {
_startAngleZ_X = target->getRotationSkewX(); _startAngle.x = target->getRotationSkewX();
_startAngleZ_Y = target->getRotationSkewY(); _startAngle.y = target->getRotationSkewY();
} }
} }
@ -963,32 +985,32 @@ void RotateBy::update(float time)
if(_is3D) if(_is3D)
{ {
Vec3 v; Vec3 v;
v.x = _startAngle3D.x + _angle3D.x * time; v.x = _startAngle.x + _deltaAngle.x * time;
v.y = _startAngle3D.y + _angle3D.y * time; v.y = _startAngle.y + _deltaAngle.y * time;
v.z = _startAngle3D.z + _angle3D.z * time; v.z = _startAngle.z + _deltaAngle.z * time;
_target->setRotation3D(v); _target->setRotation3D(v);
} }
else else
{ {
#if CC_USE_PHYSICS #if CC_USE_PHYSICS
if (_startAngleZ_X == _startAngleZ_Y && _angleZ_X == _angleZ_Y) if (_startAngle.x == _startAngle.y && _deltaAngle.x == _deltaAngle.y)
{ {
_target->setRotation(_startAngleZ_X + _angleZ_X * time); _target->setRotation(_startAngle.x + _deltaAngle.x * time);
} }
else else
{ {
// _startAngleZ_X != _startAngleZ_Y || _angleZ_X != _angleZ_Y // _startAngle.x != _startAngle.y || _deltaAngle.x != _deltaAngle.y
if (_target->getPhysicsBody() != nullptr) if (_target->getPhysicsBody() != nullptr)
{ {
CCLOG("RotateBy WARNING: PhysicsBody doesn't support skew rotation"); CCLOG("RotateBy WARNING: PhysicsBody doesn't support skew rotation");
} }
_target->setRotationSkewX(_startAngleZ_X + _angleZ_X * time); _target->setRotationSkewX(_startAngle.x + _deltaAngle.x * time);
_target->setRotationSkewY(_startAngleZ_Y + _angleZ_Y * time); _target->setRotationSkewY(_startAngle.y + _deltaAngle.y * time);
} }
#else #else
_target->setRotationSkewX(_startAngleZ_X + _angleZ_X * time); _target->setRotationSkewX(_startAngle.x + _deltaAngle.x * time);
_target->setRotationSkewY(_startAngleZ_Y + _angleZ_Y * time); _target->setRotationSkewY(_startAngle.y + _deltaAngle.y * time);
#endif // CC_USE_PHYSICS #endif // CC_USE_PHYSICS
} }
} }
@ -999,12 +1021,15 @@ RotateBy* RotateBy::reverse() const
if(_is3D) if(_is3D)
{ {
Vec3 v; Vec3 v;
v.x = - _angle3D.x; v.x = - _deltaAngle.x;
v.y = - _angle3D.y; v.y = - _deltaAngle.y;
v.z = - _angle3D.z; v.z = - _deltaAngle.z;
return RotateBy::create(_duration, v); return RotateBy::create(_duration, v);
} }
return RotateBy::create(_duration, -_angleZ_X, -_angleZ_Y); else
{
return RotateBy::create(_duration, -_deltaAngle.x, -_deltaAngle.y);
}
} }
// //

36
cocos/2d/CCActionInterval.h
View File

@ -339,10 +339,13 @@ class CC_DLL RotateTo : public ActionInterval
{ {
public: public:
/** creates the action with separate rotation angles */ /** creates the action with separate rotation angles */
static RotateTo* create(float duration, float deltaAngleX, float deltaAngleY); static RotateTo* create(float duration, float dstAngleX, float dstAngleY);
/** creates the action */ /** creates the action */
static RotateTo* create(float duration, float deltaAngle); static RotateTo* create(float duration, float dstAngle);
/** creates the action with 3D rotation angles */
static RotateTo* create(float duration, const Vec3& dstAngle3D);
// //
// Overrides // Overrides
@ -353,21 +356,21 @@ public:
virtual void update(float time) override; virtual void update(float time) override;
CC_CONSTRUCTOR_ACCESS: CC_CONSTRUCTOR_ACCESS:
RotateTo() {} RotateTo();
virtual ~RotateTo() {} virtual ~RotateTo() {}
/** initializes the action */ /** initializes the action */
bool initWithDuration(float duration, float deltaAngle); bool initWithDuration(float duration, float dstAngleX, float dstAngleY);
bool initWithDuration(float duration, float deltaAngleX, float deltaAngleY); bool initWithDuration(float duration, const Vec3& dstAngle3D);
/** calculates the start and diff angles */
void calculateAngles(float &startAngle, float &diffAngle, float dstAngle);
protected: protected:
float _dstAngleX; bool _is3D;
float _startAngleX; Vec3 _dstAngle;
float _diffAngleX; Vec3 _startAngle;
Vec3 _diffAngle;
float _dstAngleY;
float _startAngleY;
float _diffAngleY;
private: private:
CC_DISALLOW_COPY_AND_ASSIGN(RotateTo); CC_DISALLOW_COPY_AND_ASSIGN(RotateTo);
@ -403,14 +406,9 @@ CC_CONSTRUCTOR_ACCESS:
bool initWithDuration(float duration, const Vec3& deltaAngle3D); bool initWithDuration(float duration, const Vec3& deltaAngle3D);
protected: protected:
float _angleZ_X;
float _startAngleZ_X;
float _angleZ_Y;
float _startAngleZ_Y;
bool _is3D; bool _is3D;
Vec3 _angle3D; Vec3 _deltaAngle;
Vec3 _startAngle3D; Vec3 _startAngle;
private: private:
CC_DISALLOW_COPY_AND_ASSIGN(RotateBy); CC_DISALLOW_COPY_AND_ASSIGN(RotateBy);