added mouse wheel support to map

MapView.pde

@@ -18,7 +18,7 @@ class MapView extends View {
 
   void drawContent()
   {
-    imageMode(CORNER);  // modestmaps needs this
+    imageMode(CORNER);  // modestmaps needs this - I sent a patch, but who knows when it'll be committed
     mmap.draw();
     smooth();
     noStroke();
@@ -29,6 +29,26 @@ class MapView extends View {
     image(airplaneImage,p.x,p.y);
   }
 
+  boolean contentMouseWheel(float lx, float ly, int delta)
+  {
+    float sc = 1.0;
+    if (delta < 0) {
+      sc = 1.05;
+    }
+    else if (delta > 0) {
+      sc = 1.0/1.05;
+    }
+    float mx = lx - w/2;
+    float my = ly - h/2;
+    mmap.tx -= mx/mmap.sc;
+    mmap.ty -= my/mmap.sc;
+    mmap.sc *= sc;
+    mmap.tx += mx/mmap.sc;
+    mmap.ty += my/mmap.sc;
+
+    return true;
+  }
+
   boolean mouseDragged(float px, float py)
   {
     mmap.mouseDragged();

View.pde

@@ -49,6 +49,11 @@ class View {
   {
     return true;
   }
+
+  boolean contentMouseWheel(float lx, float ly, int delta)
+  {
+    return false;
+  }
 
   boolean ptInRect(float px, float py, float rx, float ry, float rw, float rh)
   {
@@ -93,5 +98,18 @@ class View {
     }
     return contentClicked(lx, ly);
   }
+
+  boolean mouseWheel(float px, float py, int delta)
+  {
+    if (!ptInRect(px, py, x, y, w, h)) return false;
+    float lx = px - x;
+    float ly = py - y;
+    // check our subviews first
+    for (int i = subviews.size()-1; i >= 0; i--) {
+      View v = (View)subviews.get(i);
+      if (v.mouseWheel(lx, ly, delta)) return true;
+    }
+    return contentMouseWheel(lx, ly, delta);
+  }
 }
 

cs424p3.pde

@@ -61,6 +61,13 @@ void setup()
   rootView.subviews.add(settingsView);
 
   settingsAnimator = new Animator(settingsView.y);
+
+  // I want to add true multitouch support, but let's have this as a stopgap for now
+  addMouseWheelListener(new java.awt.event.MouseWheelListener() {
+    public void mouseWheelMoved(java.awt.event.MouseWheelEvent evt) {
+      rootView.mouseWheel(mouseX, mouseY, evt.getWheelRotation());
+    }
+  });
 }
 
 void draw()