Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-08 16:42:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85903 commits 21 branches 28 tags 1.2 GiB
Commit graph

230 commits

Author SHA1 Message Date
ksuprynowicz
d2a768c2f0 Renamed environment variables 2022-09-08 22:18:50 +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
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
Julian Groß
ecb7c47f1a Rename fbx folder to model-serializers 2021-04-15 19:26:10 +02:00
HifiExperiments
35e836d34d image caching must maintain original image information and pass it around 2021-03-19 22:32:29 -07:00
Kasen IO
4b1e82fc0b Move user agent to networking constants. 2020-07-08 14:18:24 -04:00
Kasen IO
21fd10d154 Revert commit 359248829c using -m 1 to temporarily fix issue 383. 2020-06-03 16:08:18 -04:00
Sabrina Shanman
579eb04df9
Merge pull request #16491 from sabrina-shanman/instancing 
Fix code style / remove cruft
 2019-11-13 12:53:10 -08:00
sabrina-shanman
516debdcb2 Fix code style / remove cruft 2019-11-13 12:50:13 -08:00
sabrina-shanman
9a65d78cdf Fix model baking to work with new hfm::Shape material definition (1 
material per mesh part)
 2019-11-11 17:52:00 -08: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
sabrina-shanman
76b1f551b1 Merge branch 'master' into instancing 2019-09-16 10:17:59 -07:00
sabrina-shanman
a166b41216 Fix build warnings/errors 2019-09-13 15:39:29 -07:00
sabrina-shanman
b944db3e79 std::vector-ize joints and materials in hfm::Model 2019-09-11 16:54:07 -07:00
sabrina-shanman
65d85138cc TIL that std::vector<bool> is a bit field 
https://howardhinnant.github.io/onvectorbool.html
 2019-09-10 16:31:30 -07:00
sabrina-shanman
384b7fd629 Fix FBXBaker failing when an unbaked mesh is empty 
Error early for all model bakers for draco errors
 2019-09-10 15:22:54 -07:00
sabrina-shanman
5171b660ae Give better error message when draco part of model baking fails 2019-09-09 17:32:27 -07:00
sabrina-shanman
01b29c3aac Fix DomainBaker not finishing when Re-bake originals checked and 
.baked.fbx present
 2019-09-09 10:43:08 -07:00
sabrina-shanman
0a97f2535b Fix missing return on handling TextureBaker error 2019-09-06 17:46:59 -07:00
SamGondelman
60600779c9 merge with master 2019-07-12 11:01:17 -07:00
Anthony Thibault
6c66f5a37b Fix for DependencyManager crash on shutdown on Mac 
On Mac, it is possible to crash when shutting down, it is not clear if this is due to
shutting down the app on another thread during logout or something that can happen
during normal shutdown, because it is so difficult to reproduce.

However, from looking at the stack traces it is possible for a [NSApplication terminate:]
event to get processed while Appliction::aboutToQuit() is calling ScriptEngine::waitTillDoneRunning()
This causes AppKit to invoke the static destructors too early.  Which in turn, causes the
DependencyManager destructor to fire while there are still many dependencies running.
Unfortunatly, the order of destruction is not determinstic, causing them to get shutdown
in an incorrect order.

To workaround this, we delay the call to QCoreApplication::processEvents() as late as possible,
in the Application destructor. Theoretically, this will be a safe time for the static destructors
to be invoked, because it is after all of the DependencyManager's dependencies have been
manually destroyed.

However, this is only a speculative fix, because this is so difficult to reproduce.
 2019-07-01 17:37:57 -07:00
SamGondelman
da254c2ccc (¬‿¬) 2019-05-15 23:48:04 -07:00
SamGondelman
6ce6877dfa Merge remote-tracking branch 'upstream/master' into textureUsage 2019-04-25 15:05:27 -07:00
Shannon Romano
0768cd58dc
Merge pull request #15427 from SamGondelman/materialMap 
Case 22079: Bake existing materialMap in FST
 2019-04-24 09:16:12 -07:00
SamGondelman
3b746384ca really fix texture baking, and turn off irradiance generation during baking 2019-04-23 16:01:31 -07:00
SamGondelman
7245d1a037 handle texturebakers with same url but different usage 2019-04-22 13:24:34 -07:00
SamGondelman
080cb36170 bake existing materialMap 2019-04-19 13:01:47 -07:00
sabrina-shanman
7b74561b27 Fix baked models not preserving scale in some cases 2019-04-19 11:29:27 -07:00
SamGondelman
b9934bce70 Merge remote-tracking branch 'upstream/master' into materialMap 2019-04-19 11:27:04 -07:00
Sam Gondelman
38ca699ff5
Merge pull request #15406 from sabrina-shanman/bug_oven_fst-rebake 
(case 22271) (RC83) Fix baked models unable to rebake
 2019-04-19 10:44:54 -07:00
Shannon Romano
4962bc8c10
Merge pull request #15395 from SamGondelman/oven 
Case 22213: Fix materialJSON paths in domain baker
 2019-04-19 10:39:42 -07:00
Sam Gondelman
2604afa454
Merge pull request #15396 from SamGondelman/oven2 
Case 22244: Fix oven crash (RC83)
 2019-04-18 20:22:36 -07:00
SamGondelman
0d914a695b wip 2019-04-18 09:06:02 -07:00
sabrina-shanman
d80b40e5a5 Fix baked FSTs unable to be rebaked by creating an FST in the original 
output folder
 2019-04-17 16:37:01 -07:00
Sam Gateau
e6c76cdb19
Merge pull request #15329 from Zvork/amc 
case 22219: Improved ambient maps
 2019-04-17 10:20:53 -07:00
SamGondelman
2d5cfbf4f5 fix oven crash 2019-04-16 15:16:26 -07:00
SamGondelman
23918258d9 fix materialJSON paths in domain baker 2019-04-16 10:30:09 -07:00
sabrina-shanman
39cf3c3d83 Fix TextureBaker failures and heap corruption in MaterialBaker 2019-04-11 13:44:26 -07:00
SamGondelman
a50cca006e use # instead of ? for material URL name selection 2019-04-08 23:45:47 -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
Olivier Prat
1322fef568 Taking into account samuel's remarks 2019-04-05 20:15:58 +02:00
Sam Gateau
eee5f87dcd
Merge pull request #15264 from Zvork/hdr 
Case 22045: Added support for OpenEXR files (mostly for skyboxes)
 2019-04-04 10:32:11 -07:00
NissimHadar
3ba5f8e574 Use place holder instead of RCC file. 
(cherry picked from commit 709515dd74)
(cherry picked from commit 4e4526fbb2)
 2019-04-03 15:25:34 -07:00
SamGondelman
2b376f7881 handle weird material name case 2019-04-03 14:26:45 -07:00
SamGondelman
cf7230f023 fix non-embedded textures 2019-04-03 11:26:07 -07:00
Olivier Prat
eadace70f8 Merge branch 'master' of https://github.com/highfidelity/hifi into amc 2019-04-03 18:19:46 +02:00
Olivier Prat
50fecf5e01 Ambient map has different hash than sky map to prevent using one instead of the other, even if they are using the same source texture. 2019-04-03 11:29:59 +02:00
SamGondelman
770b863604 fixing embedded textures and materialMapping priority 2019-04-02 19:04:23 -07:00