Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-18 07:48:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
63689 commits 25 branches 0 tags 1.1 GiB
Commit graph

318 commits

Author SHA1 Message Date
Atlante45
d090ac4396 CR 2017-06-16 17:04:57 -07:00
Brad Davis
a69cf31f4b PR feedback and cmake fixes 2017-06-16 16:59:58 -07:00
Atlante45
54fc8085f3 Remove pointer to file in NetworkTexture 2017-06-16 14:31:56 -07:00
Atlante45
4d3fc39ab6 Make KTX async tasks thread safe 2017-06-16 14:31:56 -07:00
Atlante45
fb8aa96a57 Add resource processing tracking to KTX 2017-06-16 14:31:56 -07:00
Atlante45
306b55e45d Synchronous mip loading 2017-06-16 14:31:56 -07:00
Atlante45
57e8d8e1fd Fix download retries 2017-06-16 14:31:56 -07:00
Atlante45
31d2592e7d Handle header and high mips in the same callback 2017-06-16 14:31:56 -07:00
Atlante45
d2251bb840 Offload ktx processing to threadpool 2017-06-16 14:31:56 -07:00
Atlante45
3110dd72bf More ktx work 2017-06-16 14:31:56 -07:00
Atlante45
35a0c41cf5 Move Ktx processing to thread pool. 2017-06-16 14:31:56 -07:00
David Kelly
6d64261e94 working but often the spectator camera texture is not right. 2017-06-16 08:40:18 -07:00
Zach Fox
fd50434d86 New camera model; Cleanup; Bashing head :against desk 2017-06-09 11:42:16 -07:00
Zach Fox
3884287c41 Use 'resource' protocol instead of 'http' 2017-06-09 11:39:28 -07:00
Zach Fox
5114fd8e1f Rename correctly? 2017-06-09 11:39:28 -07:00
Zach Fox
7aef4dab4c Variable renaming pass 2017-06-09 11:39:28 -07:00
howard-stearns
4ccfef9702 Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectator-camera-prototype 2017-06-05 11:18:40 -07:00
Zach Fox
87fca16e0d Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-05 10:48:12 -07:00
Brad Davis
1f95daf5c1 Add dev menu option to wipe KTX cache on next launch 2017-06-02 11:19:43 -07:00
Brad Davis
b9f9cddea0 Add versioning support to the KTX cache 2017-06-01 17:16:24 -07:00
howard-stearns
3f5f47e7f3 Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectator-camera-prototype 2017-05-18 16:13:15 -07:00
howard-stearns
851911f55a Merge branch 'master' of https://github.com/highfidelity/hifi into update-from-master-1 2017-05-18 15:28:40 -07:00
Ryan Huffman
e0212ac32b Remove _fullImageSize from ktx header 2017-05-16 15:53:07 -07:00
Ryan Huffman
7225326bfc Fix failed mip insertions not being handled by TextureCache 2017-05-16 15:12:47 -07:00
Ryan Huffman
bfd1274ed3 Fix progressive loading of cubemaps 
In various places we were using the KTX _imageSize as the size of the
entire mip level, when it is actually the size of the face for cubemaps.
 2017-05-16 15:12:47 -07:00
howard-stearns
9d1283e067 resetSize of texture 2017-05-14 15:24:35 -07:00
samcake
bdb0414add Adding a validation step at runtime for the cached KTX file in order to regenerate them if anything seems wrong 2017-05-12 18:04:22 -07:00
howard-stearns
bca2cf45c0 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-05-12 15:21:03 -07:00
Brad Hefta-Gaub
a88f72024d Merge pull request #10243 from birarda/bake-textures 
Add an internal tool for domain/model/skybox KTX texture baking
 2017-05-12 12:26:33 -07:00
samcake
39241bec13 Prototyping a way to produce a selfie and use the rendering directly 2017-05-11 15:58:31 -07:00
Ryan Huffman
87a685c4f9 Fix OSX warning in TextureCache 2017-05-04 13:41:20 -07:00
Ryan Huffman
a886963e20 Fix refresh crash with ktx textures 2017-05-03 11:26:52 -07:00
Ryan Huffman
7999ed6f60 Fix Resource::refresh for NetworkTexture 2017-05-03 11:26:52 -07:00
Ryan Huffman
0263021c0c Fix loaded being reset to false for KTX resources 2017-05-03 11:26:52 -07:00
Stephen Birarda
5d1abe4499 Merge pull request #10307 from huffman/fix/ktx-crash 
Fix for resource downloads getting capped
 2017-05-03 11:25:51 -07:00
