Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-07 20:23:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
41494 commits 25 branches 28 tags 1.2 GiB
Commit graph

16854 commits

Author SHA1 Message Date
Clément Brisset
caf2595e13 Merge pull request #7452 from birarda/udt-fixes 
fix unecessary re-sends at capacity on udt, race in SendQueue timeout check
 2016-03-24 11:00:57 -07:00
Ozan
003af03b33 Merge pull request #7400 from Menithal/default-use-pre-post 
Set UserAnimPreAndPostRotations true by Default
 2016-03-24 09:57:03 -07:00
Seth Alves
bd178640f1 Merge branch 'master' of github.com:highfidelity/hifi into redo-polyvox-locking 2016-03-24 09:51:31 -07:00
Zach Pomerantz
fc8b34f8c7 Move tex alpha detection to cv method 2016-03-24 09:48:33 -07:00
Brad Davis
8bbabf186f Fix async issues related to JS / QML object lifetimes 2016-03-24 09:38:54 -07:00
Philip Rosedale
f8f0e48af9 Merge pull request #7453 from Atlante45/fix/atp-req-limit 
Make ATP respect request limit
 2016-03-24 09:20:30 -07:00
Seth Alves
1aadebb4e7 Merge pull request #7445 from AndrewMeadows/shape-management 
fix memory leak in ShapeManager
 2016-03-24 08:45:49 -07:00
Philip Rosedale
0e2d9d8aaa Merge pull request #7432 from samcake/orange 
Fix some Model loading issues with the translucent textures
 2016-03-24 08:41:35 -07:00
Andrew Meadows
21c770f37b Merge pull request #7441 from zzmp/clean/resource-reinsert 
Restrict Resource reinsertion
 2016-03-24 08:41:12 -07:00
Philip Rosedale
61205e0e37 Merge pull request #7450 from ZappoMan/reduceLogSpam 
reduce log spam
 2016-03-24 00:19:09 -07:00
Philip Rosedale
366810a20c Merge pull request #7447 from ZappoMan/fixNonAnimatedMotorProteins 
fix animated motor proteins
 2016-03-24 00:11:26 -07:00
Seth Alves
462da3aaf3 don't call getMesh from render 2016-03-23 22:46:43 -07:00
Seth Alves
2d7f32a554 redo polyvox locking 2016-03-23 22:03:27 -07:00
Brad Hefta-Gaub
2b0670718f Merge pull request #7449 from howard-stearns/report-previous-session-data 
Report previous session data
 2016-03-23 20:58:51 -07:00
Atlante45
69c516caaf Have ATP respect request limit 2016-03-23 19:09:28 -07:00
Stephen Birarda
ef3f5e0221 fix for race in last receiver response 2016-03-23 18:23:30 -07:00
Anthony J. Thibault
de3144cde5 Merge branch 'master' into tony/vive-rendering-work 2016-03-23 18:13:59 -07:00
Stephen Birarda
1b322c8d01 don't oversend because of packet pairs 2016-03-23 18:07:28 -07:00
samcake
add811e404 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-03-23 17:52:27 -07:00
Brad Hefta-Gaub
62a56ecbfa fix typos 2016-03-23 17:45:22 -07:00
Stephen Birarda
57da7c2ba7 add handling for short circuit loss in SendQueue 2016-03-23 17:29:46 -07:00
Brad Hefta-Gaub
574642a6e4 Merge pull request #7440 from zzmp/feat/resource-finished 
Add finished signal to Resource loading
 2016-03-23 17:17:53 -07:00
Anthony J. Thibault
73725106f0 OpenGLDisplayPlugin: For non-threaded present use fetchAndReleasewithGpuWait 2016-03-23 17:13:29 -07:00
Anthony J. Thibault
8bb387dc74 Revert GLEscrow changes 2016-03-23 17:11:16 -07:00
Brad Hefta-Gaub
fdd0b48ae1 reduce log spam 2016-03-23 17:06:03 -07:00
howard-stearns
c435ca212a Report previous session time. 2016-03-23 16:59:17 -07:00
samcake
22191a2864 When an albedo texture is replaced from script,make sure its aloha channel is checked for opacity 2016-03-23 16:12:43 -07:00
samcake
40f04f871f Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-03-23 16:04:26 -07:00
Anthony J. Thibault
0d37515784 Merge branch 'master' into tony/vive-rendering-work 2016-03-23 15:59:59 -07:00
samcake
1e46b0803c fixing repported issues during review 2016-03-23 15:59:57 -07:00
Brad Hefta-Gaub
3fa3b40f43 fix non-animated motor proteins 2016-03-23 15:56:31 -07:00
howard-stearns
550738776c Pass whether or not previous session crashed to the UserActivityLogger. 2016-03-23 15:56:29 -07:00
samcake
7d99183474 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-23 15:47:00 -07:00
samcake
138a996013 First draft of monitoring the memeory consumption 2016-03-23 15:46:17 -07:00
Andrew Meadows
ecfe198e35 patch btCompoundShape memory leak 2016-03-23 14:39:49 -07:00
Andrew Meadows
119ef24d5d cleanup ShapeManager API and fix bitrot in tests 2016-03-23 14:39:49 -07:00
Andrew Meadows
a52ac3cc50 remove excess whitespace 2016-03-23 14:39:49 -07:00
Zach Pomerantz
8b1a78bac0 Restrict Resource reinsertion 2016-03-23 13:00:29 -07:00
Zach Pomerantz
17aa2845a8 Add finished signal to Resource loading 2016-03-23 13:00:02 -07:00
Brad Davis
84dc15aff6 Fix potential deadlock in QML 2016-03-23 12:59:17 -07:00
Brad Hefta-Gaub
8c290ea6b9 Merge pull request #7390 from Atlante45/feat/udp-flood-protection 
Server side bandwidth dial
 2016-03-23 11:47:41 -07:00
