Commit graph

41973 commits

Author SHA1 Message Date
Brad Hefta-Gaub
338f4e0eb4 Merge pull request #7552 from zzmp/fix/model-tex-check
Avoid setting textures on empty models
2016-04-03 13:47:14 -07:00
Zach Pomerantz
79e5286335 Fix ImageReader threading issues 2016-04-03 12:38:18 -07:00
Zach Pomerantz
fc19b60f8a Avoid setting null texs on uncaching models 2016-04-03 11:25:48 -07:00
Anthony Thibault
07cfa13a82 GeometryReader: We should delete the fbxGeometry if we've lost the resource. 2016-04-03 09:23:53 -07:00
Anthony Thibault
865a77ae20 Model: fixed two crash issues when changing avatars
* When the GeometryReader has the last ref to the GeometryResource ptr
  It needs to hold on to the reference until invokeMethod is completed.
  Otherwise, invokeMethod will call a method on a deleted object, leading
  to memory corruption or crashes.

* When the Model URL is changed, the clusterMatrices are invalided and the
  RenderItemsSets are cleared.  However, there still might be renderItems in
  the scene pending changes list that might refer to those RenderItems and their
  clusterMatrices.  We need to guard against this access to prevent reading from
  memory that was previously freed.

Both of these issues were uncovered using the [avatar-thrasher](https://gist.github.com/hyperlogic/d82a61d141df43d576428501a82c5ee6) test script.
2016-04-02 21:48:22 -07:00
Zach Pomerantz
3c86191a59 Add resources prop to caches 2016-04-02 17:37:51 -07:00
Anthony Thibault
d899d7d696 Merge pull request #7530 from hyperlogic/tony/culling-fixes
Culling fixes
2016-04-01 21:29:34 -07:00
Zach Pomerantz
d78338330c Rm unused trigger from renderStats 2016-04-01 20:06:10 -07:00
Zach Pomerantz
b0185dc355 Add cacheStats.js 2016-04-01 20:06:10 -07:00
Zach Pomerantz
41cdb29bd2 Use a timer in plotperf 2016-04-01 20:06:09 -07:00
Zach Pomerantz
36e04f4434 Mv PlotPerf to shared dir 2016-04-01 19:52:44 -07:00
Zach Pomerantz
5b9198ed3d Expose tex/model cache to js/qml 2016-04-01 19:52:43 -07:00
Zach Pomerantz
b70a4d043b Expose resource cache count props 2016-04-01 19:52:42 -07:00
Seth Alves
5fa9f662fc Merge pull request #7542 from birarda/refresh-on-asset-connect
refresh/close the asset browser dialog on domain switch
2016-04-01 18:08:59 -07:00
Seth Alves
6025a66fa1 Merge pull request #7532 from Atlante45/feat/delayed-decrease
Delay congestion epochs first decrease
2016-04-01 18:07:43 -07:00
Philip Rosedale
6f9b912f46 Merge pull request #7355 from sethalves/equip-via-thumb
Equip via thumb
2016-04-01 17:58:10 -07:00
Seth Alves
3f3efc4250 remove debug prints 2016-04-01 17:55:12 -07:00
ericrius1
048d745af9 update 2016-04-01 17:53:02 -07:00
Andrew Meadows
0830c55bcf getLocalEverything->getLocalTransformAndVelocities 2016-04-01 17:48:56 -07:00
ericrius1
f7f7c18d72 added new audio room examples 2016-04-01 17:45:15 -07:00
ericrius1
5bbca785b3 added new audio room examples 2016-04-01 17:43:10 -07:00
Zach Pomerantz
3b45a57e1d Remove resource completely when uncached 2016-04-01 17:42:36 -07:00
Zach Pomerantz
d72c695417 Sanitize ResourceCache to expose to JS/QML
fix sanitize
2016-04-01 17:42:36 -07:00
ericrius1
20db8d2d65 Merge remote-tracking branch 'upstream/master' 2016-04-01 17:40:01 -07:00
Seth Alves
9942a5edd4 don't reset local offset during a hold 2016-04-01 17:22:20 -07:00
Seth Alves
d9f5a0ccaf experiment 2016-04-01 17:17:21 -07:00
samcake
be38de3239 Cleaning up the TextureMap loaders and cleaning for pr 2016-04-01 17:16:22 -07:00
Seth Alves
f05f283b04 disable setting of angular velocity upon release of a parenting grab 2016-04-01 16:58:17 -07:00
Seth Alves
4788bb453b Merge pull request #7540 from murillodigital/master
Updating defaultAvatar_full.fbx to fixed version
2016-04-01 15:53:19 -07:00
Stephen Birarda
6e83ed5ccc use a more generic custom user agent 2016-04-01 15:49:24 -07:00
Seth Alves
37b895db0a Merge branch 'master' of github.com:highfidelity/hifi into equip-via-thumb 2016-04-01 15:32:06 -07:00
Brad Hefta-Gaub
c4abec4fb2 Merge pull request #7541 from jherico/fix_simple_qml_message
Fix passing of simple string message types from QML to scripts
2016-04-01 15:20:39 -07:00
Stephen Birarda
6df7ddeb16 pass the HighFidelityInterface user agent with WebView 2016-04-01 15:13:28 -07:00
Seth Alves
bfa2d8f405 set angular velocity on parenting-grab release 2016-04-01 15:11:01 -07:00
howard-stearns
cec4175e9d whitespace 2016-04-01 15:00:51 -07:00
howard-stearns
b5cbd7720e Lock entity tree on export, and clipboard on import. 2016-04-01 14:56:56 -07:00
Seth Alves
eb22b5e4a7 velocity is now set when a parenting grab ends, though not angular velocity 2016-04-01 14:50:42 -07:00
Zach Pomerantz
eb2e254aa6 Release px resources when unused 2016-04-01 14:46:52 -07:00
Zach Pomerantz
0e9b783ca3 Release skybox texs when not rendering 2016-04-01 14:46:50 -07:00
Seth Alves
7c8050790b set velocity when something is un-parent-grabbed 2016-04-01 14:20:36 -07:00
Stephen Birarda
eaa0ba9e32 rename marketplace.js to examples.js 2016-04-01 14:16:44 -07:00
Seth Alves
0006ba281f Merge branch 'master' of github.com:highfidelity/hifi into equip-via-thumb 2016-04-01 13:46:31 -07:00
Brad Hefta-Gaub
5f710782eb Merge pull request #7528 from howard-stearns/fbx-reader-safety
Fbx reader safety
2016-04-01 13:34:17 -07:00
Brad Hefta-Gaub
0f9a6bb37b Merge pull request #7543 from sethalves/fix-scriptname-case
try again on local-scripts
2016-04-01 13:33:45 -07:00
Andrew Meadows
20914df330 fix warning about signed/unsigned comparison 2016-04-01 13:31:14 -07:00
Andrew Meadows
de5fe705a3 optimize Bullet broadphase using collision groups 2016-04-01 13:14:03 -07:00
Andrew Meadows
25fbf926df CollisionWorld only updates _active_ Aabbs
we manually set/clear active state of static objects
  that need their Aabbs updated
also fixing a bug when starting kinematic motion
2016-04-01 13:14:03 -07:00
Andrew Meadows
e1602b57fa faster isNaN checks 2016-04-01 13:14:03 -07:00
Andrew Meadows
442b52313f faster kinematic motion calculations 2016-04-01 13:14:03 -07:00
Andrew Meadows
3f52d237ed adding Bullet profiler instances for better stats 2016-04-01 13:14:03 -07:00