128 commits

Author	SHA1	Message	Date
Seth Alves	008065ba38	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-14 09:15:56 -08:00
Seth Alves	c74f8bca49	location getters also return a success boolean so that callers can know if the value they are receiving is bad due to lack of information about an object's parent	2015-12-14 09:13:36 -08:00
Atlante45	eb8fc2e156	Fix last of the windows warnings	2015-12-11 17:37:36 -08:00
Atlante45	ce51350b65	Fix warnings on windows 64bit	2015-12-11 15:42:15 -08:00
Brad Hefta-Gaub	d07629489c	Merge pull request #6543 from Atlante45/pointer ... gpu::Shader::create* return shared_ptr	2015-12-04 11:17:02 -08:00
Atlante45	3da80f5861	gpu::Shader::create* return shared_ptr	2015-12-03 14:56:07 -08:00
Seth Alves	b7ebe5b92b	merge from upstream	2015-11-30 16:59:52 -08:00
Seth Alves	4646c0c103	unmangle merge	2015-11-21 10:49:31 -08:00
Seth Alves	f013f95e9b	merge from upstream	2015-11-21 08:43:00 -08:00
Anthony J. Thibault	a77ea8da43	Removed JointStates! You won't be missed.	2015-11-20 14:15:37 -08:00
Seth Alves	f07d5d9d3f	show network and physics status on boxes and spheres	2015-11-11 11:32:12 -08:00
Seth Alves	39b92d2b52	terse log when ownership changes	2015-11-10 17:06:12 -08:00
Seth Alves	bc516c0b86	use render-item status getters to display physics debugging information	2015-11-06 11:32:56 -08:00
Seth Alves	61269c3ce8	fix up entity constructors so that setProperties isn't called during the constructor	2015-10-23 13:52:50 -07:00
Seth Alves	d86d69aeba	keep track of children. use local position and orientation on the wire.	2015-10-22 15:36:03 -07:00
Andrew Meadows	fa17b77d70	move DIRTY_FLAGS out of EntityItem namespace	2015-10-15 09:34:09 -07:00
Brad Hefta-Gaub	430cbcca7e	first cut at adding surface normals to ray intersection	2015-09-27 21:57:50 -07:00
Seth Alves	31fcd55d47	octree uses shared pointers	2015-09-08 11:59:48 -07:00
Seth Alves	1b92ae95d7	put glm:: before vec3	2015-09-04 09:41:53 -07:00
Seth Alves	07b241c778	code review	2015-09-03 11:05:44 -07:00
Seth Alves	2fe6e9c317	use AABox's ray intersection code rather than the goofed-up version that was here	2015-09-02 16:30:11 -07:00
Seth Alves	16ee5199e8	change how polyvox neighbors are notified of updates	2015-09-02 09:30:32 -07:00
Seth Alves	8608e4f2b0	small bug-fixes	2015-09-01 16:51:55 -07:00
Seth Alves	9256917f15	rebake mesh when a neighbor changes	2015-09-01 16:21:12 -07:00
Seth Alves	264d39aa9b	have knitted polyvoxes keep track of low-axis neighbors as well as high	2015-09-01 14:49:17 -07:00
Seth Alves	930c5cefc9	fix setSphere to create a world-space sphere rather than a voxel-space one	2015-09-01 11:10:21 -07:00
Seth Alves	7369ca19e9	allow setting cuboid voxel spaces. clean up some locking	2015-08-31 18:01:15 -07:00
Seth Alves	4d06890d90	lock/unlock less	2015-08-31 15:24:15 -07:00
Seth Alves	376a6bbb21	don't reload textures if the url didn't change	2015-08-31 11:48:08 -07:00
Seth Alves	41a2ff2fff	working on stitching marching-cube polyvoxs together	2015-08-30 18:42:15 -07:00
Seth Alves	64d0ce47f3	attempting to stitch polyvox entites together	2015-08-30 09:59:33 -07:00
Seth Alves	540af4afcb	remove unneeded call to computeShapeInfoWorker	2015-08-28 12:47:04 -07:00
Seth Alves	a5cd3ff046	release _threadRunning if decompressVolumeDataAsync exits early	2015-08-28 11:04:56 -07:00
Seth Alves	1ac5c19f44	if someone else changes a polyvox, we need to localy recompute the collision shape	2015-08-28 10:39:23 -07:00
Seth Alves	0bcd6b8ec5	remove no-longer-used #define	2015-08-28 10:30:56 -07:00
Seth Alves	b09de4ff65	fix worldCoordsToVoxelCoords for non-edged voxels. voxel.js now adds/delete where you click rather than near to there.	2015-08-26 21:51:28 -07:00
Seth Alves	6f46832069	clean up some commented code. attempt to fix ray-casting in non-edged polyvox -- still isn't correct	2015-08-25 21:30:38 -07:00
Seth Alves	da6a1c958b	clean up debugging prints	2015-08-25 16:40:58 -07:00
Seth Alves	3c35d90908	don't recompute meshes if nothing changed	2015-08-25 13:13:01 -07:00
Seth Alves	f6c440756c	do slow polyvox operations on a thread	2015-08-25 11:46:51 -07:00
Seth Alves	7cb9968864	more work on polyvox threading	2015-08-25 05:53:36 -07:00
Seth Alves	dc31c7e233	back out previous attempt at theading polyvox code. lay groundwork for threading that can be reasoned about	2015-08-23 08:14:05 -07:00
Seth Alves	9937416729	attempt to move some time-consuming polyvox stuff off of the main thread	2015-08-21 11:23:13 -07:00
Seth Alves	f563b2aeba	clean up debugging prints	2015-08-19 19:15:04 -07:00
Seth Alves	2dc2757eca	code review	2015-08-18 13:03:54 -07:00
Seth Alves	af11e97daa	fix broken optimisation for skipping internal voxels when making collision hull	2015-08-17 08:49:00 -07:00
Seth Alves	1ee773a532	don't include interrior voxels in cubic collision hull	2015-08-16 14:11:37 -07:00
Seth Alves	c60a8e7dfc	minecraft style voxel editing largely works	2015-08-16 12:52:55 -07:00
Seth Alves	a57278ba3c	ray-picks against cubic-voxels seem right, now	2015-08-16 11:51:04 -07:00
Seth Alves	0230d9397c	attempt to find exact ray intersection with cubic polyvox -- not working right, yet.	2015-08-16 11:04:52 -07:00