Brad Hefta-Gaub
08b87b9b98 Merge pull request #7434 from zzmp/clean/incomplete-fbo 
Clean up QML Render Thread
 2016-03-23 10:43:21 -07:00
Brad Hefta-Gaub
2e6c360708 Merge pull request #7427 from huffman/fix-scriptengine-threading 
Add protection around ScriptEngine::runInThread being called twice
 2016-03-23 10:27:16 -07:00
samcake
de96e34f7e Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-03-23 10:00:06 -07:00
samcake
b29ef7b037 IMplementing a memory counter 2016-03-23 09:45:38 -07:00
Chris Collins
29ac80d3fe Merge pull request #7430 from ZappoMan/blenderDestructorCrash 
make Blender keep a shared pointer to the model it's blending
 2016-03-23 09:00:01 -07:00
Brad Hefta-Gaub
03a12ecf5a Merge pull request #7433 from zzmp/fix/long-qml-instantiation 
Avoid triggering deadlock on long local qml component instantion
 2016-03-23 08:30:50 -07:00
Brad Davis
252a49eea4 Add a tracker and logging of memory allocated by the GPU library 2016-03-22 22:35:46 -07:00
samcake
24b26e3097 first few elements 2016-03-22 19:18:46 -07:00
Zach Pomerantz
40b21933a5 Clean QML Surface render log 2016-03-22 18:42:54 -07:00
Zach Pomerantz
fe1d8b24b4 Lock the QML Surface resizing better 2016-03-22 18:42:46 -07:00
Zach Pomerantz
b41c106f3c Only set the context once per QML surface 2016-03-22 18:40:58 -07:00
Anthony J. Thibault
9dd24f81d4 Fix for osx and linux 2016-03-22 18:24:48 -07:00
Anthony J. Thibault
c40b70688c Made Nsight wrapper win32 only. 2016-03-22 17:43:36 -07:00
Zach Pomerantz
745438148a Reset deadlock watch before qml load 2016-03-22 17:17:36 -07:00
samcake
34633c2f19 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-22 16:51:32 -07:00
samcake
3274df9923 Fixing the missing field for blender translucent map 2016-03-22 16:18:51 -07:00
Brad Hefta-Gaub
9f0084dbb1 make Blender keep a shared pointer to the model it's blending 2016-03-22 16:01:31 -07:00
Anthony Thibault
209524a5c0 openvr: Non-threaded present work 
In the unlikely event you hit 90htz in non-threaded present mode, you will have perfect tracking and latency.
This verifies that there are no other sources of tracking or rendering latency, other then the ones we already know about.
 2016-03-22 15:38:10 -07:00
samcake
3c075532f8 Good to go for merge 2016-03-22 15:14:01 -07:00
Brad Davis
3e71316589 Merge pull request #7426 from ZappoMan/avatarIdentityFix 
fix to default avatar model
 2016-03-22 13:46:52 -07:00
Brad Hefta-Gaub
d372ca47ad Merge pull request #7428 from zzmp/fix/clear-qml-gl 
Clear GL error before initializing qml to avoid mystery crash
 2016-03-22 13:39:45 -07:00
