Eric Levin
9276c78368
Merge pull request #6741 from PhilipRosedale/master
...
Improved hand controller grab and mouse movement
2015-12-30 11:10:37 -08:00
Brad Davis
76eba89f7d
Merge pull request #6745 from hyperlogic/tony/neuron-plugin
...
Support for Perception Neuron
2015-12-30 11:39:32 -05:00
Philip Rosedale
118f919c8b
fix merge conflicts
2015-12-30 00:42:14 -08:00
Philip Rosedale
e995b29712
can target without grabbing
2015-12-30 00:36:11 -08:00
Philip Rosedale
6d857296f9
show search sphere instead of beams, start at center of view
2015-12-29 23:37:10 -08:00
James B. Pollack
5caa6cbdbf
Update pistol.js
...
leading zeroes
2015-12-29 18:38:57 -08:00
ericrius1
4cc94b44ba
muzzle is in sync
2015-12-29 18:30:07 -08:00
ericrius1
1a84b5c0f0
Fixing issue with muzzle flash and hit point being out of sync for pistol
2015-12-29 18:13:34 -08:00
Anthony J. Thibault
4661152aa7
NeuronAvatar.js: Now aligns the head with the HMD if active
2015-12-28 17:57:24 -08:00
James B. Pollack
2ec712a5db
disable near grabbing on sliders
2015-12-28 15:27:17 -08:00
James B. Pollack
c266a093e0
clear sliders at cleanup
2015-12-28 15:17:00 -08:00
James B. Pollack
9f342ba8ce
readme
2015-12-28 15:14:59 -08:00
James B. Pollack
5786789a66
cleanup cleanup
2015-12-28 15:12:29 -08:00
Philip Rosedale
36beea17fa
Improved hand controller reticle movement
2015-12-28 14:59:43 -08:00
James B. Pollack
f0a12e0251
switch
2015-12-28 14:50:35 -08:00
James B. Pollack
d4fd59edc0
send blacklist messages
2015-12-28 13:49:00 -08:00
Eric Levin
890b39f04b
Merge pull request #6740 from imgntn/blacklist_grab
...
Add Raypick Blacklisting to handControllerGrab.js
2015-12-28 13:39:23 -08:00
James B. Pollack
7d7d0d4c07
mege
2015-12-28 13:21:00 -08:00
James B. Pollack
8eeae5ddf0
Merge pull request #6736 from ericrius1/handGrabCalcs
...
Hand grab calcs
2015-12-28 10:49:55 -08:00
James B. Pollack
e237f957a6
Merge branch 'master' into blacklist_grab
2015-12-28 10:24:27 -08:00
James B. Pollack
c4d7b7b9bb
Update utils.js
2015-12-28 10:21:23 -08:00
James B. Pollack
a133dfa8dd
Merge pull request #6738 from ericrius1/rayBlacklist
...
Ray-pick blacklisting
2015-12-28 10:19:52 -08:00
Anthony Thibault
1f834a9c01
neruonAvatar.js: attempt to adjust hips for HMD mode.
...
It attempts to adjust the hips so that the avatar's head is at the same location & orientation as the HMD
in world space, however it's fighting with the internal c++ code that also attempts to adjust the hips as well.
2015-12-27 16:29:30 -08:00
James B. Pollack
0e30393c81
make sure theres something on the blacklist
2015-12-27 12:47:56 -08:00
James B. Pollack
546e908633
protect blacklisting to my id
2015-12-27 12:46:40 -08:00
James B. Pollack
28c53822b1
add raypick blacklisting to hand grab script
2015-12-27 12:37:33 -08:00
Brad Davis
8e2a79ba4c
Merge pull request #6735 from ZappoMan/headPoseReticle
...
add a test script for HMD.getHUDLookAtPositionXX()
2015-12-27 13:19:18 -05:00
Anthony Thibault
fd3eed3d41
NeruonPlugin: translation support
...
Warn if translations are not present.
2015-12-26 11:50:54 -08:00
Anthony Thibault
878fe80040
Merge branch 'master' into tony/neuron-plugin
2015-12-25 10:24:55 -08:00
Anthony Thibault
84260192fb
Set up controller poses to match hifi standard skeleton
...
Neuron plugin in fills in the gap (thumb1) with identity.
Updated neuronAvatar script to work with new controller pose names.
2015-12-25 09:57:50 -08:00
Anthony Thibault
8b979b67ee
neruonAvatar.js: now sets rotations in correct frame.
...
The rotations from the neuron are effectively in world space and are deltas
from the default pose.
There still is an issue with the thumb, due to the missing joint from the Neuron.
The Neuron only has 3 thumb joints, not 4.
2015-12-24 17:16:49 -08:00
ericrius1
542d8a4b6c
Fixed spelling mistakes
2015-12-24 12:06:29 -08:00
ericrius1
2e95ca7947
fixed syntax error
2015-12-24 12:05:11 -08:00
ericrius1
340c066b5c
reverted whiteboard changes
2015-12-24 12:04:36 -08:00
ericrius1
8e7dfc07c0
Added logic to blacklist entities from raypicking
2015-12-24 11:59:47 -08:00
ericrius1
390dce4613
Adding blacklist
2015-12-24 11:48:40 -08:00
ericrius1
e8a6fd1f05
adding ray filters example/test
2015-12-24 11:00:24 -08:00
ericrius1
24796c1a1e
updated ravestick spawner relative position
2015-12-24 10:14:36 -08:00
Anthony J. Thibault
c44f69b370
WIP checkpoint
...
Changed euler angle compisition based on experiments in maya.
Also, the neuronAvatar.js attempts to transform the neuron input quaternions into
a pose relative to the avatar's default pose, but doesn't it doesn't work.
2015-12-23 17:13:52 -08:00
ericrius1
cd983db419
fixed merge conflicts
2015-12-23 15:13:45 -08:00
ericrius1
b4988b0998
Taking individual avatar hand size into consideration for grabbing objects
2015-12-23 15:09:10 -08:00
Brad Hefta-Gaub
f8a515de64
add a test script for HMD.getHUDLookAtPositionXX()
2015-12-23 14:46:18 -08:00
James B. Pollack
65d5e3f60a
add labels and transparent panel, but panel blocks pick so disable
2015-12-23 14:11:42 -08:00
AlessandroSigna
2c72e7964d
Fix assignment
2015-12-23 13:54:06 -08:00
Zach Pomerantz
ea9f2e57ce
Simplify renderDebug GUI
2015-12-23 13:09:45 -08:00
Thijs Wenker
505f4ce7e4
Merge branch 'master' of https://github.com/worklist/hifi into 20736
...
Conflicts:
examples/controllers/handControllerGrab.js
2015-12-23 02:37:38 +01:00
James B. Pollack
4115138b5b
fix merge problems
2015-12-22 17:22:55 -08:00
Anthony J. Thibault
6afe3bae5e
Copy Neuron joints into controller poses
...
This makes the accessible for controller mapping and to JavaScript.
Added 'neuronAvatar.js' as an example of reading joints from the neuron and setting them
on the avatar. NOTE: the rotations are currently in the wrong coordinate frame.
2015-12-22 17:21:33 -08:00
James B. Pollack
aa0d1f0c29
temp
2015-12-22 17:15:23 -08:00
James B. Pollack
64eb22bf22
merging
2015-12-22 16:34:01 -08:00
