56 commits

Author	SHA1	Message	Date
Stephen Birarda	c6df573933	fix some OS X warnings, add description to tooltip	2015-06-26 10:50:31 -07:00
Seth Alves	021dc64789	merge from upstream	2015-06-18 15:03:09 -07:00
Seth Alves	b258aeaa3d	merge from master	2015-06-18 10:04:14 -07:00
Seth Alves	22ac61e476	work around hiding of virtual functions in PolyVox entity classses	2015-06-17 14:40:24 -07:00
Seth Alves	508ae276c6	enable -Wdouble-promotion	2015-06-16 18:23:10 -07:00
Seth Alves	d7eddc398b	don't make changes if the polyvox is locked	2015-06-16 10:14:01 -07:00
Seth Alves	445381bb6b	fix DEFAULT_VOXEL_DATA, recompress voxel data when a script calls setVoxel. Use provided transform when rendering.	2015-06-15 16:07:28 -07:00
Seth Alves	983ae5b2f0	quiet compiler, fix some whitespace	2015-06-08 21:19:37 -07:00
Atlante45	260272d288	Transform to polyvox corner for render	2015-06-05 14:32:47 +02:00
ZappoMan	7c40b666e8	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api	2015-06-03 09:52:40 -07:00
Seth Alves	20d3814c1b	code review	2015-06-02 10:00:07 -07:00
Seth Alves	ea3f002a65	ifdef out debug pritns	2015-06-01 14:38:07 -07:00
Seth Alves	d1bb6473d9	more work on edge handling and resizing	2015-06-01 13:57:28 -07:00
Seth Alves	43a1519e29	better handling of changes to the size of voxel space. limit each dimension to 32	2015-06-01 12:01:45 -07:00
Seth Alves	00af0a4376	trying to make thing behave when voxel-space is resized	2015-06-01 07:15:37 -07:00
Seth Alves	cfeab893e7	fix voxelToLocalMatrix	2015-05-31 09:28:33 -07:00
Seth Alves	b9202ebfb6	added SURFACE_EDGED_CUBIC surface extractor which pads the outsides of the voxel-space with empty cells to change how the edges of the surface look	2015-05-31 09:14:59 -07:00
Seth Alves	a3589788df	allow edit.js to change between cubic and marching-cubes surface extractor on polyvox entity-items.	2015-05-30 18:33:35 -07:00
Seth Alves	c5a0dd72ec	keep track of number of non-zero voxels, use this information when deciding on shape-type	2015-05-30 18:13:57 -07:00
Seth Alves	fe59f8846f	recompute polyvox mesh when setVoxelSurfaceStyle is called. remove left-over color stuff from polyvox. don't require that a polyvox be rendered before computing its physics shape	2015-05-30 16:43:11 -07:00
Seth Alves	96a40bd673	basic collisions with cubic polyvoxes	2015-05-29 18:50:26 -07:00
Atlante45	e9edc3e789	PolyVox entities use simple program	2015-05-29 20:05:38 +02:00
Atlante45	ad2d4d5e85	PolyVox entities render in Batch	2015-05-29 17:44:41 +02:00
ZappoMan	f736ce714f	fix build buster	2015-05-28 13:33:57 -07:00
Seth Alves	e46c24ea58	code review	2015-05-28 10:27:59 -07:00
Seth Alves	1109444c3d	attempt to make sure the ray that picks against polyvox entities is long enough	2015-05-27 14:57:12 -07:00
Seth Alves	14c68519f3	limit size of polyvox data property to below MTU	2015-05-27 09:59:18 -07:00
Seth Alves	429cc631f3	limit size of polyvox data property to below MTU	2015-05-27 09:48:32 -07:00
Seth Alves	3af916e27e	use enum for polyvox surface style	2015-05-27 09:32:10 -07:00
Seth Alves	1749ec83db	adapting to entitypointer merge	2015-05-27 09:00:59 -07:00
Seth Alves	f310da9cd3	adapting to entitypointer merge	2015-05-27 08:59:44 -07:00
Seth Alves	0f81445cee	flag for polyvox to select minecraft vs walking-cubes. uppack to unpack	2015-05-27 07:04:44 -07:00
Seth Alves	6930008f74	remove debugging spew	2015-05-26 21:40:50 -07:00
Seth Alves	517d4372fa	debugging	2015-05-26 16:53:11 -07:00
Seth Alves	0ecd60a489	update voxel mesh when new data arrives from the wire	2015-05-26 16:45:29 -07:00
Seth Alves	55028f6cb0	voxel data sent over wire and saved to json	2015-05-26 16:34:35 -07:00
Seth Alves	22cc298861	Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox	2015-05-26 14:26:11 -07:00
Seth Alves	cdef502e2e	expose setVoxelSphere to js	2015-05-26 14:26:05 -07:00
Seth Alves	28e052ffdb	Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox	2015-05-26 14:12:11 -07:00
Seth Alves	728e6d121b	changes sam made to get normals to work on a mesh	2015-05-26 14:12:01 -07:00
Seth Alves	988ecf9d55	send PolyVox voxel dimensions and compressed data over the wire	2015-05-26 13:18:52 -07:00
Seth Alves	59f68f5625	added voxel-data compression code to see what the sizes are like	2015-05-26 09:52:18 -07:00
Seth Alves	a251ae7f50	far is a reserved word	2015-05-26 09:06:51 -07:00
Seth Alves	727f457f91	hook up RenderablePolyVoxEntityItem::findDetailedRayIntersection to polyvox library's version	2015-05-25 21:01:20 -07:00
Seth Alves	380fed7aee	metersToVoxelCoordinates and voxelCoordinatesToMeters	2015-05-22 10:37:48 -07:00
Seth Alves	a882fc7fb1	pull out common parts of the two sphere-in-volumes	2015-05-21 18:07:46 -07:00
Seth Alves	8b2d570f3f	clearSphereInVolume	2015-05-21 17:04:57 -07:00
Seth Alves	478cb40135	draws in the right place, now	2015-05-21 16:46:27 -07:00
Seth Alves	2cb73b5430	added a volex-volume size member variable. drawing transform still isn't quite right	2015-05-21 16:31:01 -07:00
Seth Alves	bbb61a77d9	dodge stride bug in mesh code	2015-05-21 14:47:23 -07:00