Atlante45
4f368cc867 Load High Mips before Fbx after skybox 2017-05-01 13:35:14 -07:00
Ryan Huffman
2faa8fb671 Fix ResourceCache warning on OSX 2017-04-27 14:45:18 -07:00
Ryan Huffman
4b0bd80c27 Fix NetworkTexture not cleaning itself up on destruction 2017-04-27 13:03:42 -07:00
Ryan Huffman
149f87e734 Fix style in NetworkTexture 2017-04-27 12:01:55 -07:00
Ryan Huffman
42da429414 Fix NetworkTexture self possibly being null when attempting request 2017-04-27 12:01:37 -07:00
ZappoMan
c0df82ff69 Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-26 18:49:24 -07:00
Stephen Birarda
49e7ae6dbc call image library for texture baking 2017-04-26 18:37:35 -07:00
Atlante45
19d5414c30 Reduce High Mips request size 2017-04-26 16:23:09 -07:00
Ryan Huffman
c7ac82b4e2 Remove magic number for kv and image sizes 2017-04-26 15:09:26 -07:00
Atlante45
70ece9f0fd Load skybox first and sounds later 2017-04-26 14:57:23 -07:00
Ryan Huffman
0f461a2188 Fix priority being reset when requesting low mips 2017-04-26 11:37:47 -07:00
Ryan Huffman
3184ddb29f Fix duplicate low mip calculation in NetworkTexture 2017-04-26 11:32:36 -07:00
Ryan Huffman
4f16eb9bcc Cleanup KTX logging and add fragment to resource url to indicate mip level 2017-04-26 11:32:35 -07:00
Ryan Huffman
b9ec573c8b Update gl41 an gl45 texture backends to take into account min avail mip 2017-04-26 11:21:43 -07:00
Ryan Huffman
674e767513 Remove MipInterestListener 2017-04-26 10:49:49 -07:00
Ryan Huffman
9505bf746c Fix lower mips not being downloaded after initial mips 2017-04-26 10:49:23 -07:00
Ryan Huffman
d338ccac26 Update NetworkTexture to automatically download all mips 2017-04-26 10:49:23 -07:00
Ryan Huffman
c10e394ad7 Fix unfailable condition in for loop 2017-04-26 10:49:23 -07:00
Ryan Huffman
430edb1560 Fix loss-of-precision warning in TextureCache 2017-04-26 10:49:23 -07:00
Ryan Huffman
e768b720ea Fix load priority for ktx loading 2017-04-26 10:49:23 -07:00
Stephen Birarda
d9c5997b63 fix references to TextureCache in NetworkTexture 2017-04-26 10:48:57 -07:00
Stephen Birarda
e708a71b64 handle 16 byte hash while reading in TextureCache 2017-04-26 10:48:57 -07:00
Ryan Huffman
8d03d50d35 Cleanup progressive ktx debugging 2017-04-26 10:48:57 -07:00
Ryan Huffman
5901ab6381 Fix initalization order warnings in KTX.h and TextureCache.cpp 2017-04-26 10:48:57 -07:00
Ryan Huffman
790290f40c Fix NetworkTexture build errors on osx/linux 2017-04-26 10:48:57 -07:00
Ryan Huffman
d5f1e6fb37 Adjust handling of requested mips in gl backend 2017-04-26 10:48:24 -07:00
Ryan Huffman
472c888529 Fix handling of failed ktx downloads 2017-04-26 10:48:24 -07:00
Ryan Huffman
841d301dec Fix build errors due to TexturePointer change 2017-04-26 10:48:24 -07:00
Ryan Huffman
cc7169b754 Add debug logging for ktx downloads 2017-04-26 10:48:24 -07:00
Ryan Huffman
ce12a216c0 I think it might be working. 2017-04-26 10:48:24 -07:00
Ryan Huffman
70eaac8d6c Add persisting of ktx min mips available to ktx cache file 2017-04-26 10:48:24 -07:00
Ryan Huffman
5594e81fe4 Improve gl backend handling of unavailable mips 2017-04-26 10:48:24 -07:00
Ryan Huffman
70b816827e Improve handling of KTX downloads in NetworkTexture 2017-04-26 10:48:24 -07:00
Ryan Huffman
11751611e1 Update NetworkTexture to track current KTX download state 2017-04-26 10:48:23 -07:00
Ryan Huffman
20f4d14e07 Add compressed KTX size evaluation 2017-04-26 10:48:23 -07:00
Ryan Huffman
b21dc12cc6 Cleanup NetworkTexture ktx handling 2017-04-26 10:47:32 -07:00
Ryan Huffman
ab7099b3eb Add loading of lower mips to NetworkTexture 2017-04-26 10:47:32 -07:00
Ryan Huffman
39c3fee838 Add caching of imageOffset to ktx ImageDescriptor 2017-04-26 10:47:32 -07:00
Ryan Huffman
e9bb895bff Implement KTXStorage::assignMipData and add writing of mips to 
TextureCache
 2017-04-26 10:47:32 -07:00
