Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-16 09:29:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85900 commits 24 branches 28 tags 1.2 GiB
Commit graph

180 commits

Author SHA1 Message Date
SamGondelman
94de0c12bc working on material baker 2019-03-06 15:34:11 -08:00
SamGondelman
4965adbc2f bake js and collision hull 2019-03-06 15:34:11 -08:00
SamGondelman
162573bc63 enable js baking from non-local file 2019-03-06 15:34:10 -08:00
SamGondelman
270b96aa8d cleaning up oven 2019-03-06 15:34:09 -08:00
sabrina-shanman
e4d6d5af89 Streamline ModelBaker initialization and URLs 2019-03-06 15:18:19 -08:00
Simon Walton
8af3bf3748 Add new dependency class (ResourceRequestObserver) to Oven 2018-11-13 09:45:18 -08:00
Qliemillar
17ddf37510
Merge pull request #12656 from ElderOrb/oven_windows_fix 
Fix inability to 'bake' models on Windows
 2018-07-17 09:42:46 -06:00
Ryan Huffman
015c092e1c Update oven to only produce uncompressed ktx for cubemaps 2018-06-11 16:37:40 -07:00
Ryan Huffman
38df5d3db5 Merge branch 'master' of github.com:highfidelity/hifi into feat/uncompressed-ktx-in-texmeta 2018-06-11 16:17:56 -07:00
Ryan Huffman
faafd26d2a Add uncompressed KTX files to baked texture output 2018-06-08 11:39:47 -07:00
Ryan Huffman
384851c289 Add option to oven cli to select texture usage type 2018-05-23 10:50:51 -07:00
Ryan Huffman
8e1c7531dc Add option to oven.exe to disable texture baking 2018-05-23 10:42:14 -07:00
Clement
da9fb9c751 Fix non self-sufficient headers 2018-05-04 16:26:41 -07:00
Ryan Huffman
24ac342c6b Add support for client texture selection 2018-05-01 14:11:31 -07:00
Alexander Ivash
2439c04528 skip url conversion to 'file:///' for the urls which schema is already 'file' 2018-04-25 11:04:45 +03:00
Ryan Huffman
e90c051744
Merge pull request #11872 from huffman/feat/version-wo 
Add asset server baking versioning
 2018-03-23 08:27:37 -07:00