Zach Pomerantz
e28a876629 Compare gl to GL_NO_ERROR, not GLEW_OK 2016-03-22 13:25:43 -07:00
Zach Pomerantz
471ac80135 Revert most of "Rm extra GL logging" 2016-03-22 13:24:29 -07:00
Brad Hefta-Gaub
361aa3e683 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarIdentityFix 2016-03-22 12:31:19 -07:00
Zach Pomerantz
362e288be8 Rm mystery GL error before qml fbo 2016-03-22 12:05:24 -07:00
Zach Pomerantz
23e3b7e4e3 Rm extra GL logging 2016-03-22 12:04:58 -07:00
Zach Pomerantz
64ced6ee04 Add comment explaining bare glGetError 2016-03-22 12:04:24 -07:00
Brad Hefta-Gaub
691ee87c73 fix to default avatar model 2016-03-22 11:32:38 -07:00
Ryan Huffman
1a2f74f43a Add protection around ScriptEngine::runInThread being called twice 2016-03-22 11:26:10 -07:00
Seth Alves
47fb85eaeb be more defensive in FBXGeometry::convexHullContains 2016-03-22 11:24:12 -07:00
Anthony Thibault
50ac101d56 Avatar and Rig NSIGHT instrumentation 2016-03-22 10:36:32 -07:00
samcake
67abdab8b2 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-22 10:13:50 -07:00
Philip Rosedale
f57332e4be Merge pull request #7421 from ZappoMan/fixBlenderCrashRedux 
one more crack at fixing the blender
 2016-03-22 09:51:21 -07:00
Andrew Meadows
114cb27c4f Merge pull request #7422 from jherico/tabs 
Fix occasional crash on creating overlay tool windows
 2016-03-22 09:49:22 -07:00
Anthony Thibault
9faccabf0d Merge branch 'master' of https://github.com/highfidelity/hifi into tony/vive-rendering-work 2016-03-21 21:55:53 -07:00
Anthony Thibault
b1286517c6 Removed frame latency in GLEscrow 
This could occur if the GLEscrow queue has extra frames in it.
When new textures were fetched, before this fix, they were simply popped from the queue.
This commit introduces a loop, that will fetch from the queue until it is empty.
 2016-03-21 21:51:16 -07:00
Anthony Thibault
225c462685 Improved NSIGHT instrumentation 
* Application::idle, physics and avatar processing are tracked
* Application::paintGL frameNumber payload is tracked
* OpenGLDisplayPlugin::present is profiled with corresponding frameNumber payload
* Added color and payload support to Nsight ProfileRange class.
 2016-03-21 21:47:59 -07:00
Brad Davis
28f25489f8 Fix occasional crash on creating overlay tool windows 2016-03-21 19:17:31 -07:00
Brad Hefta-Gaub
513138ca98 one more crack at fixing the blender 2016-03-21 18:28:26 -07:00
Philip Rosedale
6b3a4eb327 Merge pull request #7419 from hyperlogic/tony/no-locks-no-problem 
Prevent deadlocks in AvatarUpdate
 2016-03-21 17:54:27 -07:00
Seth Alves
eee4abfd95 Merge pull request #7420 from birarda/octree-leak 
fix a memory leak in OctreePacketProcessor packet piggybacking
 2016-03-21 17:52:04 -07:00
samcake
de374c0cac Switching emissive and lightmap somewhere but not big issue 2016-03-21 17:51:57 -07:00
Anthony Thibault
0d046b12de OpenVR: Moved WaitGetPoses after main window preview. 2016-03-21 17:39:10 -07:00
Stephen Birarda
20c923db32 remove leaking unused method from NLPacketList 2016-03-21 17:26:49 -07:00
Chris Collins
277f49ef64 Merge pull request #7410 from hyperlogic/tony/limit-accumulate-time-loops 
AnimUtil: prevent accumulateTime from looping forever
 2016-03-21 16:39:37 -07:00
samcake
695e558851 Trying to clena up the problem? 2016-03-21 16:36:47 -07:00
Brad Hefta-Gaub
7f3ce6dd26 Merge pull request #7417 from zzmp/fix/skybox-default 
Default background behavior to stars
 2016-03-21 16:15:06 -07:00
Brad Hefta-Gaub
afa6e6e30a Merge pull request #7414 from zzmp/fix/leaking-reply 
Delete used QNetworkReply
 2016-03-21 16:06:45 -07:00
Anthony J. Thibault
7cab8f63fb Merge branch 'master' of github.com:highfidelity/hifi into tony/no-locks-no-problem 2016-03-21 16:03:33 -07:00
Brad Hefta-Gaub
8cfa6fc960 Merge pull request #7413 from huffman/fix-emit-audio-packet 
Fix audio packet being used in a thread-unsafe way
 2016-03-21 15:58:10 -07:00
Chris Collins
6324d0e3be Merge pull request #7393 from ZappoMan/protectMeshBoxes 
Fix for crash in recalculateMeshBoxes()
 2016-03-21 15:46:28 -07:00
Brad Hefta-Gaub
a6bf84b90e Merge pull request #7399 from zzmp/fix/qml-thread 
Move QML rendering to a defined thread
 2016-03-21 15:31:42 -07:00
Brad Hefta-Gaub
5f3c29d3e2 Merge pull request #7416 from zzmp/fix/static-cast-network 
Static cast avatar network reply
 2016-03-21 15:31:20 -07:00
