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

539 commits

Author SHA1 Message Date
SamGondelman
324eefc914 remove fresnel, add unlit, fix overlays, cleanup 2018-02-14 17:02:07 -08:00
SamGondelman
38290064c1 replace materials by name, hide material mode for now 2018-02-13 13:24:08 -08:00
SamGondelman
9e8aa1898c warnings, load material from URL, shapeID -> parentMaterialID 2018-02-12 12:50:09 -08:00
SamGondelman
84cd0e1529 wip live material swapping on model entities, model overlays, avatars, 
and albedo swap on shape entities
 2018-02-09 12:00:08 -08:00
SamGondelman
4d4294dd6a Merge remote-tracking branch 'upstream/master' into decals 2018-02-02 16:50:01 -08:00
SamGondelman
d7f4b033e8 wip finish adding material entity 2018-02-02 16:49:33 -08:00
humbletim
06afaa7470 BufferView <-> QVariant/QScriptValue conversion 
update MeshProxy/SimpleMeshProxy and ScriptableModel

ModelScriptingInterface / scriptable::ModelProvider

integration

update to RC-63

initial graphics-scripting refactoring

graphics-scripting baseline commit

wip commit

Geometry -> MeshPart

remove SimpleMeshProxy

collapse graphics-utils -> graphics-scripting

scriptable::Model => scriptable::ScriptableModel
 2018-02-01 16:30:29 -05:00
Brad Davis
3e3a585b92 Fixing compile warnings 2018-01-30 21:54:29 -08:00
Brad Davis
1b35ff9b85 Use a distinct KTX cache location for GLES 2018-01-25 19:32:45 -08:00
Brad Davis
8cb0d0f8fd Don't use the KTX cache for local files 2018-01-23 13:30:07 -08:00
Brad Davis
1fb125f67f Don't process empty images 2018-01-19 11:45:11 -08:00
Brad Davis
e2c4af05bd Don't process empty images 2018-01-19 11:42:31 -08:00
Brad Davis
6a06bf405a Merge remote-tracking branch 'upstream/master' into android 2018-01-16 18:24:44 -08:00
humbletim
b91d536dd0 rename model:: -> graphics:: 2018-01-16 12:46:16 -05:00
humbletim
08ccda9cfc rename libraries/model(src/model) -> libraries/graphics(src/graphics) 2018-01-16 12:44:44 -05:00
Brad Davis
acb95d1355 GLAD polish 2018-01-14 00:10:05 -08:00
Brad Davis
58d4d193f7 Add command line disabling of QML and KTX cache 2018-01-13 12:22:00 -08:00
Brad Davis
6d45238bbd Allow disabling of KTX cache 2018-01-13 11:32:47 -08:00
Brad Davis
ab7aa52a10 GLES emulaton on windows 2018-01-12 19:17:35 -08:00
Brad Davis
97593bc4d8 Fixing compiled resource access 2018-01-10 17:18:12 -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
Zach Fox
b81cdf49ef Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-11 09:52:32 -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
Ryan Huffman
70c35f84b5 Update baker library with many style improvements 2017-12-08 10:30:38 -08:00
Atlante45
4fd83ddd0e Reduce Image memory usage by moving the data 2017-12-07 12:54:34 -08:00
Zach Fox
b2bafed2bb Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-07 11:21:24 -08:00
David Back
7101719295 newline 2017-11-28 13:01:47 -08:00
David Back
5cceceb868 secondary cam texture fixes 2017-11-28 13:00:41 -08:00
Zach Fox
7d34b3fe67 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-11-17 15:45:03 -08:00
Brad Hefta-Gaub
a85a6f6795
Merge pull request #11308 from luiscuenca/patch-1 
glTF import DEMO
 2017-11-17 14:52:51 -08:00
Brad Davis
7bf1b176d7 Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem 2017-11-10 14:21:24 -08:00
Brad Hefta-Gaub
b1812c30c9 Merge pull request #11571 from huffman/fix/ktx-thrashing 
Fix KTX requests thrashing if a mip level can't be assigned
 2017-10-13 11:53:24 -07:00
