Skip to content

Commit

Permalink
Merge pull request senchalabs#12 from Epskampie/patch-1
Browse files Browse the repository at this point in the history
Event 'pick' option should be 'picking'
  • Loading branch information
philogb committed May 14, 2012
2 parents 89d1247 + da52f82 commit b3e22bf
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docs/core.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ the WebGL application.
* centerOrigin - (*boolean*, optional) Whether to set the center (0, 0) coordinate to the center of the canvas or to the top-left corner. Default's `true`.
* disableContextMenu - (*boolean*, optional) Disable the context menu (generally shown when the canvas is right clicked). Default's `true`.
* bind - (*mixed*, optional) bind the *thisArg* in the callbacks to the specified object.
* pick - (*boolean*, optional) Whether to use picking. If true, the second parameter for the callback functions will be an [O3D](o3d.html) target for the event (or a falsy value otherwise). Default's false.
* picking - (*boolean*, optional) Whether to use picking. If true, the second parameter for the callback functions will be an [O3D](o3d.html) target for the event (or a falsy value otherwise). Default's false.
* onClick - (*function*, optional) Handles the onClick event.
* onRightClick - (*function*, optional) Handles the onRightClick event.
* onDragStart - (*function*, optional) Handles the onDragStart event.
Expand Down
4 changes: 2 additions & 2 deletions docs/event.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Creates a set of events for the given domElement that can be handled through a c

### Options:

* pick - (*boolean*, optional) Whether to use picking. If true, the second parameter for the callback functions will be an [O3D](o3d.html) target for the event (or a falsy value otherwise). Default's false.
* picking - (*boolean*, optional) Whether to use picking. If true, the second parameter for the callback functions will be an [O3D](o3d.html) target for the event (or a falsy value otherwise). Default's false.
* lazyPicking - (*boolean*, optional) When using lazy picking the framebuffer only stores a new image used for color picking when `scene.resetPicking();` is called. This is useful for when images of large resolution are being used and the scene is static most of the time (i.e. pickable objects don't change their shape/position too often). **Currently this only works for Chrome, Opera, Safari**. Default's false.
* cachePosition - (*boolean*, optional) Whether to cache the current position of the canvas or calculate it each time in the event loop. Default's `true`.
* cacheSize - (*boolean*, optional) Whether to cache the size of the canvas or calculate it each time in the event loop. Default's `true`.
Expand All @@ -52,7 +52,7 @@ Creates a set of events for the given domElement that can be handled through a c

You can also provide callback functions for the events you need to
handle. The first parameter of the callback is the event object
described [here](event.html#Event). If `pick` is set to `true` in the
described [here](event.html#Event). If `picking` is set to `true` in the
options, then the second parameter of the callback may be an
[O3D](o3d.html) that is the target of the mouse event. If no target
exists for the mouse event then a falsy value will be provided. The
Expand Down

0 comments on commit b3e22bf

Please sign in to comment.