Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-28 03:38:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
41982 commits 6 branches 1 tag 1.1 GiB
Commit graph

17068 commits

Author SHA1 Message Date
Brad Hefta-Gaub
08a19c0471 Merge pull request #7554 from jherico/load_stutter2 
Addressing stuttering in the frame while loading content - Part 2
 2016-04-05 09:45:31 -07:00
Brad Hefta-Gaub
3fee1abd2d Merge pull request #7574 from zzmp/guard/octree-del 
Hold onto octree child after creation
 2016-04-05 09:45:00 -07:00
howard-stearns
21c3a8813a Merge branch 'master' of https://github.com/highfidelity/hifi into sandbox-entity-includes 2016-04-05 09:25:40 -07:00
Brad Hefta-Gaub
ff4f693267 Merge pull request #7553 from zzmp/fix/tex-invoke-method 
Fix ImageReader threading issues
 2016-04-04 18:29:24 -07:00
Zach Pomerantz
ac30aed948 Hold onto octree child after creation 2016-04-04 17:52:41 -07:00
Seth Alves
294bdcb18e has-ancestor should test self 2016-04-04 17:41:01 -07:00
Seth Alves
af05b97c1e put back accidently deleted line. cleanups 2016-04-04 17:31:59 -07:00
Seth Alves
cecb3a6ff1 unmangle merge 2016-04-04 17:07:08 -07:00
Brad Davis
c168e2cc58 PR feedback 2016-04-04 16:53:30 -07:00
howard-stearns
22d2d2b69d Merge branch 'master' of https://github.com/highfidelity/hifi into sandbox-entity-includes 2016-04-04 16:43:00 -07:00
howard-stearns
7b7ec5a174 Prohibit entity script file includes from outside the original entity 
script's directory (unless its in our resources).
 2016-04-04 16:41:21 -07:00
Seth Alves
d814d7b35d merge from upstream 2016-04-04 16:32:49 -07:00
Seth Alves
69bb0ebd74 Revert "faster kinematic motion for entities" 2016-04-04 16:11:54 -07:00
Seth Alves
b8587e0711 update collision shapes of entities which are children of avatars 2016-04-04 16:06:53 -07:00
Seth Alves
c48a67b933 Merge pull request #7544 from AndrewMeadows/faster-kinematics 
faster kinematic motion for entities
 2016-04-04 15:26:32 -07:00
Zach Pomerantz
107cfcf10b Change Resource setBytes->setSize 2016-04-04 13:59:57 -07:00
Zach Pomerantz
f34e951c3f Make resource cache props thread-safe 2016-04-04 13:59:56 -07:00
Zach Pomerantz
aa0245b9c2 Debug when limit of checkins reached 2016-04-04 12:22:03 -07:00
samcake
f3e6c490a4 merging with master, moving the TexelFOrmat function to a cpp 2016-04-04 12:03:37 -07:00
Andrew Meadows
a08ab8e127 restore setFlag in simulateKinematicMotion() 2016-04-04 11:48:45 -07:00
Andrew Meadows
a53cb2e532 use _gravity rather than _acceleration 
also tweaks and comments about supporting low gravity
 2016-04-04 11:10:50 -07:00
Zach Pomerantz
6660f0959b Merge pull request #7557 from hyperlogic/tony/reset-thread-priority 
ModelCache: reset thread priority back to normal
 2016-04-04 11:07:18 -07:00
Zach Pomerantz
2bd53935fc Merge branch 'master' of github.com:highfidelity/hifi into fix/tex-invoke-method 2016-04-04 11:00:03 -07:00
Zach Pomerantz
d23d0f6432 Restore thread priority after tex parsing 2016-04-04 10:57:04 -07:00
Anthony J. Thibault
d1898eeac6 ModelCache: reset thread priority back to normal 
Based on PR feedback on https://github.com/highfidelity/hifi/pull/7550
 2016-04-04 10:31:36 -07:00
Brad Davis
d98abbc7df First pass at threaded texture transfers 2016-04-04 10:23:01 -07:00
samcake
2dd1b14b32 Merge pull request #7551 from jherico/load_stutter 
Working on addressing stuttering in the frame while loading content - Part 1
 2016-04-04 10:04:51 -07:00
Seth Alves
278fe93f2b Merge pull request #7546 from zzmp/fix/release-skyboxes 
Release skybox textures when rendering stars
 2016-04-04 09:23:54 -07:00
Brad Davis
667c27866e Pushing texel format translation into header 2016-04-03 20:41:35 -07:00
Brad Davis
4f373937f9 Additional performance markers 2016-04-03 20:41:34 -07:00
Andrew Meadows
74058ac049 more correct moving test for ballistic kinematics 2016-04-03 19:15:16 -07:00
Andrew Meadows
7ea81f3937 add and fix comments 2016-04-03 19:15:01 -07:00
Brad Hefta-Gaub
ecaaa34576 Merge pull request #7547 from howard-stearns/lock-trees-on-import-export 
Lock trees on import export
 2016-04-03 14:23:54 -07:00
