Merge pull request mrdoob#10732 from WhitestormJS/dev

Add Clock support in node
bhouston · Feb 17, 2017 · 8e4507d · 8e4507d
2 parents 98788fb + 3f68e22
commit 8e4507d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/core/Clock.js b/src/core/Clock.js
@@ -18,7 +18,7 @@ Object.assign( Clock.prototype, {
 
 	start: function () {
 
-		this.startTime = ( performance || Date ).now();
+		this.startTime = ( typeof performance === 'undefined' ? Date : performance ).now(); // see #10732
 
 		this.oldTime = this.startTime;
 		this.elapsedTime = 0;
@@ -52,7 +52,7 @@ Object.assign( Clock.prototype, {
 
 		if ( this.running ) {
 
-			var newTime = ( performance || Date ).now();
+			var newTime = ( typeof performance === 'undefined' ? Date : performance ).now();
 
 			diff = ( newTime - this.oldTime ) / 1000;
 			this.oldTime = newTime;