Tomáš Horáček
2eeb0d9bb9
re #19385 : importing voxels should be destructive
2013-07-02 01:16:20 +02:00
Tomáš Horáček
71c54586ba
re #19385 : use right neighbour voxels
2013-07-02 01:16:20 +02:00
Tomáš Horáček
b5e5806988
re #19385 : fill gaps between neighbourhood voxels
2013-07-02 01:16:20 +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
tosh
f49e63f842
Merge branch 'master' of git://github.com/worklist/hifi into 19377
2013-07-02 00:06:10 +02:00
Stephen Birarda
3c51f9cac7
type squishes in Agent socket match
2013-07-01 09:38:39 -07:00
tosh
f1e5a56347
adds code to show bandwidth details upon click and adds a checkbox to the menu to set visibility of the bandwidth bars
2013-06-30 17:08:01 +02:00
tosh
c18400f8b7
Merge branch 'master' of git://github.com/worklist/hifi into 19377
2013-06-29 15:41:56 +02:00
ZappoMan
f764a8d609
DRY up code in polygon
2013-06-29 00:25:04 -07:00
ZappoMan
c7e691a010
cleaned up CoverageMapV2 recursion code, fixes crazy false occlusion
2013-06-29 00:15:57 -07:00
ZappoMan
2b8b7589be
latest version of quadtree coverage map
2013-06-28 22:05:46 -07:00
ZappoMan
73ad854235
latest version of quadtree coverage map
2013-06-28 22:05:32 -07:00
Stephen Birarda
3349419c68
inital changes to add a version byte to packets
2013-06-28 16:23:35 -07:00
Stephen Birarda
eedaf5f76e
Merge pull request #593 from LionTurtle/master
...
ping reporter added to interface
2013-06-28 15:34:46 -07:00
Mark Peng
a5c6cee433
Renamed getPingTime() to getPingMs() in Agent.h, etc.
2013-06-28 15:33:08 -07:00
Mark Peng
0aa3227228
Merge remote-tracking branch 'upstream/master'
2013-06-28 15:26:34 -07:00
Eric Johnston
6c42922288
Minor bug fixes for networked Leap hands
2013-06-28 15:22:56 -07:00
Mark Peng
9313dbff52
ping reporter added to interface take 5
2013-06-28 15:17:21 -07:00
Mark Peng
a5dc47eaab
ping reporter added to interface take 4
2013-06-28 15:10:45 -07:00
Eric Johnston
0ff3554dd8
Networked Leap fingers
...
- Simplified finger updates and storage
- added pack and unpack for the fingers
- not yet tested between multiple machines, but *should* be harmless and backward-packet-compatible
2013-06-28 11:34:20 -07:00
Mark Peng
ee005f19d9
ping reporter added to interface take 2
2013-06-28 11:17:52 -07:00
Mark Peng
c5fe8b078e
ping reporter added to interface
2013-06-28 11:07:01 -07:00
Eric Johnston
1c797405da
Hand rework in preparation for adding send/receive hand data
...
- Added Hand.cpp, Hand.h, HandData.cpp, HandData.h, roughly matching the equivalent Head files
- Cleaned up Avatar by moving hand work into Hand files
- Added fixed-point data packing, for use in sending hand offsets
2013-06-28 07:57:02 -07:00
Stephen Birarda
cece4de90e
fix the default orientation for an injector
2013-06-27 11:14:22 -07:00
ZappoMan
850cfb920f
added sorting polygons by size
2013-06-24 22:11:33 -07:00
ZappoMan
c627010d3a
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-06-24 10:12:59 -07:00
ZappoMan
f918d757ca
added comment
2013-06-24 10:12:14 -07:00
tosh
7690ace2c3
Merge branch 'master' of git://github.com/worklist/hifi into 19377
...
Conflicts:
interface/src/Audio.cpp
2013-06-22 05:35:31 +02:00
tosh
290c20bfc7
introduces bandwidth meter / dialog
2013-06-22 04:22:10 +02:00
ZappoMan
4590bdc69d
added support for clipping polygons to screen bounds, not yet enabled since it doesn't help performance, will use in future
2013-06-21 16:42:55 -07:00
birarda
bd0d820fc7
Merge pull request #556 from PhilipRosedale/master
...
Dynamic jitter buffer for less stuttering, fixes to stereo
2013-06-21 14:29:45 -07:00
Philip Rosedale
13b729d9b4
Fixed problems with ring buffer not handling stereo right, reset audio buffers on spacebar.
2013-06-20 18:49:05 -07:00
Stephen Birarda
a9f7d037d1
add a helper to the logstash class to stash a value
2013-06-20 15:33:54 -07:00
Philip Rosedale
c740400224
Merge fixes plus auto jitter buffer
2013-06-20 10:54:58 -07:00
Philip Rosedale
2c8c34f9bd
set jitter buffer on application start to 1/2 of a packet
2013-06-20 09:08:37 -07:00
ZappoMan
758fadd6a9
optimized CoverageRegion to track _currentCoveredBounds and not test polygons in the tested ocludee is not in those covered bounds
2013-06-19 23:34:45 -07:00
Philip Rosedale
5dae92d610
Merge pull request #560 from ZappoMan/occlusion_culling
...
Occlusion culling optimizations
2013-06-19 19:26:56 -07:00
ZappoMan
cadd596508
implement partitioned CoverageRegions in CoverageMap to further optimize polygon compares
2013-06-19 17:52:01 -07:00
ZappoMan
91f6d0fde5
added copyright message
2013-06-19 15:29:50 -07:00
Stephen Birarda
4d330a33e6
add copyright to OctalCode header
2013-06-19 14:59:21 -07:00
Stephen Birarda
d9da29efad
add copyright to OctalCode implementation
2013-06-19 14:47:45 -07:00
ZappoMan
1284f9d09a
naming cleanup and some optimizations
2013-06-19 13:45:13 -07:00
ZappoMan
6755dfd8e4
Occlusion culling optimizations, added minimum polygon area, and only calculate projection matrix once
2013-06-19 11:46:22 -07:00
Stephen Birarda
7be50ae712
add copyright to SimpleMovingAverage implementation
2013-06-19 11:40:22 -07:00
Stephen Birarda
0aa4e000fc
add copyright to SimpleMovingAverage header
2013-06-19 11:37:28 -07:00
Stephen Birarda
8fd6bc41aa
add copyright to PerfStat implementation file
2013-06-18 18:09:03 -07:00
Stephen Birarda
f0330e9f48
add copyright to stat header
2013-06-18 18:04:38 -07:00
Stephen Birarda
2344a8c18d
add copyright to SharedUtil.cpp
2013-06-18 17:56:43 -07:00
Stephen Birarda
c48cc3c3a6
add copyright to SharedUtil
2013-06-18 17:39:32 -07:00
Stephen Birarda
c9d7cf1e8f
remove a comment and add copyright to StdDev class
2013-06-18 17:17:13 -07:00
Stephen Birarda
f6fa956144
remove a blank line
2013-06-18 16:02:02 -07:00
ZappoMan
f978d748fa
memmove instead of memcpy
2013-06-18 13:42:26 -07:00
ZappoMan
9466e81590
fixed crash
2013-06-18 12:25:16 -07:00
ZappoMan
8c44ad19a1
fixed build buster
2013-06-18 12:10:59 -07:00
ZappoMan
7922c3b625
fixed typo
2013-06-18 12:02:17 -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
00438f9d99
code cleanup
2013-06-18 10:28:14 -07:00
ZappoMan
a6b4bdba53
code cleanup
2013-06-18 10:25:58 -07:00
ZappoMan
58c4010185
added CoverageMap and occlusion culling to server
2013-06-18 09:36:43 -07:00
ZappoMan
c8d4b2ebed
added erase() and some other tweaks to CoverageMap
2013-06-18 09:35:13 -07:00
ZappoMan
7fe6c0e3b3
added occlusion culling menu option
2013-06-18 09:34:12 -07:00
ZappoMan
c9e1c898c2
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-06-14 19:50:38 -07:00
Andrzej Kapolka
dc3029b5a9
Merge pull request #540 from ZappoMan/encode_params
...
Change encodeTreeBitstream() to use params class
2013-06-14 17:25:57 -07:00
ZappoMan
e083c0c561
spacing
2013-06-14 16:48:36 -07:00
ZappoMan
08e8455c95
migrate encodeTreeBitstream() to use params class
2013-06-14 16:45:27 -07:00
ZappoMan
620a4a8ad6
latest occlusion culling with support for checking map without adding to coverage map for checking parent nodes
2013-06-13 16:37:14 -07:00
Stephen Birarda
a141e3dc5d
resolve conflicts on merge with upstream master
2013-06-13 16:31:40 -06:00
ZappoMan
7fb4ed276f
removed some debugging code
2013-06-13 14:10:53 -07:00
ZappoMan
8320925add
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-06-13 13:30:18 -07:00
ZappoMan
abb08e2482
handle out of view points
2013-06-13 13:30:04 -07:00
Andrzej Kapolka
b57a78c414
Another fix: using strlen to determine the length of the packet is... unwise.
...
Remember the length when we create it. This should fix the voxel server's not
appearing.
2013-06-13 13:15:08 -07:00
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
72b2845178
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-06-13 09:40:45 -07:00
ZappoMan
3a33d871e8
some debug code
2013-06-12 21:46:22 -07:00
Philip Rosedale
3d1ddf047e
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-12 16:27:53 -07:00
Andrzej Kapolka
6dae9db01d
Initialize members in the right order.
2013-06-12 15:54:13 -07:00
Andrzej Kapolka
e4ed9162b9
This should help, as well as fix another annoyance: bind to an ephemeral port,
...
rather than a fixed one.
2013-06-12 15:52:29 -07:00
ZappoMan
91aea82418
latest work on occlusion culling
2013-06-12 12:37:21 -07:00
ZappoMan
2e58a77180
make originalIndexArray optional in insertIntoSortedArrays()
2013-06-12 12:35:02 -07:00
ZappoMan
636030b0bb
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-06-12 01:17:03 -07:00
ZappoMan
e2d22a8e21
latest cut at occlusion culling
2013-06-12 01:16:46 -07:00
Philip Rosedale
750d210f0a
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-11 21:20:39 -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
Stephen Birarda
7d1bcf07ef
add a Logstash class to prepare for sending stats over UDP
2013-06-11 17:09:39 -07:00
Andrzej Kapolka
ee526265a1
Fix for nibble packing.
2013-06-11 16:00:14 -07:00
Stephen Birarda
84422628a9
remove thread link to audio library
2013-06-11 14:50:10 -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
57fcaceec2
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-11 11:10:41 -07:00
Stephen Birarda
b15f5a721b
remove hacked method to keep servers alive
2013-06-10 14:03:34 -07:00
Stephen Birarda
a8075e44ca
Merge remote-tracking branch 'upstream/master' into conditional-ds
2013-06-10 14:01:54 -07:00
Stephen Birarda
7fb42dcb8a
fix bug with sent and received agent interest packets
2013-06-10 13:48:34 -07:00
Stephen Birarda
ed79a9f72a
prepend the agent types of interest with the number that follow
2013-06-10 12:18:25 -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
Stephen Birarda
d33f3e43bd
agentTypesOfInterest need not be unsigned and remove debugging
2013-06-07 15:28:30 -07:00
Stephen Birarda
1e05936aea
unthread DS check in, allow agents to tell DS who they want to hear about
2013-06-07 15:19:12 -07:00
Stephen Birarda
95971b8303
rename AGENT_TYPE_VOXEL and PACKET_HEADER_DOMAIN_RFD
2013-06-07 14:12:42 -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
Stephen Birarda
233ce67379
don't link STK library while not being used
2013-06-06 11:57:38 -07:00
Philip Rosedale
3b149265d7
Merge pull request #495 from ZappoMan/recursive_voxel_delete
...
Fixes to delete voxel and color/add voxel to allow for unwinding color reaveraging
2013-06-06 11:17:57 -07:00
ZappoMan
ae3db89f63
added method for general subtree change bookkeeping
2013-06-06 10:55:11 -07:00
Stephen Birarda
f52b110b5c
conditional cleanup in Agent to re-fire PRB
2013-06-06 10:13:08 -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
Stephen Birarda
5bbf96d946
allow avatar agents to ask for audio loopback
2013-06-05 17:31:52 -07:00
Stephen Birarda
e5a1fa4dec
Merge branch 'master' of github.com:worklist/hifi into synthesis
2013-06-05 17:03:53 -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
Andrzej Kapolka
a4aa8e7bde
Basic sharing of the avatar voxel URLs.
2013-06-05 14:55:49 -07:00
Stephen Birarda
beb415a851
correct buffer byte constants in AudioRingBuffer
2013-06-05 12:45:07 -07:00
Stephen Birarda
d64b46a6b2
add specialized parsing of audio data to ARB subclasses
2013-06-05 12:11:56 -07:00
Stephen Birarda
4cb00ad54b
clean up AudioRingBuffer by subclassing
2013-06-05 11:51:21 -07:00
Stephen Birarda
eee7d6f92f
resolve some conflicts on merge with upstream master
2013-06-05 09:56:26 -07:00
Stephen Birarda
6c2dcb86c8
Merge remote-tracking branch 'upstream/master' into synthesis
2013-06-05 09:55:16 -07:00
ZappoMan
9310876531
Merge pull request #485 from birarda/cube-injector
...
spherical audio injector and quaternion rotations for audio
2013-06-05 09:37:38 -07:00
ZappoMan
726a0cecf2
fixed build issue
2013-06-04 17:40:34 -07:00
Stephen Birarda
6bf6d5a28e
cleanup NULL comparisons in AgentList
2013-06-04 17:29: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
Stephen Birarda
bfad6c8f61
fix orientation setter in AudioInjector header
2013-06-04 16:10:20 -07:00
Stephen Birarda
7d3d8f8b43
rewrite the AudioInjector to send an orientation quaternion instead of bearing
2013-06-04 15:31:11 -07:00
Stephen Birarda
cd79339670
rework audio-mixer to use orientations sent by clients
2013-06-04 15:18:05 -07:00
ZappoMan
a12353e112
hopefully fix unix build buster
2013-06-04 11:38:47 -07:00
Stephen Birarda
d02fb65a13
Merge remote-tracking branch 'upstream/master' into cube-injector
2013-06-04 11:25:39 -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
Stephen Birarda
3f7fbb5c1e
change injector from cube to sphere
2013-06-04 10:57:53 -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
ceb15d407d
removed assert
2013-06-03 22:08:19 -07:00
ZappoMan
eef0636655
some cleanup
2013-06-03 21:53:06 -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
0b7f4b21f4
Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels
2013-06-03 16:42:27 -07:00
Stephen Birarda
c55b6a20d7
parse the desired cube side length for injected audio source
2013-06-03 15:38:12 -07:00
ZappoMan
ea965f2290
fixed issue with sendVoxelsOperataion, some other cleanup
2013-06-03 13:46:21 -07:00