Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-05 14:38:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
57423 commits 69 branches 57 tags 1.2 GiB
Commit graph

789 commits

Author SHA1 Message Date
Anthony J. Thibault
270adfe692 removed debug prints 2016-11-17 11:40:05 -08:00
Anthony J. Thibault
38ac6fff03 Hand Controller rendering is camera relative 
Basically, when using the third person camera in HMD mode.  If the controllers are shown.
They should be shown in front of the users camera, not in front of the users avatar.

To accomplish this, two new faux joint indices are introduced.
CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX and CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX.

These joint indices can be used for Overlay parenting. (But not for entity parenting because they are not transmitted over the network).
They can also be queried for by using the MyAvatar.getAbsoluteJointRotationInObjectFrame() call.

These new indices are now used by the controllerDisplay.js for the hand controller rendering.
They are also used by system/libraries/controllers.js as the origin for hand controller grabbing and interaction lasers.
 2016-11-17 11:33:12 -08:00
Andrew Meadows
6bb3dd6830 Merge hifi/master into hifi/out-of-body-experience 2016-11-14 15:08:04 -08:00
Philip Rosedale
981f505a9c Merge branch 'master' of git://github.com/highfidelity/hifi into drifting 2016-11-14 14:26:45 -08:00
howard-stearns
e2fded846f make hand-controller ui work in third person 2016-11-11 11:10:42 -08:00
Philip Rosedale
c0b1392685 Merge branch 'master' of git://github.com/highfidelity/hifi into drifting 2016-11-10 13:41:13 -08:00
Dante Ruiz
e22c36b4b7 fixed menu pop up delay 2016-11-07 17:16:24 +00:00
Andrew Meadows
ccdf383151 Merge hifi/master into hifi/out-of-body-experience 2016-11-07 08:24:26 -08:00
Dante Ruiz
1a83cc2c3e fixed deleted comment 2016-11-02 00:12:23 +01:00
Dante Ruiz
d29b1c34b1 fixed coding standard conflicts 2016-11-02 00:07:58 +01:00
Dante Ruiz
e9d10b609d removed bad commit 2016-11-02 00:05:38 +01:00
Dante Ruiz
86abd9120e Fixed menu out of view with HMD and Xbox controller 2016-11-01 14:30:48 -07:00
Ryan Huffman
d933155c71 Fix trigger highlight configuration 2016-10-27 20:16:34 -07:00
Ryan Huffman
69e7dababc Collapse multiline dict to one line in controllerDisplay 2016-10-27 15:16:38 -07:00
Ryan Huffman
c0e372c380 Remove annotation API from controller display 2016-10-27 14:58:20 -07:00
Ryan Huffman
1f25ba8f1f Update controller tips and trigger highlight in tutorial 2016-10-27 14:58:20 -07:00
Ryan Huffman
e9099b77a5 Add more debug to tutorial, new firecrackers, and adjust fuse 2016-10-27 14:58:20 -07:00
Andrew Meadows
38e4ac0ae9 Merge master into out-of-body-experience 2016-10-26 16:59:31 -07:00
Ryan Downe Karpf
7a4302057a Merge pull request #8900 from huffman/fix/disable-controller-hide-on-equip 
Update vive controller display to not hide on equip
 2016-10-25 13:16:31 -07:00
Ryan Huffman
af749605ea Update vive controller display to not hide on equip 2016-10-25 08:27:20 -07:00
Brad Hefta-Gaub
ed4279783d CR feedback 2016-10-24 20:38:49 -07:00
Brad Hefta-Gaub
76ca3aa546 fix residual head laser 2016-10-24 15:25:06 -07:00
Brad Hefta-Gaub
779f326452 cleanup 2016-10-24 15:03:41 -07:00
Brad Hefta-Gaub
a25d50387e gak 2016-10-24 14:47:10 -07:00
Andrew Meadows
ccc6f8eee2 fix teleport.js to work for out-of-body 2016-10-24 08:36:51 -07:00
Andrew Meadows
51a9a99381 Merge hifi/master into hifi/out-of-body-experience 2016-10-24 08:13:42 -07:00
Brad Hefta-Gaub
0f8967970a Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers 2016-10-24 08:11:31 -07:00
Brad Hefta-Gaub
a282d83546 more work on extra lasers 2016-10-24 07:46:04 -07:00
Anthony J. Thibault
ae301602e7 Fix for incorrect tip texture URLs. 2016-10-21 14:49:46 -07:00
Anthony J. Thibault
60f728585a away.js now shows hand controllers in away mode. 
* controllerDisplayManager is now part of default scripts.
* Also tutorial and away.js communicate with controllerDisplayManager via HMD.requestShowHandControllers, HMD.requestHideHandControllers
  and sendLocalMessage.
* removed previous version of controllerDisplayManger from tutorial.
 2016-10-21 10:40:39 -07:00
Anthony J. Thibault
2193c5faad Integrated controller display from tutorial scripts + assets 2016-10-20 18:24:58 -07:00
Brad Hefta-Gaub
1a28732b64 Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers 
Conflicts:
	libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
	libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
 2016-10-20 09:38:03 -07:00
Brad Hefta-Gaub
9008de72e0 Merge pull request #8864 from hyperlogic/feature/grab-sphere-adjustments 
Adjustment to position and visibility of grab sphere.
 2016-10-19 21:51:02 -07:00
Anthony J. Thibault
55c062098a Adjustment to position and visibility of grab sphere. 
* The grab sphere used to detect near grabbing is now 10cm in radius instead of 4cm.
* The visual representation of this grab sphere is always hidden, by default.
* This representation can be enabled in via the "Developer > Show Grab Sphere" menu item.
 2016-10-19 17:33:05 -07:00
Anthony J. Thibault
bcd31e3d99 Adjust size and offset of grab balls to better align with hand controllers. 
(cherry picked from commit d97a8c2e7eace2494d3142e8187022a33aedc060)
 2016-10-19 15:59:26 -07:00
Seth Alves
7e4964db3e Merge pull request #8684 from Menithal/controller-grab-unequip 
Fixed HandcontrollerGrab distance unequip
 2016-10-19 09:53:04 -07:00
Brad Hefta-Gaub
c082c74cc0 use head pose for controller in case there are no hand controllers available 2016-10-18 10:01:00 -07:00
Ryan Huffman
5f5dedaa40 Fix equip sphere not showing up 2016-10-17 10:53:02 -07:00
howard-stearns
140caf84d8 never interact with hud elements while holding something 2016-10-14 18:30:52 -07:00
Howard Stearns
fc8bbde60a Merge pull request #8810 from ZappoMan/handControlsWhileLoading 
make laser pointers work even while content is loading
 2016-10-14 10:01:46 -07:00