Chris Collins
ed3a9cb24b Merge pull request #7415 from howard-stearns/thread-safe-entityToElementMap 
Possible fix for getContainingElement crash.
 2016-03-21 15:30:04 -07:00
Zach Pomerantz
2b92756c65 Default bg to SKY_DOME 2016-03-21 15:11:26 -07:00
Anthony J. Thibault
ce47f83288 Prevent deadlock if idle is called during rendering 
This extraordinary event can occur if a MessageBox is popped up by the opengl driver.

* removed AvatarData::avatarLock
* removed AvatarUpdate

This code was left over from an earlier avatar threading experiment.

Removed AvatarData avatarLock and AvatarUpdate class
 2016-03-21 15:11:15 -07:00
Andrew Meadows
0a00436700 Merge pull request #7411 from ZappoMan/fixBlenderCrashRedux 
Fix blender crash redux
 2016-03-21 15:04:22 -07:00
Atlante45
170433997c Set Asset server max bandwidth wiring 2016-03-21 14:50:18 -07:00
Atlante45
6d2498b4f2 Remove debug print 2016-03-21 14:50:18 -07:00
Atlante45
c48be75a37 Make sure everyone calls sendPeriod's setter 2016-03-21 14:50:18 -07:00
Brad Hefta-Gaub
d28db7bec6 fix typo 2016-03-21 14:47:53 -07:00
Zach Pomerantz
cc83a9bc36 Actually loop qml render and wake on pause 2016-03-21 14:36:45 -07:00
Stephen Birarda
884df5739d remove comment that indicates that onTimeout is not used 2016-03-21 14:28:55 -07:00
Stephen Birarda
0956649cdb give CongestionControl timeout event from SendQueue 2016-03-21 14:28:55 -07:00
Stephen Birarda
8e97a50957 unlock before de-activating the queue 2016-03-21 14:28:55 -07:00
Stephen Birarda
c65ab5f1ad re-check the timeout guards before acting on timeout 2016-03-21 14:28:55 -07:00
Stephen Birarda
24fd39dfa3 make sure NAKs is empty before append from timeout 2016-03-21 14:28:26 -07:00
Stephen Birarda
4fe9ad94f5 notify on the emptyCondition if an ACK is received 2016-03-21 14:28:26 -07:00
Stephen Birarda
74ae18e514 replace append with insert to work around assert 2016-03-21 14:28:26 -07:00
Stephen Birarda
b059e98ff5 fix units for timeout check on expiry 2016-03-21 14:28:26 -07:00
Stephen Birarda
b7ff94e20d put packets back in the queue if flow window is full 2016-03-21 14:28:26 -07:00
Stephen Birarda
4c5ad8a03e remove first congestion event drops 2016-03-21 14:28:26 -07:00
Stephen Birarda
08dff9c7ac handle expiry check even if a packet was sent 2016-03-21 14:28:26 -07:00
Stephen Birarda
cbcc6e3ef2 fix for last decrease sequence number 2016-03-21 14:28:26 -07:00
Stephen Birarda
93a00c3d5d don't perform a decrease during single packet loss events 2016-03-21 14:28:26 -07:00
Zach Pomerantz
1750b973e0 Static cast avatar network reply 2016-03-21 14:28:15 -07:00
Stephen Birarda
13a906aa20 Merge pull request #7412 from huffman/fix-handshake-packet 
Fix handshake packet being used across SendQueues
 2016-03-21 14:28:07 -07:00
Stephen Birarda
eb5ecc84ff Merge pull request #7398 from huffman/add-request-handshake 
Add HandshakeRequest packet
 2016-03-21 14:27:28 -07:00
Ryan Huffman
c515355cff Fix handshakeRequestPacket not being thread safe 2016-03-21 14:07:15 -07:00
howard-stearns
8858559247 Make access to entityToElementMap thread safe. 2016-03-21 14:02:18 -07:00
Ryan Huffman
99010c7bf6 Fix audio packet being used in a thread-unsafe way 2016-03-21 13:33:56 -07:00
samcake
ec7165983d Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-21 13:30:28 -07:00
samcake
d189dc4af2 Problem not fixed yet, need to merge with upstream 2016-03-21 13:30:08 -07:00
Zach Pomerantz
40aabe7fae Delete used QNetworkReply 2016-03-21 13:30:01 -07:00
Ryan Huffman
afb1d68f3b Fix handshake packet being used across SendQueues 2016-03-21 13:24:04 -07:00
Andrew Meadows
f58a00f75a Merge pull request #7409 from huffman/fix-handle-reply-finished 
Fix edge-case where resource can receive a signal after request deleted
 2016-03-21 13:10:24 -07:00
Andrew Meadows
47c4b226ea Merge pull request #7395 from hyperlogic/tony/openvr-crash-on-exit 
openvr crash on exit fix
 2016-03-21 13:04:45 -07:00
