Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-06 05:32:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
87403 commits 68 branches 56 tags 1.2 GiB
Commit graph

548 commits

Author SHA1 Message Date
HifiExperiments
fe61d92a09 model loading priority updates over time, takes into account out of bounds, avatar entities have higher priority, and fsts can specify to wait for wearables to load before rendering 2024-08-18 20:55:22 -07:00
HifiExperiments
ee705d285e Merge branch master into protocol_changes 2024-06-18 21:08:21 -07:00
Julian Groß
ae7d229d0e Fix copyright headers 2023-05-19 00:17:38 +02:00
Heather Anderson
1e018dbc64 isolate calls to the QtScript libraries to an interface we control 2023-05-19 00:17:33 +02:00
Heather Anderson
713b29ee41 ensure all #include's to QtScript are labeled as such (easier to find) 2023-05-19 00:17:33 +02:00
Dale Glass
fed0f21603 Fix StrongRef warning 2022-06-10 00:46:19 +02:00
Kalila
03b5b83b67
Merge pull request #1339 from odysseus654/pr/make_shared 
Housekeeping: use of std::make_shared / QSharedPointer::create.
 2021-12-09 17:14:04 -05:00
Dale Glass
d77c8bbe41 Fix warnings related to deprecated usage of multiple keys in QHash and QMap 
This replaces those uses with QMultiHash and QMultiMap
 2021-11-26 17:53:23 +01:00
Heather Anderson
bcce9a2091 convert explicit shared pointer creation (using "new") to make_shared where possible/appropriate 2021-09-11 15:15:04 -07:00
Heather Anderson
ab4d70760e review and cleanup of "#include <QtCore/QSharedPointer>" 2021-09-10 21:40:54 -07:00
David Rowe
4d11d1d515 Convert all "/**jsdoc" occurrences to "/*@jsdoc" 2021-05-12 10:54:45 +12:00
Julian Groß
ecb7c47f1a Rename fbx folder to model-serializers 2021-04-15 19:26:10 +02:00
Kasen IO
21fd10d154 Revert commit 359248829c using -m 1 to temporarily fix issue 383. 2020-06-03 16:08:18 -04:00
David Rowe
5eb6e9dadd Add recently added properties to caches' JSDoc 2019-11-26 17:00:13 +13:00
sabrina-shanman
7b14c00540 Merge branch 'master' into instancing 2019-11-05 10:22:24 -08:00
HifiExperiments
1e100a672e merge with master and try to fix opacity mode stuff 2019-10-23 22:21:45 -07:00
Sam Gateau
a95a4b5aa2 Address warnings and comments from review 2019-10-18 11:43:25 -07:00
Sam Gateau
a995f2c09f in the middle of something 2019-10-10 17:09:54 -07:00
Sam Gateau
936ac6f120 REmoving more repetitions of the meshParts 2019-10-07 18:03:33 -07:00
Sam Gateau
521ce3936b I changed names! Renaming the Geometry to NetworkModel, the GeometryResource to ModelResource, i think there is no need for the 2, only one would be enough in my opinion... 2019-10-07 15:19:23 -07:00
Sam Gateau
dc40c530a3 INstrumenting the code more... 2019-09-25 17:53:59 -07:00
SamGondelman
6d3e23a7fe merge with master 2019-05-16 20:03:10 -07:00
Anthony J. Thibault
98fe059d97 Fix blender::run crash 
Pass a shared_ptr of the HFMModel to the Blender.  This will prevent the HFMModel
from being destroyed on the main thread if an Avatar changes their skeletonModelURL.

Also the _blendshapeOffset hash in Model has been eliminated, it was not necessary and
was also a source of data races.

The body of Blender::run has been updated slightly to reduce the number of allocation necessary for temporary QVectors.
 2019-05-16 13:12:16 -07:00