Brad Hefta-Gaub
ef3c9ba78a better handling of the teleport target overlays to prevent flashing and thrashing 2016-10-13 18:24:38 -07:00
Brad Hefta-Gaub
ddce0ef74a make laser pointers work even while content is loading 2016-10-13 17:50:20 -07:00
Anthony J. Thibault
81db8f7e08 Merge branch 'master' into out-of-body-experience 2016-10-13 17:27:15 -07:00
Andrew Meadows
d54c07ed14 Merge 'master' into 'out-of-body-experience' 2016-10-12 13:35:27 -07:00
howard-stearns
0099a4e549 allow hand controller operations when Interface doesn't have focus, but 
ONLY when in hmd.
 2016-10-12 11:23:06 -07:00
Seth Alves
16af14d1f6 Merge pull request #8758 from hyperlogic/bug-fix/allow-ignoreik-false 
allow equipped object to follow hand and not controller
 2016-10-12 09:52:57 -07:00
Brad Hefta-Gaub
e1a3bc7d55 hide/show grab point sphere only when in a grabbable entity 2016-10-11 16:22:42 -07:00
Brad Hefta-Gaub
93d9cf7917 adjust grab indicators 2016-10-11 12:42:26 -07:00
Brad Hefta-Gaub
4ec9299930 fix reticle depth when not moving mouse, but moving head relative to HUD 2016-10-08 14:31:30 -07:00
Menithal
4bed3ee036 Adjusted theoretical Unequip time to 250 ms 2016-10-08 01:36:57 +03:00
Andrew Meadows
55c90e7bca Merge branch 'master' into out-of-body-experience 2016-10-07 15:18:08 -07:00
Anthony J. Thibault
7c7a9055d1 Allow grabbed objects to override the ignoreIK = true default. 
They can do this by adding the following to their userData.

    grabbableKey: {
        ignoreIK: false
    }

When this is present and false, the object will follow the hand joint, otherwise it will follow the hand controller.
 2016-10-07 14:50:00 -07:00
Anthony J. Thibault
0c2ebc27cb Fix for exception in handControllerGrab.js 
Specifically this:
    [UncaughtException] TypeError: Result of expression 'this.handToController' [undefined] is not a function. in file:///C:/msys64/home/anthony/code/hifi/build/interface/Release/scripts/defaultScripts.js:1388
 2016-10-07 14:48:55 -07:00
Ryan Huffman
a5e3fa45c3 Fix advanced movement being disabled 2016-10-07 10:30:18 -07:00
Ryan Huffman
c74df965ba Fix misnamed function and duplicate onFinish in tutorial 2016-10-07 10:30:18 -07:00
Ryan Huffman
fec8049226 Add proper disabling to advanced movement script 2016-10-07 10:30:18 -07:00
Ryan Huffman
827506e929 Disable 180 spin in tutorial 2016-10-07 10:30:18 -07:00
Ryan Huffman
a4ffa7b23f Add disabling of right click menu with vive 2016-10-07 10:30:18 -07:00
Ryan Huffman
14323a06b3 Add interface to disable hand controller grab functionality 2016-10-07 10:30:18 -07:00
Ryan Downe Karpf
ed2571704f Merge pull request #8735 from huffman/feat/teleport-improvements 
Update teleport.js to ignore invisible or collisionless objects and disallow teleporting to  certain surfaces
 2016-10-07 09:56:30 -07:00
Ryan Huffman
d50689b795 Remove disabling of teleport in hand grab 2016-10-04 20:25:46 -07:00
Ryan Huffman
d0ba53a069 Change name of isTooCloseToTeleport to be more descriptive 2016-10-04 20:22:22 -07:00
Ryan Huffman
1e6aba1928 Fix teleport not removing overlay on teleport 2016-10-04 20:21:32 -07:00
Ryan Huffman
2ef7c9a57a Disable smooth movement in teleport.js 2016-10-04 20:21:32 -07:00
Ryan Huffman
53623f7583 Make teleport.js normal rejection more lenient 2016-10-04 20:21:30 -07:00
Ryan Huffman
813ed59f00 Update teleport to not collide with non collidable entities 2016-10-04 20:19:54 -07:00
Ryan Huffman
75265cff6e Update teleport to not let you teleport into walls 2016-10-04 20:19:54 -07:00
Ryan Huffman
b0c7e91737 Disable ray picking against invisible objects in far grab and teleport 2016-10-04 20:19:51 -07:00
Ryan Huffman
17c63eb722 Add the ability to ignore invisible entities in findRayIntersection 2016-10-04 20:19:32 -07:00
Ryan Huffman
8343cfd687 Add grip to unequip 2016-10-04 16:34:18 -07:00
Ryan Huffman
289cd6ba2b Adjust hand controller unequip rotation threshold 2016-10-04 16:34:18 -07:00
Menithal
a6040197eb Fixed HandcontrollerGrab unequip. 
Will now use deltaTime and a second instead of instantly disconnecting on
if more than 0.1 off. This is to avoid accidental disconnection due to
acceleration and latency
 2016-09-29 22:24:07 +03:00
Anthony J. Thibault
98ffea2fb9 Merge branch 'master' into out-of-body-experience 2016-09-22 18:08:23 -07:00
Brad Hefta-Gaub
2b01c60a55 Merge pull request #8615 from davidkelly/dk/1264 
Make the equip sphere emissive
 2016-09-19 16:33:55 -07:00
Anthony J. Thibault
aefe224215 Fix for jittery far-grab at low update rates 
Clamp the blendFactor used to smooth out the motion of the far-grabbed object.
This prevents the newTargetPosition from over shooting it's goal.
 2016-09-19 10:51:46 -07:00
David Kelly
22d80914e2 whitespace 2016-09-16 14:17:44 -07:00
David Kelly
ade17e6456 PR feedback 2016-09-16 14:15:14 -07:00
David Kelly
2ddd46f30b Switch to the cool looking model instead 2016-09-16 10:56:59 -07:00
David Kelly
1acfe017e1 Make the equip sphere emissive 
maybe this will make it visible in low ambient light situations?
 2016-09-15 17:12:35 -07:00
Seth Alves
e5e9bb0052 Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments 2016-09-14 11:28:10 -07:00
Andrew Meadows
09c4720665 fix typo in teleport.js 2016-09-12 16:35:52 -07:00
Andrew Meadows
9728cf6904 fix typos in teleport.js 2016-09-12 16:24:08 -07:00
Andrew Meadows
0d300c3a47 teleport.js drags avatar along 2016-09-12 16:24:08 -07:00
Anthony J. Thibault
86351ca21c Teleport bugs 
* made HMD.setPosition thread safe
* changed script to use HMD.position = foo;
 2016-09-09 17:32:02 -07:00