Brad Hefta-Gaub
2389295217 actually properly remove pending blendshapes 2016-03-21 13:04:37 -07:00
samcake
227ddb12a6 Trying to clen up the way the opacity final value comes to the fragment shader 2016-03-21 12:14:59 -07:00
Anthony J. Thibault
df5afffc77 AnimUtil: prevent accumulateTime from looping forever 
This might happen with large dts, large timeScales.
 2016-03-21 11:58:13 -07:00
Ryan Huffman
4f32749c17 Fix edge-case where resource can receive a signal after request deleted 2016-03-21 11:54:41 -07:00
Brad Hefta-Gaub
492e71345a Revert "Revert "Fix ModelBlender crash"" 
This reverts commit f274cdcc7f.
 2016-03-21 11:42:25 -07:00
Zach Pomerantz
d3d0f229aa Merge branch 'master' of github.com:highfidelity/hifi into fix/qml-thread 2016-03-21 11:25:14 -07:00
Zach Pomerantz
41fcf4cc6d Forward declare qml render thread 2016-03-21 11:18:18 -07:00
Brad Hefta-Gaub
091e34e792 Merge pull request #7396 from AndrewMeadows/do-not-trust 
prevent crash in SwingTwistConstraint
 2016-03-21 11:13:41 -07:00
Brad Hefta-Gaub
f274cdcc7f Revert "Fix ModelBlender crash" 2016-03-21 10:47:31 -07:00
Andrew Meadows
cd802a6549 Merge pull request #7406 from hyperlogic/tony/transparent-texture-fix 
Model: fix for avatars with late loaded transparent textures.
 2016-03-21 09:19:33 -07:00
Andrew Meadows
d7d428d1b2 Merge pull request #7387 from ZappoMan/fixBlenderCrash 
Fix ModelBlender crash
 2016-03-21 09:14:11 -07:00
Anthony Thibault
b06f027f2e Model: fix for avatars with late loaded transparent textures. 2016-03-20 18:20:03 -07:00
Brad Hefta-Gaub
92c9dbc1aa Merge pull request #7404 from sethalves/quiet-invisible-zone 
don't spam log when a zone is invisible
 2016-03-20 17:56:15 -07:00
Seth Alves
f8b8877369 coding standard 2016-03-20 17:37:06 -07:00
Brad Hefta-Gaub
5b3be03098 Merge pull request #7402 from hyperlogic/tony/empty-geometry-crash 
NetworkGeometry: Fix crash for empty geometry/bad FBX versions
 2016-03-20 17:25:27 -07:00
Seth Alves
d4ed9993b2 don't spam log when a zone is invisible 2016-03-20 15:06:17 -07:00
Anthony Thibault
5b2a050df7 display-plugins: Pulled getHeadPose into common base class. 
* Moved getHeadPose and _headPoseCache out of each derived class and into HmdDisplayPlugin.
* updated comment in application.
 2016-03-20 14:08:35 -07:00
Anthony Thibault
6e872edcae NetworkGeometry: Fix crash for empty geometry/bad FBX versions 
Interpret empty geometry as an error.
 2016-03-20 12:13:54 -07:00
Brad Hefta-Gaub
b8929c4416 Merge pull request #7384 from zzmp/fix/bugsplat-1836 
Check qml gl context on create
 2016-03-20 11:26:09 -07:00
Menithal
cdbb7b2ad4 Set UserAnimPreAndPostRotations true by Default 
If Blender avatars are animated by Blender animations, they have missing
Pre and Post rotations. This step is no longer necessary to have false,
and also makes sure all animations from Blender Work on all avatars (from
other platforms).

This commit make it default to be enabled:
 2016-03-19 12:49:57 +02:00
Zach Pomerantz
62e635a52a Compile qml render thread on *nix 2016-03-18 18:43:59 -07:00
Zach Pomerantz
12aa057ff6 Always log if gl context fails 2016-03-18 18:37:14 -07:00
Zach Pomerantz
f987da4c43 Move qml rendering to defined thread 2016-03-18 18:10:45 -07:00
samcake
f7847f6561 Trying to fix names 2016-03-18 17:32:00 -07:00
Ryan Huffman
b7678f9818 Remove accidental addition of whitespace 2016-03-18 16:33:00 -07:00
Ryan Huffman
c5c35b7e89 Add HandshakeRequest packet 2016-03-18 16:30:19 -07:00
Andrew Meadows
e81e49b32e prevent crash in SwingTwistConstraint 2016-03-18 15:59:25 -07:00
Anthony J. Thibault
960ffd9c9e DisplayPlugins: updateHeadPose() no longer returns a value. 
Also, moved updateHeadPose so that the overlay and the main rendering use the same headPose.
Which should also be the same place the latencyMarker for the ovr_GetTrackingState is set.
 2016-03-18 15:16:58 -07:00
