397 commits

Author	SHA1	Message	Date
Andrzej Kapolka	83d209dbdc	Remove unused variables.	2014-09-04 17:26:01 -07:00
Andrzej Kapolka	a02656070f	Added some comments.	2014-09-03 14:43:11 -07:00
Andrzej Kapolka	0bd800faf2	Starting on materials attributes, fixed bug with Hermite deltas.	2014-09-03 14:09:04 -07:00
Andrzej Kapolka	33faffd9d4	Sphere tools for voxel editing.	2014-09-02 17:45:37 -07:00
Andrzej Kapolka	120563951d	Fixed bug in edge vertex generation.	2014-08-29 12:10:25 -07:00
Andrzej Kapolka	78a03fb31a	More progress toward dual contour rendering.	2014-08-28 20:01:55 -07:00
Andrzej Kapolka	f02f95c460	Hermite data computation.	2014-08-28 14:53:48 -07:00
Andrzej Kapolka	2b2bc9179a	More progress towards computing Hermite data.	2014-08-27 19:09:10 -07:00
Andrzej Kapolka	96b4a1080c	More voxel editing bits.	2014-08-27 18:15:29 -07:00
Andrzej Kapolka	9a4d56b4e9	Working on voxel bits.	2014-08-27 14:41:23 -07:00
Andrzej Kapolka	e87556450e	More voxel edit bits.	2014-08-26 18:02:55 -07:00
Andrzej Kapolka	9c0888afff	Working on voxel edits.	2014-08-26 17:15:02 -07:00
Andrzej Kapolka	c6486b7f23	Voxel material bits.	2014-08-26 14:43:54 -07:00
Andrzej Kapolka	337fe42390	Method renaming.	2014-08-26 11:34:46 -07:00
Andrzej Kapolka	e454a08e57	HeightfieldTexture -> MaterialObject (we want to use it for voxels, too, and ... eventually include components other than diffuse color).	2014-08-25 18:57:45 -07:00
Andrzej Kapolka	7aa2a1d53f	Working on voxel representations.	2014-08-25 15:44:12 -07:00
Andrzej Kapolka	2dfabdfe64	Support for scaling splat textures in S and T, use mipmaps for them.	2014-08-22 16:43:09 -07:00
Andrzej Kapolka	e152e0c2be	Detachment fix.	2014-08-21 15:22:34 -07:00
Andrzej Kapolka	74b39773d6	Don't merge after expansion; it breaks stuff.	2014-08-21 14:50:58 -07:00
Andrzej Kapolka	72500630b0	Basic splatting.	2014-08-20 19:26:06 -07:00
Andrzej Kapolka	416d9bac2e	Working on texture rendering.	2014-08-20 14:48:02 -07:00
Andrzej Kapolka	540d074270	More texture bits.	2014-08-19 17:20:14 -07:00
Andrzej Kapolka	3136e4df76	More texture progress.	2014-08-19 15:28:15 -07:00
Andrzej Kapolka	e854656a7f	Rather than using a boolean to indicate "colorness," use a different class. ... More texture bits.	2014-08-19 14:20:47 -07:00
Andrzej Kapolka	5b8ff07449	Working on heightfield textures.	2014-08-18 18:21:48 -07:00
Andrzej Kapolka	c2a5c33b7b	Added ability to encode subdivisions relative to ancestor (not currently using ... for heightfields, since absolute lossy encoding is more efficient).	2014-08-18 16:07:15 -07:00
Andrzej Kapolka	a83ff45335	Working on custom encodings for subdivisions.	2014-08-15 18:09:58 -07:00
Andrzej Kapolka	67266b41df	Deflated JPEG encoding for blocks above 16x16.	2014-08-14 19:21:32 -07:00
Andrzej Kapolka	05d6b628fa	Alllmost ready with the big edge sharing rejiggery.	2014-08-14 17:10:45 -07:00
Andrzej Kapolka	62b84edc7f	Brush fix.	2014-08-13 15:13:06 -07:00
Andrzej Kapolka	56c6c3c972	Working on the height/ray queries.	2014-08-13 11:05:48 -07:00
Andrzej Kapolka	21d6c3c48a	More work on edge rejiggery.	2014-08-12 18:21:04 -07:00
Andrzej Kapolka	ee01d85b5e	Attempting to remove some number magic.	2014-08-12 12:01:07 -07:00
Andrzej Kapolka	10315f15d4	Simplify image loading.	2014-08-11 15:15:33 -07:00
Andrzej Kapolka	ffe87ad8c6	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-08-11 14:32:24 -07:00
Andrzej Kapolka	8804fa3710	Switch to PNG encoding, send only the changed portion of the image for deltas.	2014-08-11 14:29:53 -07:00
Andrzej Kapolka	768410ca0b	A couple comments, let right mouse button decrease height.	2014-08-08 14:14:35 -07:00
Andrzej Kapolka	e24ff0130f	Basic color/height painting.	2014-08-08 14:10:44 -07:00
Stephen Birarda	b1310c065c	remove TARGET_NAME from cmake macros where it is not required	2014-08-08 13:17:54 -07:00
Stephen Birarda	26f7b1ba62	add macro to link shared dependencies to target	2014-08-08 13:17:54 -07:00
Stephen Birarda	fc92b93326	fix typo in metavoxels library setup	2014-08-08 13:17:54 -07:00
Stephen Birarda	c9f8433a2d	tweak setup_hifi_library to bubble up full path of Qt modules	2014-08-08 13:17:54 -07:00
Stephen Birarda	17df6484d4	remove ssize_t and replace with size_t or int where appropriate	2014-08-08 13:17:53 -07:00
Stephen Birarda	1a71d655b9	more cmake cleanup to remove ROOT_DIR passing	2014-08-08 13:17:53 -07:00
Stephen Birarda	87cf262b9e	get to successful cmake after library link macro changes	2014-08-08 13:17:53 -07:00
Stephen Birarda	31488e72fe	repairs for interface build to succeed	2014-08-08 13:17:53 -07:00
Stephen Birarda	892e30c5e1	get past assignment-client build after cmake auditing	2014-08-08 13:17:53 -07:00
Stephen Birarda	1059e9a635	add back more required Qt modules	2014-08-08 13:17:52 -07:00
Stephen Birarda	b5c8a4d2c6	fix requirement of networking in audio library	2014-08-08 13:17:52 -07:00
Andrzej Kapolka	0fc34a47aa	Show heightfield cursor.	2014-08-07 18:19:58 -07:00