Mercurial > hg > soniczoomios
diff grid.mm @ 34:94df2cd72d7b
New hilbert code - does rotations!
author | Robert Tubb <rt300@eecs.qmul.ac.uk> |
---|---|
date | Mon, 08 Apr 2013 12:58:21 +0100 |
parents | 92dba082d957 |
children | 790939017078 |
line wrap: on
line diff
--- a/grid.mm Tue Mar 26 18:41:42 2013 +0000 +++ b/grid.mm Mon Apr 08 12:58:21 2013 +0100 @@ -13,6 +13,7 @@ extern PresetManager presetManager; extern EventLogger eventLogger; +extern Hilbert hilbert; //-------------------------------------------------------------- Grid::Grid(): maxValue(pow(32.0,7.0)-1), minValue(60), paramsPerDim(5), paramBitDepth(7){ @@ -23,8 +24,7 @@ } void Grid::init(){ - //maxValue = pow(32.0,7.0)-1; - //minValue = 60; // number of 1-size divisions at smallest scale + maxZoom = false; minZoom = false; @@ -40,7 +40,8 @@ size.setCoord(pixSize.x*scale, pixSize.y*scale); centre.setCoord(maxValue/2 , maxValue/2); topLeft.setCoord(centre.x - size.x/2, centre.y - size.y/2); - + + hilbert.init(paramBitDepth, paramsPerDim); makeCode();