Ryan Huffman
c6672fc4ac Fix KTX requests thrashing if a mip level can't be assigned 
When downloading a mip level and assigning it to the underlying
resource, we weren't checking to see if the assignment was successful.
If it was unsuccessful, we would queue up a request for the next mip
which would end up being a request for the same mip that was just
attempted. This change fixes this problem by checking to see if the
texture's available mip level is at least <= the assigned mip level.
 2017-10-11 14:20:57 -07:00
Ryan Huffman
69b6a8c163 Fix .fst texdir not being followed 
Although the texdir was being acknowledged and used as the
_textureBaseURL inside of the Geometry* classes, it was being
overwritten in code meant to handle redirects. Basically, when a
geometry resource request is redirected (via ATP, HTTP, etc.), we needed
to update the _textureBaseURL to take the new location into account.
Previously we were overwriting the _textureBaseURL all the time, even
when not being redirected, but this updates it to only be overwritten
when the request is redirected.

There is at least 1 known case that this does not handle: a .fst with
its `texdir` set, that points at an fbx that gets redirected.
 2017-10-10 18:29:59 -07:00
luiscuenca
1da5c221ac ModelCache.cpp to coding standard 2017-10-10 13:53:18 -07:00
luiscuenca
297f591ce2 fixed errors and default avatar 2017-10-09 14:37:45 -07:00
Sam Gateau
287f4f1d71 Merge pull request #11466 from SamGondelman/mirrorCrash 
Fix mirror and fade threading crashes
 2017-09-27 16:17:04 -07:00
SamGondelman
49512c95d7 possibly fix threading crashes, mirror and fade 2017-09-26 16:21:36 -07:00
Bradley Austin Davis
e42068f681 Merge branch 'master' into android_new 2017-09-26 14:31:29 -07:00
Stephen Birarda
b77ceab661 remove noisy logging added by auto-baking 2017-09-26 10:45:23 -07:00
SamGondelman
9f12d3a365 fix missing models 2017-09-21 17:57:25 -07:00
Ryan Huffman
20759b0c97 Merge pull request #11404 from birarda/feat/auto-bake 
add abort on shutdown to Baker/FBXBaker/TextureBaker
 2017-09-19 14:20:56 -07:00
Bradley Austin Davis
b93e91b9f3 New android toolchain 2017-09-19 13:45:12 -07:00
Stephen Birarda
e1d79ee8f4 add abort to Baker and subclasses 2017-09-19 13:18:23 -07:00
Ryan Huffman
5950006111 Remove extraneous logging 2017-09-19 11:18:25 -07:00
Luis Cuenca
d7c525cf3a glTF importer Demo 
Imports a glTF model as the default avatar.
Geometry data and materials are imported.
No bone information is imported.
 2017-09-05 13:32:51 -07:00
Ryan Huffman
e9258ec97a Fix loading standalone baked textures from Asset Server 
NetworkTexture was not properly handling redirected ATP files. For
instance, if going from .jpg -> .ktx, the NetworkTexture class needs to
be aware of this so it can stop the current request and make multiple
requests for the individual mip levels.
 2017-08-28 15:54:40 -07:00
Ryan Huffman
39f04adc8d Improve baking interface and add automatic baking to asset server 2017-08-24 16:15:28 -07:00
David Kelly
88a449c1af Fixes hmd preview when resizing 2017-07-12 16:49:26 -07:00
David Kelly
e1df3feb5c fix hmd preview 2017-07-11 10:54:35 -07:00
David Kelly
f18e64ed1a first pass at blitting correct hmd preview (in mono) 2017-07-07 15:53:29 -07:00
David Kelly
b41c470064 first cut, still stereo 2017-07-06 15:59:24 -07:00
Zach Fox
ee86638c4e Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-07-06 09:58:00 -07:00
Brad Davis
7f1bc07d04 Trying to fix overlay crashes again 2017-07-05 14:30:01 -07:00
David Kelly
09d959bdeb Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview 2017-06-30 14:16:01 -07:00
Seth Alves
794495c197 make ResourceManager be owned by DependencyManager 2017-06-28 14:18:14 -07:00
David Kelly
b73102d063 Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview 2017-06-28 08:57:04 -07:00
Brad Davis
28d727153b PR feedback 2017-06-27 19:22:07 -07:00
Brad Davis
8130a91b8c Cleanup entity dependencies 2017-06-27 19:15:49 -07:00
Clément Brisset
48aadb2899 Merge pull request #10775 from 1P-Cusack/21401 
Adding support for loading obj.gz files in ModelCache.
 2017-06-22 11:03:23 -07:00