Andrew Meadows
82522fbbb1 fix C++ism typo in JS script 2016-09-09 16:40:07 -07:00
Andrew Meadows
6b9cdb440b update teleport.js to teleport HMD before avatar 
(in theory, not tested)
 2016-09-09 16:33:13 -07:00
Seth Alves
ecb0669972 try to keep far grab from getting stuck if the entity is brought very near to the grab-point 2016-09-08 17:02:29 -07:00
Seth Alves
0f98c51d89 distance-grabbed things collide with static entities 2016-09-08 16:13:22 -07:00
Seth Alves
9c96ffc9cb don't show grab-point spheres if controller poses aren't valid 2016-09-07 16:31:02 -07:00
Seth Alves
746d0cd91c get various hand lasers to all line up with grab-point sphere 2016-09-07 16:10:37 -07:00
Seth Alves
b45181ea92 don't back up pick-ray from hand 2016-09-07 13:32:26 -07:00
Anthony J. Thibault
dc0d0c2d5c Merge branch 'master' into feature/tablet-ui-foundation 2016-09-07 09:49:55 -07:00
Seth Alves
616b094111 experimenting with position of grab sphere 2016-09-06 16:16:09 -07:00
Seth Alves
34e4b4ae19 move haptic-pulse for when grab-point enters a grabbable entity to the right section of code 2016-09-06 15:37:37 -07:00
Seth Alves
215fd4ddfd fix grab-point sphere for right hand 2016-09-06 15:15:46 -07:00
Seth Alves
43c98b3f1e attempt to avoid a very-still far-grab leaving something non-dynamic in bullet upon release. adjust position of grab-point sphere 2016-09-06 14:42:53 -07:00
Seth Alves
b8b1127d55 merge from upstream 2016-09-02 15:11:21 -07:00
Anthony J. Thibault
0128d7c61b Merge branch 'master' into feature/tablet-ui-foundation 2016-09-02 12:16:25 -07:00
Anthony J. Thibault
3d5e8fc213 First pass of keyboard raising and lowering 2016-09-02 12:15:30 -07:00
Brad Hefta-Gaub
cf242eca9f Merge pull request #8537 from hyperlogic/feature/larger-marketplace-tablet 
Marketplace tablet is a bit larger and lower DPI.
 2016-09-02 08:45:29 -07:00
Seth Alves
9ef03b1205 avoid having auto-unequip code trigger during a teleport 2016-09-01 19:13:08 -07:00
Seth Alves
8505d1eeed avoid a bootstrap 2016-09-01 17:51:02 -07:00
Seth Alves
da35281941 don't assume collides-with-dynamic during a multi-grab 2016-09-01 16:57:23 -07:00
Seth Alves
b1eb4c361d if a hand is disabled while holding something, release it 2016-09-01 15:02:41 -07:00
Seth Alves
dd7e25441c include which hand in grab messages 2016-09-01 14:58:37 -07:00
Seth Alves
045042a9c6 don't disable grabbing when teleporting 2016-09-01 14:15:49 -07:00
Seth Alves
a35e527128 try to fix far-trigger 2016-09-01 11:46:08 -07:00
Seth Alves
53ba190ca6 don't do auto-release test unless the hand is equipping 2016-09-01 09:57:46 -07:00
Anthony J. Thibault
823420ae0a Working web entity keyboard 
* Missing many keys
* Does not dynamically appear and disappear
 2016-08-31 17:57:13 -07:00
Seth Alves
47259ee053 find equip-points with controller position rather than hand 2016-08-31 16:52:46 -07:00
Seth Alves
78f54a7f33 get rid of some jitter in equipped items. do a better job of deciding when something equipped has been torn-away 2016-08-30 14:39:11 -07:00
Seth Alves
617880479a Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-08-30 11:19:40 -07:00
Seth Alves
3a5f92d7a2 ignoreIK for equipping. change how auto-unequip searches 2016-08-30 11:16:13 -07:00
Brad Davis
eb0a8db0af Merge pull request #8539 from hyperlogic/bug-fix/snappy-search-beam 
When trigger is pulled, snap search beam to correct length instead of animating
 2016-08-30 11:13:58 -07:00
Seth Alves
f4eee8d480 Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers 2016-08-30 09:12:53 -07:00
Anthony J. Thibault
e34aecde49 Bug fix for click events received by entity scripts 
PointerEvent.isLeftButton should be true even on left button release events.
in a previous PR this behavior was changed. isLeftButton was used as a flag indicating the button state, which would be false on left button release events.
Because we have scripts that rely on the old behavior, I've changed it back to the original and introduced isPrimaryHeld properties instead.
 2016-08-29 16:21:39 -07:00
Anthony J. Thibault
3ed11d2e5f When trigger is pulled, snap search beam to correct length instead of animating. 
This improves interaction on web browser tablets. Instead of the beam shooting
through the tablet and animating back to the surface, it starts at the correct length.
 2016-08-29 13:22:57 -07:00
Anthony J. Thibault
dcd91d4398 removed debug flag 2016-08-29 12:04:48 -07:00
Anthony J. Thibault
0f42943bfb Marketplace tablet is a bit larger and lower DPI. 
Bug fix for grabbing/equipping large objects, they no longer will drop immediately
if your grab point is too far away from the grabbed entity position.
 2016-08-29 11:55:04 -07:00
