Commit graph

135 commits

Author SHA1 Message Date
atlante45
4dda71e830 Final code for minecraft import to review 2013-07-09 12:41:44 +02:00
atlante45
4899f77a0c Complete color handling in minecraft import 2013-07-08 16:11:50 +02:00
atlante45
6c840a9ec3 Functionnal version of minecraft import 2013-07-08 13:37:47 +02:00
Tomáš Horáček
a9f8b586ee re #19385: CR changes 2013-07-02 23:04:06 +02:00
Tomáš Horáček
c4c2d46847 re #19385: first version of PNG import
works for size <= 128px
2013-07-02 01:16:20 +02:00
ZappoMan
cadd596508 implement partitioned CoverageRegions in CoverageMap to further optimize polygon compares 2013-06-19 17:52:01 -07:00
ZappoMan
1284f9d09a naming cleanup and some optimizations 2013-06-19 13:45:13 -07:00
ZappoMan
9466e81590 fixed crash 2013-06-18 12:25:16 -07:00
ZappoMan
8b18ee6844 renamed VoxelProjectedShadow class 2013-06-18 12:01:01 -07:00
ZappoMan
9a22db28a3 code cleanup 2013-06-18 10:35:32 -07:00
ZappoMan
58c4010185 added CoverageMap and occlusion culling to server 2013-06-18 09:36:43 -07:00
ZappoMan
c9e1c898c2 Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-06-14 19:50:38 -07:00
ZappoMan
08e8455c95 migrate encodeTreeBitstream() to use params class 2013-06-14 16:45:27 -07:00
ZappoMan
3a33d871e8 some debug code 2013-06-12 21:46:22 -07:00
ZappoMan
e2d22a8e21 latest cut at occlusion culling 2013-06-12 01:16:46 -07:00
ZappoMan
ba7863605c fix several delete/delete[] mismatches 2013-06-07 10:49:43 -07:00
ZappoMan
e57db88c07 remove redundant calls to reaverageVoxelColors() now only use recursion unwinding 2013-06-07 10:28:25 -07:00
ZappoMan
ae3db89f63 added method for general subtree change bookkeeping 2013-06-06 10:55:11 -07:00
ZappoMan
66ebb7d01c Made readCodeColorBufferToTree() use self contained recursion so we can
implement color averaging properly
2013-06-06 01:39:40 -07:00
ZappoMan
57aff0af64 fixed bug in recursive delete that caused animation ghosts 2013-06-06 01:00:12 -07:00
ZappoMan
873ae85d4e changed deleteVoxelCodeFromTree() to use recursion to allow for proper unwinding, updating of parent path 2013-06-05 16:01:37 -07:00
ZappoMan
4f3872c18f CR feedback 2013-06-04 01:13:58 -07:00
ZappoMan
37cc436b2b CR feedback 2013-06-04 01:08:18 -07:00
ZappoMan
1f3de3e12b CR feedback 2013-06-04 01:03:26 -07:00
ZappoMan
03f79f5cab fixed delete voxel 2013-06-03 21:04:42 -07:00
ZappoMan
ea965f2290 fixed issue with sendVoxelsOperataion, some other cleanup 2013-06-03 13:46:21 -07:00
ZappoMan
e5e200345b more work on copy and paste 2013-05-31 11:52:18 -07:00
ZappoMan
46c6f2f9b5 latest copy paste 2013-05-29 15:02:28 -07:00
ZappoMan
377fb1e936 latest copy and paste 2013-05-29 12:06:58 -07:00
ZappoMan
6b1d37599c Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels 2013-05-29 08:12:07 -07:00
ZappoMan
d1d2e75143 first cut at export and import of voxels 2013-05-28 19:00:02 -07:00
Andrzej Kapolka
cfb66bee95 Capsule/box collisions. 2013-05-27 14:05:44 -07:00
Andrzej Kapolka
70b25fd6c4 Sphere/box collisions for voxels, various utility functions. 2013-05-25 19:59:07 -07:00
ZappoMan
25700ae490 fixes to coloring bugs, coding standard cleanup 2013-05-23 12:08:51 -07:00
birarda
9ec04855f8 Merge pull request #386 from ZappoMan/voxel_animation
Fix some crashing issues on delete
2013-05-22 14:27:29 -07:00
ZappoMan
47c4ff887e CR feedback 2013-05-22 14:13:38 -07:00
ZappoMan
06f2528d6a fix crashing on deleting voxels in server and client 2013-05-22 13:23:01 -07:00
Andrzej Kapolka
8b1362636e Merge branch 'master' of https://github.com/worklist/hifi 2013-05-21 22:29:46 -07:00
Philip Rosedale
8b65fcae75 Merge pull request #352 from tschw/master
refactors logging, adds comments, and revises names & formatting in all submitted code
2013-05-21 22:10:10 -07:00
Andrzej Kapolka
a864a6f8c6 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-21 21:34:09 -07:00
Andrzej Kapolka
fd98982fa6 Support for multiple environments, collisions with notional planet surfaces. 2013-05-21 21:33:08 -07:00
ZappoMan
09711d86ed fix compiler warning 2013-05-21 18:03:14 -07:00
ZappoMan
c316899f27 CR feedback 2013-05-21 17:42:55 -07:00
ZappoMan
166ad4f73d CR feedback 2013-05-21 17:37:21 -07:00
tosh
ba4f4b9809 Merge branch 'master' of git://github.com/worklist/hifi 2013-05-21 22:49:39 +02:00
ZappoMan
0bcd629c8a Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-21 13:46:04 -07:00
ZappoMan
869a100486 cleanup 2013-05-21 13:37:58 -07:00
Andrzej Kapolka
0377ca1adb Compute nodes' enclosing radius in the same place. 2013-05-21 13:32:41 -07:00
Andrzej Kapolka
597769a861 Added basic capsule/sphere collisions between avatar and voxels. 2013-05-21 12:58:02 -07:00
ZappoMan
d6d9b053f5 removed extra color exists bitmask since we weren't using it and it was redundant 2013-05-21 12:45:40 -07:00