1P-Cusack
f8c30c70e8 Addressing some feedback. Making the .obj.gz checks more specific and adding an exception if gunzip fails. 2017-06-22 11:21:19 -04:00
1P-Cusack
781e2f409f Adding support for loading obj.gz files in ModelCache. 2017-06-21 18:50:39 -04:00
Atlante45
4a552affe6 Fix reload content for baked skyboxes 2017-06-21 15:19:03 -07:00
Brad Davis
e3fb42eefd Fix crash when cache File lifetime exceeds cache lifetime 2017-06-20 14:38:51 -07:00
Howard Stearns
ddce665613 Merge pull request #10739 from zfox23/spectatorCamera_mergeable_20170619 
Spectator Camera - Mergeable Rendering Components
 2017-06-19 14:55:43 -07:00
Brad Davis
8aeeab30e7 Merge pull request #10689 from Atlante45/fix/ktx 
Fix KTX performance problems
 2017-06-19 14:44:52 -07:00
Zach Fox
cbdffce88e Merge branch 'master' of https://github.com/highfidelity/hifi into spectatorCamera_mergeable_20170619 2017-06-19 13:53:29 -07:00
Brad Davis
ed6620fc51 Merge pull request #10718 from jherico/frame_thread 
Cleanup and refactoring
 2017-06-19 13:31:44 -07:00
Atlante45
c4c6142935 Merge branch 'master' of https://github.com/highfidelity/hifi into fix/ktx 2017-06-19 11:06:51 -07:00
Atlante45
8d45c4da7c Fix comments 2017-06-19 11:02:31 -07:00
Brad Davis
1d4b443113 Prevent cache ejection of textures in use 2017-06-19 09:51:11 -07:00
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
Bradley Austin Davis
638364497d Trying a different tactic to avoid multiple concurrent file access 2017-03-27 16:18:04 -07:00
Bradley Austin Davis
f764cd614b Don't hold KTX files open for longer than transfers require 2017-03-27 13:33:00 -07:00
Brad Davis
14c8c3f4db Return existing textures when matching hash for a previously found live texture 2017-03-20 09:39:29 -07:00
Brad Davis
5e716f15b5 Protect against missing texture cache on shutdown 2017-03-14 13:48:24 -07:00
Zach Pomerantz
a41146451b Merge pull request #9883 from jherico/smarter_textures 
Don't crash when failing to convert a texture to KTX format
 2017-03-14 12:14:56 -04:00
Brad Davis
1ccf715e3b Don't crash when failing to convert a texture to KTX format 2017-03-14 09:09:14 -07:00
Zach Pomerantz
172a638ef0 move resource paths to PathUtils 2017-03-13 17:26:34 -04:00
Zach Pomerantz
a27d88da1a update TextureCache to use FileCache 2017-03-13 13:41:44 -04:00
Zach Pomerantz
ffdaa09072 use stored Usage(Type), Sampler for KTX 2017-03-08 15:54:32 -05:00
Brad Davis
9d56001341 Fix rebase 2017-03-08 12:14:45 -08:00
Zach Pomerantz
170df4a1f4 Merge branch 'smarter_textures' of github.com:highfidelity/hifi into 2-27 2017-03-06 17:14:11 -07:00
Brad Davis
8782fe1d93 Merge branch 'master' into smarter_textures 
Conflicts:
	libraries/model-networking/src/model-networking/TextureCache.cpp
 2017-03-06 15:29:41 -08:00
