Corrected optimized calculation of texture coordinates

Signed-off-by: Heikki Pora <heikki.pora@fusemail.com>
heikkipora · May 8, 2010 · 572d8c2 · 572d8c2
1 parent 797aef0
commit 572d8c2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/benchmark/index.html b/benchmark/index.html
@@ -19,8 +19,8 @@
     "(((Math.floor(_benchmarkVar) + 1024 * textureHeight) % textureHeight) * textureWidth + ((Math.floor(_benchmarkVar) + 1024 * textureWidth) % textureWidth )) << 2;",
     "(((Math.floor(_benchmarkVar) + 1024 * 256) % textureHeight) * 256 + ((Math.floor(_benchmarkVar) + 1024 * 256) % textureWidth )) << 2;",
     "(((Math.floor(_benchmarkVar) + 1024 * 256) % 256) * 256 + ((Math.floor(_benchmarkVar) + 1024 * 256) % 256 )) << 2;",
-    "(((Math.floor(_benchmarkVar) + 1024 << 8) % 256) << 8 + ((Math.floor(_benchmarkVar) + 1024 << 8 ) % 256 )) << 2;",
-    "(((Math.floor(_benchmarkVar) + 262144) & 0xff) << 8 + ((Math.floor(_benchmarkVar) + 262144) & 0xff )) << 2;"
+    "((((Math.floor(_benchmarkVar) + 1024 << 8) % 256) << 8) + ((Math.floor(_benchmarkVar) + 1024 << 8 ) % 256 )) << 2;",
+    "((((Math.floor(_benchmarkVar) + 262144) & 0xff) << 8) + ((Math.floor(_benchmarkVar) + 262144) & 0xff )) << 2;"
   ];
 
   var benchmark = new Benchmark(200000);

diff --git a/rotozoom/rotozoom.js b/rotozoom/rotozoom.js
@@ -72,7 +72,7 @@ var Rotozoom = {
       var y = startY;
       var w = width;
       while (w--) {
-        pos = (((Math.floor(y) + 262144) & 0xff) << 8 + ((Math.floor(y) + 262144) & 0xff )) << 2;
+        pos = ((((Math.floor(y) + 262144) & 0xff) << 8) + ((Math.floor(x) + 262144) & 0xff )) << 2;
         frame[i++] = texture[pos++];
         frame[i++] = texture[pos++];
         frame[i++] = texture[pos];