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
samcake
a8c5828eb3
Merge pull request #6737 from zzmp/refactor/final-blit
...
Move final blit into RenderDeferredTask
2015-12-24 10:43:52 -08:00
Zach Pomerantz
dfa2b8d453
Remove redundant clearColorBuffer from Blit
2015-12-24 10:39:29 -08:00
ericrius1
24796c1a1e
updated ravestick spawner relative position
2015-12-24 10:14:36 -08:00
Zach Pomerantz
687eef37da
Move final blit into RenderDeferredTask
...
- Also changes color buffer clearing, such that
anything run through Blit will now clear BUFFER_COLOR0 to 0,0,1,0.
- Blit will always be added to RenderDeferredTask, but
will only run if renderArgs._blitFramebuffer is set.
2015-12-23 18:21:08 -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
Seth Alves
175506bbf1
when a script sets joint-data on a model-entity, send an edit packet
2015-12-23 16:06:04 -08:00
Seth Alves
83f60d6e97
make entity properties for model-entity joint-states
2015-12-23 15:43:50 -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
James B. Pollack
a023a7eebd
Merge pull request #6734 from AlessandroSigna/branchJS
...
Fix assignment
2015-12-23 14:05:56 -08:00
AlessandroSigna
2c72e7964d
Fix assignment
2015-12-23 13:54:06 -08:00
samcake
01a5f47070
Merge pull request #6733 from zzmp/feat/render-gui
...
Simplify renderDebug GUI
2015-12-23 13:40:53 -08:00
Zach Pomerantz
ea9f2e57ce
Simplify renderDebug GUI
2015-12-23 13:09:45 -08:00
Brad Davis
dd17fa0058
Merge pull request #6730 from ZappoMan/fixWarning
...
fix warning
2015-12-23 12:59:38 -08:00
James B. Pollack
d8278459be
Merge pull request #6724 from thoys/20736
...
Winter Smash up Target Practice game
2015-12-23 10:34:20 -08:00
Seth Alves
29e79c0672
Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints
2015-12-22 18:00:42 -08:00
Seth Alves
d878dde952
whitespace
2015-12-22 17:57:25 -08:00
Seth Alves
1a51c9ddbe
remove some unused stuff
2015-12-22 17:56:12 -08:00
Seth Alves
84bcfb7d71
hook up a way for scripts to set model-entity joint state
2015-12-22 17:43:01 -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
32b9f60bd5
Merge pull request #6731 from imgntn/grabhotfix1
...
fix handControllerGrab merge problems
2015-12-22 17:24:30 -08: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
Brad Hefta-Gaub
68c6cae4f3
fix warning
2015-12-22 17:21:25 -08:00
Brad Hefta-Gaub
7a09582a65
Merge pull request #6729 from zzmp/fix/reorder
...
Reorder RenderContext initializer to avoid -Wreorder
2015-12-22 17:19:32 -08:00
James B. Pollack
aa0d1f0c29
temp
2015-12-22 17:15:23 -08:00
Seth Alves
46233b24c0
Merge pull request #6630 from imgntn/particle_grab
...
Add Various Grab Visualization Options
2015-12-22 16:51:30 -08:00
James B. Pollack
64eb22bf22
merging
2015-12-22 16:34:01 -08:00
James B. Pollack
c39f26ad72
new features
2015-12-22 16:31:49 -08:00
Brad Davis
88d36487f8
Merge pull request #6727 from samcake/hdr
...
Clean up shaders removing glowIntensity and alphaThreshold legacy
2015-12-22 15:41:08 -08:00
Zach Pomerantz
df78f895a6
Reorder RenderContext initializer to avoid -Wreorder
2015-12-22 14:54:47 -08:00
James B. Pollack
edd11a670a
minor adjustments to particles
2015-12-22 14:38:53 -08:00
James B. Pollack
60f2314469
remove debugging print
2015-12-22 14:38:05 -08:00
Brad Davis
a6d9dbc5c4
Merge pull request #6728 from ZappoMan/rightClickMenu
...
More Hand Reticle movement improvements
2015-12-22 14:00:42 -08:00
Brad Hefta-Gaub
9a3d72c7b6
tweak sleep cycle slightly
2015-12-22 13:55:01 -08:00
Brad Hefta-Gaub
119f3e9895
make both hands and mouse work
2015-12-22 13:35:16 -08:00
samcake
f9070ee989
Cleanup cruft in the shaders, glowIntensity and alphaThreshold not needed anymore
2015-12-22 12:41:31 -08:00
James B. Pollack
88a5a0a35d
Merge pull request #6685 from ericrius1/polylineOptimizations
...
First pass at Flow Arts Hut
2015-12-22 12:28:34 -08:00
James B. Pollack
52e6b84968
Update lightBall.js
...
zeroes
2015-12-22 12:09:16 -08:00
James B. Pollack
5e0a428dec
Update hiddenEntityReset.js
...
add zeroes
2015-12-22 12:07:57 -08:00
James B. Pollack
51630734df
Update masterReset.js
...
add initial zeroes
2015-12-22 12:07:02 -08:00