Bradley Austin Davis
47087add15 Add support for fallback textures, throttling texture creation 2017-03-03 09:00:12 -08:00
Zach Pomerantz
1425eb0936 Merge branch 'smarter_textures' of github.com:highfidelity/hifi into 2-27 2017-03-01 21:01:37 -05:00
Zach Pomerantz
febeeeca3a namespace cache::FileCache and use unique_ptr 2017-03-01 20:58:00 -05:00
Zach Pomerantz
c71e614dd5 add loading from persisted files 2017-03-01 20:18:31 -05:00
Bradley Austin Davis
fa5b315e09 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-01 15:16:18 -08:00
Zach Pomerantz
e8319f967d add loading from KTXCache 2017-03-01 17:28:51 -05:00
Zach Pomerantz
a6a0fd3851 fix FileCache persistence 2017-03-01 11:32:11 -05:00
Zach Pomerantz
c044daf7b2 TextureCache 2017-02-28 13:30:47 -05:00
samcake
576660f6ef Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-02-27 18:17:28 -08:00
Zach Pomerantz
cfe14518a1 KTXCache 2017-02-27 18:05:57 -05:00
Seth Alves
6e9854cad0 don't crash if geometry fails to load 2017-02-24 13:01:01 -08:00
sam
e1aad8bd63 Deep dive into the shape key and filters and the PLumber construction 2017-02-24 00:35:10 -08:00
Brad Davis
27e8750b9b Adding new storage backing for gpu::Texture, moving mip format into Storage abstraction 2017-02-19 18:11:56 -08:00
Bradley Austin Davis
7fb7aa87eb Working on new texture management strategy 2017-02-17 07:53:16 -08:00
samcake
b9102204ea FIx the filtering problem on color and normals introduced since we generate mips with QImage 2017-02-10 11:40:39 -08:00
Andrew Meadows
d65cbbb455 name change: maxSize to maxNumPixels 2017-02-06 11:53:37 -08:00
Andrew Meadows
b3ae6f9aec cap size of textures from FBX files 2017-02-06 11:53:37 -08:00
Andrew Meadows
45c73439eb use type definition 2017-02-06 11:53:37 -08:00
Brad Davis
30a9961362 tracing polish 2016-12-16 14:02:27 -08:00
Brad Davis
a12b8b4b62 Cleanup dead code 2016-12-16 09:21:41 -08:00
Ryan Huffman
7bb2755913 Add chrome tracing support 2016-12-16 01:14:01 -08:00
Anthony J. Thibault
ec801cb9d8 Addressed feedback from code review. 2016-10-07 17:46:46 -07:00
Brad Hefta-Gaub
2cba3db2b6 fix crash when bouncing to escotology, which may or may not be related 2016-10-01 11:08:52 -07:00
Brad Davis
0953027ef3 Identify pre-generated textures 2016-09-23 12:04:56 -07:00
Brad Davis
a7f0ba24ed Dynamic texture memory management 2016-09-23 12:04:42 -07:00
Brad Davis
ecfe56085d GLM update and GLI integration 2016-09-09 10:18:15 -07:00
Andrew Meadows
48c73acae0 restore privacy of GeometryResourceWatcher methods 2016-08-24 22:26:56 -07:00
Andrew Meadows
726928c14c creae collision Geometry from mesh 2016-08-24 22:25:45 -07:00
Brad Davis
5cdb30357f Add checking for failed downloads in the textures 2016-08-24 18:03:56 -07:00
Seth Alves
87dbfa7e47 add -Wsuggest-override to compile flags and deal with fallout 2016-08-18 09:51:41 -07:00
Ryan Huffman
36744d72d6 Fix warning using init list for QVariantMap 2016-08-08 16:03:03 -07:00
Ryan Huffman
5b69ca03f0 Move default skybox out of global and make irradiance gen optional 2016-08-08 16:03:03 -07:00
Seth Alves
b953e6f0ff when an avatar URL fails, switch to the default 2016-08-01 18:12:30 -07:00
Anthony Thibault
2429b82b5e Support for animGraphUrl override in FST file. 2016-07-21 17:17:08 -07:00
samcake
744474982d Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-17 13:28:03 -07:00
Andrew Meadows
cba49be9ea fix compile bug 2016-07-13 15:13:35 -07:00
Andrew Meadows
c106f4c3a0 fix crash for null pointer 2016-07-13 15:13:35 -07:00
Andrew Meadows
4bebb682dc namechange: fetchResource --> getGeometryResource 2016-07-13 15:13:35 -07:00
Andrew Meadows
c50d41c532 finish name changes as per PR feedback 2016-07-13 15:13:35 -07:00
Andrew Meadows
9f7d2cf263 NetworkGeometry --> GeometryResourceWatcher 
Model class gets render and collision geometries with watchers
also changed names for readability
 2016-07-13 15:00:12 -07:00
