274 commits

Author	SHA1	Message	Date
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
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