Seth Alves
be1332532f disable debugging prints 2016-08-29 03:39:52 -07:00
Seth Alves
5daf334a0e avoid extra grab-point spheres when resetting scripts 2016-08-27 20:42:03 -07:00
Seth Alves
d69e712bef keep near-grab radius small but still allow large equip hotspots 2016-08-27 20:23:19 -07:00
Seth Alves
2a5d686a76 don't show grab-point sphere when near grabbing or equipping 2016-08-27 20:11:16 -07:00
Seth Alves
3355097bd0 handle another type of abandoned grab 2016-08-27 19:46:15 -07:00
Seth Alves
7dad303ce7 don't leave stray blue search sphere when near-grabbing 2016-08-27 19:25:05 -07:00
Seth Alves
765cd72e0e fix code that prints relative offsets of an equipped entity after it's been adjusted by the other hand 2016-08-27 19:13:32 -07:00
Seth Alves
cfca32e0b4 fix code that notices and fixes an abandoned grab 2016-08-27 16:00:27 -07:00
Seth Alves
e4b2b7158f hotspots with large radius work correctly, again 2016-08-27 09:30:26 -07:00
Seth Alves
acb04a0bc9 don't add children of controller joints until we know our avatar ID 2016-08-25 19:09:10 -07:00
Seth Alves
7c5b8cb75d send faux joints to the avatar-mixer 2016-08-25 15:21:29 -07:00
Seth Alves
948b4b7a15 in search, consider distance from grab-point rather than from avatar-hand when selecting the closest entity 2016-08-25 13:46:52 -07:00
Seth Alves
0783629cde grab-point sphere is a child of controller joint, so it doesn't jitter 2016-08-25 13:31:07 -07:00
Seth Alves
cab30651d0 cleanups 2016-08-25 09:47:14 -07:00
Andrew Meadows
fefe5e30ec don't use globals and remove double definitions 2016-08-25 08:57:06 -07:00
Andrew Meadows
6f6a7bcc44 wrap default scripts with local scope 2016-08-25 08:57:06 -07:00
Anthony J. Thibault
c2af948e25 Merge branch 'master' into feature/handheld-marketplace 2016-08-24 16:07:04 -07:00
Seth Alves
18852137b5 cleanups, avoid pop when grabbing 2016-08-23 17:06:53 -07:00
Seth Alves
dbe65df90b merge from upstream 2016-08-23 16:42:02 -07:00
James B. Pollack
fb6fa687e8 in the right place... thanks howard! 2016-08-23 12:07:59 -07:00
James B. Pollack
fcf459645d center after teleport 2016-08-23 12:02:57 -07:00
Anthony J. Thibault
b2dff8aa77 Easier to click buttons on web entities with shaky hand controllers 
There is an angular and time dead spot on webEntity for scrolling vs clicking.
Currently, it's 150 ms and 3 degrees.  See POINTER_PRESS_TO_MOVE_DELAY and POINTER_PRESS_TO_MOVE_DEADSPOT_ANGLE

* Fix for warnings when clicking on window.open() links in WebEntity
 2016-08-23 10:19:49 -07:00
Brad Hefta-Gaub
21bc06f154 Merge pull request #8335 from hyperlogic/feature/hand-controller-web-entity-integration 
handControllerGrab and web entity input integration
 2016-08-23 09:59:25 -07:00
Seth Alves
6c80a35c4b Merge pull request #8477 from sethalves/fix-grab-ignore-ik-1 
ignoreIK flag on action-grabbable objects works again
 2016-08-22 18:48:39 -07:00
Anthony J. Thibault
d015c5cfb5 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-22 14:13:17 -07:00
Anthony J. Thibault
ff4c194756 eslint fix 2016-08-19 15:31:57 -07:00
James B. Pollack
2b1e629cca some extra checks on settings values 2016-08-19 14:51:15 -07:00
James B. Pollack
3922192cfc update 2016-08-19 14:31:47 -07:00
James B. Pollack
653b1acc4a cleanup 2016-08-19 14:29:14 -07:00
Seth Alves
ff95ef2492 ignoreIK flag on action-grabbable objects works again 2016-08-19 08:59:42 -07:00
Anthony J. Thibault
4db1687746 bug fix for when web-entity is deleted while being scrolled 2016-08-18 18:37:52 -07:00
James B. Pollack
b694b8e541 update turn rate for left stick 2016-08-18 17:24:18 -07:00
James B. Pollack
855561c014 moar 2016-08-18 16:52:32 -07:00
James B. Pollack
a0d4fd4c0e fix bug 2016-08-18 16:51:04 -07:00
James B. Pollack
214a705199 slow 180 rate 2016-08-18 16:50:50 -07:00
James B. Pollack
3a8de5ab0d fix rotation function 2016-08-18 15:58:12 -07:00
James B. Pollack
bae51bcfd4 remove prints 2016-08-18 15:29:49 -07:00
James B. Pollack
859d3ccadc tweaks 2016-08-18 14:36:52 -07:00
James B. Pollack
2e22bc5e46 new coolin 2016-08-18 14:08:31 -07:00
James B. Pollack
992504e179 adjust coolin 2016-08-18 13:35:51 -07:00
James B. Pollack
b8213aed7b naming and some logging for teleport stuff 2016-08-18 11:59:58 -07:00
James B. Pollack
37846d9f0c store settings 2016-08-18 11:07:50 -07:00
James B. Pollack
1eaac8605f invert the structure and make it work with oculus 2016-08-18 10:43:37 -07:00
James B. Pollack
09cd0b8f4a debug prints 2 2016-08-18 09:24:01 -07:00
James B. Pollack
7768e65e8b update name 2016-08-18 09:22:43 -07:00
James B. Pollack
9e14191217 recondition 2016-08-18 08:57:37 -07:00
James B. Pollack
cfbc589829 debug prints 2016-08-18 08:43:26 -07:00
James B. Pollack
8ede4ddb66 longform 2016-08-17 17:33:24 -07:00
James B. Pollack
e69c89a93e y 2016-08-17 17:00:17 -07:00
James B. Pollack
fdfcc235b6 as functions 2016-08-17 16:24:59 -07:00
James B. Pollack
514d6ec139 get lsy lsx rsy values 2016-08-17 16:22:44 -07:00
James B. Pollack
fc65d246ee update whens 2016-08-17 16:13:23 -07:00
James B. Pollack
a4a41faf24 demo and only do for vive 2016-08-17 16:12:07 -07:00
James B. Pollack
82a8887275 add whens 2016-08-17 15:50:19 -07:00
James B. Pollack
a7ba4ce1f9 jumping 2016-08-17 15:11:07 -07:00
James B. Pollack
8bc6ca2fa1 demo changes 2016-08-17 15:08:43 -07:00
Anthony J. Thibault
7b248b440a Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-17 13:55:12 -07:00
Anthony J. Thibault
7de8cc6422 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-16 16:49:57 -07:00
Seth Alves
7bc1235c54 local velocity and angular velocity in scripts is now handled the way local position and rotation are 2016-08-16 16:47:13 -07:00
Anthony J. Thibault
36d87ddd7c Added EntityItem::wantsHandControllerPointerEvents method 2016-08-16 16:23:45 -07:00
Anthony J. Thibault
a595a72d0a handControllerGrab now calls Entities.sendHoverLeaveEntity() 2016-08-16 15:39:02 -07:00
Anthony J. Thibault
c407818d63 send pointer events from handControllerGrab.js to webEntities 2016-08-16 15:26:14 -07:00
Seth Alves
c85e8d0580 don't show equip sphere until hand is in position to equip. widen unequip/drop cone 2016-08-16 11:18:12 -07:00
Anthony J. Thibault
1ddbd7022a Moved keyboardFocus, mouse/touch event methods from Reticle to Entities 2016-08-11 11:52:04 -07:00
Anthony J. Thibault
8dac45c99e Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-10 11:27:21 -07:00
SamGondelman
2360e90d39 simplify valid check for rotation 2016-08-09 15:48:31 -07:00
SamGondelman
956078bc91 teleport works with xbox controller 2016-08-09 15:17:36 -07:00
Brad Hefta-Gaub
b903c974bc Merge pull request #8371 from imgntn/teleport_cancel 
Cancel mode for teleporting
 2016-08-08 13:04:27 -07:00
