Andrzej Kapolka
78072fbde0
Merge pull request #523 from PhilipRosedale/master
...
Better physics, first person to third person transition
2013-06-13 12:07:06 -07:00
Andrzej Kapolka
db729a04aa
Converted double timestamps to long long (64 bit integers), fixed bug with
...
updating agent timestamps.
2013-06-13 11:11:59 -07:00
ZappoMan
3a33d871e8
some debug code
2013-06-12 21:46:22 -07:00
ZappoMan
91aea82418
latest work on occlusion culling
2013-06-12 12:37:21 -07:00
ZappoMan
e2d22a8e21
latest cut at occlusion culling
2013-06-12 01:16:46 -07:00
ZappoMan
b3ef9868e3
fixed line spacing and added BoundingBox support
2013-06-11 18:37:31 -07:00
ZappoMan
6d3ec662a1
CoverageMap class, implments a quad tree that handles coverage map for 2d polygon projections of voxels
2013-06-11 18:36:25 -07:00
ZappoMan
77dc8d9900
moved line intersection to GeometryUtil
2013-06-11 14:06:17 -07:00
ZappoMan
56753fc21d
added getProjectedShadow() and projectPoint() to ViewFrustum to implement support for projecting Axis Aligned Boxes to 2D
2013-06-11 12:33:18 -07:00
ZappoMan
6d8826de43
cleaned up line spacing and tabs, added getVertex()
2013-06-11 12:30:52 -07:00
ZappoMan
658c5adfbf
first cut at VoxelProjectedShadow class, which implements a 2D polygon that matches a voxels projected outline
2013-06-11 12:30:18 -07:00
ZappoMan
a9c18c2af0
cleaned up line spacing and tabs, added getVertex()
2013-06-11 12:28:09 -07:00
Philip Rosedale
297a78188a
removed const values per code review
2013-06-10 08:10:51 -07:00
Philip Rosedale
3ec16695f4
Finished adding concept of density to the voxel server, objects now appear more visible at a distance in an appealing way.
2013-06-09 12:48:22 -07:00
Philip Rosedale
b7c680e3e7
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-08 15:15:27 -07:00
Philip Rosedale
769383582b
Adding density to nodes
2013-06-08 14:24:29 -07:00
ZappoMan
a175ad8fda
fix spacing
2013-06-07 17:25:05 -07:00
ZappoMan
46c66c39e5
implement keyhole frustum
2013-06-07 17:23:23 -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
4f1131fc97
add markWithChangedTime() method as public method
...
Conflicts:
libraries/voxels/src/VoxelNode.cpp
libraries/voxels/src/VoxelNode.h
2013-06-05 16:05:32 -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
4f2af717f2
Fixed merge issue with new orientation vectors, migrated to common identity names
2013-06-04 17:27:40 -07:00
ZappoMan
6e70f3b187
Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization
2013-06-04 16:21:20 -07:00
Andrzej Kapolka
d09700adde
Merge branch 'master' of https://github.com/worklist/hifi into voxeltars
...
Conflicts:
interface/src/Avatar.cpp
interface/src/Avatar.h
interface/src/Skeleton.h
interface/src/VoxelSystem.h
2013-06-04 11:00:59 -07:00
ZappoMan
026fb5b344
Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization
2013-06-04 09:34: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
510dfc7353
Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization
2013-06-03 21:43:38 -07:00
ZappoMan
03f79f5cab
fixed delete voxel
2013-06-03 21:04:42 -07:00
ZappoMan
cf3ff53e2c
copy and paste working
2013-06-03 18:08:11 -07:00
ZappoMan
ea965f2290
fixed issue with sendVoxelsOperataion, some other cleanup
2013-06-03 13:46:21 -07:00
ZappoMan
78fe89172a
eyedropper mode, and import work
2013-06-03 12:23:16 -07:00
Andrzej Kapolka
a6daa296ff
Slight fix to capsule/box penetration test: we should use the smaller distance
...
to the diagonal, not the first one we find.
2013-06-03 10:08:42 -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
Jeffrey Ventrella
82683dbabc
merge
2013-05-28 17:58:02 -07:00
Stephen Birarda
65f10cb99a
fix the enum in AABox, fix a warning in Head
2013-05-28 16:26:18 -07:00
Andrzej Kapolka
1df7806464
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-27 14:40:30 -07:00
Andrzej Kapolka
949befee09
Fix for NaN.
2013-05-27 14:37:07 -07:00
ZappoMan
5d1ba857c5
Optimize View Frustum wire format.
...
- Changed View frstum orientaton to be a quaternion
- Implemented packing formats for Orientation Quats, Ratios, and Clipping values
- Changed wire format for View Frustum details to be more efficient 28 bytes vs 64 bytes
2013-05-27 14:17:34 -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
48ca562b10
tweak ViewFrustum::matches() to use EPSILON compare
2013-05-25 15:28:56 -07:00
Andrzej Kapolka
95f1a9adaa
Removed unused nearCenter/farCenter from ViewFrustum.
2013-05-23 16:34:11 -07:00
ZappoMan
473665fb4a
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation
2013-05-23 12:16:29 -07:00
ZappoMan
25700ae490
fixes to coloring bugs, coding standard cleanup
2013-05-23 12:08:51 -07:00
ZappoMan
2130572034
fixed color initialization on VoxelNode construction
2013-05-23 12:07:56 -07:00
Andrzej Kapolka
34b526f15c
Restore the original floor behavior.
2013-05-23 10:32:12 -07:00
Andrzej Kapolka
629c7b0146
Send all environment data in the same packet and only send it about once a
...
second.
2013-05-22 17:09:35 -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
ZappoMan
edcc92cfb6
cleanup code
2013-05-21 11:58:48 -07:00
ZappoMan
e8fd96018b
cleanup code
2013-05-21 11:52:57 -07:00
ZappoMan
b61d6cf4e8
cleanup code
2013-05-21 11:48:30 -07:00
ZappoMan
e47d9ea21f
cleanup code
2013-05-21 11:44:48 -07:00
ZappoMan
7c9be4b9f5
cleanup code
2013-05-21 11:42:13 -07:00
ZappoMan
a7f0a66aee
code cleanup
2013-05-21 11:31:47 -07:00
ZappoMan
4f9c7fed59
removed UI for want exists bits, defaults to true
2013-05-21 11:25:50 -07:00
ZappoMan
ef2d27aba6
getting closer to working delete
2013-05-21 10:43:31 -07:00
tosh
a86b8a1d93
refactors logging
2013-05-21 01:00:10 +02:00
ZappoMan
a53f84fcb9
latest hacking
2013-05-20 15:51:47 -07:00
ZappoMan
321d1952d6
first cut at exists bits
2013-05-20 12:56:59 -07:00
Andrzej Kapolka
85bca558f5
Tabs -> spaces, spacing fix.
2013-05-20 09:38:01 -07:00
Andrzej Kapolka
0c03f66948
Fixed the frustum computation, fixed a bug in Plane.
2013-05-19 22:32:55 -07:00
Andrzej Kapolka
dd3e8d524a
Support for eye offset position/orientation in camera/frustum.
2013-05-19 18:37:21 -07:00
Andrzej Kapolka
3ed99f40a6
Working on support for off-axis projection.
2013-05-17 10:17:21 -07:00
Andrzej Kapolka
8e04c17cc2
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
interface/src/Application.cpp
2013-05-14 14:44:22 -07:00
Andrzej Kapolka
ebc612f87a
Start out with gray, fix coloring smaller portions by (similar to deleting)
...
breaking up leaf nodes into their components.
2013-05-14 14:23:08 -07:00
ZappoMan
8dc61d89fc
Added support for "destructive" vs "non-destructive" voxel create
...
- changed VoxelTree to support destructive and non-destructive mode
- added protocol packet headers to differentiate
- added new UI to switch modes
- default mode now, non-destructive.
2013-05-14 14:19:31 -07:00
ZappoMan
4e92f5d3d8
tweaks to delta sending
2013-05-14 12:11:32 -07:00
ZappoMan
fa37b88fa8
first cut at delta view frustum encoding
2013-05-14 09:02:01 -07:00
ZappoMan
f63407aea5
added printDebugDetails()
2013-05-14 08:57:49 -07:00
ZappoMan
dd4303800d
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-13 13:15:02 -07:00
ZappoMan
777dd6dc53
Added PointerStack class, and implemented support for monochrome in VoxelTree
2013-05-13 09:57:36 -07:00
Andrzej Kapolka
eb77f5ff83
Removed debug code, more tests for staged-for-deletion.
2013-05-12 20:36:10 -07:00
Andrzej Kapolka
be88fec7d3
Fixed the major bug, which is that non-leaves were being collapsed. Update
...
full VBO on deletion, since otherwise we don't see the update.
2013-05-12 20:08:01 -07:00
Andrzej Kapolka
4289921b7e
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-11 15:39:18 -07:00
Andrzej Kapolka
750843e867
More editing progress. Now there are threading issues. Joy!
2013-05-10 21:02:08 -07:00