From a0ed0a35f45a797172953f585b95dcc2c1bee785 Mon Sep 17 00:00:00 2001 From: VisualSJ Date: Thu, 25 Sep 2014 09:41:10 +0800 Subject: [PATCH] Remove Timeline.js --- .../cocostudio/reader/timeline/TimeLine.js | 323 ------------------ 1 file changed, 323 deletions(-) delete mode 100644 extensions/cocostudio/reader/timeline/TimeLine.js diff --git a/extensions/cocostudio/reader/timeline/TimeLine.js b/extensions/cocostudio/reader/timeline/TimeLine.js deleted file mode 100644 index 176c35419c..0000000000 --- a/extensions/cocostudio/reader/timeline/TimeLine.js +++ /dev/null @@ -1,323 +0,0 @@ -/**************************************************************************** - Copyright (c) 2013-2014 Chukong Technologies Inc. - - 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: - - 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. - ****************************************************************************/ - -/** - * timeline object - * @class - * @extend ccs.Class - */ -ccs.Timeline = ccs.Class.extend({ - - //{ccs.Frame} - _frames: null, - //{ccs.Frame} - _currentKeyFrame: null, - //{Number} - _currentKeyFrameIndex: null, - //{Number} - _fromIndex: null, - //{Number} - _toIndex: null, - //{Number} - _betweenDuration: null, - //{Number} - _actionTag: null, - //{ccs.ActionTimeline} - _ActionTimeline: null, - //{cc.Node} - _node: null, - - ctor: function(){ - this._frames = []; - this._currentKeyFrame = null; - this._currentKeyFrameIndex = 0; - this._fromIndex = 0; - this._toIndex = 0; - this._betweenDuration = 0; - this._actionTag = 0; - this._ActionTimeline = null; - this._node = null; - }, - - _gotoFrame: function(frameIndex){ - if(this._frames.length == 0) - return; - - this._binarySearchKeyFrame(frameIndex); - this._apply(frameIndex); - }, - - _stepToFrame: function(frameIndex){ - if(this._frames.length == 0) - return; - - this._updateCurrentKeyFrame(frameIndex); - this._apply(frameIndex); - }, - - /** - * Get the frame list - * @returns {ccs.Frame} - */ - getFrames: function(){ - return this._frames; - }, - - /** - * push frame to frame list - * @param {ccs.Frame} frame - */ - addFrame: function(frame){ - this._frames.push(frame); - frame.setTimeline(this) - }, - - /** - * insert the frame to frame list - * @param {ccs.Frame} frame - * @param {Number} index - */ - insertFrame: function(frame, index){ - this._frames.splice(index, 0, frame); - frame.setTimeline(this); - - }, - - /** - * remove frame - * @param {ccs.Frame} frame - */ - removeFrame: function(frame){ - cc.arrayRemoveObject(this._frames, frame); - frame.setTimeline(null); - }, - - /** - * Set the action tag - * @param {Number} tag - */ - setActionTag: function(tag){ - this._actionTag = tag; - }, - - /** - * Gets the action tag - * return {Number} - */ - getActionTag: function(){ - return this._actionTag; - }, - - /** - * Set the node - * @param {cc.Node} node - */ - setNode: function(node){ - for (var i=0; i= this._frames[0].getFrameIndex()) - needEnterFrame = true; - - from = to = this._frames[0]; - this._currentKeyFrameIndex = 0; - this._betweenDuration = this._frames[0].getFrameIndex(); - break; - } - else if(frameIndex >= this._frames[length - 1].getFrameIndex()) - { - from = to = this._frames[length - 1]; - this._currentKeyFrameIndex = this._frames[length - 1].getFrameIndex(); - this._betweenDuration = 0; - break; - } - - var target = -1; - var low = 0, - high = length - 1, - mid = 0; - while(low <= high){ - mid = Math.ceil(( low + high )/2); - if(frameIndex >= this._frames[mid].getFrameIndex() && frameIndex < this._frames[mid + 1].getFrameIndex()) - { - target = mid; - break; - } - if(this._frames[mid].getFrameIndex()>frameIndex) - high = mid - 1; - else - low = mid + 1; - } - - from = this._frames[target]; - to = this._frames[target+1]; - - if(target == 0 && this._currentKeyFrameIndex < from.getFrameIndex()) - needEnterFrame = true; - - this._currentKeyFrameIndex = from.getFrameIndex(); - this._betweenDuration = to.getFrameIndex() - from.getFrameIndex(); - } while (0); - - if(needEnterFrame || this._currentKeyFrame != from) - { - this._currentKeyFrame = from; - this._currentKeyFrame.onEnter(to); - } - - }, - - _updateCurrentKeyFrame: function(frameIndex){ - //! If play to current frame's front or back, then find current frame again - if (frameIndex < this._currentKeyFrameIndex || frameIndex >= this._currentKeyFrameIndex + this._betweenDuration) - { - var from = null; - var to = null; - - do - { - var length = this._frames.length; - - if (frameIndex < this._frames[0].getFrameIndex()) - { - from = to = this._frames[0]; - this._currentKeyFrameIndex = 0; - this._betweenDuration = this._frames[0].getFrameIndex(); - break; - } - else if(frameIndex >= this._frames[length - 1].getFrameIndex()) - { - from = to = this._frames[length - 1]; - this._currentKeyFrameIndex = this._frames[length - 1].getFrameIndex(); - this._betweenDuration = 0; - break; - } - - do{ - this._fromIndex = this._toIndex; - from = this._frames[this._fromIndex]; - this._currentKeyFrameIndex = from.getFrameIndex(); - - this._toIndex = this._fromIndex + 1; - if (this._toIndex >= length) - { - this._toIndex = 0; - } - - to = this._frames[this._toIndex]; - - if (frameIndex == from.getFrameIndex()) - { - break; - } - }while (frameIndex < from.getFrameIndex() || frameIndex >= to.getFrameIndex()); - - this._betweenDuration = to.getFrameIndex() - from.getFrameIndex(); - - } while (0); - - this._currentKeyFrame = from; - this._currentKeyFrame.onEnter(to); - } - } - -}); - -/** - * Create the Timeline - * - * @deprecated v3.0, please use new ccs.Timeline() instead. - * @returns {ccs.Timeline} - */ -ccs.Timeline.create = function(){ - return new ccs.Timeline(); -}; \ No newline at end of file