comparison grid.h @ 37:8ed7522deaaa

Interpolation.

 #include "2dvector.h"
 #include "ofMain.h"
 #include "eventLogger.h"
 #include "presetManager.h"
 #include "hilbert.h"
+
 using namespace std;
 class Preset;
+
+
 
 class Grid {
     
 public:
     bool snapped;

     ~Grid();
     void init();
     void move(TwoVector moveP); // shift view by pixels
     void zoom(float factor);
 
-    
+    typedef enum{NO_INTERPOLATION, INTERPOLATE_GRID, INTERPOLATE_PRESET} interpolateModeType;
+    interpolateModeType interpolateMode;
     void snapCheck();
     void shiftCentreToSnapped();
-    void draw();    // draw lines
-    
+    void draw();  
+    void drawGridLines();
     void update(); // change according to zoom
-    
+    int interpLevel;
+    int smallestGridSpacing; // number of pixels when small grid dissappears from view
     vector<int> getParams();
     TwoVector getCoord();
     void setMinZoom();
     void setMaxZoom();
     
     // HILBERT now does each coord for this
-    vector<int> calculateParamsFromCoord(TwoVector coord) const;
-    TwoVector calculateCoordFromParams(vector<int> params) const;
-
+    vector<int> calculateParamsFromCoord(TwoVector coord);
+    TwoVector calculateCoordFromParams(vector<int> params);
+    vector<int> calculateInterpolatedParamsFromCoord(TwoVector coord);
     TwoVector coordToPixel(TwoVector coord);
  
     // the inverse stuff
     void setParams(vector<int>);
     

     void drawPresets();
     
     void setCoord(TwoVector coord);
     void drawCrossHairs();
     
-
-    
+    int calculateInterpolateLevel();
+    vector<int> interpVector(vector<int> upper, vector<int> lower, float frac);
 
 
     
 };