54 commits

Author	SHA1	Message	Date
Stephen Birarda	684c6b5372	run regex header replacement on all cpp files	2014-04-09 09:35:42 -07:00
Stephen Birarda	974d8c0427	prepare header files for regex run against cpp	2014-04-09 09:35:05 -07:00
Andrzej Kapolka	ccd7106527	Include "InterfaceConfig" before QOpenGLFramebufferObject to fix Windows ... build.	2014-04-08 10:54:41 -07:00
Andrzej Kapolka	2d535f3b86	Removed debugging code.	2014-04-04 16:36:58 -07:00
Andrzej Kapolka	d2b0cc43dd	Extent tweaks.	2014-04-04 16:32:14 -07:00
Andrzej Kapolka	a2b94aa433	Working on render modes.	2014-04-04 14:22:01 -07:00
Andrzej Kapolka	a0c7e4d3cc	Working on model rendering modes.	2014-04-04 11:45:03 -07:00
Andrzej Kapolka	38022d2440	Fix for voxelizing models.	2014-04-04 00:33:33 -07:00
Andrzej Kapolka	dfaa98cc34	Blend when setting.	2014-04-03 23:51:49 -07:00
Andrzej Kapolka	d706e23012	Basic voxelization.	2014-04-03 23:47:31 -07:00
Andrzej Kapolka	407a6ecc70	More work on voxelizing.	2014-04-03 11:26:54 -07:00
Andrzej Kapolka	4375fe85f1	Working on voxelizing spanners using a set of six rendered images.	2014-04-02 18:56:18 -07:00
Andrzej Kapolka	005ae79928	Various fixes and what-not, got the basic spanner clipping working.	2014-03-31 18:21:28 -07:00
Andrzej Kapolka	5934a7fbea	Working on voxelizing spanners.	2014-03-25 20:41:19 -07:00
Andrzej Kapolka	800be7eef4	One more degree conversion.	2014-03-12 13:38:16 -07:00
Andrzej Kapolka	e249b29b45	Merge pull request #2268 from AndrewMeadows/radians ... prefer radians over degrees	2014-03-12 12:10:29 -07:00
Andrew Meadows	aa8c2fc8cb	use radians instead of degrees (almost) everywhere	2014-03-11 17:26:58 -07:00
Andrzej Kapolka	9e5aae4a39	Remove spanner bits.	2014-03-10 17:01:27 -07:00
Andrzej Kapolka	3b63424abd	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-03-10 12:27:07 -07:00
Stephen Birarda	27d486c0a1	resolve conflicts on merge with upstream master	2014-03-06 14:47:58 -08:00
Andrzej Kapolka	23556f0cf7	Fix for merging after streaming, added ability to "set" a spanner's attributes ... in the actual metavoxel data.	2014-03-06 12:38:11 -08:00
Stephen Birarda	b705ec560f	cleanup resources directory references by copying beside the executable	2014-03-06 11:46:49 -08:00
Stephen Birarda	403f91c988	update resource references to use Qt resource system	2014-03-06 10:41:11 -08:00
Stephen Birarda	7451cfe130	remove glm so it is referenced only externally	2014-03-04 15:19:47 -08:00
Andrzej Kapolka	1dfb72173d	Hide metavoxel editing bits when mouse is hidden.	2014-02-26 16:44:00 -08:00
Andrzej Kapolka	718439014a	Compute the mesh extents for geometry and use them to set the spanner bounds.	2014-02-24 17:28:11 -08:00
Andrzej Kapolka	b408e31d91	More work on spanners.	2014-02-20 17:18:15 -08:00
Andrzej Kapolka	25ae81e2de	More work on spanners.	2014-02-19 15:25:21 -08:00
Andrzej Kapolka	0138ecb3b2	Layout tweaks.	2014-02-19 11:35:45 -08:00
Andrzej Kapolka	55e2ebd92f	More spanner bits.	2014-02-18 13:58:44 -08:00
Andrzej Kapolka	494685140b	Various bits of work on spanners.	2014-02-17 21:44:32 -08:00
Andrzej Kapolka	3e40927d3a	More work on spanning objects.	2014-02-14 18:01:48 -08:00
Andrzej Kapolka	bb56e2847f	Global edits, edits use virtual function.	2014-02-12 20:00:07 -08:00
Andrzej Kapolka	5b207e4f8e	Work on creating new attributes.	2014-02-12 17:10:32 -08:00
Andrzej Kapolka	d6d95a586d	Working on deleting attributes.	2014-02-12 14:16:14 -08:00
Andrzej Kapolka	7dfb83b6cc	Fix for obtaining values from editor.	2014-02-03 14:35:29 -08:00
Andrzej Kapolka	a7ebcf5a96	Layout fix.	2014-01-30 11:24:24 -08:00
Andrzej Kapolka	8df4e884e4	Fix box color on hovering.	2014-01-30 11:15:03 -08:00
Andrzej Kapolka	64df9718f2	Working on object attributes.	2014-01-29 16:36:44 -08:00
Andrzej Kapolka	4c70af51e8	Expand data automatically to encompass edits.	2014-01-29 13:30:54 -08:00
Andrzej Kapolka	674bc70223	Offset adjustment.	2014-01-28 15:50:13 -08:00
Andrzej Kapolka	f435f61467	Start the grid position off roughly at our feet.	2014-01-28 15:46:02 -08:00
Andrzej Kapolka	d5695395c4	Basic editing with delta streaming up and running.	2014-01-27 15:49:50 -08:00
Andrzej Kapolka	1ef6f5f7b3	MetavoxelDataPointer -> MetavoxelData, grid spacing as power of 2.	2014-01-26 13:23:10 -08:00
Andrzej Kapolka	7f20750e80	Working on sending edits.	2014-01-24 16:03:25 -08:00
Andrzej Kapolka	f73f16b0fb	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-01-23 18:12:52 -08:00
Andrzej Kapolka	c4254cd423	Fix OS X warning.	2014-01-23 18:08:45 -08:00
Andrzej Kapolka	4414c91f1e	Working on streaming edits.	2014-01-23 18:05:04 -08:00
Andrzej Kapolka	4e3988f843	Have the drag-out box show up in the selected color.	2014-01-23 11:20:07 -08:00
Andrzej Kapolka	a3ffb1d8a3	Working on performing the actual edit.	2014-01-22 19:17:48 -08:00