samcake
90151b67c4
Merge pull request #9339 from jherico/min_threadpool
...
Reduce min threads in threadpool to 1
2017-01-12 15:37:17 -08:00
Brad Davis
659badd8bf
Change minimum threadpool size 1
2017-01-12 14:43:31 -08:00
samcake
ca53235d54
Merge pull request #9358 from AndrewMeadows/model-cleanup
...
minor cleanup for Model rendering code
2017-01-12 14:30:16 -08:00
samcake
b9e8f7ee14
Merge pull request #9359 from jherico/cached_qml_surfaces
...
Eagerly cache QML surfaces for Web3D overlays
2017-01-12 14:28:35 -08:00
Brad Davis
e8f6f3787b
Merge pull request #9364 from jherico/trace_cpu_usage
...
Add process and system CPU usage to traces
2017-01-12 13:50:29 -08:00
Howard Stearns
606e0c382d
Merge pull request #9337 from davidkelly/dk/letsHover
...
add hover effect to PAL
2017-01-12 10:14:28 -08:00
Brad Davis
01cdbb5721
Merge pull request #9334 from elmanytas/add_libssl_dev
...
Add dependency to Ubuntu documentation
2017-01-12 10:04:49 -08:00
Brad Davis
2de83d42bc
Add process and system CPU usage to traces
2017-01-12 09:19:08 -08:00
David Kelly
e36f6b6521
Merge branch 'master' of github.com:highfidelity/hifi into dk/letsHover
2017-01-12 08:40:04 -07:00
Howard Stearns
48304a3cc2
Merge pull request #9361 from howard-stearns/fix-laser-vs-mouse-again
...
Fix laser vs mouse again
2017-01-11 19:38:54 -08:00
Andrew Meadows
c060fd6a68
restore updateClusterMatrices() in render()
2017-01-11 17:33:30 -08:00
howard-stearns
88c2c534ad
don't set bogus values
2017-01-11 17:01:46 -08:00
howard-stearns
9298bcf628
remove log spam
2017-01-11 16:32:15 -08:00
howard-stearns
5c06841732
use update signal instead of timer
2017-01-11 16:24:05 -08:00
Andrew Meadows
e2130d33d9
speedup cauterizedClusterMatrices math
2017-01-11 15:10:44 -08:00
Andrew Meadows
b3e336de3d
remove cruft: unused function arguments
2017-01-11 15:02:18 -08:00
Brad Davis
27293c342c
Change present rate to be an average over 1/10th of a second
2017-01-11 14:27:46 -08:00
Brad Davis
e256f7cccc
Remove sendqueue spam in traces
2017-01-11 14:27:27 -08:00
howard-stearns
357b4db1db
fix mouse vs lasers, again
2017-01-11 14:24:24 -08:00
howard-stearns
a808a8c749
revert "fix competition between seek mouse and lasers"
2017-01-11 14:23:18 -08:00
Brad Davis
f235a52a6d
Eagerly cache QML surfaces for Web3D overlays to prevent stutter on loading the tablet
2017-01-11 14:21:29 -08:00
David Kelly
1e3a00d1fb
Enable the LT and RT signals, use them
...
A bit cleaner. Still have to keep track of which hand is the mouse, but
this removes some of the hacky code.
2017-01-11 14:43:37 -07:00
Andrew Meadows
87bdaae05a
remove scale from ModelMeshPartPayload's transform
2017-01-11 12:38:47 -08:00
Brad Hefta-Gaub
db5e4db79f
Merge pull request #9355 from kencooke/audio-hrtf-gainadj
...
Add a local HRTF gain adjustment
2017-01-11 10:21:07 -08:00
Ken Cooke
083c7bc523
Add a local HRTF gain adjustment. Gain adjustments are persistent and properly interpolated.
2017-01-11 10:05:39 -08:00
Andrew Meadows
bd16824d55
remove cruft: Model::_pupilDilation
2017-01-11 06:57:05 -08:00
Andrew Meadows
1804f33b98
add assert and TODO comment
2017-01-11 06:56:35 -08:00
Andrew Meadows
5d880487a0
cleanup class method declarations
2017-01-11 06:56:07 -08:00
Andrew Meadows
e88f02d7b6
remove cruft
2017-01-11 06:55:13 -08:00
Andrew Meadows
1b5fd52165
Merge pull request #1 from samcake/model-cleanup
...
Factorization of the modelTransform out of the cluster matrices
2017-01-11 06:33:59 -08:00
sam
7a01b856f7
Factorization of the modelTransform out of the cluster matrices
2017-01-11 02:33:56 -08:00
samcake
8b45afecde
Merge pull request #9342 from jherico/trace_detail
...
More tracing support
2017-01-10 17:55:50 -08:00
David Kelly
0a018e133d
Blue laser should be enough to hover
2017-01-10 18:23:39 -07:00
Andrew Meadows
44699fc661
modelToWorld rotation not in cluster matrices
2017-01-10 16:21:13 -08:00
David Kelly
4fade3a53e
CR feedback
2017-01-10 16:12:02 -07:00
David Kelly
5fd11ade9c
minor tweak to hover color for glow effect
2017-01-10 16:00:19 -07:00
David Kelly
2d55ed2658
Fix hover - probably my merge didn't get this line
2017-01-10 15:51:24 -07:00
David Kelly
17333ee307
Merge branch 'master' of github.com:highfidelity/hifi into dk/letsHover
2017-01-10 15:24:31 -07:00
Zach Fox
0b574e170a
Merge pull request #9348 from howard-stearns/talking-glow-node
...
Talking glow node
2017-01-10 14:12:09 -08:00
Brad Davis
31f39d7eef
Allow scripts to inject tracing events
2017-01-10 14:06:39 -08:00
David Kelly
5c6ae6fe95
HMD hover working now
...
Had to hack a bit -- the trigger mappings were not firing so instead I
just get the hand that is triggering (when HMD is active) and handle the
hover almost as before, with mouse move events. Some thought about how
to map a 'mouse move' event into something where 2 triggers can both be
pressed at same time was in order.
2017-01-10 14:47:34 -07:00
howard-stearns
e67675ac36
color nodes by audio level
2017-01-10 13:24:38 -08:00
howard-stearns
42b2b2154e
store audio level in overlay data object (so that they gc properly and we
...
have the data to color with).
2017-01-10 13:08:07 -08:00
David Kelly
a855bc60e0
Merge branch 'master' of github.com:highfidelity/hifi into dk/letsHover
2017-01-10 12:12:48 -07:00
Brad Davis
1dd2747ef9
Push some tracing into 'detail' categories for easy filtering. Add new tracing categories, add counter change tracking.
2017-01-10 10:44:04 -08:00
Brad Davis
7ce4277b4c
Merge pull request #9341 from samcake/blue
...
Add profiling in Context batch execution and shortcuts for trace names
2017-01-10 09:56:51 -08:00
samcake
8c7ec8b0c5
Add profiling in COntext batch execution and shortcuts for trace names
2017-01-09 18:05:02 -08:00
Ryan Huffman
39070fe0d1
Merge pull request #9065 from huffman/fix/script-engine-abuse
...
Fix deleteLater() vulnerability in scripts
2017-01-09 11:02:28 -08:00
Chris Collins
30d5f70e11
Merge pull request #9278 from jherico/cpu_opt_scene
...
More low level optimizations
2017-01-09 10:10:40 -08:00
David Kelly
fef8c8900f
Merge branch 'master' of github.com:highfidelity/hifi into dk/letsHover
2017-01-09 08:51:42 -07:00
