Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-27 09:05:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
41494 commits 29 branches 28 tags 1.2 GiB
Commit graph

16854 commits

Author SHA1 Message Date
Brad Hefta-Gaub
d63728bd55 Merge pull request #7502 from huffman/fix-asset-client 
Fix bug where a pending asset request could receive a pending message after deletion
 2016-03-29 18:15:03 -07:00
Brad Hefta-Gaub
8a47c5a35f Merge pull request #7504 from zzmp/log/building-web-surface 
Log OffscreenQml lifetime
 2016-03-29 18:11:16 -07:00
samcake
be27eaff24 Moving the scripts for render that where in utilities/tools/render to utilities/render, adding counters for lights 2016-03-29 17:51:24 -07:00
howard-stearns
5381be6902 Whitespace 2016-03-29 17:06:19 -07:00
howard-stearns
86a77d4f55 Remove unused/non-existent include. 2016-03-29 16:55:17 -07:00
howard-stearns
eef9de4d4f Remove obsolete remapIDs. 2016-03-29 16:28:02 -07:00
howard-stearns
4ebf816166 cleanup 2016-03-29 16:17:19 -07:00
Zach Pomerantz
6ae03fe72e Sync ordering of gl fields/reset commands 2016-03-29 15:52:29 -07:00
Seth Alves
2ad02941e4 lowercase filenames/paths before they go into _treeNodes to avoid scripts being unstoppable 2016-03-29 15:38:11 -07:00
Zach Pomerantz
ad9027f9d6 Log OffscreenQml lifetime 2016-03-29 15:26:22 -07:00
howard-stearns
bcb729eac2 Abstract out globalizeProperties. 2016-03-29 15:21:06 -07:00
Zach Pomerantz
6c7b6cd62e Return parsed tex directly as variant 2016-03-29 14:16:22 -07:00
Seth Alves
51cf854863 cleanups 2016-03-29 13:45:09 -07:00
Seth Alves
0c72ca1be3 works on windows now 2016-03-29 13:39:35 -07:00
howard-stearns
4a28dadae5 Working, but not cleaned up. 2016-03-29 13:26:50 -07:00
Stephen Birarda
b9ce427344 use c-style casts to respect the coding standard 2016-03-29 13:25:03 -07:00
Stephen Birarda
37950e9931 use explicit double casts for win_high_resolution_clock 2016-03-29 13:13:22 -07:00
Seth Alves
3aa1090ced working toward allowing local files in running-scripts window 2016-03-29 11:58:21 -07:00
Ryan Huffman
96a35a8f43 Fix bug where a pending asset request could receive a pending message after deletion 2016-03-29 11:33:02 -07:00
Zach Pomerantz
848e7703ee Test textures emptiness correctly 2016-03-29 10:50:27 -07:00
Zach Pomerantz
29dedd5524 Update model URL on render thread 2016-03-29 10:42:40 -07:00
Seth Alves
b88770228e convert running-scripts window to use local script files 2016-03-29 10:40:56 -07:00
Anthony J. Thibault
80dfed77d7 Fix for flickering eyeballs 
Calling glm::axis() on an identity quaternion does not result in a normalized vector.
This vector was used within Rig::updateEyeJoint() to limit the rotation of the eye balls,
to prevent the eyes from rolling back into the avatar's head.

If the avatar was looking straight ahead, this could result in bad quaternions in the eye ball
joint matrices, which in turn would cause the eye ball mesh or any mesh influenced by the eyeball joints
not to render.
 2016-03-29 10:01:10 -07:00
Seth Alves
442339bbc3 Merge branch 'master' of github.com:highfidelity/hifi into use-local-scripts 2016-03-29 09:39:50 -07:00
howard-stearns
3f18e0cd09 Merge branch 'master' of https://github.com/highfidelity/hifi into import-export-parents 2016-03-29 09:20:07 -07:00
Howard Stearns
5db1c33e4d kill offsets 2016-03-29 09:18:29 -07:00
Eric Levin
830d08c385 Merge pull request #7498 from Atlante45/fix/import-entities 
Make svo loading use ResourceManager
 2016-03-29 08:09:47 -07:00
