454 commits

Author	SHA1	Message	Date
trent	e9035a1efb	More fixes for the OBJ reader. The data seems to be fine. The rendering seems not so fine.	2017-03-30 19:10:15 -04:00
trent	c5bb419bd1	Fixed OBJ reader crash, did not fix OBJ reader not working properly.	2017-03-30 18:16:55 -04:00
trent	864184a107	wip OBJ loader rewrite; wip because it crashes.	2017-03-30 17:11:40 -04:00
trent	5bf3da9a7f	Restoring hifi version of the OBJ files to get rid of my debug nonsense.	2017-03-30 16:14:42 -04:00
trent	ada7664749	Merge branch 'master' of https://github.com/highfidelity/hifi into origin/21240	2017-03-28 18:43:30 -04:00
trent	2d0fac794e	Committing this work-in-progress loader as an example of how not to do this.	2017-03-28 18:41:38 -04:00
Seth Alves	7641677902	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2	2017-03-28 10:14:49 -07:00
Andrew Meadows	ff2f4da4b2	final changes as per samcake	2017-03-27 15:19:28 -07:00
Andrew Meadows	60bc76e1c4	store cluster indices and weights in uint16_t	2017-03-27 14:40:31 -07:00
Andrew Meadows	60874e6041	remove unused cruft	2017-03-27 14:40:31 -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	642cf57976	obj-writer now outputs normals	2017-03-24 12:49:58 -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
Chris Collins	05c40d2930	Merge pull request #9933 from mittens/hotfix/obj-texture-fix ... Fixed the texture assignment for the OBJ loader	2017-03-22 13:19:01 -07:00
Brad Davis	a3828ce45c	Fixing comment	2017-03-21 13:42:24 -07:00
Atlante45	73dd2abdaf	Delete old sitting points code	2017-03-20 17:29:44 -07:00
Brad Davis	e482eac437	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-03-20 16:22:13 -07:00
Seth Alves	b945d9c4cb	fix a bug that caused obj models with no material to randomly use the materials of other things in the view	2017-03-18 14:34:19 -07:00
trent	f1e81c34a3	Fixed the texture assignment for the OBJ loader (it wasn't doing anything with the spceular texture)	2017-03-17 14:34:17 -04:00
Brad Davis	813e3a1bca	Fix issue with scaling prior to KTX serialization	2017-03-17 08:05:52 -07:00
Seth Alves	0e8d62c11e	delete dead code	2017-03-16 15:24:39 -07:00
Seth Alves	7afe091c52	quiet warnings	2017-03-14 19:47:30 -07:00
Seth Alves	0785172398	quiet warnings	2017-03-14 19:01:13 -07:00
Seth Alves	08ad56d254	quiet warnings	2017-03-14 18:05:53 -07:00
Seth Alves	40b87171a9	quiet warnings	2017-03-14 17:49:39 -07:00
Seth Alves	5b28f3a3c4	cleanups	2017-03-14 10:08:34 -07:00
Seth Alves	4a1be69be4	writeOBJToString	2017-03-14 07:11:38 -07:00
Seth Alves	e8a9ff867d	merge from upstream	2017-03-13 17:57:01 -07:00
ZappoMan	32add6635d	checkpoint on reducing raypicking recalcs	2017-03-04 23:33:17 -08:00
samcake	c62108c3c8	Resolve merging conflict	2017-02-09 09:49:59 -08:00
Seth Alves	2ec4f118fd	Merge pull request #9639 from hyperlogic/feature/tablet-pal ... Ported PAL to tablet	2017-02-08 21:17:38 -08:00
Anthony J. Thibault	e25ad0f332	Fix debug assert in FBXReader.	2017-02-08 18:56:58 -08:00
Brad Hefta-Gaub	07cf87749f	Merge branch 'master' of https://github.com/highfidelity/hifi into betterBots	2017-02-08 13:41:33 -08:00
Brad Hefta-Gaub	eedfc4fd38	fix various bot related bugs	2017-02-08 12:35:00 -08:00
samcake	2975f73fc9	merging	2017-02-07 13:13:21 -08:00
Andrew Meadows	8b1f569132	tweak max texture resolution thresholds	2017-02-06 12:13:31 -08:00
samcake	feb36b8dbf	Merge branch 'purple' of https://github.com/samcake/hifi into blue	2017-02-06 11:56:45 -08:00
Andrew Meadows	8b2c720e29	sliding texture caps for models	2017-02-06 11:53:37 -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	24b1f3ddbc	cleanup whitespace	2017-02-06 11:53:37 -08:00
samcake	e8cdee71ed	avoid assertion on mac	2017-02-03 22:49:41 -08:00
Andrew Meadows	56911bdf1b	sliding texture caps for models	2017-02-03 11:14:40 -08:00
Andrew Meadows	2f8823d103	name change: maxSize to maxNumPixels	2017-02-02 14:09:47 -08:00
Andrew Meadows	64dbfd0819	cap size of textures from FBX files	2017-02-02 13:38:08 -08:00
Andrew Meadows	b4cef787d9	cleanup whitespace	2017-02-02 13:38:08 -08:00
Seth Alves	91e542a7a7	ModelScriptingInterface::meshToOBJ takes a list of MeshProxys instead of just one	2017-01-31 21:26:49 -08:00
Seth Alves	bb3155ee61	obj file is now produced in /tmp	2017-01-31 14:29:42 -08:00
Seth Alves	541692c5ca	start on scripting interface to allow saving polyvox meshes to obj files	2017-01-28 15:38:18 -08:00
Seth Alves	6bace4f451	merge from upstream	2017-01-17 09:29:30 -08:00