James B. Pollack
58ccc9581a cleanup 2016-08-08 12:20:48 -07:00
Seth Alves
090a0a6e9a only use hand-sphere vs equipped-item bounding box when deciding to auto-unequip 2016-08-05 18:01:48 -07:00
Seth Alves
e59c010642 speling 2016-08-05 15:39:20 -07:00
Seth Alves
dc22b579f7 adjust code that auto-unequips items when they are pulled too far from the equipping hand 2016-08-05 15:28:37 -07:00
Anthony J. Thibault
0ba34c5635 Remove input restrictions on grabbable web entities. 
You no longer have to be grabbing a grabbable web entity to interact with it.
 2016-08-05 15:25:54 -07:00
Anthony J. Thibault
1dd276c1a5 Improved support for button rollover and hover 
Send a combination of mouse and touch events to the web browser entity.

* MouseMove events for when the trigger is not depressed.  This will trigger mouse over and hover events within the browser
* Touch Begin, End, Update events when the trigger is squeezed.  This will give us the iPad like scrolling behavior.
 2016-08-05 11:32:50 -07:00
Anthony J. Thibault
90a06f0d40 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-05 11:05:10 -07:00
James B. Pollack
80da690680 incease distance a bit 2016-08-05 00:04:30 -07:00
James B. Pollack
7d37f86337 different swapping method 2016-08-04 23:45:43 -07:00
James B. Pollack
80b6ca2b86 single call to istooclose 2016-08-04 16:47:10 -07:00
James B. Pollack
fb8263a882 cleanup 2016-08-04 16:35:50 -07:00
James B. Pollack
63aa0f8c3f remove weird n 2016-08-04 16:18:13 -07:00
James B. Pollack
f93ed56124 cleaner code 2016-08-04 16:17:21 -07:00
James B. Pollack
c0cfee371e cancel mode for teleporting 2016-08-04 16:08:51 -07:00
Chris Collins
be87f294d8 Merge pull request #8351 from thoys/fix-handcontrollergrab-grab-message 
fix remote triggering handControllerGrab
 2016-08-04 11:55:48 -07:00
James B. Pollack
5ad5899140 revert pointer changes 2016-08-02 21:26:48 -07:00
James B. Pollack
fed39d9056 cleanup dead code 2016-08-02 21:26:04 -07:00
James B. Pollack
9d56c697e7 no delay! 2016-08-02 19:02:20 -07:00
James B. Pollack
364eb992fb no teleport while moving 2016-08-02 18:53:36 -07:00
James B. Pollack
88ebeaa4cb start no movement mode. using actual keys since avatar speed doesnt work with gtting stuck 2016-08-02 18:46:47 -07:00
Philip Rosedale
53ef9fa5a8 test commit 2016-08-02 16:05:46 -07:00
Thijs Wenker
3a2b0ffa08 Fixes the handControllerGrab Hifi-Hand-Grab message. Was broken since the hotspot changes to handControllerGrab.js. 2016-08-03 00:47:28 +02:00
James B. Pollack
8541d4bd41 small change to protect 2016-08-02 15:41:28 -07:00
James B. Pollack
d00c1f62fc fixes 2016-08-02 15:40:19 -07:00
Anthony J. Thibault
6d768d8327 hand controllers send touch events instead of mouse events to web entities 
This gives a much better experience when scrolling web content.
 2016-08-02 15:23:46 -07:00
James B. Pollack
f6984aaff8 clear timeout one more place 2016-08-02 14:42:21 -07:00
James B. Pollack
41aa485f11 one hand teleprt 2016-08-02 12:52:35 -07:00
James B. Pollack
7fae7e9c77 cleanup 2016-08-02 12:26:37 -07:00
James B. Pollack
108e7a2fc1 Merge remote-tracking branch 'upstream/master' into tweak_lazers 2016-08-02 12:25:27 -07:00
James B. Pollack
a7b8f2c9df updates 2016-08-02 12:25:24 -07:00
Anthony Thibault
cf7450beb7 handControllerGrab and web entity input integration 2016-07-29 17:50:45 -07:00
Eric Levin
5167809342 release near and far grab at trigger click detent 2016-07-28 08:51:11 -07:00
Eric Levin
f37570dc9a only pulse on release when held 2016-07-28 08:23:45 -07:00
Eric Levin
0f7f9990c2 Tuned haptic pulses for grab, release, equip, de-quip 2016-07-27 17:58:24 -07:00
James B. Pollack
6a72fe7df4 cleanup 2016-07-25 16:58:59 -07:00
James B. Pollack
5ed1e602e6 Merge pull request #8316 from AlexanderOtavka/fix-script-end-errors 
Fix script end errors
 2016-07-25 16:50:05 -07:00
James B. Pollack
05e3a8613a colors back to blue and red 2016-07-25 16:28:47 -07:00
James B. Pollack
9240672c9d change distance hold origin 2016-07-25 13:06:09 -07:00
Brad Hefta-Gaub
1802f8e7a2 Merge pull request #8298 from imgntn/lazzzers 
Update hand controller laser colors
 2016-07-23 13:50:38 -07:00
James B. Pollack
c04a41c3cb fix invisible characters from slack copying 2016-07-22 16:51:42 -07:00
Chris Collins
e755528cf2 Merge pull request #8278 from sethalves/fix-equip-fly-away 
fix equip fly-away
 2016-07-22 16:47:31 -07:00
Zander Otavka
2cd97bfe78 Fix squeezeHands.js error on script end 2016-07-22 15:55:42 -07:00
James B. Pollack
3607a34f55 tweak telecolors 2016-07-22 13:25:33 -07:00
James B. Pollack
e81f65d992 colors 2016-07-22 10:54:57 -07:00
James B. Pollack
54109c6c6f remove all the old visualization methods 2016-07-22 09:39:38 -07:00
James B. Pollack
1d3dc7b195 remove particle beam and lights 2016-07-22 09:19:13 -07:00
Thijs Wenker
be0ccad0d3 Merge branch 'fix-duplicate-teleport-target-overlays' of github.com:thoys/hifi into fix-duplicate-teleport-target-overlays 2016-07-20 03:12:26 +02:00
Thijs Wenker
b3b1bf7884 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-duplicate-teleport-target-overlays 2016-07-20 03:12:02 +02:00
Thijs Wenker
2adff24a05 silly workaround- workaround 2016-07-19 21:34:42 +02:00
Seth Alves
be001a652f when doing a parenting grab, zero velocity 2016-07-19 11:50:53 -07:00
Brad Hefta-Gaub
866ba2f185 Merge pull request #8273 from hyperlogic/bug-fix/far-grab-zoom 
far-grabbed objects no longer fly away when the avatar body shifts
 2016-07-19 10:40:48 -07:00