howard-stearns
b9a3e130cb Safer early-bail for fetch of subresources of .obj models. 2016-03-18 15:02:30 -07:00
Brad Hefta-Gaub
2ef5b3727e Merge branch 'master' of https://github.com/highfidelity/hifi into fixBlenderCrash 2016-03-18 14:04:45 -07:00
Chris Collins
5e8c10508c Merge pull request #7392 from jherico/resource 
Make shared lists thread safe
 2016-03-18 13:25:58 -07:00
samcake
225b330d41 Trying to better load aand detect the case for transparent textures oor opacity mask 2016-03-18 12:47:33 -07:00
Anthony J. Thibault
d218ca4960 openvr: fix for crash on exit 
Before this fix, a script could call into HMD.getHUDLookAtPosition2D() while the app was shutting down, which in turn would call
getHeadPose() on the currently active display plugin.  This call could cause a crash within the openvr plugin, because the SDK was either shutdown, or in the process of shutting down on the main thread.

This fixes this by spliting the previous DisplayPlugin::getHeadPose(int) into two parts:

* updateHeadPose(int) which is only called once a frame and only by the main thread.
* getHeadPose() which is thread-safe and will return a cached copy of the hmd pose sampled by the last updateHeadPose.
 2016-03-18 12:26:11 -07:00
Brad Hefta-Gaub
925d5d36ac clean up the recalculateMeshBoxes() calls in findRayIntersectionAgainstSubMeshes() 2016-03-18 12:20:45 -07:00
Bradley Austin Davis
16e6d9a4f9 Make shared lists thread safe 2016-03-18 11:15:35 -07:00
Zach Pomerantz
a0ba5d3c29 Look at whole tex for alpha mask 2016-03-18 11:00:36 -07:00
Brad Hefta-Gaub
0474be59c9 remove invalid.com url 2016-03-17 19:49:45 -07:00
Brad Hefta-Gaub
eb8a6527c6 change ModelBlender to use a set<WeakPointers> to safely handle model lifetime 2016-03-17 19:44:42 -07:00
Seth Alves
1e02c8d9d3 minimize diff 2016-03-17 17:28:36 -07:00
Seth Alves
cbfde2032c fix bug which caused observers of a parenting grab to not see the entity in the grabber's hand 2016-03-17 17:09:32 -07:00
Brad Hefta-Gaub
7483b8546b remove FaceModel, make Model support shared_from_this() so we can ave shared and weak pointers to it 2016-03-17 17:05:35 -07:00
Zach Pomerantz
60f22c51b9 Check qml gl context on create 2016-03-17 16:56:23 -07:00
Brad Hefta-Gaub
a6ecfd789c Merge pull request #7381 from sethalves/fix-crashes-1 
fix FBXGeometry::convexHullContains crash
 2016-03-17 16:00:58 -07:00
Zach Pomerantz
b1e020d3fd Fix threadname typo 2016-03-17 15:56:57 -07:00
Brad Hefta-Gaub
edcf642410 Merge pull request #7374 from jherico/plugin_switch_crash 
Reduce crashes on switching display plugins
 2016-03-17 15:51:39 -07:00
Brad Hefta-Gaub
d5bf65cc8f Merge pull request #7379 from sethalves/fix-crashes-0 
possibly fix a couple of crashes
 2016-03-17 15:51:27 -07:00
Seth Alves
87dbec8974 add comment 2016-03-17 14:43:00 -07:00
Seth Alves
cea97aa317 fix FBXGeometry::convexHullContains crash 2016-03-17 10:55:24 -07:00
Seth Alves
db5c6d80d2 possibly fix a couple of crashes 2016-03-17 10:31:54 -07:00
Bradley Austin Davis
7045680bc7 Reduce crashes on switching display plugins 2016-03-17 10:13:52 -07:00
Brad Hefta-Gaub
9d15c190f7 Merge pull request #7373 from howard-stearns/lazy-obj 
Lazy obj aux file reading
 2016-03-17 09:47:52 -07:00
Bradley Austin Davis
384351067e Don't crash when the Rift is turned off 2016-03-16 20:16:28 -07:00
samcake
1240f144d4 Merge pull request #7358 from zzmp/fix/px-dirty-atomic 
Make procedural dirty marker atomic
 2016-03-16 18:41:12 -07:00
Chris Collins
307a0cf05a Merge pull request #7349 from zzmp/fix/guard-skybox-tex 
Guard against failure to load skybox tex
 2016-03-16 15:06:52 -07:00
Howard Stearns
07214843e0 Merge branch 'master' of https://github.com/highfidelity/hifi into lazy-obj 2016-03-16 09:50:17 -07:00
Howard Stearns
e25c547cb7 whitespace 2016-03-16 09:50:05 -07:00
Clément Brisset
35aa074955 Merge pull request #7369 from birarda/udt-slow-start 
repairs to udt SendQueue packet timing
 2016-03-16 09:44:58 -07:00
