Howard Stearns
188c477f7e
Fix render rate.
...
Depending on how the threads get assigned, the actual render rate (not just the stats) could be as little as a third of what is targetted.
That's because the code was insisting on an empty texture escrow before our update/render cycle could begin, and otherwise just waits for the next whole cycle.
On my MacbookPro, this was regularly giving a render average of 20fps instead of 60.
2015-12-05 17:32:32 -08:00
Seth Alves
7448d9f262
Merge pull request #6565 from hyperlogic/tony/thread-safe-rig-joint-getters
...
Make Avatar::getJointRotation and getJointTranslation thread-safe
2015-12-04 16:45:56 -08:00
Anthony J. Thibault
7abfc93ff9
Avatar::getJointRotation and getJointTranslation is thread-safe
...
It can be called from script with minimal blocking,
because it inspects a copy of the joint values from the Rig, which is updated atomically.
This copy occurs in Rig::updateAnimations()
2015-12-04 16:16:17 -08:00
Brad Hefta-Gaub
5bbff7534d
Merge pull request #6560 from birarda/log-handler-crash
...
don't stop a non-started timer, debug cleanup
2015-12-04 15:46:51 -08:00
Anthony J. Thibault
ba001ef4b0
Rig: split Poses into internal and external sets.
...
In preparation for making some accessors thread safe.
2015-12-04 15:15:18 -08:00
howard-stearns
0a9b42ad3c
Fix present rate stats display, which was counting (roughly) twice for 2D
...
display, and flickering.
2015-12-04 15:10:46 -08:00
Stephen Birarda
ad4f818b21
only attempt to stop QTimer if active
2015-12-04 14:12:41 -08:00
Stephen Birarda
d2fdf6a04b
Merge branch 'master' of https://github.com/highfidelity/hifi into log-handler-crash
2015-12-04 13:55:57 -08:00
Brad Hefta-Gaub
f71d2d00d2
Merge pull request #6548 from jherico/threaded_present
...
Threaded present
2015-12-04 13:42:09 -08:00
Brad Davis
11917ca501
Fixing preview / vsync functionality
2015-12-04 12:46:19 -08:00
Stephen Birarda
165db97cb2
cleanup double reset debug on assignment-client restart
2015-12-04 11:50:27 -08:00
Brad Hefta-Gaub
84b98c93a1
Merge pull request #6559 from birarda/log-handler-crash
...
reset the NodeList on its own thread
2015-12-04 11:44:06 -08:00
Brad Hefta-Gaub
79d60f74ba
Merge pull request #6558 from sethalves/parents
...
fix an AC race/crash
2015-12-04 11:40:21 -08:00
Brad Hefta-Gaub
15c4dbfb11
Merge pull request #6554 from Atlante45/warnings
...
Last of the OpenGL warnings on OS X
2015-12-04 11:24:28 -08:00
Stephen Birarda
d5f79b84fc
make the NodeList reset a blocking queued connection
2015-12-04 11:20:46 -08:00
Stephen Birarda
918342df5f
make sure the NodeList is reset on its own thread
2015-12-04 11:18:46 -08:00
Brad Hefta-Gaub
d07629489c
Merge pull request #6543 from Atlante45/pointer
...
gpu::Shader::create* return shared_ptr
2015-12-04 11:17:02 -08:00
Seth Alves
ea65ef964f
fix an AC race/crash
2015-12-04 11:13:36 -08:00
Stephen Birarda
ca84fcd7f4
parent the keepalive timer to the NL thread
2015-12-04 11:01:18 -08:00
Atlante45
528a17422d
Last of the OpenGL warnings on OS X
2015-12-04 10:33:10 -08:00
Brad Davis
c4514743d1
Fixing tests, moving some plugin container stuff to base class
2015-12-04 10:28:19 -08:00
Brad Davis
60aa93c38c
Fixing menu items in display plugins
2015-12-04 10:28:19 -08:00
Brad Davis
7262a10e62
Refactoring present thread / GL base plugin for saner context management
2015-12-04 10:28:18 -08:00
Brad Davis
d8bb9f8d18
Fixing screenshot functionality
2015-12-04 10:28:17 -08:00
Brad Davis
b9ace94ff1
Prototyping threaded present
2015-12-04 10:28:16 -08:00
Brad Hefta-Gaub
d9a1563396
Merge pull request #6152 from sethalves/parents
...
Parents
2015-12-04 10:26:57 -08:00
Brad Hefta-Gaub
ab63f19b6a
Merge pull request #6546 from kencooke/audio-reverb
...
Reverb
2015-12-04 10:19:56 -08:00
Brad Hefta-Gaub
49a7852d76
Merge pull request #6540 from Atlante45/warnings
...
Fix warnings on OS X
2015-12-04 10:19:25 -08:00
Brad Hefta-Gaub
8b58aa706a
Merge pull request #6534 from jherico/homer
...
Windows 64 bit updates
2015-12-04 10:05:45 -08:00
Atlante45
07387ab8c0
Fix most OpenGL warnings
2015-12-04 10:01:43 -08:00
Atlante45
cb758ca6b4
Fix override warnings on XCode 7
2015-12-04 08:55:43 -08:00
Atlante45
cd26422ca0
Fix warnings on OS X
2015-12-04 08:47:06 -08:00
Brad Hefta-Gaub
18e62290f3
fix warnings
2015-12-04 08:37:46 -08:00
Brad Hefta-Gaub
f472b515c3
remove wantsColor support since its always true and required for entities
2015-12-03 21:03:32 -08:00
Brad Hefta-Gaub
81fb4476bc
remove coverage map and occulusion culling, since it was always disabled
2015-12-03 20:29:23 -08:00
Ken Cooke
aad4743bf0
Completely remove Gverb from cmake
2015-12-03 18:06:50 -08:00
Brad Hefta-Gaub
5a75a17174
Revert "Cruft removal"
2015-12-03 17:40:41 -08:00
Brad Hefta-Gaub
46556b7fa5
Merge pull request #6513 from huffman/fix-script-race-condition
...
Fix ScriptEngine setting _isFinished when it shouldn't, causing scripts to accumulate when restarting
2015-12-03 17:17:42 -08:00
Clément Brisset
fa52b97f61
Merge pull request #6538 from ZappoMan/cruftRemoval
...
Cruft removal
2015-12-03 17:03:04 -08:00
Brad Hefta-Gaub
6fbb67021f
Merge pull request #6530 from hyperlogic/tony/mirrored-model-entity-fix
...
Fix for mirrored transforms in FBX models
2015-12-03 17:01:21 -08:00
Brad Hefta-Gaub
ec7d3ffd63
Merge pull request #6536 from huffman/fix-uninitialized-xcolor
...
Fix uninitialized xColor value when converting script value
2015-12-03 16:46:00 -08:00
Brad Hefta-Gaub
528b8e5d3f
fix warnings
2015-12-03 16:45:01 -08:00
Brad Hefta-Gaub
1df24dd174
Merge branch 'master' of https://github.com/highfidelity/hifi into cruftRemoval
2015-12-03 16:31:15 -08:00
Ken Cooke
1d01f08324
Fix compiler warnings
2015-12-03 16:27:35 -08:00
Atlante45
3da80f5861
gpu::Shader::create* return shared_ptr
2015-12-03 14:56:07 -08:00
samcake
902b6b8ea1
Merge pull request #6506 from jherico/maggie
...
OpenGL class cleanup
2015-12-03 13:55:29 -08:00
Brad Davis
cc80dfb9e1
Fixing case on gl surface format helper
2015-12-03 13:08:26 -08:00
Brad Hefta-Gaub
1a5bc5d111
removing optional compression
2015-12-03 12:40:24 -08:00
Seth Alves
e5b1cfa920
fix windows build
2015-12-03 11:15:04 -08:00
Brad Hefta-Gaub
849a8707d2
remove wantsColor support since its always true and required for entities
2015-12-03 11:11:15 -08:00
