samcake
3638a3b9c3
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-18 23:15:21 -07:00
Brad Hefta-Gaub
2e491e0afb
Merge pull request #8275 from jherico/web_entity_leak
...
Cleanup resources used by offscreen GL surfaces
2016-07-18 21:46:18 -07:00
Brad Davis
cbbb2a7975
Properly delete GL context and offscreen surfaces
2016-07-18 19:47:23 -07:00
Brad Davis
455d890358
Merge pull request #8266 from jherico/texture_free_fix
...
Actually delete textures we're not using
2016-07-18 19:41:35 -07:00
samcake
a8dd06ad38
Better groupint of the diffuseion of the curvature for easier fix for mini mirror
2016-07-18 19:24:43 -07:00
samcake
34f2a96888
Adding the check for Obscurrance
2016-07-18 18:11:51 -07:00
David Kelly
2a89fa25bb
Removing comments
...
Since I looked into it, seems ok
2016-07-18 16:22:12 -07:00
David Kelly
df615b1503
NotFinished never should have had its own bit
...
Since there is a Finished flag too. So now, it is just 0, used as
a starting point, and we check for !hasState(Finished). <sigh>
2016-07-18 16:02:02 -07:00
David Kelly
3df373252f
Several minor things
...
We could only partially fill the _scratchBuffer - .wav files may not
be exactly N frames long. Doh.
While at it, I needed to call finishLocalInjection() after local
injectors are done, and the access to the injector vector needs to
be locked, given that we do a QtDirectConnection with the networking
and thus the outputLocalInjectors is on a different thread.
The clicking was just 0-ing out the _scratchBuffer.
2016-07-18 14:00:41 -07:00
samcake
80587ca8a3
using the textureGather lookup
2016-07-18 12:52:21 -07:00
samcake
be4839d46c
a better depth filter
2016-07-18 12:26:04 -07:00
Brad Davis
0f240d39b6
Actually delete textures we're not using
2016-07-18 11:21:09 -07:00
samcake
a4ad4659c4
Fixing build warnings
2016-07-18 11:17:06 -07:00
David Kelly
a30b631a0a
Merge branch 'master' of github.com:highfidelity/hifi into dk/localNoEcho
2016-07-18 11:15:58 -07:00
samcake
a44aee84ce
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-18 10:16:55 -07:00
Brad Hefta-Gaub
2cd38064a5
Merge pull request #8235 from jherico/more_shapes
...
Support triangle and hexagon shapes, add shape support to overlays.
2016-07-18 09:05:24 -07:00
samcake
86d9ee56d2
Downsampling shader pass
2016-07-18 03:56:11 -07:00
samcake
5a0ce81516
Performing the curvature generation and diffusion at half the resolution
2016-07-18 03:54:05 -07:00
samcake
378f4576fa
a bit better making the curvature and diffusion passes
2016-07-17 20:18:06 -07:00
samcake
cfa51ae1f5
REmoving problematic timers for mac
2016-07-17 18:32:43 -07:00
samcake
9332f82d54
Carrefully improving the curvature generation performances
2016-07-17 17:13:07 -07:00
samcake
744474982d
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-17 13:28:03 -07:00
Brad Hefta-Gaub
dc2741950a
Merge pull request #8259 from kencooke/improved-hrtf
...
Fix the AudioMixer distance attenuation.
2016-07-15 22:36:51 -07:00
Brad Davis
03cb6175ab
Support triangle and hexagon shapes, add shape support to overlays.
2016-07-15 22:02:17 -07:00
David Kelly
8c0eb1e4d2
Fixed some bad logic
...
When I "fixed" my or instead of and issue, I did it in the wrong
direction. But it looked right :) Now it is. Sigh. Long story
how it got there, but it seems good now.
2016-07-15 19:48:15 -07:00
Ken Cooke
1ee608ad2c
Cleanup
2016-07-15 18:23:12 -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
samcake
076b8cd297
Instrumenting the GPU git status
2016-07-15 17:47:54 -07:00
David Kelly
fb99828e30
PR feedback
...
Code a bit more readable. Sadly (and I guess it makes sense), a
enum class XXX is not a class, so you cannot have member functions
for it. I can imagine no way to have a vtable if you are really
representing it as a uint8_t or whatever. So, I put a stateHas
function in the AudioInjector instead. Definite improvement.
2016-07-15 17:09:27 -07:00
David Kelly
8df4ed01d9
fixed typo
...
which oddly I was sure I already did. Seems I didn't push it? OK
now it is pushed.
2016-07-15 16:22:41 -07:00
Brad Davis
b31300406a
Don't extend glow line length
2016-07-15 16:20:05 -07:00
Brad Davis
317dee1b23
Fix decoration inflation
2016-07-15 16:15:53 -07:00
Brad Hefta-Gaub
496f3b14c7
Merge pull request #8205 from AndrewMeadows/model-cache-cleanup
...
decouple Geometry from its GeometryResource in ModelCache
2016-07-15 12:38:46 -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
David Kelly
0fcc427d41
Merge branch 'master' of github.com:highfidelity/hifi into dk/localNoEcho
2016-07-15 11:01:42 -07:00
David Kelly
e1212c54cb
Updated to deal with streaming out of both buffers
...
So gotta keep track of when finished streaming to network and
locally separately. That means the State needed to be more of a
bitflag and less of an enum.
2016-07-15 09:55:50 -07:00
samcake
a3f6ed6a89
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-15 09:22:34 -07:00
samcake
22ac95d463
REvisiting the RangeTimer to measure the real gpu duration
2016-07-15 09:12:16 -07:00
Brad Hefta-Gaub
878a01cbaf
Merge pull request #8242 from kencooke/improved-hrtf
...
Improved HRTF
2016-07-15 09:02:15 -07:00
Ken Cooke
2674df6095
Fix the distance-attenuation model (for injectors only)
...
The original attenuation model seems wrong, under-attenuating at close distance but completely muting after 45m.
This uses a physics-based model of -6dB per doubling of distance in free space, for the injectors. The AudioMixer model and domain settings still need to be reworked in a future PR.
2016-07-14 18:34:07 -07:00
samcake
89ec547161
Trying to get the gpu timer to work correctly
2016-07-14 18:20:20 -07:00
samcake
d69be5e4d2
Fixing the default value for the lightingMOdel flag when using debugDeferredLighting
2016-07-14 16:45:56 -07:00
samcake
c45f810622
Fixing the mac build
2016-07-14 16:43:56 -07:00
samcake
776bcb6655
FIxing the web entity rendering
2016-07-14 15:49:49 -07:00
Ken Cooke
d84c7524bf
Remove global HRTF headroom.
...
The initial HRTF reduced overall gain by -6dB to avoid clipping at spectral peaks. With the addition of a peak limiter, this is no longer necessary. Changing to 0dB improves the loudness match between spatialized and unspatialized sounds.
2016-07-14 14:56:58 -07:00
Brad Davis
44500889f8
Remove 'updating reverb' logspam
2016-07-14 13:34:56 -07:00
Zach Pomerantz
e71a2097a5
update doc for task template
2016-07-14 13:19:49 -07:00
Zach Pomerantz
e4dabc6be4
fix task config initialization
2016-07-14 13:16:19 -07:00
Brad Davis
882139ebcf
Allow scripts to override the navigation focus state set by QML dialogs
2016-07-14 12:10:46 -07:00
samcake
3ab56062d4
Address some warnings and syntax issues
2016-07-14 12:06:02 -07:00
