good bitmap reading

1 files changed, 4 insertions, 3 deletions

diff --git a/parsecalldata.pde b/parsecalldata.pde
index 5870e6d..ba6e46f 100644
--- a/parsecalldata.pde
+++ b/parsecalldata.pde
@@ -68,6 +68,7 @@ class bitmapcountry extends country {
     super(n,c,m,shp);
   }
   void analyse(float _xo,float _xs,float _yo,float _ys) {
+      int step=5; //speedup
         xo=_xo;
         xs=_xs;
         yo=_yo;
@@ -82,12 +83,12 @@ class bitmapcountry extends country {
         float bmin=255;
         float bmax=0;
         println("searching "+tl.x+","+tl.y+" -> "+(tl.x+(pixstep*(brp.x-tlp.x)))+","+(tl.y+(pixstep*(brp.y-tlp.y))));
-        for (int i=0;i<brp.x-tlp.x;i++) {
-          for (int j=0;j<brp.y-tlp.y;j++) {
+        for (int i=0;i<brp.x-tlp.x;i+=step) {
+          for (int j=0;j<brp.y-tlp.y;j+=step) {
             RPoint pn=new RPoint(tl.x+(i*pixstep),tl.y+(j*pixstep));
             if(outline.contains(pn)) {
               float bn=brightness(lightmap.get((int)brp.x+i,(int)brp.y+j));
-              points.add(new weightedpixel(normalise(pn),bn));
+              points.add(new weightedpixel(pn,bn));
               totalbright +=bn;
               if (bn>bmax) bmax=bn;
               if (bn<bmin) bmin=bn;