Brad Hefta-Gaub
4a78ad877e Merge pull request #7550 from hyperlogic/tony/avatar-thrasher 
Model: fixed two crash issues when changing avatars
 2016-04-03 13:47:35 -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
b70a4d043b Expose resource cache count props 2016-04-01 19:52:42 -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
Andrew Meadows
0830c55bcf getLocalEverything->getLocalTransformAndVelocities 2016-04-01 17:48:56 -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
samcake
be38de3239 Cleaning up the TextureMap loaders and cleaning for pr 2016-04-01 17:16:22 -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
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
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
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
Brad Hefta-Gaub
a3734eba00 Merge pull request #7535 from birarda/suppress-more 
add suppression for ring buffer and sequence number messages
 2016-04-01 13:04:32 -07:00
Brad Hefta-Gaub
830c7a90e1 Merge pull request #7537 from zzmp/fix/fst 
Keep textureBaseUrl for fst models
 2016-04-01 12:28:23 -07:00
Seth Alves
56b84b3106 fix display of path of selected file in running-scripts window 2016-04-01 12:05:49 -07:00
Seth Alves
35affe26e3 trying again on script loading changes 2016-04-01 11:52:47 -07:00
samcake
1ca87fa069 Refactoring a bit the texture loaders to factorize work 2016-04-01 11:44:57 -07:00
Zach Pomerantz
489a2fd0b9 Persist tex base url across caching 2016-04-01 11:32:29 -07:00
Zach Pomerantz
2daf0c4da4 Init tex base url in Geometry ctor 2016-04-01 11:32:13 -07:00
Brad Davis
ca67c7335f Fix passing of simple string message types from QML to scripts 2016-04-01 11:04:01 -07:00
Anthony J. Thibault
75219573a4 Merge branch 'master' into tony/culling-fixes 2016-04-01 10:58:33 -07:00
Anthony Thibault
8d06cd2447 Merge pull request #7539 from huffman/fix-asset-request-cancel 
Fix asset resource request not properly cleaning up
 2016-04-01 10:58:31 -07:00
Seth Alves
0f288247a7 include script in default script location 2016-04-01 10:50:22 -07:00
Ryan Huffman
0948c8cefb Fix format of long lines 2016-04-01 10:11:32 -07:00
Ryan Huffman
8e375fd076 Fix asset resource request not properly cleaning up 2016-04-01 10:08:44 -07:00
Anthony J. Thibault
5e81cccc6c Merge branch 'master' into tony/culling-fixes 2016-04-01 09:29:46 -07:00
Brad Hefta-Gaub
5a665f9aef Merge pull request #7482 from huffman/extra-logging 
Add system information to log file
 2016-04-01 09:10:21 -07:00
samcake
582a6b7db3 Adding the correct mip evaluation 2016-04-01 01:34:33 -07:00
samcake
9404846ca4 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-31 22:58:36 -07:00
Ryan Huffman
03f9a02857 Update env var logging to only include certain keys 2016-03-31 22:49:22 -07:00
Brad Hefta-Gaub
1e7a69fb90 Merge pull request #7523 from zzmp/fix/tex-load-fixup 
Render alpha textures immediately
 2016-03-31 21:04:04 -07:00
Brad Hefta-Gaub
7f041ec18e Merge pull request #7529 from jherico/texture_stress_test 
Add texture stress test
 2016-03-31 21:01:39 -07:00
samcake
9d1f91fa19 First pass at using compressed format when uploading textures 2016-03-31 19:27:35 -07:00
Brad Hefta-Gaub
16f249ce6c Merge pull request #7524 from jherico/oculus_audio 
Allow display plugins to expose a preferred audio device
 2016-03-31 19:09:46 -07:00
Brad Davis
ef7febfcaf Merge pull request #7533 from zzmp/fix/model-release-texs 
Release textures from cache
 2016-03-31 18:58:01 -07:00
Stephen Birarda
fc8707dc05 add suppression for unreasonable sequence number messages 2016-03-31 18:04:13 -07:00
Stephen Birarda
5ab59fe770 suppress overflown AudioRingBuffer debug 2016-03-31 17:53:39 -07:00
Zach Pomerantz
809b489146 Don't cache 0-sized Resources 2016-03-31 17:15:20 -07:00
Clément Brisset
588a5da3ca Merge pull request #7525 from sethalves/fix-load-from-disk 
Fix load from disk
 2016-03-31 17:04:33 -07:00