Ryan Huffman
00aa564d84 Fix crashes on exit because of ResourceManager thread destruction 2018-03-21 10:43:31 -07:00
Alexander Ivash
b1690b3189 fix malformed urls on windows (like file:///Users/ai/AppData....) 
note: the issue happened because drive letter on Windows is treated by QUrl as 'scheme', so replacing it with 'file' results in broken url.
 2018-03-16 00:27:36 +03:00
Ryan Huffman
0a00227ce3 Update message for failed bakes inside of AssetServer.cpp 2018-03-13 15:03:20 -07:00
Ryan Huffman
c555590e9b Enable support for baking JS files inside of the oven 2018-03-13 14:57:35 -07:00
Ryan Huffman
5448099a93 Fix baker CLI not correctly exiting on failure 
We previusly were exiting while still inside of the QApplication ctor,
before the event loop had been started. This fixes that by queueing up
the baking to occur after the ctor has completed.
 2018-03-13 14:57:04 -07:00
Ryan Huffman
11a3a86af3 Merge branch 'master' of github.com:highfidelity/hifi into feat/obj-baker-update 2018-03-13 14:49:26 -07:00
Ryan Huffman
bcbe55d751 Fix OBJ support in DomainBaker 2018-03-13 14:30:42 -07:00
Ryan Huffman
a5e491e29d Add OBJ support to domain baker 2018-03-13 10:38:21 -07:00
Ryan Huffman
004e15d2d9 Update ATP to be optional in ResourceManager for OBJBaker 2018-03-07 16:31:41 -08:00
Ryan Huffman
975f0bfbd2 Fix OBJBaker not correctly waiting until all assets have been baked to finish 2018-03-07 16:30:23 -08:00
John Conklin II
7381bb0d7e
Merge pull request #12447 from birarda/feat/oven-no-dock-bounce 
use QCoreApplication for Oven when headless version is used
 2018-03-07 12:56:25 -08:00
Ryan Huffman
842d5cdb39 Fix erroneous syntax (unmatched paren) 2018-03-05 12:03:24 -08:00
Ryan Huffman
ac0ecc8baa Merge remote-tracking branch 'upstream/master' into feat/obj-baker-update 2018-03-05 10:41:49 -08:00
Atlante45
277e556b48 Create a standard function to init Hifi Apps 2018-02-22 17:06:09 -08:00
Atlante45
80c0f2a21e Fix crash when passing --checkMinSpec flag 
That flag caused a DLL to be loaded before Application was
	instanced.
	This triggers a Qt bug inside Q_COREAPP_STARTUP_FUNC that causes
	the previous registration pointing the startup function in
	the main executable to be overridden with the address of the
	function in the DLL (Since they both link the same static
	library)
	This leads to the correct function running in the wrong address
	space (the DLLs), hence not initializing some global variables
	correctly.
 2018-02-22 16:29:38 -08:00
Stephen Birarda
79f5d0cee2 include memory for unique_ptr in Oven 2018-02-21 13:52:07 -08:00
Stephen Birarda
d4061c172e quit all threads before waiting on them (CR) 2018-02-21 13:52:07 -08:00
Stephen Birarda
2a597eb715 use QCoreApplication for oven when headless version is used 2018-02-21 13:52:07 -08:00
Atlante45
314c51ab3b Fix settings init in all exe 2018-01-26 15:53:08 -08:00
Clément Brisset
956f45b5af
Merge pull request #11932 from birarda/bug/baking-folder-number 
fix sparse rectification for small textures, export for same model at diff URL
 2018-01-18 14:25:33 -08:00
Ryan Huffman
c2e0f19591 Merge branch 'master' of github.com:highfidelity/hifi into feat/obj-baker-update 2017-12-11 13:39:58 -08:00
Ryan Huffman
7b48f08566 Remove _baker inside ModelBakeWidget 2017-12-08 16:45:27 -08:00
Ryan Huffman
70c35f84b5 Update baker library with many style improvements 2017-12-08 10:30:38 -08:00
Ryan Huffman
4dd08d93f4 Cleanup dead code and unused var in BakerCLI 2017-12-07 10:54:39 -08:00
Ryan Huffman
6b098bfc6a Fix aborted baking in oven cli 2017-12-06 13:51:31 -08:00
Ryan Huffman
bee666b522 Add error text reading to asset server baking 2017-12-06 11:49:34 -08:00
Ryan Huffman
f3fc5769e8 Move asset baking on asset server to separate process 2017-12-06 11:49:19 -08:00
Stephen Birarda
5688a166f8 fix folder name creation for duplicated models 2017-12-05 14:44:11 -08:00
utkarshgautamnyu
79c1e84c76 More indentation/spacing fixes 2017-10-24 16:15:20 -07:00
utkarshgautamnyu
98ec464106 Indentation Fixes 2017-10-24 16:05:00 -07:00
utkarshgautamnyu
46b46c2f4c Fixed issues with FBXBaker and refactoring of OBJBaker 2017-10-23 20:07:24 -07:00
utkarshgautamnyu
28baed18c0 Added code for OBJBaker and moved Texture and Mesh compression to ModelBaker superclass 2017-10-20 18:55:41 -07:00
Bradley Austin Davis
e42068f681 Merge branch 'master' into android_new 2017-09-26 14:31:29 -07:00
Bradley Austin Davis
b93e91b9f3 New android toolchain 2017-09-19 13:45:12 -07:00
Stephen Birarda
4066c9392d output from oven into folder with model name 2017-09-13 13:34:15 -07:00
Stephen Birarda
88b8fb4c5e use general worker threads for fbx baking 2017-09-12 20:02:27 -07:00
Ryan Huffman
395c9283dc Merge remote-tracking branch 'upstream/feat/auto-bake' into feat/auto-bake-fbxwriter 2017-09-12 14:09:59 -07:00
Ryan Huffman
b60d68c714 Replace FBX SDK loading of file in FBXBaker with FBXReader 2017-09-07 14:00:09 -07:00
Ryan Huffman
49e09f4838 Remove FBXBaker and TextureBaker from oven 2017-09-07 13:12:07 -07:00
Stephen Birarda
26b74db864 enable compression in image library from Asset Server 2017-09-07 12:07:57 -07:00
Ryan Huffman
39f04adc8d Improve baking interface and add automatic baking to asset server 2017-08-24 16:15:28 -07:00
Ryan Huffman
8d4ab5f751 Update FBXBaker to take output directory and update oven to use it 2017-08-21 13:40:51 -07:00
Stephen Birarda
bff54d260e fix for baking FBX with external textures 2017-07-07 10:11:13 -07:00
Ryan Huffman
b12018ccf3 Fix Oven not properly handling native separators 2017-06-23 10:54:48 -07:00
Seth Alves
b1119ff465 more changes to get oven building on Linux 2017-06-21 20:10:54 -07:00
Stephen Birarda
e658953246 Merge pull request #10645 from seefo/oven 
Oven will now give proper return codes when used via CLI
 2017-06-09 13:06:09 -07:00
Seth Alves
485df396ef Merge pull request #10628 from jherico/qt59 
Fixes for Qt 5.9 compatibility
 2017-06-08 16:51:08 -07:00
seefo
a4f4d49bec Oven will now give proper return codes when used via CLI 2017-06-08 11:52:58 -07:00
seefo
0c7ffa0ac6 Replaced baker in OvenCLI with an std::unique_ptr 2017-06-08 09:48:30 -07:00
seefo
99e9e10882 Made requested changes to OvenCLI constructor 2017-06-07 11:36:56 -07:00
seefo
a3d2fa2630 Made requested changed to Oven CLI 2017-06-06 16:13:18 -07:00
seefo
46400f4122 Cleaned up oven CLI 2017-06-06 15:05:26 -07:00
Bradley Austin Davis
b4bbf98fe3 Suppress TBB warnings 2017-06-06 15:02:16 -07:00
seefo
9bc1bc47a2 Added CLI to Oven tool 2017-06-06 14:57:42 -07:00
Stephen Birarda
9cdd7cc895 fix model check for filenames with periods 2017-05-23 15:46:45 -07:00
Stephen Birarda
4c652487d0 enable skybox compression (via BC7) by default 2017-05-23 14:14:22 -07:00
Stephen Birarda
0621ddfd9f don't enable cube map compression by default 2017-05-23 11:54:09 -07:00
Stephen Birarda
2ba700d062 add a toggle to domain baker to re-bake originals 2017-05-23 11:54:09 -07:00
Stephen Birarda
3edbd41027 enable image compression at run time in baker 2017-05-23 11:54:08 -07:00
Stephen Birarda
a7f154a853 make a copy of original models file when baking domain 2017-05-23 11:54:08 -07:00
Stephen Birarda
fe280ab103 remember the browse directory for model baker 2017-05-03 14:24:23 -07:00
Stephen Birarda
b422ec3f88 also set the relative filename to fix double references 2017-05-02 18:04:23 -07:00
Stephen Birarda
2637040f17 remove skybox baking from domain baking 2017-04-26 18:37:36 -07:00
Stephen Birarda
0b4a8d05aa fix references to moved texture type enum 2017-04-26 18:37:36 -07:00
Stephen Birarda
93c35314ec use HF user agent for texture and FBX requests 2017-04-26 18:37:36 -07:00
Stephen Birarda
3aa6757c32 use QCryptographicHash static for cleaner hashing 2017-04-26 18:37:36 -07:00
Stephen Birarda
683985aea9 correct headers after move from model-baking to oven 2017-04-26 18:37:36 -07:00
Stephen Birarda
c43a4eec86 fix indexOf checks by using lastIndexOf 2017-04-26 18:37:36 -07:00
Stephen Birarda
258533de7b fix filename references in FBXBaker 2017-04-26 18:37:36 -07:00
Stephen Birarda
46fc69dd32 fix filename parsing in TextureBaker 2017-04-26 18:37:36 -07:00
Stephen Birarda
38cb998ca1 move model-baking library to oven for build exclusion 2017-04-26 18:37:36 -07:00
Stephen Birarda
b3f3302f5c add accepted file types to baker file pickers 2017-04-26 18:37:36 -07:00
Stephen Birarda
b520640fef grow status column when there are long results 2017-04-26 18:37:36 -07:00
Stephen Birarda
2478ddb379 cleanup comments in skybox baking widget 2017-04-26 18:37:36 -07:00
Stephen Birarda
26d13ce002 make results window raising optional 2017-04-26 18:37:36 -07:00
Stephen Birarda
822af3365b always bring the results window to front when shown 2017-04-26 18:37:36 -07:00
Stephen Birarda
95e2cc4eea add BakeWidget, leverage for skybox widget cancellation 2017-04-26 18:37:36 -07:00
Stephen Birarda
8a1eb5f077 add cancellation handling to model bake widget 2017-04-26 18:37:36 -07:00
Stephen Birarda
7a5bfb8c19 add cancellation handling for domain bake widget 2017-04-26 18:37:36 -07:00
Stephen Birarda
9d8e493c20 remove suggestion that domain baker can load from URL 2017-04-26 18:37:36 -07:00
Stephen Birarda
3216202a8b fix local skybox file reference on windows 2017-04-26 18:37:36 -07:00
Stephen Birarda
0bb3f1c9dc assume local file if scheme is not remote 2017-04-26 18:37:36 -07:00
Stephen Birarda
a072f94085 leverage QDesktopServices to show output directory 2017-04-26 18:37:36 -07:00
Stephen Birarda
19aa05281e fix build errors for oven on windows 2017-04-26 18:37:36 -07:00