Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix the timer.

  • Loading branch information...
commit 94f7d9347f09f0fbe19ecefe11caa59e7eafc27d 1 parent e46a02b
@jverkoey authored
Showing with 3 additions and 3 deletions.
  1. +1 −1  dev/core/class.statemachine.js
  2. +2 −2 dev/core/class.timer.js
View
2  dev/core/class.statemachine.js
@@ -249,7 +249,7 @@ Breeze.StateMachine.prototype.tickEnd = function() {
this.setState(this.transitionTo_);
}
}
- } else {// if( !this.transition_ )
+ } else {// if (!this.transition_)
// Not transitioning, so let's do the regular state change logic.
if (this.percent_ >= 1) {
if (Breeze.StateMachine.ReservedIDs.QueuedID == state.nextState) {
View
4 dev/core/class.timer.js
@@ -66,8 +66,8 @@ Breeze.Timer.prototype.reset = function() {
*/
Breeze.Timer.prototype.frameDidStep = function() {
if (!this.isPaused_) {
- this.frameDuration_ = this.clock_.getFrameDuration() * this.scale_;
- this.currentTime_ += this.frameDuration_;
+ this.frameDuration_ = this.clock_.getFrameDuration() * this.scale_ / 1000;
+ this.currentTime_ += this.frameDuration_;
}
};
Please sign in to comment.
Something went wrong with that request. Please try again.