Commit graph

202 commits

Author SHA1 Message Date
Andrzej Kapolka
c1c5991ac5 Fix for distorted replaced textures. 2014-12-12 12:07:48 -08:00
ZappoMan
d698594899 use common findRayTriangleIntersection 2014-12-06 19:39:02 -08:00
ZappoMan
d3aacc3838 Merge branch 'master' of https://github.com/highfidelity/hifi into mirrorTest
Conflicts:
	interface/src/MetavoxelSystem.cpp
2014-12-05 10:11:49 -08:00
ZappoMan
e68e3fe774 Revert "get rid of redundant _displayViewFrustum and use _viewFrustum"
This reverts commit 6d385d9a75.
2014-12-05 10:06:17 -08:00
ZappoMan
9753c82a3b get rid of redundant _displayViewFrustum and use _viewFrustum 2014-12-05 10:04:23 -08:00
ZappoMan
feab942375 Revert "get rid of redundant _displayViewFrustum and use _viewFrustum"
This reverts commit 6d385d9a75.
2014-12-05 10:01:16 -08:00
Andrzej Kapolka
ace415b138 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Conflicts:
	interface/src/MetavoxelSystem.cpp
2014-12-04 16:46:32 -08:00
Andrzej Kapolka
8fb766a5d0 Only recreate the renderers for nodes that have changed. 2014-12-03 16:44:13 -08:00
Andrzej Kapolka
94d0612804 Fix for Hermite display. 2014-12-02 20:17:18 -08:00
ZappoMan
6d385d9a75 get rid of redundant _displayViewFrustum and use _viewFrustum 2014-12-02 11:45:33 -08:00
Andrzej Kapolka
0a329bbe3c More work on LOD rendering; now rendering in preview. 2014-11-26 16:18:57 -08:00
Andrzej Kapolka
790b085307 Rejiggering the heightfield renderer for LOD. 2014-11-26 13:02:11 -08:00
Andrzej Kapolka
296718e2aa Removed redundant members, clarified class names, used better hash factors. 2014-11-21 12:46:24 -08:00
Andrzej Kapolka
87cc565c1a I believe this should be a better hash function for the voxel coordinates. 2014-11-20 18:16:57 -08:00
Andrzej Kapolka
1e294e043b Batch voxel drawing, too. 2014-11-20 16:37:37 -08:00
Andrzej Kapolka
da85714dc8 Batch heightfield sections for better performance. 2014-11-20 15:09:38 -08:00
Andrzej Kapolka
d351a65999 Increase the smoothing cutoff. 2014-11-20 12:09:33 -08:00
Andrzej Kapolka
fa122b505a Further improvement to normals. 2014-11-19 17:38:45 -08:00
Andrzej Kapolka
82fc75b2c4 Tweak to normal computation on dual contour surfaces. 2014-11-19 17:27:10 -08:00
Andrzej Kapolka
d273e7c399 Render heightfields -> render spanners. 2014-11-18 19:49:08 -08:00
Andrzej Kapolka
a0f75c990e Working on fetching/clearing heightfield chunks. 2014-11-18 17:12:47 -08:00
Andrzej Kapolka
a3e65fc231 Simplification, window fix. 2014-11-17 18:44:38 -08:00
Andrzej Kapolka
479bea1eb2 Removed heightfield buffer code. 2014-11-14 17:18:34 -08:00
Andrzej Kapolka
bba042e823 Heightfield material paint bits. 2014-11-14 16:52:29 -08:00
Andrzej Kapolka
6dc4abd286 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-14 13:22:37 -08:00
Andrzej Kapolka
14eb87aefd Eliminate wacky scales in favor of newfangled "meters." 2014-11-14 12:23:47 -08:00
Andrzej Kapolka
b879471a4b Cursor rendering on spanners. 2014-11-13 20:55:36 -08:00
Andrzej Kapolka
b2ac33db16 Ray tests for heightfield spanners. 2014-11-13 19:53:16 -08:00
Andrzej Kapolka
75e1cf8a7b Migrate getHeightfieldHeight to spanner heightfields. 2014-11-13 18:00:25 -08:00
Andrzej Kapolka
d05bb49a74 Yet more heightfield spanner bits. 2014-11-12 15:40:54 -08:00
Andrzej Kapolka
caef237376 More work on spannerizing heightfields. 2014-11-11 14:40:05 -08:00
Andrzej Kapolka
93a61dd0c2 More heightfield bits. 2014-11-10 19:26:19 -08:00
Andrzej Kapolka
0664ff3181 Moved spanners into separate file, working on heightfields as spanners. 2014-11-10 15:51:41 -08:00
Andrzej Kapolka
e08a0144c2 Cleanup on aisle three! Removed the color/normal/voxelized spanner bits, as
well as the throbbing/scripted guides and the notion of spanner masking.
2014-11-06 19:15:43 -08:00
Andrzej Kapolka
fd12c7a0d7 One more piece of the resolution puzzle. 2014-10-30 16:52:19 -07:00
Andrzej Kapolka
754d1a2802 Another resolution fix. 2014-10-29 16:55:55 -07:00
Andrzej Kapolka
37569dadd5 More resolution bits. 2014-10-29 13:00:32 -07:00
Andrzej Kapolka
f0e4e034b6 Fix for color bytes. 2014-10-28 18:55:12 -07:00
Andrzej Kapolka
d28da9250f More progress towards allowing different resolutions for height and color,
material, etc.
2014-10-28 18:31:34 -07:00
Andrzej Kapolka
4ab90ce49c Avoid killing the updater twice. 2014-10-27 15:04:03 -07:00
Andrzej Kapolka
7bcc267cb5 Fix for crash on exit. 2014-10-27 15:01:06 -07:00
Andrzej Kapolka
8684384316 Disconnect metavoxel LOD from avatar LOD. 2014-10-24 16:38:57 -07:00
Andrzej Kapolka
34cba5c031 Added options to selectively toggle heightfield/dual contour surface
rendering.
2014-10-23 13:16:43 -07:00
Andrzej Kapolka
4840c44d7c Time calculation fix. 2014-10-21 17:41:41 -07:00
Andrzej Kapolka
311d1332f1 Include a simple bandwidth limit option. 2014-10-21 17:29:28 -07:00
Andrzej Kapolka
02c6b5a8bf Fix for send delay, delay ordering. 2014-10-21 12:16:55 -07:00
Andrzej Kapolka
45fb31cd08 Basic network simulation for metavoxels. 2014-10-20 18:43:41 -07:00
Andrzej Kapolka
fba383f6d3 Render voxel cursor on heightfields, too. 2014-10-14 15:21:45 -07:00
Andrzej Kapolka
13efaba22c Basic metavoxels example. 2014-10-13 15:34:38 -07:00
Andrzej Kapolka
60576bdcbd Basic metavoxel scripting bits. 2014-10-13 15:05:16 -07:00