Commit graph

651 commits

Author SHA1 Message Date
Olivier Prat
98a47e56fc Added a hack to force referencing of shader source on Android 2018-01-12 17:32:12 +01:00
Olivier Prat
420b58fd5b Trying to fix Android build error 2018-01-12 15:13:55 +01:00
Olivier Prat
814de4ab81 Scribe now outputs shaders as cpp files. 2018-01-12 11:59:19 +01:00
Nissim Hadar
0f4206d330 Added option to delete old snapshots. 2018-01-10 18:21:34 -08:00
Stephen Birarda
fa75320acf
Merge pull request #11984 from birarda/bug/macdeployqt-for-oven
fix rpath for oven on OS X
2017-12-14 10:26:13 -08:00
Stephen Birarda
88831ff08a don't trigger unix step on apple for oven 2017-12-13 18:39:19 -08:00
Stephen Birarda
0b598ea948 fix RPATH for oven so it loads things from macdeployqt 2017-12-13 18:39:19 -08:00
Zach Fox
ed5082e5d4
Merge pull request #11974 from birarda/feat/staging-env-or-cl
allow custom metaverse URL to be used with env var
2017-12-13 17:29:45 -08:00
Stephen Birarda
139976d8bb allow staging METAVERSE_SERVER_URL to be toggled by env 2017-12-12 16:22:08 -08:00
David Rowe
578c42b4ea Merge branch 'master' into 21624 2017-12-13 09:41:09 +13:00
MiladNazeri
16e16501cd
Merge pull request #11791 from ctrlaltdavid/21602
JSDoc updates
2017-12-12 12:18:02 -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
divya
e187852df1
Merge pull request #11941 from huffman/feat/atp-baking-process
Move asset server baking to a separate process
2017-12-09 20:48:14 -08:00
Ryan Huffman
7b48f08566 Remove _baker inside ModelBakeWidget 2017-12-08 16:45:27 -08:00
Nissim Hadar
9ff1b4bcb1 WTF.... 2017-12-08 16:38:46 -08:00
Nissim Hadar
44c76061ed Lowered threshold to 0.999 2017-12-08 16:25:10 -08:00
Ryan Huffman
373b29c031 Merge branch 'master' of github.com:highfidelity/hifi into feat/obj-baker-update 2017-12-08 14:29:58 -08:00
Nissim Hadar
b7a170c718 Added error messages to file rename. 2017-12-08 11:45:30 -08:00
Ryan Huffman
70c35f84b5 Update baker library with many style improvements 2017-12-08 10:30:38 -08:00
Nissim Hadar
5806605439 Reformatting per coding standard. 2017-12-07 11:34:56 -08:00
Nissim Hadar
8c1a4e058e Changed format (to 5 digits).
Changed threshold.
2017-12-07 10:58:28 -08:00
Ryan Huffman
4dd08d93f4 Cleanup dead code and unused var in BakerCLI 2017-12-07 10:54:39 -08:00
Ryan Huffman
94a58a2471 Remove baking dependency from assignment-client 2017-12-07 10:53:23 -08:00
Nissim Hadar
ebad5cf503 Reduced threshold from 0.9995 to 0.995 2017-12-06 16:55:32 -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
7eb93f4777 Add oven as dep to assignment-client 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
Nissim Hadar
3de34834e1 Changed autoTester threshold to 0.9995
Added a readme explaining how to deploy autoTester.
2017-12-05 11:19:00 -06:00
Nissim Hadar
c35310c2fb Deal with user canceling folder selection. 2017-12-01 17:17:11 -08:00
Nissim Hadar
6c2e701023 Improved CMakeLists.txt for QT deployment.
Changed threshold from 0.999 to 0.9998
2017-12-01 13:31:52 -08:00
Nissim Hadar
a83244c27f Corrected typo in comment. 2017-12-01 11:16:57 -08:00
Nissim Hadar
526aa8fe57 Changed threshold from 0.98 to 0.999 2017-12-01 09:28:31 -08:00
Nissim Hadar
12ac551d25 Changed power from 2.0 to 2 2017-11-30 18:27:47 -08:00
Nissim Hadar
c0673db3c5 Fix for MacOS 2017-11-30 18:23:58 -08:00
Nissim Hadar
c63571a710 Debugging the image comparison. 2017-11-30 16:27:28 -08:00
Nissim Hadar
0842e09570 Debugging the image comparison. 2017-11-30 13:59:02 -08:00
Nissim Hadar
2e8fe40da8 Recursive test evaluations. 2017-11-30 13:07:54 -08:00
Nissim Hadar
4afc8f9759 Added print() code to the produced script. 2017-11-29 12:12:13 -08:00
Nissim Hadar
7a67e3e5f7 Using js modules. 2017-11-29 09:15:30 -08:00
Nissim Hadar
3710d726df WIP - improving the recursive script. 2017-11-28 15:23:57 -08:00
Nissim Hadar
709fadff2e WIP - improving the recursive script. 2017-11-28 15:23:33 -08:00
David Rowe
cd2922a560 Merge branch '21602' into 21624
# Conflicts:
#	tools/jsdoc/plugins/hifi.js
2017-11-28 17:04:59 +13:00
nissim.hadar
42fbe95768 Additional code. 2017-11-26 13:33:01 -08:00
nissim.hadar
b397cd80db Implemented code to call the various test.s functions. 2017-11-26 02:44:12 -08:00
nissim.hadar
9b2c057e9b Trying to fix Qt error on Ubuntu. 2017-11-26 01:39:16 -08:00
nissim.hadar
1510c4d68a Fixed CMakeLists.txt. 2017-11-26 01:12:55 -08:00
nissim.hadar
c0d1549ca5 Trying to fix Qt error on Ubuntu. 2017-11-26 00:17:41 -08:00
nissim.hadar
ea53b9893c Minor edit. 2017-11-26 00:00:19 -08:00
nissim.hadar
0a51ca46e8 Fix gcc error. 2017-11-25 11:58:30 -08:00
nissim.hadar
2911b7dec6 Fix gcc error, and MAC error (no pow). 2017-11-25 11:41:05 -08:00
nissim.hadar
fcd8a47bec Fix gcc error. 2017-11-25 11:24:24 -08:00
nissim.hadar
e35e76afd7 Removed unused variable warning. 2017-11-25 11:03:33 -08:00
nissim.hadar
747ba0bf84 Removed unneeded include of glm. 2017-11-25 11:03:02 -08:00
nissim.hadar
034f4f6036 Fixes for gcc warnings. 2017-11-25 09:21:31 -08:00
nissim.hadar
a71ee719dc Minor typos. 2017-11-25 08:45:22 -08:00
nissim.hadar
ab400159bd Removed ITK. 2017-11-25 03:13:41 -08:00
nissim.hadar
e20ac9aa94 First version with own implementation of SSIM. 2017-11-25 03:01:15 -08:00
nissim.hadar
2a062ad772 Merge branch 'master' into QtImageCompare 2017-11-25 02:59:11 -08:00
nissim.hadar
186d9da303 First version with own implementation of SSIM. 2017-11-25 02:30:23 -08:00
David Rowe
de49fefc61 Merge branch 'master' into 21602
# Conflicts:
#	libraries/shared/src/RegisteredMetaTypes.h
2017-11-25 17:06:36 +13:00
David Rowe
91671722a5 Add Shape API types JSDoc 2017-11-25 16:09:54 +13:00
nissim.hadar
857f2c6880 New image comparison method. 2017-11-23 05:58:00 -08:00
nissim.hadar
346c691f0c Implemented creation of allTests.js 2017-11-22 10:56:32 -08:00
nissim.hadar
fef5d95e94 First fully-coded registration. 2017-11-20 12:33:38 -08:00
nissim.hadar
80b646f48c Clean-up. 2017-11-20 11:13:06 -08:00
nissim.hadar
689957c80b Created RGB to monochrome filters. 2017-11-20 08:11:19 -08:00
nissim.hadar
b13ccab303 Can copy an image using ITK. 2017-11-20 01:24:52 -08:00
nissim.hadar
861c33d5a9 Added first use of ITK. 2017-11-19 13:48:37 -08:00
nissim.hadar
7b2fed6db2 Include of "ITK" in Test.cpp complete 2017-11-17 05:38:29 -08:00
nissim.hadar
f990e3f918 Build auto-tester iff ITK has been installed. 2017-11-17 05:10:14 -08:00
SamGondelman
8730a26d20 use mouse events for offscreenui because touch events aren't working with the eventFilter, cleanup, documentation 2017-11-15 14:12:16 -08:00
Nissim Hadar
a2925518c2 Andrew's amazing fix. 2017-11-14 13:35:37 -08:00
Nissim Hadar
95bd10063d Fixing CMake 2017-11-14 11:48:33 -08:00
Nissim Hadar
7dacea327b Fixing CMake 2017-11-14 09:40:24 -08:00
Nissim Hadar
ed28cf07b6 Fixing CMake 2017-11-14 09:20:38 -08:00
Nissim Hadar
4eda0ce025 Fixing CMake 2017-11-14 09:00:46 -08:00
Nissim Hadar
b07f98da14 Fixing CMake 2017-11-14 08:34:02 -08:00
Nissim Hadar
156282beaa Fixing CMake 2017-11-14 08:09:46 -08:00
Nissim Hadar
3f59446718 Fixing CMake 2017-11-14 07:50:16 -08:00
Nissim Hadar
27f7511ce9 Fixing CMake 2017-11-14 07:12:03 -08:00
Nissim Hadar
84c64c3992 Fixing CMake 2017-11-14 00:30:32 -08:00
Nissim Hadar
0e0574edd5 Fixing CMake 2017-11-14 00:11:52 -08:00
Nissim Hadar
c6ffbf612a Fixing CMake 2017-11-13 23:52:31 -08:00
Nissim Hadar
0c271488bb Modified tools/auto-tester/CMakeLists.txt 2017-11-13 22:37:10 -08:00
Nissim Hadar
2417890cce Fixing CMake 2017-11-13 22:26:38 -08:00
Nissim Hadar
ddab843b4d To make Jenkins happy. 2017-11-13 22:08:48 -08:00
Nissim Hadar
cfcbf1c7cf Fixing CMake 2017-11-13 21:25:07 -08:00
Nissim Hadar
4b3f892abe Used 'system' return value. 2017-11-13 17:35:01 -08:00
Nissim Hadar
311d794529 Corrected case of #include'd file. 2017-11-13 15:38:59 -08:00
Nissim Hadar
58eadbe00f Use GLOB_RECURSE in lieu of listing the files. This is an attempt to deal with Linux build failing. 2017-11-13 15:29:47 -08:00
Nissim Hadar
d11aa64306 Seems to work. 2017-11-13 13:25:59 -08:00
Nissim Hadar
aa4320104b WIP. 2017-11-13 10:25:31 -08:00
Nissim Hadar
572646b8c6 Just missing the dll's. 2017-11-12 21:43:33 -08:00
Nissim Hadar
eaa51ebe9d WIP. 2017-11-12 11:27:24 -08:00
Nissim Hadar
7a0d188149 WIP. 2017-11-11 18:10:47 -08:00
David Rowe
39ccd7d656 Update JSDoc for Camera API 2017-11-12 11:04:35 +13:00
Nissim Hadar
3457e1de5d WIP. 2017-11-11 13:19:57 -08:00
Nissim Hadar
8433374fb6 CMake includes Qt headers 2017-11-10 20:24:11 -08:00
Nissim Hadar
3101663b7b In the beginning. 2017-11-10 18:55:07 -08:00
David Rowe
a482b7c371 Fix up JSDoc tool readme file 2017-11-10 17:09:45 +13: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
Seth Alves
66191a5419 Merge pull request #11291 from ElderOrb/optional-build-tools
make building tools (besides 'scribe') optional
2017-10-08 10:02:28 -07:00
Bradley Austin Davis
e42068f681 Merge branch 'master' into android_new 2017-09-26 14:31:29 -07:00
Ryan Huffman
a56303a3fe Merge pull request #11379 from highfidelity/feat/auto-bake
Add auto baking to Asset Server and mesh compression for FBXs
2017-09-21 08:33:51 -07:00
Bradley Austin Davis
bc4193f276 Merge branch 'master' into android_new 2017-09-19 14:27:31 -07:00
Bradley Austin Davis
b93e91b9f3 New android toolchain 2017-09-19 13:45:12 -07:00
beholder
04305155d0 make building tools (besides 'scribe') optional 2017-09-14 23:16:12 +03: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
9b462171f6 Add draco support to FBXBaker 2017-09-08 16:58:29 -07:00
Stephen Birarda
91f4551598 add draco to the oven tool 2017-09-08 09:46:55 -07:00
Stephen Birarda
3cf77f377c remove FBX SDK from CMake files 2017-09-07 18:46:44 -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
Anthony J. Thibault
23ff1b9ead Fixes for scaling controller display
Adds MyAvatar.sensorToWorldScaleChanged signal.
2017-09-05 15:03:41 -07:00
Atlante45
28c9aa031c Setup script model status 2017-08-25 10:54:34 -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
Seth Alves
c4d909927a make atp-client work again 2017-07-24 19:23:39 -07:00
Andrew Meadows
665aa92da2 Merge pull request #10877 from sethalves/atp-client
Atp client
2017-07-07 14:04:50 -07:00
Stephen Birarda
bff54d260e fix for baking FBX with external textures 2017-07-07 10:11:13 -07:00
Seth Alves
b8875a8902 Merge branch 'master' of github.com:highfidelity/hifi into atp-client 2017-07-06 17:28:55 -07:00
Clément Brisset
34e3f56002 Merge pull request #10843 from birarda/bug/user-activities-interface-only
disable user activity logger in DS/AC/ac-client
2017-07-06 14:01:49 -07:00
Stephen Birarda
916f57772b default the UAL off for all targets, enable manually for Interface 2017-07-06 10:21:07 -07:00
Seth Alves
98ac2ccb90 rearrange code so authed connection works better 2017-07-05 17:36:25 -07:00
Seth Alves
f7131027e0 if user has provided login credentials, wait for the keypair to be ready before proceeding 2017-07-05 17:26:15 -07:00
Seth Alves
d62b0ffb3b Merge branch 'acclient_fix' of github.com:jherico/hifi into atp-client 2017-07-05 17:03:16 -07:00
Brad Davis
2409c83d5d Fix ACClient on Linux 2017-07-05 16:53:42 -07:00
Seth Alves
a05e9e12c1 remove some debug prints 2017-07-04 17:59:56 -07:00
Seth Alves
bdbfe25a53 remove some debug prints 2017-07-04 17:46:35 -07:00
Seth Alves
1192e86494 add a way to login on command-line 2017-07-04 17:11:53 -07:00
Seth Alves
a6af6015a4 add a way to login on command-line 2017-07-04 17:00:25 -07:00
Seth Alves
e9a8c3f5e8 rename atp-get to atp-client. add ability to list atp file mappings and to upload new files 2017-07-04 15:52:03 -07:00
Ryan Huffman
b8ce4b9006 Merge pull request #10801 from huffman/fix/oven-native-separators
Add support for native separators in oven, and vs2015/2017 FBX sdk
2017-07-03 12:07:26 -07:00
Stephen Birarda
86eb5b14ca disable the user activity logger in DS/AC/ac-client 2017-06-28 13:19:58 -07:00
Anthony J. Thibault
d7416434bf added tool to visualize avatar-animation.json using graphviz. 2017-06-26 11:38:24 -07:00
Ryan Huffman
b12018ccf3 Fix Oven not properly handling native separators 2017-06-23 10:54:48 -07:00
Seth Alves
a053a1da4b more HIFI_MEMORY_DEBUGGING fixes 2017-06-22 13:50:46 -07:00
Seth Alves
9ce173f682 missed a few 2017-06-22 10:56:08 -07:00
Seth Alves
7ff576ef18 add memory-debugging macro to some cmake files 2017-06-22 10:07:39 -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
Bradley Austin Davis
fc6a278217 Fixing dangling thread issues, consolidating thread management 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
c71255d5fe force oven dependency on model-baker since it is excluded 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
6127b72834 don't build oven and model-baking with default/ALL_BUILD 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
Stephen Birarda
980de595a9 handle skybox baking from oven menu 2017-04-26 18:37:36 -07:00
Stephen Birarda
25d24c445d handle ambient skybox textures for zones in domain bake 2017-04-26 18:37:36 -07:00
Stephen Birarda
7bc69e6eda add skybox baking to DomainBaker 2017-04-26 18:37:35 -07:00
Stephen Birarda
cbd6f6417c allow clicking on results row to show dir 2017-04-26 18:37:35 -07:00
Stephen Birarda
cdd9990fe8 use worker threads for Oven, re-write animation URLs 2017-04-26 18:37:35 -07:00
Stephen Birarda
383d82fe1d fix multi-line display in results window 2017-04-26 18:37:35 -07:00
Stephen Birarda
3388debe9f remove debug for percentage in DomainBakeWidget 2017-04-26 18:37:35 -07:00
Stephen Birarda
446cbf59b3 add domain bake progress to results table 2017-04-26 18:37:35 -07:00
Stephen Birarda
49e7ae6dbc call image library for texture baking 2017-04-26 18:37:35 -07:00
Stephen Birarda
429e65888b cleanup threading and result handling for DomainBaker 2017-04-26 18:37:35 -07:00