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

closed #4448: Elastic bounce back effect support for cocos2d::extension::ScrollView.

This commit is contained in:
James Chen 2014-03-19 17:01:38 +08:00
parent 5b53197e1c
commit 02ee3a52eb
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
extensions/GUI/CCScrollView/CCScrollView.cpp
View File

@ -41,6 +41,7 @@ NS_CC_EXT_BEGIN
#define BOUNCE_DURATION 0.15f #define BOUNCE_DURATION 0.15f
#define INSET_RATIO 0.2f #define INSET_RATIO 0.2f
#define MOVE_INCH 7.0f/160.0f #define MOVE_INCH 7.0f/160.0f
#define BOUNCE_BACK_FACTOR 0.35f
static float convertDistanceFromPointToInch(float pointDis) static float convertDistanceFromPointToInch(float pointDis)
{ {
@ -681,7 +682,7 @@ void ScrollView::onTouchMoved(Touch* touch, Event* event)
dis = moveDistance.y; dis = moveDistance.y;
float pos = _container->getPosition().y; float pos = _container->getPosition().y;
if (!(minContainerOffset().y <= pos && pos <= maxContainerOffset().y)) { if (!(minContainerOffset().y <= pos && pos <= maxContainerOffset().y)) {
dis *= 0.35; moveDistance.y *= BOUNCE_BACK_FACTOR;
} }
} }
else if (_direction == Direction::HORIZONTAL) else if (_direction == Direction::HORIZONTAL)
@ -689,12 +690,22 @@ void ScrollView::onTouchMoved(Touch* touch, Event* event)
dis = moveDistance.x; dis = moveDistance.x;
float pos = _container->getPosition().x; float pos = _container->getPosition().x;
if (!(minContainerOffset().x <= pos && pos <= maxContainerOffset().x)) { if (!(minContainerOffset().x <= pos && pos <= maxContainerOffset().x)) {
dis *= 0.35; moveDistance.x *= BOUNCE_BACK_FACTOR;
} }
} }
else else
{ {
dis = sqrtf(moveDistance.x*moveDistance.x + moveDistance.y*moveDistance.y); dis = sqrtf(moveDistance.x*moveDistance.x + moveDistance.y*moveDistance.y);
float pos = _container->getPosition().y;
if (!(minContainerOffset().y <= pos && pos <= maxContainerOffset().y)) {
moveDistance.y *= BOUNCE_BACK_FACTOR;
}
pos = _container->getPosition().x;
if (!(minContainerOffset().x <= pos && pos <= maxContainerOffset().x)) {
moveDistance.x *= BOUNCE_BACK_FACTOR;
}
} }
if (!_touchMoved && fabs(convertDistanceFromPointToInch(dis)) < MOVE_INCH ) if (!_touchMoved && fabs(convertDistanceFromPointToInch(dis)) < MOVE_INCH )