Commit graph

32492 commits

Author SHA1 Message Date
Ken Cooke
aa01dca0a8 Fix compiler warnings 2015-09-27 19:14:31 -07:00
Anthony J. Thibault
c970ff0c0c Reset joint priorities back to 0 for new animation system.
Added Rig::clearJointStatePriorities() to do this.
2015-09-27 18:25:28 -07:00
Anthony J. Thibault
4b31d87bf5 renamed magic constant to FRAMES_PER_SECOND. 2015-09-27 17:52:53 -07:00
Anthony J. Thibault
5a24a020ca Fix for HMD rotation sticking between 2d & HMD mode
The main fix for this was to set the JointState animation priority to 3.0
The secondary fix was only noticed when we changed the animation priority
Basically, the debugRendering was using the JointStates after they were
manipulated by SkeletonModel to 'relax' them toward thier default pose for
IK purposes.
2015-09-27 17:44:54 -07:00
Anthony J. Thibault
a2562c92f4 Small changes to Anim System for Debugging
* Added constant for Rig animation fade time
* Added index output for AnimSkeleton::dump()
2015-09-27 16:24:55 -07:00
Ken Cooke
7faada24a8 Moved table to the top, so it can be declared static 2015-09-27 15:45:00 -07:00
Ken Cooke
c000c635b1 CR feedback 2015-09-27 15:31:11 -07:00
James B. Pollack
a49c4756dd Merge remote-tracking branch 'highfidelity/master' 2015-09-26 11:10:45 -07:00
James B. Pollack
ad42b4da51 Merge branch 'master' of https://github.com/imgntn/hifi 2015-09-26 11:09:55 -07:00
Ken Cooke
4c12630458 Removed a stray reference to SOXR 2015-09-26 09:09:39 -07:00
James B. Pollack
b254353b38 Update collectHifiStats.js
Clears the current batch after we send it to the endpoint.
2015-09-26 07:09:41 -07:00
Ken Cooke
956d83c872 Size optimization of new resampler. Reduced size of precomputed tables by 8x. Even with 32x oversampling of the prototype filter, aliasing from Lagrange interpolation is (12+24/octave) = -132dB which is fine. 2015-09-25 21:28:48 -07:00
Ken Cooke
4a1458e152 Algorithmic optimization of new resampler. All common sample rates now use a rational mode that does direct FIR filtering instead of coefficient interpolation. Complexity reduced by 2x for mono, 1.5x for stereo. 2015-09-25 19:05:55 -07:00
Thijs Wenker
14fc39ffa3 Added JS access to the variables
Stats.audioPacketlossUpstream
Stats.audioPacketlossDownstream
Which contain a floating point with the value between 0.0f and 1.0f which is the percentage of packet loss.
2015-09-26 02:36:01 +02:00
ericrius1
bcd2171491 updated chair model 2015-09-25 16:28:12 -07:00
ericrius1
534cffcf85 fixed animation bug with doll 2015-09-25 16:23:35 -07:00
Howard Stearns
a820682816 Merge pull request #5901 from hyperlogic/tony/gangsta-lean
Threshold based walking/leaning while in HMD.
2015-09-25 15:51:39 -07:00
Howard Stearns
9e001f0b4b Merge pull request #5903 from AndrewMeadows/ik-repairs-006
enforce target rotation during IK calculations
2015-09-25 15:50:59 -07:00
ericrius1
e94d9b39fd made pots and chair not grabbable 2015-09-25 15:42:13 -07:00
James B. Pollack
a6c3a601ae Merge pull request #5896 from thoys/20672
Worklist job #20672 - Create a script to record a users stats
2015-09-25 15:30:55 -07:00
James Pollack
1f7914766c Add ability to prevent an object from being grabbable by specifying a custom key grabbableKey to grabbable:false 2015-09-25 15:26:29 -07:00
Andrew Meadows
a97f556958 enforce IK target rotation 2015-09-25 15:13:57 -07:00
Thijs Wenker
5fc053cf97 Merge pull request #1 from imgntn/thoys-20672
Update stat collection to occur in batches
2015-09-26 00:04:25 +02:00
James Pollack
2c0c2a0979 Merge remote-tracking branch 'upstream/master' into thoys-20672 2015-09-25 14:49:31 -07:00
Anthony J. Thibault
402573dbf1 Remove unused local 2015-09-25 14:11:33 -07:00
ericrius1
c53ad3c534 combined arm chair 2015-09-25 12:34:35 -07:00
James Pollack
9626bed8ca Merge remote-tracking branch 'upstream/master' 2015-09-25 12:24:39 -07:00
ericrius1
f5e44675bb removed start and end frame 2015-09-25 12:11:22 -07:00
Thijs Wenker
9ed1397a63 Merge branch 'master' of https://github.com/worklist/hifi into 20672 2015-09-25 21:09:38 +02:00
ericrius1
65169da64d removed old doll script 2015-09-25 11:58:05 -07:00
ericrius1
9227676275 Merge branch 'master' into toybox 2015-09-25 11:50:34 -07:00
ericrius1
ccc6a343fc updated lights to use newly named grab events 2015-09-25 11:49:51 -07:00
ericrius1
7789d8b3a8 fixed potted plant bug 2015-09-25 11:37:04 -07:00
Anthony J. Thibault
fc9b270951 Merge branch 'master' into tony/gangsta-lean 2015-09-25 11:36:58 -07:00
ericrius1
d29c337e95 moved light switches up 2015-09-25 11:32:41 -07:00
ericrius1
a629701362 couch 2015-09-25 11:15:19 -07:00
ericrius1
f4007584e1 formatted master script 2015-09-25 11:02:41 -07:00
ericrius1
0815b8e939 Added polar finish to spray paint stream 2015-09-25 10:59:20 -07:00
Eric Levin
135e2683a6 Merge pull request #5902 from ctrlaltdavid/particles-fixes
Particles fixes
2015-09-25 10:56:18 -07:00
James Pollack
1051416ed7 Change stat collection to batch stats together to make fewer network calls 2015-09-25 10:33:16 -07:00
James Pollack
54419301f3 Merge branch '20672' of https://github.com/thoys/hifi into thoys-20672 2015-09-25 10:01:33 -07:00
Andrew Meadows
4f0bd08b62 Merge pull request #5900 from ZappoMan/batchOptimizations
more work on batch optimzation
2015-09-25 09:00:38 -07:00
Andrew Meadows
7822d58164 Merge pull request #5870 from howard-stearns/apostrophe
Apostrophe key resets animation state.
2015-09-25 08:50:19 -07:00
James B. Pollack
857a7f8a83 Merge remote-tracking branch 'upstream/master' 2015-09-24 22:19:02 -07:00
David Rowe
d233d3f81b Fix particle emitter corner cases 2015-09-24 19:17:02 -07:00
David Rowe
629128c17f Fix particle emit directions for point emitter 2015-09-24 19:16:28 -07:00
David Rowe
d063f3488d Back out fromSpherical code addition 2015-09-24 19:14:26 -07:00
James Pollack
337bdfdaf6 end of day 2015-09-24 18:35:26 -07:00
Anthony J. Thibault
474c847ef1 Updated constants and units. 2015-09-24 18:00:59 -07:00
Anthony J. Thibault
20d784ba39 Threshold based walking while in HMD.
This is a blend of the previous 'sitting' and 'standing' HMD modes.
Basically, when you move your head within a small range (20cm) your
avatar will lean appropriately, however when you cross that threshold
your body will move underneath you, re-centering your head above the body.

While this occurs the avatar should play the appropriate walking animations.
2015-09-24 17:54:32 -07:00