Mercurial > jmeCapture
diff src/com/aurellem/capture/IsoTimer.java @ 73:877ae4b2993c tip
merge laptop changes.
| author | Robert McIntyre <rlm@mit.edu> |
|---|---|
| date | Mon, 10 Mar 2014 18:58:08 -0400 |
| parents | a67aef438383 |
| children |
line wrap: on
line diff
1.1 --- a/src/com/aurellem/capture/IsoTimer.java Mon Mar 10 18:57:00 2014 -0400 1.2 +++ b/src/com/aurellem/capture/IsoTimer.java Mon Mar 10 18:58:08 2014 -0400 1.3 @@ -45,19 +45,19 @@ 1.4 } 1.5 1.6 public long getTime() { 1.7 - return this.ticks; 1.8 + return ticks; 1.9 } 1.10 1.11 public long getResolution() { 1.12 - return (long) framerate; 1.13 + return framerate; 1.14 } 1.15 1.16 public float getFrameRate() { 1.17 - return this.framerate; 1.18 + return framerate; 1.19 } 1.20 1.21 public float getTimePerFrame() { 1.22 - return (float) (1.0f / this.framerate); 1.23 + return (float) (1.0f / framerate); 1.24 } 1.25 1.26 public void update() {this.ticks++;}