Merge pull request #1128 from knoxHuang/master

add slider component for fireball/issues/1462
This commit is contained in:
Jare Guo
2016-09-21 14:03:18 +08:00
committed by GitHub
4 changed files with 217 additions and 1 deletions
+1 -1
View File
@@ -41,7 +41,7 @@ var Direction = cc.Enum({
/**
* !#en Vertical scroll.
* !#zh 垂直滚动
* @property {Number} Horizontal
* @property {Number} Vertical
*/
Vertical: 1
});
+209
View File
@@ -0,0 +1,209 @@
/****************************************************************************
Copyright (c) 2013-2016 Chukong Technologies Inc.
http://www.cocos.com
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated engine source code (the "Software"), a limited,
worldwide, royalty-free, non-assignable, revocable and non-exclusive license
to use Cocos Creator solely to develop games on your target platforms. You shall
not use Cocos Creator software for developing other software or tools that's
used for developing games. You are not granted to publish, distribute,
sublicense, and/or sell copies of Cocos Creator.
The software or tools in this License Agreement are licensed, not sold.
Chukong Aipu reserves all rights not expressly granted to you.
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.
****************************************************************************/
/**
* !#en The Slider Direction
* !#zh 滑动器方向
* @enum Slider.Direction
*/
var Direction = cc.Enum({
/**
* !#en The horizontal direction.
* !#zh 水平方向
* @property {Number} Horizontal
*/
Horizontal: 0,
/**
* !#en The vertical direction.
* !#zh 垂直方向
* @property {Number} Vertical
*/
Vertical: 1
});
/**
* !#en The Slider Control
* !#zh 滑动器组件
* @class Slider
* @extends Component
*/
var Slider = cc.Class({
name: 'cc.Slider',
extends: require('./CCComponent'),
editor: CC_EDITOR && {
menu: 'i18n:MAIN_MENU.component.ui/Slider',
help: 'i18n:COMPONENT.help_url.slider'
},
ctor: function () {
this._dragging = false;
},
properties: {
/**
* !#en The "handle" part of the slider
* !#zh 滑动器滑块按钮部件
* @property {cc.Button} handle
*/
handle: {
default: null,
type: cc.Button,
tooltip: 'i18n:COMPONENT.slider.handle',
notify: function() {
if (CC_EDITOR && this.handle) {
this._updateHandlePosition();
}
}
},
/**
* !#en The slider direction
* !#zh 滑动器方向
* @property {Slider.Direction} direction
*/
direction: {
default: Direction.Horizontal,
type: Direction,
tooltip: 'i18n:COMPONENT.slider.direction'
},
/**
* !#en The current progress of the slider. The valid value is between 0-1
* !#zh 当前进度值,该数值的区间是 0-1 之间
* @property {Number} progress
*/
progress: {
default: 0.5,
type: cc.Float,
range: [0, 1, 0.1],
slide: true,
tooltip: 'i18n:COMPONENT.slider.progress',
notify: function() {
this._updateHandlePosition();
}
},
/**
* !#en The slider events callback
* !#zh 滑动器组件事件回调函数
* @property {Component.EventHandler[]} slideEvents
*/
slideEvents: {
default: [],
type: cc.Component.EventHandler,
tooltip: 'i18n:COMPONENT.slider.slideEvents'
}
},
statics: {
Direction: Direction
},
__preload: function () {
this._registerEvent();
this._updateHandlePosition();
},
// 注册事件
_registerEvent: function () {
this.node.on(cc.Node.EventType.TOUCH_START, this._onTouchBegan, this, true);
this.node.on(cc.Node.EventType.TOUCH_MOVE, this._onTouchMoved, this, true);
this.node.on(cc.Node.EventType.TOUCH_END, this._onTouchEnded, this, true);
this.node.on(cc.Node.EventType.TOUCH_CANCEL, this._onTouchCancelled, this, true);
if (this.handle) {
this.handle.node.on(cc.Node.EventType.TOUCH_START, this._onHandleDragStart, this);
this.handle.node.on(cc.Node.EventType.TOUCH_MOVE, this._onTouchMoved, this);
this.handle.node.on(cc.Node.EventType.TOUCH_END, this._onTouchEnded, this);
}
},
_onHandleDragStart: function () {
this._dragging = true;
event.stopPropagation();
},
_onTouchBegan: function (event) {
if (!this.handle) { return; }
this._dragging = true;
this._handleSliderLogic(event.touch);
event.stopPropagation();
},
_onTouchMoved: function (event) {
if (!this._dragging) { return; }
this._handleSliderLogic(event.touch);
event.stopPropagation();
},
_onTouchEnded: function (event) {
this._dragging = false;
event.stopPropagation();
},
_onTouchCancelled: function (event) {
this._dragging = false;
event.stopPropagation();
},
_handleSliderLogic: function (touch) {
this._updateProgress(touch);
this._emitSldeEvent();
},
_emitSldeEvent: function () {
cc.Component.EventHandler.emitEvents(this.slideEvents, this);
},
_updateProgress: function (touch) {
if (!this.handle) { return; }
var maxRange = null, progress = 0, newPos = this.node.convertTouchToNodeSpaceAR(touch);
if (this.direction === Direction.Horizontal) {
maxRange = this.node.width / 2 - this.handle.node.width * this.handle.node.anchorX;
progress = cc.clamp01((newPos.x + maxRange) / (maxRange * 2), 0, 1);
}
else if (this.direction === Direction.Vertical) {
maxRange = this.node.height / 2 - this.handle.node.height * this.handle.node.anchorY;
progress = cc.clamp01((newPos.y + maxRange) / (maxRange * 2), 0, 1);
}
this.progress = progress;
},
_updateHandlePosition: function () {
if (!this.handle) { return; }
var handlelocalPos;
if (this.direction === Direction.Horizontal) {
handlelocalPos = cc.p(-this.node.width * this.node.anchorX + this.progress * this.node.width, 0);
}
else {
handlelocalPos = cc.p(0, -this.node.height * this.node.anchorY + this.progress * this.node.height);
}
var worldSpacePos = this.node.convertToWorldSpaceAR(handlelocalPos);
this.handle.node.position = this.handle.node.parent.convertToNodeSpaceAR(worldSpacePos);
}
});
cc.Slider = module.exports = Slider;
+1
View File
@@ -43,6 +43,7 @@ module.exports = [
require('./CCScrollView'),
require('./CCPageViewIndicator'),
require('./CCPageView'),
require('./CCSlider'),
require('./CCLayout'),
require('./CCEditBox'),
require('./CCVideoPlayer'),
+6
View File
@@ -102,6 +102,12 @@
"./cocos2d/core/components/CCPageViewIndicator.js"
]
},
{
"name": "Slider",
"entries": [
"./cocos2d/core/components/CCSlider.js"
]
},
{
"name": "Layout",
"entries": [