Commit graph

381 commits

Author SHA1 Message Date
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
Andrzej Kapolka
4e1886dfcb Divided when I should have multiplied. 2014-08-07 15:04:55 -07:00
Andrzej Kapolka
8de2dd9485 Working on ray intersection testing. 2014-08-07 14:38:47 -07:00
Andrzej Kapolka
acb973d245 Working on ray intersection testing. 2014-08-06 19:41:25 -07:00
Andrzej Kapolka
62e6493456 Started on heightfield brush tool, added simple query for heightfield height
(accessible from scripts).
2014-08-06 17:09:22 -07:00
Andrzej Kapolka
96302ca271 Provide for custom expansion according to attribute, tweak spanner attribute. 2014-08-05 14:10:39 -07:00
Andrzej Kapolka
f8afdba922 Allow configurable block sizes, merging children with different resolutions. 2014-08-04 16:56:30 -07:00
Andrzej Kapolka
b1d6977112 Added simple "erase heightfield" tool. 2014-08-04 12:58:01 -07:00
Andrzej Kapolka
46d4172157 Filter terrain, points, spanners by frustum intersection. 2014-08-04 11:41:56 -07:00
Andrzej Kapolka
c11b739ad6 Frustum class/box intersection testing. 2014-08-01 13:53:46 -07:00
Andrzej Kapolka
53fc31353d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-31 12:06:01 -07:00
Andrzej Kapolka
c3c2265ddd Hide the unset (black) bits. 2014-07-30 18:14:11 -07:00
Andrzej Kapolka
6c15468c87 Fix for sizing. 2014-07-30 17:21:31 -07:00
Andrzej Kapolka
f356f0652b Collapse nodes when they fall out of LOD. 2014-07-30 16:36:40 -07:00
Andrzej Kapolka
a722c4ba0a Merge fix. 2014-07-30 15:22:45 -07:00
Stephen Birarda
2796f71419 library cleanup to suppress warnings on cmake 3.0 2014-07-30 15:06:15 -07:00
Andrzej Kapolka
82e442c115 Working on heightfield transmission, merging. 2014-07-30 14:54:38 -07:00