Anthony J. Thibault
24ca5b3d60 Update after merge changes to NetworkGeometry. 
Also cleaned up API for ModelMeshPartPayload::updateTransformForSkinnedMesh() to pass a QVector const ref, instead of a raw pointer and a size.
 2016-03-28 20:29:02 -07:00
Seth Alves
4f65f26717 Merge branch 'master' of github.com:highfidelity/hifi into use-local-scripts 2016-03-28 20:26:23 -07:00
Anthony J. Thibault
940f3e636d Merge branch 'master' into tony/animated-culling 2016-03-28 19:58:38 -07:00
Anthony J. Thibault
115fd607a0 Address performance issues introduced with this PR. 
* Prevent clusterMatrices from being invalidated and re-computed in each updateItem lambda.
  We do this by not setting _model->_needsUpdateClusterMatrices = true;
* Prevent redundant work if Model::enqueueLocationChange is called multiple times per frame.
  We do this by introducing a preRenderLambdas map in the Application class.
  Instead of adding work directly to the scene PendingChanges queue Model::enqueueLocationChange
  adds a lambda to the Application preRenderLambdas map.  The Application ensures that only one lambda will
  be invoked for each model per frame.
 2016-03-28 19:47:30 -07:00
Stephen Birarda
b134f22cfa fix an overflow in portable high resolution clock on windows 2016-03-28 18:51:34 -07:00
Atlante45
807698f0bb Make svo loading use ResourceManager 2016-03-28 18:07:48 -07:00
howard-stearns
1b3d9d7ab6 Merge branch 'master' of https://github.com/highfidelity/hifi into import-export-parents 2016-03-28 16:59:20 -07:00
howard-stearns
b09b9a4a0a snapshot after using tree from entity item. 2016-03-28 16:58:20 -07:00
samcake
b34ab28c22 Merge pull request #7456 from zzmp/feat/geocaching 
Add model caching
 2016-03-28 16:28:40 -07:00
Ken Cooke
a51cc9d12a make self-reverb depend on wetDryMix 2016-03-28 16:04:45 -07:00
Atlante45
92ef8cafb1 Make sure pos/rot getters don't crash 2016-03-28 14:37:06 -07:00
howard-stearns
db13b15337 Merge branch 'master' of https://github.com/highfidelity/hifi into import-export-parents 2016-03-28 14:26:18 -07:00
howard-stearns
7a066afa26 Checkpoint for freakin edit.js again. 2016-03-28 14:25:51 -07:00
Clément Brisset
b6ce7a7db8 Merge pull request #7492 from birarda/next-packet-delta 
fix for incorrect next packet delta in udt::SendQueue
 2016-03-28 14:12:04 -07:00
Zach Pomerantz
2de94e672b Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching 2016-03-28 14:08:30 -07:00
howard-stearns
d07967d6d8 Merge branch 'master' of https://github.com/highfidelity/hifi into import-export-parents 2016-03-28 14:02:20 -07:00
Brad Hefta-Gaub
7396fa1cc3 Merge pull request #7493 from zzmp/fix/plugin-check 
Default to desktop when display plugins fail to load
 2016-03-28 13:49:58 -07:00
Clément Brisset
19ccee5d3c Merge pull request #7490 from birarda/udt-fixes 
cleanup unused public keys in ice-server
 2016-03-28 13:48:45 -07:00
Seth Alves
b273d5efd3 fix defaultScripts filename 2016-03-28 13:48:19 -07:00
howard-stearns
c6347eb92a checkpoint for debugging/comparing edit.js 2016-03-28 13:39:43 -07:00
Stephen Birarda
1df7cf5c8d Merge pull request #7484 from Atlante45/fix/atp-req-limit 
Fix segfault with gxx
 2016-03-28 13:31:12 -07:00