Zach Pomerantz
33d56d974e Set texture size in cache post-proc 2016-03-31 17:02:40 -07:00
Zach Pomerantz
b80f0fc8a6 Add actual byte size to Resource 2016-03-31 17:02:40 -07:00
Zach Pomerantz
9d3abe5513 Release texs when models are cached 2016-03-31 17:02:40 -07:00
Anthony J. Thibault
d670853941 AnimDebugDraw: enable bound now that culling works. :) 2016-03-31 16:10:04 -07:00
Atlante45
31942d9a73 Code cleanup 2016-03-31 16:09:54 -07:00
Brad Davis
27406f5b21 Add texture stress test 2016-03-31 15:13:04 -07:00
Anthony J. Thibault
bc967f0ab0 Model: update renderItems when items are added to the scene. 
* Renamed enqueueLocationChange to updateRenderItems
* Call updateRenderItems when models are added to the scene.

This will fix entity render bounds being incorrect when they are first added to the scene,
then later being correct after a position update.

* Renamed getMeshPartBound to getRenderableMeshBound.
* Avatar now uses getRenderableMeshBound() to do boundingRadius vs frustum check.
* Model::getRenderableMeshBound now returns a more accurate bound, because it is the same one used for rendering.

This will fix avatar freezing, when they are in the corner of your frustum.
This was due to matrices not being updated because the avatar had to a small bounding sphere.
 2016-03-31 14:59:27 -07:00
Anthony J. Thibault
635f58629a MeshPartPayload: remove dead code 2016-03-31 14:58:25 -07:00
Seth Alves
63595e196e fix batch-loaded local scripts 2016-03-31 14:02:47 -07:00
Brad Davis
97e96f7b67 PR comments 2016-03-31 13:19:26 -07:00
Zach Pomerantz
bc2901aa96 Fix model fetch delay 2016-03-31 12:54:23 -07:00
Seth Alves
aea06914b4 Merge branch 'master' of github.com:highfidelity/hifi into fix-load-from-disk 2016-03-31 11:45:48 -07:00
Atlante45
86b425143b Use Mbps for max bandwith 2016-03-31 11:03:06 -07:00
howard-stearns
1df9a57e58 Merge branch 'master' of https://github.com/highfidelity/hifi into fbx-reader-safety 2016-03-31 10:56:55 -07:00
Zach Pomerantz
e4cba14333 Avoid recreating model items when adding to scene 2016-03-31 10:46:51 -07:00
Zach Pomerantz
377a20e983 Use default texs for empty json 2016-03-31 10:46:51 -07:00
Zach Pomerantz
984bacdae3 Rearrange model entity render to reduce flicker 2016-03-31 10:46:51 -07:00
Zach Pomerantz
3de5f73a1f Fixup model on tex load 2016-03-31 10:46:51 -07:00
Brad Davis
b53968fd64 Add automatic switching the Oculus headphones and mic when activating the plugin 2016-03-31 10:33:11 -07:00
Andrew Meadows
74633ca8c8 Merge pull request #7522 from ZappoMan/optimizeFindZones 
optimize checkEnterLeaveEntities() to do distance check and stationary checks less frequently
 2016-03-31 10:14:32 -07:00
howard-stearns
258ffbc8ac Merge branch 'master' of https://github.com/highfidelity/hifi into fbx-reader-safety 2016-03-31 10:08:01 -07:00
Seth Alves
cfa847ba54 don't put empty folders at end of scripts tree. allow /~/ to work from outside scripts 2016-03-31 09:45:28 -07:00
Brad Hefta-Gaub
03f9a2b46f more optimization in find best zone 2016-03-31 09:36:51 -07:00
Brad Hefta-Gaub
a7f93aa75c Merge pull request #7519 from zzmp/fix/avatar-crash 
Fix crash from updating/resetting avatar
 2016-03-30 21:31:17 -07:00
Brad Hefta-Gaub
30cb62f1aa Merge pull request #7517 from zzmp/fix/qml-renderer 
Check for valid qml gl context creation
 2016-03-30 19:52:03 -07:00
Brad Hefta-Gaub
b76f8509aa Merge branch 'master' of https://github.com/highfidelity/hifi into optimizeFindZones 2016-03-30 19:29:28 -07:00
Brad Hefta-Gaub
32a90b4709 Merge pull request #7521 from sethalves/fix-load-from-disk 
fix script load from disk on windows
 2016-03-30 19:29:11 -07:00
Brad Hefta-Gaub
28978c8adb optimize checkEnterLeaveEntities() to do distance check and stationary checks less frequently 2016-03-30 17:49:30 -07:00
Brad Hefta-Gaub
f0cc8c0dd3 Merge pull request #7491 from jherico/oculus_release 
Update to latest Oculus SDK, add input device support
 2016-03-30 17:42:32 -07:00
Seth Alves
651d2c8954 fix script load from disk on windows 2016-03-30 17:27:36 -07:00
howard-stearns
51a4154ae7 Check results of qUncompress, and catch fbx reader throws in utility 
programs.
 2016-03-30 16:56:39 -07:00
