Fixed fps display to work in FF, and tweaked readme

josephg · Feb 2, 2013 · da084d8 · da084d8
1 parent 1984a46
commit da084d8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -19,13 +19,13 @@ The API for Chipmunk-js is almost identical to chipmunk-physics. Except:
 cpMomentForPoly(mass, numVerts, *verts, offset);
     ```
 
-    is now simply:
+    becomes:
 
     ```javascript
-momentForPoly(mass, verts, offset);
+cp.momentForPoly(mass, verts, offset);
     ```
 
-- Lots of trivial getters and setters have been removed. Access the property directly.
+- Lots of trivial getters and setters have been removed.
 
 ## On a website
 
@@ -39,7 +39,7 @@ space.addBody(new cp.Body(...))
 </script>
 ```
 
-If any exceptions are thrown or anything, use `cp.js` instead and post the stack trace you get to the issue page.
+If any exceptions are thrown or anything, use `cp.js` instead of cp.min.js and post the stack trace you get to the issue page.
 
 ## From nodejs
 

diff --git a/demo/demo.js b/demo/demo.js
@@ -218,15 +218,18 @@ Demo.prototype.run = function() {
 	this.running = true;
 
 	var self = this;
-	var step = function() {
-		self.step();
+
+	var lastTime = 0;
+	var step = function(time) {
+		self.step(time - lastTime);
+		lastTime = time;
+
 		if (self.running) {
 			raf(step);
 		}
 	};
 
-	this.lastStep = Date.now();
-	step();
+	step(0);
 };
 
 var soon = function(fn) { setTimeout(fn, 1); };
@@ -252,13 +255,10 @@ Demo.prototype.stop = function() {
 	this.running = false;
 };
 
-Demo.prototype.step = function() {
-	var dt = (now - this.lastStep) / 1000;
-	this.lastStep = now;
-
+Demo.prototype.step = function(dt) {
 	// Update FPS
 	if(dt > 0) {
-		this.fps = 0.7*this.fps + 0.3*(1/dt);
+		this.fps = 0.9*this.fps + 0.1*(1000/dt);
 	}
 
 	// Move mouse body toward the mouse
@@ -268,10 +268,6 @@ Demo.prototype.step = function() {
 
 	var lastNumActiveShapes = this.space.activeShapes.count;
 
-	// Limit the amount of time thats passed to 0.1 - if the user switches tabs or
-	// has a slow computer, we'll just slow the simulation down.
-	dt = Math.min(dt, 1/25);
-
 	var now = Date.now();
 	this.update(1/60);
 	this.simulationTime += Date.now() - now;

diff --git a/demo/index.html b/demo/index.html
@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE HTML>
 <style>
 	body {
 		margin: 0px;