Anthony J. Thibault
8792812884
Change raw for loop to Array.prototype.forEach instead
2016-06-20 13:26:41 -07:00
Anthony J. Thibault
359483d9ba
coding standard fix
2016-06-20 11:43:42 -07:00
Anthony J. Thibault
a14bbe4e68
Remove /* style multi-line comments
2016-06-20 11:40:59 -07:00
Anthony J. Thibault
35276c3893
Use Array.prototype.filter instead of my hand rolled filter function
2016-06-20 11:30:40 -07:00
Anthony J. Thibault
7ccbc9e6eb
Primary thumb press can be used to drop an equipped object
2016-06-20 11:22:56 -07:00
Anthony J. Thibault
14efd5dc12
Disable WANT_DEBUG_STATE
2016-06-20 10:44:09 -07:00
Anthony J. Thibault
1759132377
Use trigger to both grab and equip objects
...
* Removed entry into HOLD state via secondary aka grip buttons.
* Changed equip logic to prioritize equip over near over far grabs.
* Added drop gesture, upside down controller + slight shake + trigger press
* Bug fix for near grab snapping to an incorrect offset after a far grab (this bug is present in master)
2016-06-20 10:39:07 -07:00
Howard Stearns
faa2624ca7
Merge pull request #8081 from howard-stearns/continue-grabbing-through-overlays
...
Continue grabbing through overlays
2016-06-15 16:07:01 -07:00
howard-stearns
6f671b7cde
see comment.
2016-06-15 15:17:34 -07:00
howard-stearns
1e3b20b66d
Explicit check enumerated states instead of relying on order, per
...
feedback.
2016-06-15 15:06:36 -07:00
Howard Stearns
b9754c8564
continue grabbing through overlays
2016-06-14 20:17:52 -07:00
Anthony J. Thibault
071584597d
Merge branch 'vive-ui' into feature/grab-script-preliminaries
2016-06-14 15:33:38 -07:00
Anthony J. Thibault
67aac09033
Set state debug flag to false
2016-06-14 14:59:29 -07:00
Anthony J. Thibault
cb51d00c1d
Removed CONTINUE_FAR_TRIGGER and CONTINUE_NEAR_TRIGGER
2016-06-13 19:08:33 -07:00
Anthony J. Thibault
28b6cc2777
handControllerGrab.js is now eslint clean.
2016-06-13 18:54:21 -07:00
howard-stearns
526fc7d062
Make handControllerGrab independent of whether we're using laser or
...
Reticle.
2016-06-13 17:13:10 -07:00
Anthony J. Thibault
b01eb0439d
removed sticky thumb equip states.
...
* removed STATE_WAITING_FOR_EQUIP_THUMB_RELEASE and waitingForEquipThumbRelease
* removed STATE_EQUIP
* removed STATE_WAITING_FOR_RELEASE_THUMB_RELEASE and waitingForReleaseThumbRelease
* removed 'Hifi-Object-Manipulation' 'loaded' support and checkNewlyLoaded method.
2016-06-13 16:49:38 -07:00
Anthony J. Thibault
fe65df350b
Combined the release and off states.
2016-06-13 15:05:34 -07:00
Anthony J. Thibault
bd3326d2fc
Collapse continueNearGrabbing and nearGrabbing into a single state.
...
* Moved the update logic from STATE_NEAR_GRABBING, STATE_HOLD & STATE_EQUIP into the entryMethods
for those states.
* Removed STATE_CONTINUE_NEAR_GRABBING, STATE_CONTINUE_HOLD & STATE_CONTINUE_EQUIP states
This functionality has been moved into the updateMethod for their respective states.
This *should* be a pure re-factor no functionality was changed.
2016-06-13 14:40:30 -07:00
Anthony J. Thibault
6d2181f0f1
Combine DISTANCE_HOLDING and CONTINUE_DISTANCE_HOLDING states.
2016-06-13 14:40:30 -07:00
Howard Stearns
b0f6b59207
Merge pull request #8040 from hyperlogic/bug-fix/equip-hotspot-render
...
Only render equip-hotspots for objects with attach points.
2016-06-13 11:29:39 -07:00
Brad Davis
472a3540d7
Merge remote-tracking branch 'upstream/master' into vive-ui
...
Conflicts:
scripts/system/controllers/handControllerGrab.js
2016-06-10 10:43:09 -07:00
Anthony J. Thibault
42068cf2dd
Only render equip-hotspots for objects with attach points.
2016-06-08 15:01:53 -07:00
Anthony J. Thibault
b836a580ff
Updated some debug print information
2016-06-06 14:40:58 -07:00
Anthony J. Thibault
6d462a477d
Change equip-hotspot to a green sphere.
2016-06-06 14:40:57 -07:00
Anthony J. Thibault
c9f440a49d
handControllerGrab: initial rendering of equip hot-spots
...
* When trigger is depressed, any entities that are marked with a wearable equip-point
will become highlighted by a wireframe box (temporary art).
* The grab state machine is now defined by the CONTROLLER_STATE_MACHINE object.
this includes each state's name and updateMethod name.
* Support was added for entry and exit methods when changing states, this
functionality is used to draw and delete the hot spots when entering
and exiting the searching state.
2016-06-06 14:40:57 -07:00
SamGondelman
4fb8eac8ea
much better way of fixing script
2016-06-03 18:12:47 -07:00
SamGondelman
2367cb1995
fixing input mapping for vive/touch grip button/trigger, script needs fixing
2016-06-03 15:07:21 -07:00
howard-stearns
9ad19a2eaf
Draw grab balls in front of entities (not just the lines as before).
...
Don't intersect with grab balls (not just lasers as before).
Don't run grab lasers through (2d or 3d) overlays.
Don't try to manage reticle in handControllerGrab because other scripts
do.
2016-05-31 14:57:31 -07:00
Seth Alves
a24d63a39c
make distance-grab work better when avatar is walking
2016-05-20 15:45:00 -07:00
Seth Alves
009c288745
revert a change from previous fixes -- non-dynamic things should have to opt-into being grabbable. dynamic things have to opt-out
2016-05-12 13:29:40 -07:00
Seth Alves
9db839bc13
don't allow someone else to delete an action that I own. reset dynamic property when releasing and entity, even if refCount isn't 0
2016-05-04 15:01:00 -07:00
Seth Alves
44beca1687
try having all spring derived actions agree on a target
2016-05-04 11:29:17 -07:00
Seth Alves
ec554c3c0b
Merge branch 'master' of github.com:highfidelity/hifi into grab-fixes
2016-05-01 17:28:20 -07:00
James B. Pollack
06171f6063
move default to system
2016-04-26 14:47:02 -07:00
