437 commits

Author	SHA1	Message	Date
Seth Alves	a1107deef1	cleanups	2017-07-23 08:21:50 -07:00
Seth Alves	47ea32f4d3	vertex color support in ModelScriptingInterface	2017-07-23 08:06:26 -07:00
Seth Alves	a8698c2fbc	EntityScriptingInterface::getMeshes support for Model entities	2017-07-19 08:59:09 -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
Brad Davis	a69cf31f4b	PR feedback and cmake fixes	2017-06-16 16:59:58 -07:00
Sam Cake	d38a396e9d	Fixing warning	2017-06-03 08:59:47 -07:00
Sam Cake	f9aa400b95	Refining the stencil configuration and triggering only in hmd mode	2017-06-02 00:22:38 -07:00
samcake	9c1e99fe3f	Removing cruft and organizing the stencil config	2017-06-01 13:06:22 -07:00
samcake	82d348a2ef	Stencil rejection is working, and more cleaning	2017-05-31 16:46:20 -07:00
samcake	8559ed6260	Starting to add the stencil mask for hmd	2017-05-30 16:37:10 -07:00
Sam Cake	5edcc38eba	Polishing the scope shaders	2017-05-18 01:06:59 -07:00
samcake	2cd2c95940	Adding more debugging tool	2017-05-16 16:12:31 -07:00
samcake	bbb513220b	Moving forward	2017-05-08 17:33:24 -07:00
Sam Cake	d3724116d9	Using the items to pick the key light!	2017-05-08 00:20:20 -07:00
Atlante45	a450f52427	Start to setup image library	2017-04-25 15:56:22 -07:00
Atlante45	2e1355618f	Use NVTT to mipmap color textures	2017-04-25 15:56:22 -07:00
Atlante45	0428b22b63	Add nvtt external	2017-04-25 15:56:22 -07:00
samcake	b6504bba56	Moving the num mips per texture to the creator so it s immutable and simpler	2017-03-29 17:58:56 -07:00
samcake	9bc7e41642	Remove extra calls for binding default textures, not needed	2017-03-29 10:57:08 -07:00
Seth Alves	651d87dc2a	move Qt-related stuff out of model and into model-networking	2017-03-28 07:53:25 -07:00
Seth Alves	2682586c38	some clean-ups and a bug fix in PolyVox to mesh code	2017-03-27 06:50:06 -07:00
Seth Alves	6e40f03c8e	cleanups	2017-03-24 15:08:13 -07:00
Seth Alves	8f7f5efade	new javascript call: Model.newMesh()	2017-03-24 12:51:00 -07:00
Seth Alves	bb1c556c91	forgot a file	2017-03-23 11:04:50 -07:00
Seth Alves	f5680def55	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2	2017-03-23 09:55:41 -07:00
Seth Alves	ce9bb439b3	change Model api in anticipation of more than just PolyVox being able to give meshes to javascript	2017-03-23 09:55:30 -07:00
Brad Davis	85c80f3be8	Merge remote-tracking branch 'upstream/master' into smarter_textures ... Conflicts: libraries/gpu/src/gpu/Texture.cpp	2017-03-22 14:25:23 -07:00
Seth Alves	98cae8d152	added EntityScriptingInterface::getEntityLocalTransform. try harder to make sure polyvox mesh is ready before giving it to javascript	2017-03-20 09:37:46 -07:00
Seth Alves	b876d22e46	fix handling of normals. don't crash when extracting a mesh from a polyvox with no 'on' voxels	2017-03-18 22:36:24 -07:00
Seth Alves	488ed081dd	Mesh::forEach and Mesh::map	2017-03-18 10:18:04 -07:00
Seth Alves	b3603ce8b3	Entities.voxelsToMesh, Model.transformMesh, Model.appendMeshes, Model.meshToOBJ appear to work now	2017-03-17 16:52:56 -07:00
samcake	900615fcd5	Fix the unsupported ktx format, it was coming from the BUmp map case	2017-03-14 15:53:29 -07:00
samcake	e0f0cc2102	Fix the unsupported ktx format, it was coming from the BUmp map case	2017-03-14 15:49:44 -07:00
samcake	9843b68878	Merge branch 'smarter_textures' of https://github.com/highfidelity/hifi into brown	2017-03-08 11:56:08 -08:00
sam	1b036b7225	Implement the ktx keyvalue feature for read and write and use it with gpu::Texture to store meat data required for full serialization	2017-03-07 00:58:22 -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
Bradley Austin Davis	9051c84b6d	Fix warnings	2017-03-03 14:16:27 -08:00
samcake	67d14230c5	Merge branch 'smarter_textures' of https://github.com/highfidelity/hifi into brown	2017-03-03 10:14:04 -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
Bradley Austin Davis	fa5b315e09	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-03-01 15:16:18 -08:00
Zach Pomerantz	c044daf7b2	TextureCache	2017-02-28 13:30:47 -05:00
samcake	f050cc31f2	Backing up from the rgba format to go back to a rgb 888 just to repair the broken normals on Seth's Avatar	2017-02-27 13:32:24 -08:00
samcake	9d593f2ba9	Merge branch 'smarter_textures' of https://github.com/highfidelity/hifi into brown	2017-02-24 09:27:52 -08:00
Brad Davis	594fe9b1be	Use hashes of URLs for filenames, due to length constraints	2017-02-23 22:01:53 -08:00
samcake	f564f33db2	Merge branch 'smarter_textures' of https://github.com/highfidelity/hifi into brown	2017-02-23 14:53:13 -08:00
Brad Davis	cd8f3e1b01	Prevent name collisions in KTX from causing crashes	2017-02-23 13:04:04 -08:00
Brad Davis	a168bbf2dd	Fix ktx file location, unique->shared pointer	2017-02-23 10:26:59 -08:00
sam	d7cb479dbe	clean the clean ups	2017-02-23 02:17:18 -08:00
sam	fbb0a24c4f	FIxing the bug preventing to deserialize normals, clean up the ktx usage of the storage::Storage class and cleaning up somewhat the Qt pixel formats used	2017-02-23 02:08:46 -08:00