diff --git a/core/src/processing/event/MouseEvent.java b/core/src/processing/event/MouseEvent.java
index 63c2aad5a..ce48658fb 100644
--- a/core/src/processing/event/MouseEvent.java
+++ b/core/src/processing/event/MouseEvent.java
@@ -103,6 +103,11 @@ public class MouseEvent extends Event {
/**
* Number of clicks for mouse button events, or the number of steps (positive
* or negative depending on direction) for a mouse wheel event.
+ * Wheel events follow Java (see here), so
+ * getAmount() will return "negative values if the mouse wheel was rotated
+ * up or away from the user" and positive values in the other direction.
+ * On Mac OS X, this will be reversed when "natural" scrolling is enabled
+ * in System Preferences &rarr Mouse.
*/
public int getCount() {
return count;
diff --git a/core/todo.txt b/core/todo.txt
index 929f9e596..f75de5002 100644
--- a/core/todo.txt
+++ b/core/todo.txt
@@ -13,6 +13,38 @@ X getContent() or getStringContent()?
X switch to CATEGORY instead of CATEGORICAL
X removed createXML() and createTable()... just use 'new' for these
+mouse wheel
+X add mouse wheel support to 2.0 event system
+X https://github.com/processing/processing/issues/1461
+X http://code.google.com/p/processing/issues/detail?id=1423
+X this is fairly messy since desktop and JS behave a little differently
+o wheel event should subclass mouse (since position still relevant)
+X just another sub-event as part of mouse
+o might be more effort than it's worth?
+X peasycam uses e.getWheelRotation()
+X js has a couple versions
+X http://www.javascriptkit.com/javatutors/onmousewheel.shtml
+X e.detail is 1 for 1 tick upward (away), -2 for 2 ticks down
+X e.wheelDelta is 120 for 1 click up, -240 for two clicks down
+X this is for non-natural! opposite of Java.. ugh
+X testing with Java on OS X
+X natural on OS X: up is 1 unit, down is -1 units
+X non-natural: up is -1 units, down is +1 unit
+X Windows says 3 units per notch, OS X says just 1
+X appears to be opposite of JS
+X using float value (/120.0f)
+X high-precision method grabbed if 1.7 is in use
+X test with actual wheel mouse
+X test on Windows
+X decide on getAmount() and weirdness w/ clickCount
+X add note re: API docs
+X get mouseWheel() added to api ref
+o also added to keywords.txt
+X ref: "negative values if the mouse wheel was rotated up or away from the user"
+X http://docs.oracle.com/javase/6/docs/api/java/awt/event/MouseWheelEvent.html#getWheelRotation()
+X http://docs.oracle.com/javase/7/docs/api/java/awt/event/MouseWheelEvent.html#getWheelRotation()
+
+
before release
_ "deleted n framebuffer objects"
@@ -27,6 +59,7 @@ _ https://github.com/processing/processing/issues/1672
_ image memory issue was huge, need to close that one
+
data
X are we comfortable with setInt/Float/etc instead of just set(int, blah)
X yes, better to have parity
@@ -161,7 +194,6 @@ o maybe it's Table.INT since it's for advanced users anyway
o problem is loading types from file, no way to access it from code
o CATEGORICAL -> CATEGORY? ORDINAL?
X add clearRows()
-
_ function that will convert awful CSV to TSV.. or something else?
_ maybe to write binary instead? then read the binary file once it's ok?
_ if loading from a File object
@@ -195,7 +227,7 @@ _ getCategories() and getCategory() methods to query names?
xml
o add nodes() (no) or children() to XML?
X not necessary, getChildren() already exists
-_ add indent= as option for XML, JSON save
+_ add indent= as option for XML save
andres
A lines not properly renderered in P3D when using ortographic projection
@@ -209,36 +241,6 @@ _ Deleted 1 texture objects, 0 remaining
_ shader syntax (Andres request)
_ might also need a define inside the shader to control what type it is
-X add mouse wheel support to 2.0 event system
-X https://github.com/processing/processing/issues/1461
-X http://code.google.com/p/processing/issues/detail?id=1423
-X this is fairly messy since desktop and JS behave a little differently
-o wheel event should subclass mouse (since position still relevant)
-X just another sub-event as part of mouse
-o might be more effort than it's worth?
-X peasycam uses e.getWheelRotation()
-X js has a couple versions
-X http://www.javascriptkit.com/javatutors/onmousewheel.shtml
-X e.detail is 1 for 1 tick upward (away), -2 for 2 ticks down
-X e.wheelDelta is 120 for 1 click up, -240 for two clicks down
-X this is for non-natural! opposite of Java.. ugh
-X testing with Java on OS X
-X natural on OS X: up is 1 unit, down is -1 units
-X non-natural: up is -1 units, down is +1 unit
-X Windows says 3 units per notch, OS X says just 1
-X appears to be opposite of JS
-X using float value (/120.0f)
-X high-precision method grabbed if 1.7 is in use
-X test with actual wheel mouse
-X test on Windows
-X decide on getAmount() and weirdness w/ clickCount
-X add note re: API docs
-X get mouseWheel() added to api ref
-o also added to keywords.txt
-X ref: "negative values if the mouse wheel was rotated up or away from the user"
-X http://docs.oracle.com/javase/6/docs/api/java/awt/event/MouseWheelEvent.html#getWheelRotation()
-X http://docs.oracle.com/javase/7/docs/api/java/awt/event/MouseWheelEvent.html#getWheelRotation()
-
shape
_ major surgery to put loadShape() back into PApplet/PGraphics
_ then have the OpenGL or Java2D versions as cached objects
@@ -269,16 +271,6 @@ _ colorCalc() methods added to PShape.. should just be used from PGraphics
_ loadShape() needs to live in PApplet
_ make PShapeOpenGL a cache object
-async requests
-Request r = createRequest("http://p5.org/feed/13134.jpg");
-Request r = createRequest("http://p5.org/feed/13134.jpg", "callbackName");
-Request r = createRequest("http://p5.org/feed/13134, "callbackName", "jpg");
-_ implement callbacks for images and other loadXxxx() functions
-_ remove requestImage() and friends
-_ callback for requestImage()
-_ http://code.google.com/p/processing/issues/detail?id=641
-_ remove/update requestImage example
-
stop() mess
_ in PApplet.main(), windowClosing() should probably be calling 'exit()'
_ or rather, we should never call System.exit(0), ja?
@@ -835,3 +827,12 @@ _ put a Hash class in there
_ will this work to sort by the values?
_ there was another concern as well..
_ save() should probably come out of image, ja?
+_ async requests
+_ Request r = createRequest("http://p5.org/feed/13134.jpg");
+_ Request r = createRequest("http://p5.org/feed/13134.jpg", "callbackName");
+_ Request r = createRequest("http://p5.org/feed/13134, "callbackName", "jpg");
+_ implement callbacks for images and other loadXxxx() functions
+_ remove requestImage() and friends
+_ callback for requestImage()
+_ http://code.google.com/p/processing/issues/detail?id=641
+_ remove/update requestImage example