Anthony J. Thibault
212175bdaa bug fix for far-grab pulling the object in the wrong direction 2016-07-19 10:23:00 -07:00
Thijs Wenker
11b461a730 Fixes duplicate target overlays for teleporter, make sure to delete overlay before creating one 2016-07-19 01:46:29 +02:00
Anthony J. Thibault
69500643f3 bugfix for saving attach points 
The feature to add transition from equip -> near-grab, in inadvertently broke attach point saving.
 2016-07-18 14:17:32 -07:00
Anthony J. Thibault
659e1ff984 remove debug prints 2016-07-18 14:17:06 -07:00
Anthony J. Thibault
959a2f9915 far-grabbed objects no longer fly away when the avatar body shifts 
Before this fix, a hand vector was being tracked that was the difference between the avatar's hand in avatar space with the avatar's hand
in avatar space the previous frame.  This hand vector was used to move the grabbed object position.  However, when the body shifts, objects
in the avatar's space will change rapidly, this would cause this hand vector to be incorrect and cause the object to shoot off in the distance.

Now, we track this hand delta in sensor a.k.a. room space.  This is immune to the shifts caused by body shifting.
 2016-07-18 13:10:16 -07:00
Anthony J. Thibault
5a01bf406e remove obsolete handControllerMouse.js to avoid confusion 2016-07-18 11:29:41 -07:00
Anthony Thibault
c7c8046231 De-equip goes into a near grab instead of dropping the object. 2016-07-16 14:58:21 -07:00
Anthony Thibault
4b2fb546eb Re-enable storing of attach points in user settings 
* bug fix, use localOffset property of grabbed entity, which is dynamically updated as
  the near grab action moves the entity.
 2016-07-16 12:21:08 -07:00
Philip Rosedale
4925980cbb Merge pull request #8255 from jherico/search_circle 
Make search line termination a circle, like 2D UI
 2016-07-15 17:51:50 -07:00
Brad Davis
1145c3b590 Smaller and hotter circle, per Philip 2016-07-15 17:45:16 -07:00
Seth Alves
a0e6654ac6 Merge pull request #8247 from hyperlogic/feature/grab-script-polish-part-deux 
Grab Script Polish (part deux)
 2016-07-15 17:34:50 -07:00
Brad Davis
317dee1b23 Fix decoration inflation 2016-07-15 16:15:53 -07:00
Anthony Thibault
e4794450c2 Disable attach point saving 2016-07-15 15:36:20 -07:00
Brad Davis
0d811c489a Removing debug logging 2016-07-15 14:05:16 -07:00
Brad Davis
c462b8c387 Make search line termination a circle, like 2D UI 2016-07-15 13:51:14 -07:00
Brad Hefta-Gaub
7bb31fe075 Merge pull request #8240 from jherico/hand_controller 
Menu & hand controller polish
 2016-07-15 12:36:31 -07:00
Anthony J. Thibault
37d60c6c85 eslint clean 2016-07-14 15:58:13 -07:00
Anthony J. Thibault
31f1d69c43 Merge branch 'master' into feature/grab-script-polish-part-deux 2016-07-14 15:57:41 -07:00
Brad Hefta-Gaub
45aa78702c Merge pull request #8217 from sethalves/fix-throwing 
fix throwing
 2016-07-14 15:52:41 -07:00
Anthony J. Thibault
6094fb3de3 Remember object attach point offsets in user settings 2016-07-14 15:51:05 -07:00
Brad Davis
8685b23610 When using the hand controller as a mouse, disable the navigation focus state in QML 2016-07-14 12:11:12 -07:00
Anthony J. Thibault
eb5107d9a5 highlight the grabbed hotspot when the drop gesture is detected 2016-07-14 12:07:07 -07:00
Anthony J. Thibault
e62d34136d Added haptics and hysteresis to drop gesture 2016-07-14 10:53:47 -07:00
Anthony J. Thibault
51cce939b3 removed shake to drop 2016-07-14 10:32:02 -07:00
Brad Davis
091e798267 Make hand pointer lasers 'click' on fully pressing and clicking the vive controller 2016-07-14 10:30:35 -07:00
Anthony J. Thibault
23ea85541c Animate equip hotspots scale instead of alpha 2016-07-14 10:24:08 -07:00
Anthony J. Thibault
66830a0538 First pass at equip sphere animation 2016-07-13 19:44:51 -07:00
Anthony J. Thibault
f3ef2801b4 Support for model overrides for equip hotspots rendering 
Bug fix for modelScale on hotspots
 2016-07-13 19:13:40 -07:00
Anthony J. Thibault
0ce970408c Fix for double rendering of equip hotspots 2016-07-13 19:13:40 -07:00
Anthony J. Thibault
848d5a8975 Reduce calls to Entity.getEntityProperties(). 
By using a single EntityProprtiesCache instance instead of one per controller.
 2016-07-13 19:13:39 -07:00
Brad Hefta-Gaub
819cab4aab Merge pull request #8158 from sethalves/raypick-avatars 
Raypick avatars
 2016-07-12 15:27:30 -07:00
Seth Alves
1999193907 split the grab script's deactivation on an entity into two parts -- one that happens during release and a delayed part which finishes up. This makes collisions with a thrower's capsule less likely 2016-07-12 11:42:58 -07:00
Seth Alves
367c26a5ee wait a bit before resetting collides-with-my-avatar 2016-07-11 18:53:47 -07:00
Seth Alves
85cc5f8956 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-07-11 18:02:18 -07:00
Seth Alves
84c5bef487 back to ignore more recent 3 frames. don't have released entities collide with myAvatar until 0.25 seconds after release 2016-07-11 17:02:11 -07:00
James B. Pollack
27f70e9d52 finish merge 2016-07-11 15:13:25 -07:00
Seth Alves
c034879b74 Merge branch 'master' of github.com:highfidelity/hifi into fix-throwing 2016-07-11 11:12:20 -07:00
Anthony J. Thibault
6f6fe5f244 reduced radius of grab sphere 2016-07-08 18:23:33 -07:00
Anthony J. Thibault
bec71e4af4 Went back to transparent spheres for equip points 2016-07-08 17:05:23 -07:00
Seth Alves
051616d7c3 experimenting 2016-07-08 16:16:06 -07:00
James B. Pollack
6249f3ed12 less changes to hand grab 2016-07-08 16:01:17 -07:00
James B. Pollack
ee970c5e07 cleanup 2016-07-08 15:16:26 -07:00
James B. Pollack
4f899d8752 play nice with grab 2016-07-08 15:14:04 -07:00
James B. Pollack
5ca14b528b remove prints and format 2016-07-08 15:08:44 -07:00
James B. Pollack
3492367c63 cleanup comments etc 2016-07-08 15:03:59 -07:00
James B. Pollack
38e580b211 fix some bugs and also change it to use arrival mode 2016-07-08 14:50:21 -07:00
Anthony J. Thibault
c8d0decab7 Fix for far grab not working until after edit button is pressed 2016-07-08 14:47:13 -07:00
Anthony J. Thibault
7d1f52da70 Added glow effect to search beam 2016-07-08 14:33:22 -07:00
Anthony J. Thibault
9242147394 Merge branch 'master' into feature/grab-script-polish 2016-07-08 13:40:01 -07:00
James B. Pollack
1cda8afa40 simplify code 2016-07-08 13:37:59 -07:00
James B. Pollack
24832df14a changes 2016-07-08 13:13:32 -07:00
Anthony J. Thibault
1ec3472230 Model overlay dimensions fixes 
At the moment model overlays will ALWAYS scale to fit their dimensions
Update handControllerGrab to account for this behavior.
 2016-07-08 11:36:43 -07:00