samcake
3ec14fd746 MErging and still trying to understand the curvature isssue 2016-06-22 18:06:55 -07:00
samcake
25eb569433 Merge branch 'master' of https://github.com/highfidelity/hifi into color 2016-06-02 10:38:40 -07:00
samcake
c1fa096e78 adding texcoord 1 on all the material/model and go fetch occlusion map with this uv instead of texcoor0. this allow for separate transforms just for occlusoin map 2016-05-16 15:42:48 -07:00
Atlante45
0878d87ac7 remove some unnecessary dependencies 2016-05-14 14:50:02 -07:00
Zach Pomerantz
09d879e19f Remove delayLoad 2016-05-09 18:09:48 -07:00
Zach Pomerantz
7f496ea069 Fix colliding fbx tex names 2016-05-05 17:54:00 -07:00
Brad Hefta-Gaub
49d02b802a Merge pull request #7719 from zzmp/feat/resource-prefetch 
Add prefetching to exposed caches
 2016-05-02 18:04:26 -07:00
Zach Pomerantz
13945aa4d9 Annotate all virtual fns with override 2016-04-30 13:48:59 -07:00
Zach Pomerantz
de8145ec71 Nest TextureType JS interface in Type 2016-04-27 19:20:41 -07:00
Zach Pomerantz
6e12493ed7 Add default NetworkTexture::_textureLoader 2016-04-21 10:54:03 -07:00
Zach Pomerantz
cba5bff89e Make ResourceCache::prefetch private and comment 2016-04-21 10:33:35 -07:00
Zach Pomerantz
df4857947b Add prefetch overload for texture specificity 2016-04-20 20:18:22 -07:00
Zach Pomerantz
c096b0dfa1 Add TextureType to NetworkTexture for reflection 2016-04-20 20:18:22 -07:00
Zach Pomerantz
a148a69a35 Move cache to bottom of texture header 2016-04-20 20:18:22 -07:00
Zach Pomerantz
3c7fc95d6c Allow url-only cache queries for tex, model 2016-04-20 20:14:15 -07:00
Zach Pomerantz
948af75f8a Transfer loaded resources with smart ptrs to avoid shutdown deadlock 2016-04-20 13:00:35 -07:00
Brad Davis
c35d81260d Load local texture files through the same code as network 2016-04-17 10:20:01 -07:00
Brad Hefta-Gaub
21f30f1a10 Merge pull request #7672 from zzmp/fix/name-caches 
Name exposed cache objects
 2016-04-14 18:02:36 -07:00
Zach Pomerantz
bb02af793c Name exposed cache objects 2016-04-14 17:00:18 -07:00
Atlante45
785eda44cd CR 2016-04-13 13:29:00 -07:00
Atlante45
c8aeecdabd Don't fire onGeoMappLoading twice 2016-04-12 13:51:11 -07:00
samcake
e28e85a29c Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-04-06 09:30:53 -07:00
Brad Hefta-Gaub
891cc12d3f Merge pull request #7549 from zzmp/feat/resource-vis 
Add a visualization of cacheable resource usage
 2016-04-05 15:43:27 -07:00
samcake
710c4a1b8f TRying to merge and expose counters for in flights transfers 2016-04-05 12:18:30 -07:00
Brad Hefta-Gaub
ff4f693267 Merge pull request #7553 from zzmp/fix/tex-invoke-method 
Fix ImageReader threading issues
 2016-04-04 18:29:24 -07:00
Zach Pomerantz
107cfcf10b Change Resource setBytes->setSize 2016-04-04 13:59:57 -07:00
samcake
f3e6c490a4 merging with master, moving the TexelFOrmat function to a cpp 2016-04-04 12:03:37 -07:00