Anthony Thibault
26b9469df5 Merge pull request #7516 from hyperlogic/tony/show-collision-geometry-crash-fix 
Model: fix for crash when displaying collision mesh
 2016-03-30 16:48:07 -07:00
Seth Alves
d9909fb7da Merge pull request #7518 from hyperlogic/tony/model-hand-grab-fix 
Model: Fix for equipped models not updating their matrices
 2016-03-30 16:10:21 -07:00
samcake
c13e24438c Merge pull request #7512 from zzmp/fix/light-buf-fmt 
Correctly represent lighting framebuffer
 2016-03-30 16:10:10 -07:00
Zach Pomerantz
6e0d6ee45b Guard updateClusterMatrices from unloaded geo 2016-03-30 16:04:00 -07:00
Atlante45
c95bc1c563 Don't set _loss on delayed decrease 2016-03-30 15:58:31 -07:00
Zach Pomerantz
00db095306 Guard against reset model geo on scene update 2016-03-30 15:49:45 -07:00
Brad Hefta-Gaub
84bbeef72b Merge pull request #7511 from zzmp/guard/gl 
Add GL checks
 2016-03-30 15:47:16 -07:00
Brad Hefta-Gaub
eb61a4fee9 Merge pull request #7514 from zzmp/guard/model-tex 
Add lock on model texs
 2016-03-30 15:46:52 -07:00
Brad Hefta-Gaub
4a1e82892a Merge pull request #7494 from sethalves/use-local-scripts 
Use local scripts
 2016-03-30 15:46:32 -07:00
Brad Hefta-Gaub
2381ab1cba Merge pull request #7496 from kencooke/master 
make self-reverb depend on wetDryMix
 2016-03-30 15:44:20 -07:00
Zach Pomerantz
02273e067a Add GL checks 2016-03-30 15:20:21 -07:00
Anthony J. Thibault
f6344c34e7 Model: Fix for equipped models not updating their matrices 2016-03-30 15:19:35 -07:00
Zach Pomerantz
530cb40528 Check for valid qml gl context creation 2016-03-30 15:11:54 -07:00
samcake
6213e0859d Expose to counters fro drawcalls, one for the API drawcalls and the other for gpu drawcalls spawned 2016-03-30 15:07:45 -07:00
Seth Alves
e8f26b675a try to fix path to osx scripts 2016-03-30 15:04:29 -07:00
Atlante45
2e3040715b Delay congestion epoch's first decrease 2016-03-30 14:59:46 -07:00
Zach Pomerantz
01db2be6b8 Avoid JSON parsing texs every render cycle 2016-03-30 14:48:57 -07:00
Anthony J. Thibault
103257493c Model: fix for crash when displaying collision mesh. 
This was due to a default constructed PayloadPointer being sent to the scene via resetItem.

The fix is to A) not do that anymore, B) make resetItem more robust and not crash if this happens.
 2016-03-30 14:24:28 -07:00
samcake
f09593e106 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-30 14:16:16 -07:00
Zach Pomerantz
54b8a9278d Guard model texs 2016-03-30 14:11:45 -07:00
Zach Pomerantz
e4f12c81e0 Get remap textures through getter 2016-03-30 14:11:36 -07:00
Seth Alves
065c238dd0 Merge branch 'use-local-scripts' of github.com:sethalves/hifi into use-local-scripts 2016-03-30 14:02:21 -07:00
Seth Alves
62372415be get this working on windows 2016-03-30 14:01:35 -07:00
Seth Alves
f5333423ff remove unused variable 2016-03-30 13:43:06 -07:00
Seth Alves
bb43347599 Merge branch 'master' of github.com:highfidelity/hifi into use-local-scripts 2016-03-30 13:33:59 -07:00
Seth Alves
26e01bbacd rewrite a bunch of path/url mangling code 2016-03-30 13:33:49 -07:00
Zach Pomerantz
1234514e8f Correctly represent light fbo fmt 2016-03-30 11:22:44 -07:00
samcake
0ee1f039e9 Telling like it is... 2016-03-30 11:15:10 -07:00
Brad Hefta-Gaub
699b3a9dd7 Merge pull request #7499 from birarda/udt-fixes 
fix an overflow in portable high resolution clock on windows
 2016-03-30 10:54:00 -07:00
Brad Davis
f569cbf70e Add debugging output, fix timewarp 2016-03-30 10:40:32 -07:00
Brad Davis
d056c41e25 Update to latest Oculus SDK, add input device support 2016-03-30 10:40:28 -07:00
samcake
11b6952eff Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-30 09:49:17 -07:00
samcake
b492c4b52c DUmb fix to the flickering issue by overshooting the inside volume of the light and avoid the failing region 2016-03-30 09:32:40 -07:00