James B. Pollack
1a46366557 uncomment 2016-07-07 19:23:04 -07:00
James B. Pollack
f8ff0da901 trying to fix interaction with grab script... 2016-07-07 19:22:42 -07:00
Anthony J. Thibault
0d454cd45e Equip hotspots render when your hand is near them. 2016-07-07 17:28:23 -07:00
James B. Pollack
7fa1dc7053 make thumb and trigger work in any order and on either button released 2016-07-07 16:36:40 -07:00
James B. Pollack
71392bc1b2 change to sphere now that sphere alpha works. 2016-07-07 16:30:30 -07:00
James B. Pollack
5c83db3b28 take care of naughty intervals 2016-07-07 14:37:51 -07:00
James B. Pollack
4a9f6e677c add new target model 2016-07-07 12:52:24 -07:00
James B. Pollack
be770c8177 make thumb and trigger mode an option 2016-07-07 12:39:11 -07:00
James B. Pollack
93081e73d8 thumb and trigger 2016-07-07 12:12:22 -07:00
James B. Pollack
8212ada4de introduce delay 2016-07-07 11:42:41 -07:00
Seth Alves
6786a07ac2 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-07-07 09:53:24 -07:00
James B. Pollack
54e0c131a5 cleanup and protect against some interval naughtiness 2016-07-06 18:30:50 -07:00
James B. Pollack
5626938fb4 add instant mode 2016-07-06 18:13:42 -07:00
James B. Pollack
1728878982 working smooth arrival 2016-07-06 17:52:18 -07:00
Anthony J. Thibault
2db8160568 handControllerGrab improvements 
* Made handControllerGrab eslint clean
* A model overlay is used instead of a sphere to draw equip hotspots.
* The equip hotspot model will grow in size by 10% when hand is near enough to equip it.
* The hand controller will now perform a haptic pulse when your hand is near enough to an equip hotspot.
* Near triggers events will also perform a haptic pulse
 2016-07-06 15:46:14 -07:00
James B. Pollack
5cb585aec3 remove debug prints 2016-07-06 15:25:01 -07:00
James B. Pollack
696169ed37 terminate lines at intersection 2016-07-06 15:19:10 -07:00
James B. Pollack
dc8e21d76c cleanup stretchy stuff 2016-07-06 15:16:31 -07:00
howard-stearns
110f5e9e2a Don't compare distance when no intersection. 2016-07-06 15:08:57 -07:00
James B. Pollack
e993a69519 last commit for stretched beams -- doesnt work at long distances due to lack of precision 2016-07-06 14:06:53 -07:00
James B. Pollack
b2ef491b97 rotate target toward you 2016-07-06 13:20:42 -07:00
James B. Pollack
2d073cc99c working teleporter in huffmans build 2016-07-06 12:31:03 -07:00
James B. Pollack
b0494ec9d5 bug notes 2016-07-05 17:48:30 -07:00
James B. Pollack
26950eaaa6 working second model adjustment with hack but wtf 2016-07-05 17:30:17 -07:00
James B. Pollack
c78dbe26b6 working initial beam, still trying to clear up no intersection beam issues 2016-07-05 17:25:21 -07:00
howard-stearns
b8e6572ebf basic hand-controller editing 2016-07-05 17:00:54 -07:00
James B. Pollack
cbd1f8df88 add stuff for fading in/out and also for a nice stretchy beam 2016-07-05 13:11:14 -07:00
James B. Pollack
056e9e3a72 add teleport models etc 2016-07-05 10:31:47 -07:00
James B. Pollack
ac99ec04d0 Merge remote-tracking branch 'upstream/master' into viveteleporter 2016-07-05 10:28:07 -07:00
James B. Pollack
ff745a345e remove dupe 2016-07-05 09:44:51 -07:00
James B. Pollack
f4d409f1e1 fix typo 2016-07-05 09:22:19 -07:00
Seth Alves
5ab82cd7c8 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-07-02 15:11:59 -07:00
James B. Pollack
9b822f97c0 end of day 2016-07-01 17:26:52 -07:00
James B. Pollack
00ce75ef48 more notes 2016-07-01 15:30:21 -07:00
James B. Pollack
9afc4d0c26 cleanup 2016-07-01 15:19:53 -07:00
James B. Pollack
ffbfc89e99 teleportr 2016-07-01 15:19:37 -07:00
James B. Pollack
4762091aaf add easy mode 2016-07-01 11:12:20 -07:00
Ryan Downe Karpf
873b57219a Merge pull request #8167 from hyperlogic/feature/equip-hotspots 
equip-hotspots feature
 2016-07-01 09:55:49 -07:00
James B. Pollack
b2e407a8e1 fix vive bug 2016-07-01 00:48:29 -07:00
James B. Pollack
104ee63a77 notes 2016-06-30 17:05:16 -07:00
James B. Pollack
82e074de0f working teleporter 2016-06-30 16:05:44 -07:00
Anthony J. Thibault
d8e5e3cbe4 equip bug fix 
you should not be able to equip an object that is already equipped, with your other hand.
 2016-06-30 16:00:18 -07:00
Anthony J. Thibault
82b1cba81d equip improvements 
Allow the user to equip an object while near or far grabbing it from the other hand.
 2016-06-30 13:58:44 -07:00
Howard Stearns
5556bbb0a3 Merge branch 'master' of https://github.com/highfidelity/hifi into update-invisible-reticle-only-when-triggered 2016-06-30 11:25:44 -07:00
Brad Hefta-Gaub
7dd53d7757 Merge pull request #8149 from howard-stearns/limit-hand-controller-actions-to-recommended-area 
limit hand controller actions to recommended area
 2016-06-30 11:06:32 -07:00
