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
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
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
