mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-25 14:46:10 +03:00
Code Issues Projects Releases Wiki Activity

removing psuedo-private accessors from Spring class

Browse Source
This commit is contained in:
thatcher 2011-12-29 18:16:51 -05:00
parent dc841a6294
commit 1e21c898bf
3 changed files with 116 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
openseadragon.js
View File

@ -2985,12 +2985,17 @@ $.Rect.prototype = {
},
getBottomRight: function() {
return new $.Point(this.x + this.width, this.y + this.height);
return new $.Point(
this.x + this.width,
this.y + this.height
);
},
getCenter: function() {
return new $.Point(this.x + this.width / 2.0,
this.y + this.height / 2.0);
return new $.Point(
this.x + this.width / 2.0,
this.y + this.height / 2.0
);
},
getSize: function() {
@ -2998,14 +3003,21 @@ $.Rect.prototype = {
},
equals: function(other) {
return (other instanceof $.Rect) &&
(this.x === other.x) && (this.y === other.y) &&
(this.width === other.width) && (this.height === other.height);
return
( other instanceof $.Rect ) &&
( this.x === other.x ) &&
( this.y === other.y ) &&
( this.width === other.width ) &&
( this.height === other.height );
},
toString: function() {
return "[" + this.x + "," + this.y + "," + this.width + "x" +
this.height + "]";
return "[" +
this.x + "," +
this.y + "," +
this.width + "x" +
this.height +
"]";
}
};
@ -3026,11 +3038,31 @@ $.DisplayRect.prototype.constructor = $.DisplayRect;
(function( $ ){
$.Spring = function(initialValue, config) {
this._currentValue = typeof (initialValue) == "number" ? initialValue : 0;
$.Spring = function( options ) {
var args = arguments;
if( typeof( options ) != 'object' ){
//allows backward compatible use of ( initialValue, config ) as
//constructor parameters
options = {
initial: args.length && typeof ( args[ 0 ] ) == "number" ?
args[ 0 ] :
0,
springStiffness: args.length > 1 ?
args[ 1 ].springStiffness :
5.0,
animationTime: args.length > 1 ?
args[ 1 ].animationTime :
1.5,
};
}
$.extend( true, this, options );
this._currentValue = typeof ( this.initial ) == "number" ? this.initial : 0;
this._startValue = this._currentValue;
this._targetValue = this._currentValue;
this.config = config;
this._currentTime = new Date().getTime(); // always work in milliseconds
this._startTime = this._currentTime;
@ -3038,10 +3070,6 @@ $.Spring = function(initialValue, config) {
};
$.Spring.prototype = {
_transform: function(x) {
var s = this.config.springStiffness;
return (1.0 - Math.exp(-x * s)) / (1.0 - Math.exp(-s));
},
getCurrent: function() {
return this._currentValue;
},
@ -3061,7 +3089,7 @@ $.Spring.prototype = {
this._startValue = this._currentValue;
this._startTime = this._currentTime;
this._targetValue = target;
this._targetTime = this._startTime + 1000 * this.config.animationTime;
this._targetTime = this._startTime + 1000 * this.animationTime;
},
shiftBy: function(delta) {
@ -3073,10 +3101,16 @@ $.Spring.prototype = {
this._currentTime = new Date().getTime();
this._currentValue = (this._currentTime >= this._targetTime) ? this._targetValue :
this._startValue + (this._targetValue - this._startValue) *
this._transform((this._currentTime - this._startTime) / (this._targetTime - this._startTime));
transform( this.springStiffness, (this._currentTime - this._startTime) / (this._targetTime - this._startTime));
}
}
function transform( stiffness, x ) {
return ( 1.0 - Math.exp( stiffness * -x ) ) /
( 1.0 - Math.exp( -stiffness ) );
};
}( OpenSeadragon ));
(function( $ ){

28
src/rectangle.js
View File

@ -18,12 +18,17 @@ $.Rect.prototype = {
},
getBottomRight: function() {
return new $.Point(this.x + this.width, this.y + this.height);
return new $.Point(
this.x + this.width,
this.y + this.height
);
},
getCenter: function() {
return new $.Point(this.x + this.width / 2.0,
this.y + this.height / 2.0);
return new $.Point(
this.x + this.width / 2.0,
this.y + this.height / 2.0
);
},
getSize: function() {
@ -31,14 +36,21 @@ $.Rect.prototype = {
},
equals: function(other) {
return (other instanceof $.Rect) &&
(this.x === other.x) && (this.y === other.y) &&
(this.width === other.width) && (this.height === other.height);
return
( other instanceof $.Rect ) &&
( this.x === other.x ) &&
( this.y === other.y ) &&
( this.width === other.width ) &&
( this.height === other.height );
},
toString: function() {
return "[" + this.x + "," + this.y + "," + this.width + "x" +
this.height + "]";
return "[" +
this.x + "," +
this.y + "," +
this.width + "x" +
this.height +
"]";
}
};

40
src/spring.js
View File

@ -1,11 +1,31 @@
(function( $ ){
$.Spring = function(initialValue, config) {
this._currentValue = typeof (initialValue) == "number" ? initialValue : 0;
$.Spring = function( options ) {
var args = arguments;
if( typeof( options ) != 'object' ){
//allows backward compatible use of ( initialValue, config ) as
//constructor parameters
options = {
initial: args.length && typeof ( args[ 0 ] ) == "number" ?
args[ 0 ] :
0,
springStiffness: args.length > 1 ?
args[ 1 ].springStiffness :
5.0,
animationTime: args.length > 1 ?
args[ 1 ].animationTime :
1.5,
};
}
$.extend( true, this, options );
this._currentValue = typeof ( this.initial ) == "number" ? this.initial : 0;
this._startValue = this._currentValue;
this._targetValue = this._currentValue;
this.config = config;
this._currentTime = new Date().getTime(); // always work in milliseconds
this._startTime = this._currentTime;
@ -13,10 +33,6 @@ $.Spring = function(initialValue, config) {
};
$.Spring.prototype = {
_transform: function(x) {
var s = this.config.springStiffness;
return (1.0 - Math.exp(-x * s)) / (1.0 - Math.exp(-s));
},
getCurrent: function() {
return this._currentValue;
},
@ -36,7 +52,7 @@ $.Spring.prototype = {
this._startValue = this._currentValue;
this._startTime = this._currentTime;
this._targetValue = target;
this._targetTime = this._startTime + 1000 * this.config.animationTime;
this._targetTime = this._startTime + 1000 * this.animationTime;
},
shiftBy: function(delta) {
@ -48,8 +64,14 @@ $.Spring.prototype = {
this._currentTime = new Date().getTime();
this._currentValue = (this._currentTime >= this._targetTime) ? this._targetValue :
this._startValue + (this._targetValue - this._startValue) *
this._transform((this._currentTime - this._startTime) / (this._targetTime - this._startTime));
transform( this.springStiffness, (this._currentTime - this._startTime) / (this._targetTime - this._startTime));
}
}
function transform( stiffness, x ) {
return ( 1.0 - Math.exp( stiffness * -x ) ) /
( 1.0 - Math.exp( -stiffness ) );
};
}( OpenSeadragon ));