Anthony J. Thibault
e77cf54483 Geometry.cpp: rename method 2016-03-28 13:29:28 -07:00
Brad Hefta-Gaub
44b37c332a Merge pull request #7480 from jherico/webchannel_redux 
Webchannel redux
 2016-03-28 13:18:22 -07:00
Atlante45
659d7e7335 Fix segfault with gxx 2016-03-28 13:17:07 -07:00
Atlante45
103c6d89f2 Add Socket include to see debug macro 2016-03-28 13:11:44 -07:00
Seth Alves
cefc5293b0 Merge branch 'master' of github.com:highfidelity/hifi into use-local-scripts 2016-03-28 12:23:37 -07:00
Seth Alves
de8153bd75 on windows and osx use default scripts bundled with interface 2016-03-28 12:23:23 -07:00
Brad Hefta-Gaub
b26533bc14 Merge pull request #7481 from samcake/lemon 
Monitoring Tool for rendering engine
 2016-03-28 12:20:07 -07:00
Zach Pomerantz
931cad34d1 Check plugin activation success 2016-03-28 12:05:58 -07:00
samcake
aa085f6955 Putting members of the ENgineStats class NOT public so they can keep their name proudly 2016-03-28 11:52:31 -07:00
samcake
b5028acde1 CLeaning up the location of the global variables, moved them to the gpu::COntext class as static 2016-03-28 11:45:07 -07:00
Stephen Birarda
c0b92486f9 fix incorrect next packet delta 2016-03-28 11:09:32 -07:00
Brad Davis
5343dfef24 PR feedback on 7480 2016-03-28 10:19:38 -07:00
Brad Davis
ae82298e1b Working on the App JS <-> HTML JS communication 2016-03-28 10:09:22 -07:00
Stephen Birarda
3e4b4a0fc7 cleanup un-used public keys in ice-server 2016-03-28 10:03:05 -07:00
Anthony J. Thibault
f5a86666a1 Model: fix for collision mesh rendering 2016-03-28 09:56:15 -07:00
Zach Pomerantz
77bb8bafbb Catch and report GL errors in QML render 2016-03-27 17:56:44 -07:00
Zach Pomerantz
d6640ac520 Update Model::_hasTransparentTextures 2016-03-27 16:38:45 -07:00
Andrew Meadows
5ac0640cbe check for time machine 2016-03-27 16:33:53 -07:00
samcake
5a3896b1de FIxing warnigns 2016-03-27 09:35:13 -07:00
Anthony J. Thibault
49a4d104a6 Minimize diff with master 2016-03-26 13:27:05 -07:00
Anthony J. Thibault
bf433487fa Dynamic bound update for skinned mesh 
* Use all cluster matrices to compute bound for skinned mesh.
  This is far less expensive then doing per-vertex work, but it's not free, for avatars especially.
* Remove skinnedMeshBound, compute it instead.
* Compute clusterMatrices in render update, because we need them to update bounds.
 2016-03-26 12:22:02 -07:00
Anthony J. Thibault
b4e70d9101 WIP: checkpoint 
* bug fix in AABox::operator+=
* added AABox::emiggen
* Avatar now has a default bound for it's skinned mesh.
* WIP: AABox tests;  NEED MORE
* Model: split collision and model mesh render items.
  Because ModelMeshRenderItems need special handling to update bounds for animated joints.
