291 commits

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