Ryan Huffman
cf3dc12542 Add object labels to GL objects and add ktx min mip kv 2017-04-26 10:47:32 -07:00
Ryan Huffman
aca7ad27c6 Fix ktx dependencies 2017-04-26 10:47:32 -07:00
Ryan Huffman
b20fcbfcdb Add a way to write data to a storage object 2017-04-26 10:45:50 -07:00
Ryan Huffman
ccd9c4697b Add extended ktx header/high-mip request handling to NetworkTexture 2017-04-26 10:45:50 -07:00
Ryan Huffman
1fec531c68 Add basic mip writing to gpu::Texture 2017-04-26 10:45:50 -07:00
Ryan Huffman
00cbfa0f70 Add start of progressive ktx-loading 2017-04-26 10:45:50 -07:00
Ryan Huffman
105d17e85e Add byte range support to HTTPResourceRequest 2017-04-26 10:45:14 -07:00
ZappoMan
65801cbb4d Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-25 18:21:17 -07:00
Atlante45
33f58f99d1 CR 2017-04-25 16:09:31 -07:00
Atlante45
fc1b920341 Add ability to disable texture compression 2017-04-25 15:56:23 -07:00
Atlante45
ad16a935e9 Texture::create returns shared pointer 2017-04-25 15:56:23 -07:00
Atlante45
63e564c178 Add source hash to KTX metadata 2017-04-25 15:56:23 -07:00
Atlante45
a450f52427 Start to setup image library 2017-04-25 15:56:22 -07:00
ZappoMan
f133713d0e CR feedback 2017-04-21 10:21:34 -07:00
ZappoMan
e89b6c5d2c some initial debugging on tpose avatars 2017-04-20 17:26:31 -07:00
Ryan Huffman
8463fffc8c Merge pull request #10185 from highfidelity/revert-10116-bug/rel-ext-textures 
Revert "fix relative/absolute path handling for external FBX textures"
 2017-04-10 15:30:40 -07:00
Stephen Birarda
e86db26224 Revert "fix relative/absolute path handling for external FBX textures" 2017-04-10 14:31:02 -07:00
Seth Alves
8a3a52cbcf make getCollisionGeometryResource a separate call from getGeometryResource rather than passing a bool 2017-04-10 13:54:24 -07:00
Seth Alves
554b23357c add combineParts flag to getGeometryResource. append ?collsion-hull to urls that are used as compound collision hulls 2017-04-10 10:14:36 -07:00
Seth Alves
a1cab2c0d1 working toward fixing compound hulls 2017-04-09 17:23:56 -07:00
Seth Alves
8d00f0ab8f allow obj reader to either combine meshes or keep parts separate 2017-04-07 15:59:01 -07:00
Stephen Birarda
0b57b98970 change readFBX calls to use QUrl where possible 2017-04-04 14:53:14 -07:00
samcake
a2b2e3e169 Revert "Revert "Don't hold KTX files open for longer than transfers require"" 2017-03-28 14:45:04 -07:00
samcake
08e1a2ba4c Revert "Don't hold KTX files open for longer than transfers require" 2017-03-28 14:06:09 -07:00
samcake
e42cb52bd1 Merge pull request #10020 from jherico/ktx_refactor 
Don't hold KTX files open for longer than transfers require
 2017-03-28 14:06:02 -07:00
Seth Alves
651d87dc2a move Qt-related stuff out of model and into model-networking 2017-03-28 07:53:25 -07:00