James B. Pollack
4b4e38a57c end of day 2016-06-29 18:28:39 -07:00
Anthony J. Thibault
6072487c9c Equip-points attachments work 
Also made handControllerGrab.js eslint clean.
 2016-06-29 17:28:53 -07:00
James B. Pollack
fd062d09dc initial notes and research 2016-06-29 15:59:51 -07:00
Anthony J. Thibault
43d4dba4c0 iterate over hotspots not entities. 
This makes it possible to render multiple hotspots per entity.
Also, it will use the same logic to decide how to deal with overlapping entity
equip hotspots.
 2016-06-29 13:53:07 -07:00
Anthony J. Thibault
1b98c73473 WIP, equip-points work but they don't use the proper attach point. 2016-06-29 13:53:06 -07:00
Anthony J. Thibault
b042210637 Addition of equipHotspots 2016-06-29 13:53:06 -07:00
Howard Stearns
b649b30777 Reduce margin. 2016-06-29 08:20:47 -07:00
Seth Alves
52d017ac74 undo previous change 2016-06-28 19:22:19 -07:00
Howard Stearns
b551bc3c1a Use the whole area, less a margin. 2016-06-28 18:01:09 -07:00
Howard Stearns
d650c50a5b Use normal Script.update (60hz) instead of a timer (@20hz). 2016-06-28 17:44:30 -07:00
Seth Alves
b782ae667c when one hand adjusts something equippd in the other, print out the new local position and rotation in case a content-creator wants to update userData 2016-06-28 16:36:37 -07:00
Seth Alves
630d5cfc82 make trigger more sensitive, print out position and rotation when releasing something 2016-06-28 15:47:17 -07:00
howard-stearns
c492d125e0 limit hand controller actions to recommended area 2016-06-28 13:19:03 -07:00
howard-stearns
799686f29d Only update the (invisible) cursor position from hand controllers when the 
trigger is partially squeezed.
 2016-06-28 11:36:08 -07:00
Anthony J. Thibault
41fcfb45ca Merge branch 'vive-ui' into bug-fix/grab-visualization-improvements 2016-06-24 13:28:00 -07:00
howard-stearns
6a1dd235c9 Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into vive-ui 2016-06-24 12:49:54 -07:00
Anthony J. Thibault
8bf72f28da Fix for grab script search ray length 2016-06-24 12:06:02 -07:00
Anthony J. Thibault
7bd553c09c near grab logic to uses sphere vs entity box 
instead of sphere vs sphere.  Adjusted debug drawing accordingly.
 2016-06-23 17:03:15 -07:00
howard-stearns
f8391f0062 fix reticle bugs 2016-06-23 16:51:15 -07:00
Anthony J. Thibault
eabb8d08c0 Merge branch 'vive-ui' into feature/equip-hotspots 2016-06-23 15:42:55 -07:00
Anthony J. Thibault
fc42a3aef5 Grab script hotspot work 
* Updated grab/equip logic to use sphere vs sphere tests, instead of sphere vs entity bounding box.
* Added debug flag for visualizing grab spheres.
* hotspot overlays are now updated as the objects they are attached to move.
* You can now use the search beam to near grab large objects, as well as the sphere sphere test.
* Optimized EntityPropertyCache to make a single call to Entities.getEntityProperties instead of three.
* Moved grab script options from the "Developer > Hands" menu to the "Developer > Grab Script" menu.
 2016-06-23 15:36:47 -07:00
howard-stearns
581d87d653 feedback re magic numbers and variable name. 2016-06-22 16:40:10 -07:00
Anthony J. Thibault
2a82dddc2b Draw attach points as if they were equip-hotspots 2016-06-21 17:36:36 -07:00
howard-stearns
223f9bda2e gratuitous change to force things. 2016-06-21 17:03:49 -07:00
Howard Stearns
7e88772e85 Merge pull request #8106 from howard-stearns/triggering-change 
triggering change
 2016-06-21 13:51:12 -07:00
Anthony J. Thibault
972c292857 Fix for equip-hotspot being visible for whiteboard markers 2016-06-21 11:59:11 -07:00
Anthony J. Thibault
2ed88bca6d Bug fix for bow and arrow. 
* before this change the releaseEquip message was not getting sent to the bow,
  which it would use to re-enable the grab script via the 'Hifi-Hand-Disabler' msg.
 2016-06-20 17:24:36 -07:00
howard-stearns
bfb697bc77 No hysteresis. 2016-06-20 17:04:23 -07:00
Anthony J. Thibault
8817bbea09 reduce log spam 2016-06-20 15:53:33 -07:00
Anthony J. Thibault
e5159ad213 Added "Developer > Hands > Drop Without Shake" menu option 2016-06-20 14:50:15 -07:00
Anthony J. Thibault
408f65100b Bug fix for dropping near-grabbed entities via thump press. 2016-06-20 13:34:05 -07:00
Anthony J. Thibault
8792812884 Change raw for loop to Array.prototype.forEach instead 2016-06-20 13:26:41 -07:00
howard-stearns
cd1780efef brush clearing 2016-06-20 13:21:06 -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
74a3db4e1c When setting Reticle.depth, don't assume that we're in the center of the 
HUD.
 2016-06-17 11:14:56 -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
0915d1287f Merge pull request #8079 from howard-stearns/no-laser-without-trigger 
No laser without trigger
 2016-06-15 16:06:56 -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
2c7642a367 Do not make ReticleClick when we enter an overlay with the trigger 
pressed.
 2016-06-15 12:28:42 -07:00
howard-stearns
6366ca7508 Go red for full trigger. 2016-06-15 11:08:59 -07:00
Howard Stearns
b9754c8564 continue grabbing through overlays 2016-06-14 20:17:52 -07:00
Howard Stearns
ae65790bf3 no laser (or mouse cursor) from hand controllers unless trigger squeezed 2016-06-14 18:07:08 -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
howard-stearns
5759c2d29d final 2016-06-14 11:28:44 -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
dfd03d5e61 Prepare for working laser. But at this point, we still show the laser AND 
the Reticle.
 2016-06-13 17:15:51 -07:00
howard-stearns
526fc7d062 Make handControllerGrab independent of whether we're using laser or 
Reticle.
 2016-06-13 17:13:10 -07:00
howard-stearns
0366c891cc Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into use-system-pointer 2016-06-13 17:06:43 -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
Howard Stearns
357ccc17aa Merge pull request #8030 from howard-stearns/fix-paused-interactions-with-mouse 
fix paused interactions with mouse
 2016-06-13 11:28:47 -07:00
howard-stearns
4344a35c60 Use the new system pointer functionality. 2016-06-10 16:00:16 -07:00
howard-stearns
542cfb2e11 Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into fix-paused-interactions-with-mouse 2016-06-10 13:02:49 -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