From 4f7d86588ece62d7a3beea00eb6a1104dc09544a Mon Sep 17 00:00:00 2001
From: Josh Stewart <josh@noisymime.org>
Date: Mon, 11 Feb 2013 10:53:00 +1100
Subject: [PATCH] Removed floats from table lookup

---
 .DS_Store | Bin 0 -> 6148 bytes
 table.h   |  15 +++++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001

diff --git a/table.h b/table.h
index 55b2837f..9d045811 100644
--- a/table.h
+++ b/table.h
@@ -2,6 +2,7 @@
 This file is used for everything related to maps/tables including their definition, functions etc
 */
 
+
 struct table {
   //All tables must be the same size for simplicity
   const static int xSize = 8;
@@ -92,6 +93,8 @@ int getTableValue(struct table fromTable, int Y, int X)
     
     //Create some normalised position values
     //These are essentially percentages (between 0 and 1) of where the desired value falls between the nearest bins on each axis
+    /*
+    // Float version
     float p = ((float)(X - xMinValue)) / (float)(xMaxValue - xMinValue);
     float q = ((float)(Y - yMaxValue)) / (float)(yMinValue - yMaxValue);
     
@@ -102,4 +105,16 @@ int getTableValue(struct table fromTable, int Y, int X)
     
     
     return ( (A * m) + (B * n) + (C * o) + (D * r) ); 
+    */
+    
+    // Non-Float version:
+    int p = ((X - xMinValue) << 7) / (xMaxValue - xMinValue);
+    int q = ((Y - yMaxValue) << 7) / (yMinValue - yMaxValue);
+      
+    int m = ((128-p) * (128-q)) >> 7;
+    int n = (p * (128-q)) >> 7;
+    int o = ((128-p) * q) >> 7;
+    int r = (p * q) >> 7;
+
+    return ( (A * m) + (B * n) + (C * o) + (D * r) ) >> 7; 
   }