* Model: dynamically update the bound for rigidly bound animated meshes
* Rig: added access to geometryToRigTransform
* RenderableModelEntityItem: try to update bounds for skinned mesh to be the entity dimentions (this doesn't seem to be working)
* Geometry.cpp: removed unused bounds parameter in evalPartBounds
* ModelMeshPartPayload: bounds updating
   * non-animated: use existing _localBound
   * rigid bound mesh: use _localBound transformed by clusterMatrix joint transform
   * fully skinned mesh: use _skinnedMeshBound provided by the application.
 2016-03-25 21:29:20 -07:00
samcake
c96d5b093c Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-03-25 18:42:00 -07:00
samcake
7361304084 Cleaning up for review 2016-03-25 18:38:52 -07:00
Brad Hefta-Gaub
bb42d84bbd Merge pull request #7479 from sethalves/fix-logging-crash 
fix locking in GenericQueueThread::process
 2016-03-25 17:56:10 -07:00
Brad Hefta-Gaub
9a66d779ae Merge pull request #7463 from zzmp/guard/bugsplat-2177 
Guard against lack of GL support to avoid crash
 2016-03-25 16:31:14 -07:00
Seth Alves
1532800a4e Merge branch 'master' of github.com:highfidelity/hifi into fix-logging-crash 2016-03-25 16:17:58 -07:00
Philip Rosedale
44c6f81c0f Merge pull request #7457 from ZappoMan/reduceFalsePositiveDeadlocks 
make the deadlock watchdog more generous
 2016-03-25 16:10:37 -07:00
Philip Rosedale
dfb09f134a Merge pull request #7476 from ZappoMan/bugFixes 
fix a couple of model bugs
 2016-03-25 15:58:52 -07:00
samcake
c23640249e Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-03-25 15:29:01 -07:00
samcake
9b58d50fd4 BUilding a more complete set of tools to monitor performances 2016-03-25 15:28:06 -07:00
Zach Pomerantz
b252139704 LMK when running with old GL version 2016-03-25 14:42:58 -07:00
Clément Brisset
82f22b42e1 Merge pull request #7465 from sethalves/redo-polyvox-locking 
Redo polyvox locking
 2016-03-25 14:35:27 -07:00
Zach Pomerantz
1405daa4ee Add guards when checking vsync 2016-03-25 14:18:12 -07:00
Seth Alves
f3ba16ab3e fix locking around polyvox state flags 2016-03-25 14:06:57 -07:00
Ryan Huffman
306425b940 Merge pull request #7475 from birarda/udt-fixes 
guard long sleeps in udt::SendQueue
 2016-03-25 13:56:45 -07:00
Seth Alves
d97ab1e2fc Merge branch 'master' of github.com:highfidelity/hifi into redo-polyvox-locking 2016-03-25 13:53:01 -07:00
Stephen Birarda
d9abc79b5d return for AccountManager sendRequest if threads do not match 2016-03-25 13:37:13 -07:00
Zach Pomerantz
b90f2b2e0a Use correct textureBaseUrl 2016-03-25 13:17:29 -07:00
Stephen Birarda
044fb983d7 cast chrono durations to qint64 2016-03-25 13:07:54 -07:00
Stephen Birarda
ce4d56fb90 add warning for long sendqueue sleeps 2016-03-25 13:06:21 -07:00
Brad Hefta-Gaub
541c1e5c6f Merge branch 'master' of https://github.com/highfidelity/hifi into reduceFalsePositiveDeadlocks 2016-03-25 13:03:31 -07:00
Zach Pomerantz
fac54b6ee3 Maintain parity with tex changes 2016-03-25 13:00:18 -07:00
Zach Pomerantz
c5e5195db1 Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching 2016-03-25 12:07:00 -07:00
Zach Pomerantz
581bbea36e Accomodate the caching Model 2016-03-25 11:57:40 -07:00
Zach Pomerantz
a262d9960c Mind differently tex'ed instances 2016-03-25 11:47:33 -07:00
Zach Pomerantz
af55547766 Copy material schema buffers as new ref 2016-03-25 11:46:24 -07:00
Philip Rosedale
4893d1f09e Merge pull request #7474 from zzmp/fix/drop-network-data 
Drop network data after processing
 2016-03-25 11:43:58 -07:00
Brad Hefta-Gaub
4ebb114a8e also fix joint simulation from 3rd party editors 2016-03-25 11:43:32 -07:00
Stephen Birarda
74e041e9aa cast chrono durations to int explicitly 2016-03-25 11:41:41 -07:00
Seth Alves
13eddef312 fix locking in GenericQueueThread::process 2016-03-25 11:37:04 -07:00
Philip Rosedale
e891fd219b Merge pull request #7472 from AndrewMeadows/delete-mortal-entities 
expire mortal entities correctly
 2016-03-25 11:33:07 -07:00