SamGondelman
da254c2ccc (¬‿¬) 2019-05-15 23:48:04 -07:00
Clement
ad36df0455 Fix build warnings 2019-05-09 13:59:49 -07:00
Atlante45
3605b3d560 Patch interface redirect code 2019-04-23 14:54:12 -07:00
SamGondelman
b1f00d6f22 attempt to handle atp redirects from .fbx to .baked.fst 2019-04-23 14:54:10 -07:00
Sabrina Shanman
16da80b9b6
Merge pull request #15425 from sabrina-shanman/bug_hfm_main-thread 
(case 22011) Fix model processing occurring on main thread
 2019-04-19 15:40:54 -07:00
sabrina-shanman
7333b02f34 Fix model processing occurring on main thread 2019-04-19 09:48:30 -07:00
SamGondelman
27f1255899 fix transparent textures on baked assets 
(cherry picked from commit b89dbf8346)
 2019-04-18 11:23:45 -07:00
Sam Gondelman
88c278d357
Merge pull request #15319 from SamGondelman/materialBaker 
Case 21764: Oven bakes model materials directly to separate material description
 2019-04-05 17:08:22 -07:00
SamGondelman
75a246b82d simplifying material baker and support bump/gloss maps 2019-04-01 22:35:28 -07:00
David Rowe
9a1bb27034 AnimationCache, ModelCache, SoundCache, and TextureCache JSDoc 2019-03-26 13:58:43 +13:00
Howard Stearns
44f897fbd2
Merge pull request #15216 from howard-stearns/allow-base-url-to-be-specified-in-fst 
allow baseURL to be specified in fst
 2019-03-19 13:56:27 -07:00
Howard Stearns
61fb65b5a4 don't set _url, so that cache_clearing works 2019-03-19 12:41:58 -07:00
howard-stearns
0e4d3b2aeb allow baseURL to be specified in fst 2019-03-18 17:40:54 -07:00
sabrina-shanman
a93825c2f9 Fix remaining issues with merge 2019-03-12 18:14:18 -07:00
sabrina-shanman
ddc4f5349e Merge branch 'master' into hfm_oven_wip 2019-03-12 16:23:07 -07:00
Shannon Romano
d068630728
Merge pull request #15108 from sabrina-shanman/crash_physics-fst 
(case 21585) Fix crash when FST model used as both graphics and physics model
 2019-03-06 17:06:38 -08:00
sabrina-shanman
1576125c42 Integrate HFM Asset Engine (aka model prep step) into Oven 
Add 'deduplicateIndices' parameter to FBXSerializer and make deduplicate a required parameter for extractMesh

Add draco mesh and FBX draco node version

Support generating/saving draco meshes from FBX Model nodes
 2019-03-06 15:54:12 -08:00
sabrina-shanman
86c948f116 Convert hfmModel and materialMapping fields in model-baker Baker to getters 2019-03-06 15:33:31 -08:00
sabrina-shanman
7ad8b3a610 Fix FST models being copied improperly in the ModelCache 2019-03-05 16:59:36 -08:00
Thijs Wenker
ff8cb27256 include fst URL in the GeometryExtra hash 2019-02-28 23:45:08 +01:00
Thijs Wenker
6aede024f4 use fst mapping path as reference instead of model path 2019-02-28 23:22:55 +01:00
SamGondelman
44e70db4cd WE DID IT FOLKS 2019-02-19 15:02:36 -08:00
sabrina-shanman
bb123cfe3b Fix GLTF materials 2019-02-15 14:51:29 -08:00
SamGondelman
dd0d7f0118 merge with master 2019-02-14 09:57:13 -08:00
Andrew Meadows
efe2767f3f
Merge pull request #14913 from SamGondelman/pal 
Case 21147, Case 20944: Fix setTextures (pal, etc.)
 2019-02-13 17:50:08 -08:00
Andrew Meadows
72b5fa1968
Merge pull request #14857 from Atlante45/fix/ess-parenting 
Case 15420: Fix ESS sometimes not getting the parents/children of entities with scripts.
 2019-02-13 17:26:57 -08:00
SamGondelman
13ece79476 merge with master 2019-02-13 16:30:22 -08:00