ZappoMan
|
2b27c91550
|
Merge branch 'master' of https://github.com/worklist/hifi into particle_server
Conflicts:
interface/src/VoxelSystem.cpp
interface/src/VoxelSystem.h
|
2013-12-04 11:40:54 -08:00 |
|
ZappoMan
|
188d52c06e
|
get client working in refactored mode
|
2013-12-04 10:05:37 -08:00 |
|
ZappoMan
|
d7ae023492
|
make addChildAtIndex() use createNewElement() so we get our correct classes
|
2013-12-03 20:40:40 -08:00 |
|
ZappoMan
|
9faef65ccc
|
first cut at splitting out octree base classes
|
2013-12-03 17:32:02 -08:00 |
|
Stephen Birarda
|
3277cb49a6
|
Merge remote-tracking branch 'upstream/master' into cleanup
|
2013-12-03 12:21:03 -08:00 |
|
Stephen Birarda
|
bdf9f9eb22
|
remove extra debugging line
|
2013-12-03 12:11:31 -08:00 |
|
Stephen Birarda
|
5143c68b91
|
fix packet sending from VoxelScriptingInterface
|
2013-12-03 12:09:47 -08:00 |
|
Stephen Birarda
|
141394a664
|
replace UDPSocket with QUDPSocket
|
2013-12-02 13:34:29 -08:00 |
|
ZappoMan
|
040ad1853e
|
properly handle sequence numbers to not skip when supressing duplicate packets
|
2013-11-27 15:33:48 -08:00 |
|
ZappoMan
|
7f9d0849bd
|
added more client side voxel stats including lost packets, out of order packets, and average flight time
|
2013-11-27 13:37:47 -08:00 |
|
ZappoMan
|
17e979dc9f
|
improved client side stats, don't suppress initial stats message in server since it includes jurisdiction
|
2013-11-27 10:20:49 -08:00 |
|
ZappoMan
|
7cc5339702
|
cleanup comments and coding standard
|
2013-11-27 07:40:23 -08:00 |
|
ZappoMan
|
dac211cebd
|
pack more compressed sections into wire packets if there is room
|
2013-11-26 22:18:24 -08:00 |
|
ZappoMan
|
b7ee2ea2db
|
add section size to compressed packets to allow packing of multiple sections
|
2013-11-26 19:47:14 -08:00 |
|
ZappoMan
|
77590b5b87
|
cleanup debug, readd fix to not recurse subtrees when node is colored
|
2013-11-26 19:23:21 -08:00 |
|
ZappoMan
|
491512fbce
|
major pass on cleaning up voxel packets to have flags, sequence numbers, and flight time, add compression menu item
|
2013-11-26 17:26:54 -08:00 |
|
ZappoMan
|
a60cf0f34e
|
fix issue with copy
|
2013-11-25 15:52:30 -08:00 |
|
ZappoMan
|
d13ebf6095
|
more menu cleanup removing developer options that are now defunct
|
2013-11-25 14:44:34 -08:00 |
|
ZappoMan
|
de26b950f8
|
cleanup menu defaults
|
2013-11-25 14:25:09 -08:00 |
|
ZappoMan
|
66ebaae7c8
|
added debugging/logging of sleep times removed bail early loging in send thread since it wasn't needed and reduced sending potential in high PPS case
|
2013-11-25 13:34:53 -08:00 |
|
ZappoMan
|
78d39ed948
|
added timing details for better debugging and results measurement
|
2013-11-25 10:41:07 -08:00 |
|
ZappoMan
|
78a8f2d0cc
|
added comments
|
2013-11-25 08:56:37 -08:00 |
|
ZappoMan
|
17f5530893
|
fixed wasted bitmasks bug where we would include colors and extra layers
|
2013-11-25 01:42:19 -08:00 |
|
ZappoMan
|
8bb2bd2ecf
|
get voxel packet statistics to work and add them to server status page
|
2013-11-25 00:26:37 -08:00 |
|
ZappoMan
|
8d8d73a940
|
start of statistics, convert level key into class
|
2013-11-24 20:49:47 -08:00 |
|
ZappoMan
|
ed80895eb3
|
fix issue where we sometimes don't completely fill a packet mid scene
|
2013-11-24 20:29:54 -08:00 |
|
ZappoMan
|
0cd269632e
|
fix bug where some parts of scene weren't sent, turned out it was in the octal code not fitting voxels getting ignored
|
2013-11-24 17:49:10 -08:00 |
|
ZappoMan
|
3ef7c1a732
|
moved const definitions to better file
|
2013-11-24 15:28:50 -08:00 |
|
ZappoMan
|
25511f99ec
|
cleanup for coding standard
|
2013-11-24 15:22:44 -08:00 |
|
ZappoMan
|
94584d4ead
|
disable voxel packet compression for now
|
2013-11-24 15:01:37 -08:00 |
|
ZappoMan
|
e2f5069e6a
|
more VoxelPacket compression tuning
|
2013-11-24 14:41:50 -08:00 |
|
ZappoMan
|
57633f8b92
|
fixed comment
|
2013-11-24 00:05:06 -08:00 |
|
ZappoMan
|
ba26e5c3e3
|
add back non-compression mode to VoxelPacket and tweaks to how compression works to make it more efficient
|
2013-11-24 00:02:51 -08:00 |
|
ZappoMan
|
c28027b7ca
|
better compressed packets with fewer calls to checkCompress
|
2013-11-23 22:30:15 -08:00 |
|
ZappoMan
|
e65f74e06b
|
moved compression into VoxelPacket class. works, but too slow for larger sizes
|
2013-11-23 21:40:50 -08:00 |
|
ZappoMan
|
cd1d3765a9
|
cleaned up const semantics and DRYed up appendBitMask
|
2013-11-23 16:28:21 -08:00 |
|
ZappoMan
|
0f66f4c1bd
|
Revert "cleaned up some comments and code"
This reverts commit 99c427c97d .
|
2013-11-23 16:19:57 -08:00 |
|
ZappoMan
|
99c427c97d
|
cleaned up some comments and code
|
2013-11-23 16:18:18 -08:00 |
|
ZappoMan
|
cb43b0dea1
|
cleaned up some comments and code
|
2013-11-23 15:10:03 -08:00 |
|
ZappoMan
|
b0cc6494da
|
cleaned up some comments and code
|
2013-11-23 14:58:23 -08:00 |
|
ZappoMan
|
7ff7b13c6b
|
cleaned up some comments
|
2013-11-23 14:52:34 -08:00 |
|
ZappoMan
|
0ed31b5b9f
|
tweaks and cleanup
|
2013-11-23 14:14:00 -08:00 |
|
ZappoMan
|
ae5d5324c1
|
added some comments to VoxelPacket
|
2013-11-23 14:02:46 -08:00 |
|
ZappoMan
|
4c0569fc60
|
removing compression from VoxelNodeData to eventually move it into VoxelPacket where it belongs
|
2013-11-23 13:55:21 -08:00 |
|
ZappoMan
|
b1a0ed6480
|
remove old buffer style approach to encoding
|
2013-11-23 13:36:38 -08:00 |
|
ZappoMan
|
661152956a
|
clean up comments
|
2013-11-23 13:23:03 -08:00 |
|
ZappoMan
|
00b3451729
|
properly handle update fails when encoding
|
2013-11-23 13:11:06 -08:00 |
|
ZappoMan
|
b1adf82d4b
|
cleaned up const semantics in streaming voxel packets, fixed double reset bug
|
2013-11-23 13:05:37 -08:00 |
|
ZappoMan
|
1d88399476
|
cleaning up semantics of VoxelPacket
|
2013-11-22 20:39:11 -08:00 |
|
ZappoMan
|
0cd0012aab
|
cleaning up semantics of VoxelPacket
|
2013-11-22 20:08:58 -08:00 |
|