Stephen Birarda
c94e2bdc8b grab the now timestamp only when needed 2016-03-16 08:53:31 -07:00
Brad Hefta-Gaub
d840e68f05 Merge pull request #7365 from howard-stearns/reregister-and-scale-after-model-change 
Reregister and scale after model change
 2016-03-16 08:04:42 -07:00
Andrew Meadows
7acc56bf00 Merge pull request #7359 from zzmp/feat/bg-gpu-timer 
Add a DrawBackgroundDeferred gpu timer
 2016-03-16 07:58:53 -07:00
Howard Stearns
798a225573 Hack to suppress the attempted loading of .mtllib files if the url has a query part that includes "hifiusemat". 2016-03-15 21:11:54 -07:00
Howard Stearns
76b5b6aeeb clean 2016-03-15 20:31:57 -07:00
Zach Pomerantz
6f1079e0e0 Merge pull request #7372 from samcake/orange 
Fixing a bug when albedo map transparent is not quite loaded yet
 2016-03-15 19:47:02 -07:00
Howard Stearns
d1d8e6cb22 Merge branch 'master' of https://github.com/highfidelity/hifi into lazy-obj 2016-03-15 18:37:13 -07:00
Howard Stearns
c9f6b15ac5 checkpoint after lazy mtllib reading 2016-03-15 18:35:59 -07:00
howard-stearns
6161aab0c1 checkpoint 2016-03-15 17:05:01 -07:00
samcake
d58ac269ee Fixing a bug when albedo map transaprent but not quite loaded yet 2016-03-15 17:01:26 -07:00
Andrew Meadows
6028c3e841 Merge pull request #7318 from birarda/atp 
Asset Transfer Protocol Mappings
 2016-03-15 16:52:36 -07:00
samcake
f30e8e9e0c Merge pull request #7281 from zzmp/fix/png-opacity 
Fix materials to honor png texture opacity
 2016-03-15 16:08:36 -07:00
Brad Hefta-Gaub
870677a223 Merge pull request #7339 from samcake/red 
Less jittering at far distance
 2016-03-15 15:39:33 -07:00
Stephen Birarda
1cd16da83e do sleep timing off when next packet would have been 2016-03-15 15:28:55 -07:00
Stephen Birarda
0012967734 use curly braced initialization for consts 2016-03-15 14:38:41 -07:00
Stephen Birarda
29cd487f84 fixes for styling and logging from CR 2016-03-15 14:38:08 -07:00
samcake
f3daa9e1c5 Fixing the lighting issue in stereo 2016-03-15 14:35:43 -07:00
Brad Hefta-Gaub
5245b6f7be Merge pull request #7323 from howard-stearns/zone-visibility 
Zone visibility
 2016-03-15 13:44:40 -07:00
samcake
a779381230 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-03-15 13:06:07 -07:00
howard-stearns
1891062dd2 Merge branch 'master' of https://github.com/highfidelity/hifi into reregister-and-scale-after-model-change 2016-03-15 12:22:36 -07:00
howard-stearns
ddc658af5f After a modelURL change to an existing model, allow the model to be 
snapped and scaled to the existing entity registration and dimensions.
 2016-03-15 12:20:51 -07:00
Zach Pomerantz
1a8cca3dcc Clarify use of procedural's dirty atomic flag 2016-03-15 10:51:55 -07:00
Anthony Thibault
addde84bee Merge pull request #7363 from markej/master 
Fill in the Downloads: line of the stats window
 2016-03-15 10:42:09 -07:00
samcake
af24b5f1a3 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-03-15 10:23:06 -07:00
Clément Brisset
17e5b441cf Merge pull request #111 from huffman/atp-manager-name 
Add atp filename to entities added to world
 2016-03-15 10:19:53 -07:00
Stephen Birarda
72c64532f5 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-15 09:12:49 -07:00
Howard Stearns
010aaa55c0 const ref 2016-03-14 22:13:26 -07:00
Howard Stearns
28f5ee16b8 Merge branch 'master' of https://github.com/highfidelity/hifi into zone-visibility 2016-03-14 22:05:41 -07:00
Ryan Huffman
e54d5aa162 Merge pull request #7354 from birarda/udt-slow-start 
fix for UDT slow start phase with handshake changes
 2016-03-14 21:07:49 -07:00
Stephen Birarda
8cb602173a remove the unused member variable 2016-03-14 20:54:41 -07:00
Brad Hefta-Gaub
cf6a975a2b Merge pull request #7336 from ctrlaltdavid/text3d-tuning 
Improve text3d rendering
 2016-03-14 18:59:06 -07:00
Brad Hefta-Gaub
447918d148 Merge pull request #7348 from hyperlogic/tony/cppcheck-fixes 
Avatar & Animation cppcheck static analysis fixes
 2016-03-14 18:58:25 -07:00
Zach Pomerantz
5ab21588f2 Add gpu timer to background 2016-03-14 17:53:39 -07:00
Zach Pomerantz
ff07e47626 Make procedural dirty marker atomic 2016-03-14 17:52:13 -07:00
Zach Pomerantz
ff0862b594 Emplace render engine jobs 2016-03-14 17:51:43 -07:00
Howard Stearns
d7e3699bc8 Merge branch 'master' of https://github.com/highfidelity/hifi into zone-visibility 2016-03-14 17:45:52 -07:00
samcake
51be2a7107 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-03-14 17:33:56 -07:00
Anthony J. Thibault
16a57bda81 SwingTwistConstriant: fix for bad index. 2016-03-14 17:30:53 -07:00
Anthony Thibault
5623fc1b89 Merge pull request #7328 from AndrewMeadows/dynamic-constraints 
reduce clamping of animation underpose by IK system
 2016-03-14 16:47:00 -07:00
Ryan Huffman
7823882aa1 Add atp filename to entities added to world 2016-03-14 16:13:33 -07:00
Stephen Birarda
7858b6b0cd fix for slow start initial value with new randomization 2016-03-14 15:06:05 -07:00
ZappoMan
1a17de6dbb reduce log spam 2016-03-14 14:02:25 -07:00
Seth Alves
e8a03b725f try again on queryAACube 2016-03-14 13:03:27 -07:00
samcake
fbc19ec74f Back to the previous comuputation for the eye position in the hope to fix local lighting in stereo 2016-03-14 12:11:17 -07:00
Seth Alves
5292e537ea further unmangle merge 2016-03-14 11:22:01 -07:00
Seth Alves
908481d5d4 merge from upstream 2016-03-14 11:15:16 -07:00
Zach Pomerantz
b6322164cf Guard against failure to load skybox tex 2016-03-14 11:15:06 -07:00
samcake
a7f21d5fce Clena up comments, ready to PR 2016-03-14 10:36:19 -07:00
samcake
dc1f787873 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-03-14 10:11:46 -07:00
Brad Hefta-Gaub
830f53cc46 Merge pull request #7345 from sethalves/delete-parentless-entities-redux 
Delete parentless entities redux
 2016-03-14 10:04:22 -07:00
Brad Hefta-Gaub
7f4cbeda00 Merge pull request #7343 from jherico/procedural_time 
Fix iDate uniform in procedurals to be continuous
 2016-03-13 22:08:54 -07:00
Anthony Thibault
54cc49283c libraries/avatars: cppcheck warning fixes 2016-03-13 18:19:42 -07:00
Anthony Thibault
9f30556084 libraries/animation: cppcheck fixes 
* Fix for potential bug in AnimLoop due to _maxFrameIndexHint being uninitialized.
* made more single argument constructors explicit.
 2016-03-13 17:17:34 -07:00
Anthony Thibault
11fcf00b2a AnimSkeleton.h: made single argument ctors explicit 2016-03-13 16:55:34 -07:00
Anthony Thibault
02b2281def AnimVarient.h: cppcheck fixes 
* make all constructors explicit.
* remove static string comparison in assert.
 2016-03-13 16:51:57 -07:00
Brad Davis
798d2a73db Merge pull request #7326 from ZappoMan/toggleOverlay 
Various Overlay, Menu, and Away Mode bug fixes
 2016-03-13 11:44:19 -07:00
Seth Alves
dbd548a8c7 fix a crash 2016-03-13 11:01:11 -07:00
Seth Alves
7641b1e99d remove debug print 2016-03-13 08:45:23 -07:00
Seth Alves
415f21c189 be more aggressive about putting entities into the missing-its-parent list 2016-03-13 08:35:21 -07:00
Seth Alves
0a2fb77698 delete child entities when parent is deleted 2016-03-13 07:04:50 -07:00
Mark Johnson
b7a47d7bf2 Tabs -> Spaces 2016-03-12 17:35:57 -08:00
samcake
5b5d5cc328 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-03-12 17:33:57 -08:00
Mark Johnson
47d3f418e3 Merge remote-tracking branch 'highfidelity/master' 2016-03-12 17:30:22 -08:00
Mark Johnson
d868b541c4 Separate the request limit value from the active request value 
Use _requestLimit as the download limit, and track active downloads using
_requestsActive.  If the limit is changes below the active count, it will
continue downloading all active requests, but not allow new requests until
the active count gets below the limit.  If the limit increases, the pending
request queue will be checked immediately to fill the available download slots.
 2016-03-12 17:19:29 -08:00
Brad Davis
27ecdffeb3 Fix iDate uniform in procedurals to be continuous 2016-03-12 16:46:15 -08:00