Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-13 08:04:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
7941 commits 25 branches 0 tags 1.1 GiB
Commit graph

1898 commits

Author SHA1 Message Date
ZappoMan
19515c80fd Merge branch 'master' of https://github.com/worklist/hifi into new_voxel_scene_stats 
Conflicts:
	interface/src/Application.cpp
 2013-11-07 16:44:34 -08:00
ZappoMan
afaa448f92 Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 2013-11-07 15:52:29 -08:00
ZappoMan
fffbdb1db0 reverted code 2013-11-07 15:52:19 -08:00
Stephen Birarda
5889d4122f use virtual deleteOrDeleteLater in NodeData to handle AvatarVoxelSystem 2013-11-07 15:41:10 -08:00
ZappoMan
385865c6c1 remove comment 2013-11-07 15:25:21 -08:00
ZappoMan
ce41477f46 fix VS crash on domain server restart 2013-11-07 15:23:23 -08:00
Stephen Birarda
9aacda7d56 fix for AC lack of QCoreApplication 2013-11-07 14:34:01 -08:00
ZappoMan
77ba88e56d removed dead comment 2013-11-07 13:06:57 -08:00
ZappoMan
b5f6a51728 fix thread contention issues and VS crash on domain server shutdown and restart 2013-11-07 13:03:04 -08:00
Stephen Birarda
72b2309dc0 Merge branch 'master' of github.com:worklist/hifi into assignment 2013-11-07 12:43:58 -08:00
Stephen Birarda
24c88512e2 only attempt to deleteLater on linkedData if it exists 2013-11-07 12:41:29 -08:00
Stephen Birarda
fe962e6be1 only call deleteLater for linkedData if we have a QCoreApplication instance 2013-11-07 12:38:28 -08:00
ZappoMan
100439784d got rid of redundant getTree() 2013-11-06 17:37:37 -08:00
ZappoMan
76ad42015a added debugging to JurisdictionMap for server crashes 2013-11-06 16:41:08 -08:00
ZappoMan
f9291e6e5c implement ReadWriteLock for VoxelTree to fix crashes in VoxelServer 2013-11-06 15:22:17 -08:00
ZappoMan
c3914e648f lock our node while using it to prevent crash on domain shutdown 2013-11-06 13:52:31 -08:00
ZappoMan
5cd0ecde18 small tweak in debug out 2013-11-06 12:10:19 -08:00
ZappoMan
0da28fd44c debbugging for node shutdown in VS 2013-11-06 11:20:40 -08:00
ZappoMan
987ce16b10 more potential fixes for voxel server crashes 2013-11-06 01:55:04 -08:00
ZappoMan
1b18b53cfd removed force_crash by default 2013-11-06 00:09:37 -08:00
ZappoMan
c1b22dfdd6 added force_crash to test crashing behavior 2013-11-06 00:00:21 -08:00
ZappoMan
58b74e1f58 added uptime/start time to server status page, and disabled noisy debuggin 2013-11-05 20:49:20 -08:00
ZappoMan
93ad1c3f99 make temp copy of NetworkPacket to protect against vector resizing 2013-11-05 15:11:31 -08:00
ZappoMan
318b9b1671 make temp copy of NetworkPacket to protect against vector resizing 2013-11-05 14:50:49 -08:00
ZappoMan
406d42fe87 added more debugging 2013-11-05 14:27:20 -08:00
ZappoMan
1c580551bb added more debugging 2013-11-05 13:47:58 -08:00
ZappoMan
3ba9c8c30e added more debugging 2013-11-05 13:41:15 -08:00
ZappoMan
7cbebf3941 fixed warning and logic problem 2013-11-05 13:11:35 -08:00
ZappoMan
6dc7f68f0e Merge pull request #1185 from birarda/assignment 
add helper to ping if no active socket
 2013-11-05 12:55:06 -08:00
Stephen Birarda
eef6fd53eb cleanup node type check in JL 2013-11-05 12:37:38 -08:00
Stephen Birarda
771021995b add helper to ping with inactive socket 2013-11-05 12:34:56 -08:00
ZappoMan
e296be8c7a make numberOfThreeBitSectionsInCode() robust against overflowing buffers if length is known 2013-11-05 12:31:20 -08:00
ZappoMan
9060020279 style cleanup 2013-11-05 11:33:28 -08:00
ZappoMan
4cab991c02 style cleanup 2013-11-05 11:24:51 -08:00
ZappoMan
adf0feed29 style clenaup 2013-11-05 11:14:29 -08:00
ZappoMan
1c4163b010 add guards against buffer overflow in voxel server for edit/delete voxel packets 2013-11-05 11:12:14 -08:00
ZappoMan
581e0adecf Merge branch 'master' of https://github.com/worklist/hifi into new_voxel_scene_stats 
Conflicts:
	interface/src/Application.cpp
 2013-11-05 10:45:30 -08:00
ZappoMan
09dab892d3 first cut at new voxel scene stats 2013-11-05 10:29:56 -08:00
ZappoMan
7daff4c279 coding standard cleanup 2013-11-04 15:36:46 -08:00
ZappoMan
9e88cfe953 initlaize sortedChildren[] array to help prevent possible crashes 2013-11-04 15:33:28 -08:00
ZappoMan
e89079e86c add server config to the status page 2013-11-04 15:32:53 -08:00
Philip Rosedale
11e6982a9d Merge pull request #1176 from ZappoMan/bugfixes 
fix oversending bug
 2013-11-04 13:36:47 -08:00
ZappoMan
e0d5f2476c tweak 2013-11-04 13:21:30 -08:00
ZappoMan
e8a1a383a3 fix oversending bug 2013-11-04 13:19:42 -08:00
Stephen Birarda
5c3075401a add a guard for JurisdictionListener kill for missing UUID 2013-11-04 12:03:04 -08:00
ZappoMan
c18de72dd4 work on debugging stutter behavior, mostly debugging and cleanup 2013-11-03 19:06:06 -08:00
Stephen Birarda
5b505bcc95 just use default to catch unknown Qt message types 2013-10-31 14:16:30 -07:00
Stephen Birarda
bfe7c82232 add default and QtTraceMsg to switch to avoid warnings 2013-10-31 14:10:08 -07:00
Stephen Birarda
9e3de05e97 activate public socket if a node sends data to VS and AM 2013-10-31 13:55:26 -07:00
ZappoMan
9a5cc596b3 CR feedback 2013-10-30 16:57:32 -07:00
ZappoMan
054f49808f Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 
Conflicts:
	libraries/voxel-server-library/src/VoxelSendThread.cpp
 2013-10-30 16:48:50 -07:00
ZappoMan
ac236b9ed8 if LOD changes than don't consider WasInView on server 2013-10-30 16:26:42 -07:00
ZappoMan
2f1ecd8d1b improve voxel server's behavior when client is moving, dump out of view pending voxels 2013-10-30 15:12:04 -07:00
ZappoMan
3445a15d61 fix build buster 2013-10-30 12:35:42 -07:00
ZappoMan
96870f5d66 removed debug 2013-10-30 12:15:16 -07:00
ZappoMan
3a6f8ea66b Merge branch 'master' of https://github.com/worklist/hifi into lod_slider 2013-10-30 12:04:52 -07:00
ZappoMan
dd7eb66cec adjustable LOD tweaks 2013-10-30 11:53:16 -07:00
ZappoMan
baafea05af make server resend scene when LOD changes 2013-10-30 11:22:38 -07:00
ZappoMan
580102bb38 more work on LOD slider 2013-10-30 11:01:37 -07:00
ZappoMan
32b1fb2e23 Merge pull request #1145 from birarda/assignment 
fix silent node removal thread join bug
 2013-10-29 16:35:41 -07:00
ZappoMan
fbc3a4d2c1 first cut at user adjustable LOD 2013-10-29 16:16:58 -07:00
Stephen Birarda
03b23b504f reference global with colon 2013-10-29 16:05:23 -07:00
Stephen Birarda
66b27fa607 have silent node removal flag reset on join 2013-10-29 15:59:09 -07:00
ZappoMan
3b04eabe8a made sending environments off by default 2013-10-29 15:46:23 -07:00
Stephen Birarda
6e9ee93ed6 add debug for sleep amount to AvatarMixer 2013-10-29 15:28:10 -07:00
Stephen Birarda
08a368a9fd add debug to catch AvatarMixer ghosting 2013-10-29 15:21:55 -07:00
Philip Rosedale
2931e2e41a Merge pull request #1138 from ZappoMan/bugfixes 
add mutex for _nodesRequestingJurisdictions to fix crash
 2013-10-29 09:49:15 -07:00
Philip Rosedale
6b3a1de22b Merge pull request #1139 from ZappoMan/voxelnode_memory_savings 
VoxelNode memory savings
 2013-10-29 09:48:53 -07:00
ZappoMan
4874eda317 add mutex for _nodesRequestingJurisdictions to fix crash 2013-10-28 22:16:36 -07:00
ZappoMan
905fd48e84 fix blinking 2013-10-28 16:03:29 -07:00
ZappoMan
97070607ea added SIMPLE_EXTERNAL_CHILDREN mode, which saves on most of our child VoxelNode children storage without being too complicated 2013-10-28 14:43:27 -07:00
ZappoMan
f12064c647 clean up voxel server stats page 2013-10-28 13:24:25 -07:00
ZappoMan
03b2ace488 moved blended _children union into BLENDED_UNION_CHILDREN 2013-10-28 12:54:37 -07:00
ZappoMan
87a44bafc9 added population data back for SIMPLE_CHILD_ARRAY implementation 2013-10-28 12:37:47 -07:00
ZappoMan
e3c64429b9 added SIMPLE_CHILD_ARRAY implementation to temporarily work around memory corruption 2013-10-28 12:10:30 -07:00
ZappoMan
ce524714d9 properly call resetVoxelPacket() when suppressing duplicate packets 2013-10-28 12:09:40 -07:00
ZappoMan
b10d111891 delete _lastVoxelPacket in ~VoxelNodeData() 2013-10-28 12:08:52 -07:00
ZappoMan
3ed61db873 add guard around nodeData on delete 2013-10-28 12:07:56 -07:00
ZappoMan
8cbf5a88e5 Merge pull request #1128 from birarda/master 
pay attention to jurisdictions, run the silent node removal thread in the agent
 2013-10-25 15:01:51 -07:00
ZappoMan
130213bffc Merge pull request #1129 from ZappoMan/bugfixes 
added guard to protect against external child access
 2013-10-25 14:24:04 -07:00
ZappoMan
b8a87294e6 added guard to protect against external child access 2013-10-25 14:22:56 -07:00
Stephen Birarda
0ba73154b9 Merge pull request #1127 from ZappoMan/bugfixes 
temporarily force external child storage
 2013-10-25 14:10:19 -07:00
ZappoMan
dcccfb7ef0 temporarily force external child storage 2013-10-25 14:03:49 -07:00
Stephen Birarda
3df07d344f have assignment client pay attention to jurisdictions 2013-10-25 11:39:21 -07:00
Stephen Birarda
8aad3e146f avoid a divide by zero in PacketSender 2013-10-25 10:49:35 -07:00
Stephen Birarda
67050f5cd2 fix Assignment ctor from data to properly parse payload 2013-10-25 10:34:58 -07:00
Stephen Birarda
9dbbf8c65c don't alloc memory for checkInPacket, make it stack to function 2013-10-25 09:22:23 -07:00
ZappoMan
953196510f removed some dead code 2013-10-25 00:07:34 -07:00
ZappoMan
9492c3de18 various memory leaks and compiler warning fixes 2013-10-25 00:05:52 -07:00
ZappoMan
4a74499ea1 removed asserts and replaced with error messages 2013-10-24 17:43:38 -07:00
Stephen Birarda
b1a7e7c052 make the NodeList handle ping reply packets in VS 2013-10-24 17:03:49 -07:00
ZappoMan
0368e8c75e cleanup bit field positions 2013-10-24 14:27:47 -07:00
ZappoMan
f2229ae708 moved debug into if 2013-10-24 14:21:05 -07:00
ZappoMan
015adeedcb first cut at splitting out PACKET_TYPE_VOXEL_QUERY from PACKET_TYPE_HEAD_DATA 2013-10-24 13:22:31 -07:00
ZappoMan
9cd04af1ae removed debug 2013-10-24 10:48:17 -07:00
ZappoMan
80701b93d5 Merge branch 'master' of https://github.com/worklist/hifi into rate_control 2013-10-24 10:44:27 -07:00
ZappoMan
14cf5b04b5 added suppression of duplicate voxel packets to save on bit/packet rate 2013-10-24 10:33:19 -07:00
ZappoMan
8ac5f5070c Merge branch 'master' of https://github.com/worklist/hifi into view_is_similar 2013-10-23 17:59:00 -07:00
ZappoMan
b4c88a85f8 improvements to subtle moves for view frustum and voxel serving 2013-10-23 17:49:58 -07:00
Stephen Birarda
d85ed014ba switch to bootstrap 3, complete initial index page 2013-10-23 14:43:59 -07:00
ZappoMan
aa5e2b6a19 memset to 0 in VoxelNode to address potential memory corruption 2013-10-23 10:54:02 -07:00
Stephen Birarda
1eba133a6d use char array of static length for pool 2013-10-22 13:35:26 -07:00
Stephen Birarda
b4a2214d26 add notion of pool back to assignment 2013-10-22 11:43:06 -07:00
Philip Rosedale
d44a82fce1 Merge pull request #1097 from ZappoMan/keep_local_voxels 
Fixed bug in Keep Local Voxels
 2013-10-22 09:35:47 -07:00
ZappoMan
73d8cdacf8 fixed comment 2013-10-22 09:24:21 -07:00
ZappoMan
bfb9ed2229 fix issue with delta frustums in hideOutOfView 2013-10-22 09:22:55 -07:00
Philip Rosedale
cab9e7f658 Merge pull request #1094 from birarda/assignment 
allow multiple buffers to be hooked to an individual node
 2013-10-21 20:29:10 -07:00
Stephen Birarda
00446076b5 remove audio injectors that are starved and not added 2013-10-21 16:04:13 -07:00
ZappoMan
1b302f60f8 Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 2013-10-21 16:03:53 -07:00
Stephen Birarda
fbb097accb remove leftover listening mode, fix UUID push in InjectedAudioRingBuffer 2013-10-21 15:03:07 -07:00
ZappoMan
303f4a8ce4 improved VoxelNode delete of children 2013-10-21 14:44:46 -07:00
ZappoMan
2f423e66eb fixed long line 2013-10-21 14:43:55 -07:00
Stephen Birarda
1b129a43b5 initial changes to allow for multiple buffers per client 2013-10-21 14:27:55 -07:00
Stephen Birarda
b3909da5f0 audio injector requires two UUIDs 2013-10-18 17:37:25 -07:00
Stephen Birarda
4fe2e25bf0 add a stream identifier back to the audio injector 2013-10-18 17:36:59 -07:00
Stephen Birarda
7da1f5a235 add AudioMixerClientData to hold vector of PositionalAudioRingBuffer 2013-10-18 17:32:53 -07:00
Stephen Birarda
0dd16cfc1e debug a STUN reponse that only changes port 2013-10-18 15:27:35 -07:00
Stephen Birarda
32680bbaad continued STUN requests for keepalive, propagate socket changes 2013-10-18 15:05:16 -07:00
Stephen Birarda
d85c0bb88a add a DELETE method to civetweb to delete assignment by UUID 2013-10-18 10:25:35 -07:00
ZappoMan
ca7225e525 fix reset of VoxelSystem on eraseAllVoxels() 2013-10-17 18:45:52 -07:00
Stephen Birarda
11a05481e1 remove an infamous birarda extra g 2013-10-17 17:54:52 -07:00
Stephen Birarda
ded7735572 remove crazy debug from testing 2013-10-17 17:54:25 -07:00
Stephen Birarda
a4798acb22 bring ping interval back to 1 second 2013-10-17 17:35:24 -07:00
Stephen Birarda
b25487cda3 increase the ping interval 2013-10-17 17:33:34 -07:00
Stephen Birarda
65e0670eba Merge branch 'master' of github.com:worklist/hifi into assignment 2013-10-17 17:25:21 -07:00
Stephen Birarda
19e6f668d2 add debug to test hole punching 2013-10-17 17:25:14 -07:00
Stephen Birarda
bd806241fd don't attempt to send in UDPSocket with NULL destAddress 2013-10-17 17:01:15 -07:00
Stephen Birarda
b4ef3dbd8a add ping/reply to assignment-client servers 2013-10-17 16:56:52 -07:00
Stephen Birarda
7d48c9b3bd don't attempt to inject if audio mixer has no active socket 2013-10-17 16:49:05 -07:00
Stephen Birarda
75d8934961 fix pinging of agents in broadcast to nodes 2013-10-17 16:46:49 -07:00
Stephen Birarda
964200cdab Merge pull request #1080 from ZappoMan/voxelnode_memory_savings 
fix voxel nodes to work with new UUID format
 2013-10-17 16:35:40 -07:00
ZappoMan
370defdc4a fixed comment 2013-10-17 16:16:20 -07:00
ZappoMan
9b0cc14552 fix voxel nodes to work with new UUID format 2013-10-17 16:14:06 -07:00
Stephen Birarda
87d6c0085f add a fallback if STUN to outside server isn't possible 2013-10-17 15:11:02 -07:00
Stephen Birarda
42de553e32 Merge branch 'master' of github.com:worklist/hifi into assignment 2013-10-17 14:51:20 -07:00
Stephen Birarda
4bbb59be72 fix use of htonl in constant outside function 2013-10-17 14:45:38 -07:00
ZappoMan
a11b6858d3 fix small stats bug 2013-10-17 14:43:19 -07:00
Stephen Birarda
90e189b425 remove accidentally double saved NodeList.cpp 2013-10-17 14:42:07 -07:00
Stephen Birarda
73d3ecccf3 resolve conflicts on merge with upstream master 2013-10-17 14:37:58 -07:00
Stephen Birarda
8f1135feb7 more repairs to Agent and AvatarData for UUID transition 2013-10-17 14:35:42 -07:00
Stephen Birarda
d7d8d76b07 fix ping of VS from agent 2013-10-17 13:58:00 -07:00
ZappoMan
8d7874b01b add guards to prevent runaway reaverageVoxels(), added stats to see if 4 children could be packed internally 2013-10-17 13:47:18 -07:00
Stephen Birarda
74e66dfd35 push various PACKET_TYPES, repairs to Agent for UUID setup 2013-10-17 13:35:53 -07:00
Stephen Birarda
0ae825d761 temporary activation of node public socket in VS 2013-10-17 13:01:03 -07:00
ZappoMan
d566026026 Merge branch 'master' of https://github.com/worklist/hifi into voxelnode_memory_savings 2013-10-17 12:31:31 -07:00
ZappoMan
6688b450c5 cleaned up some printf's to qDebug's 2013-10-17 12:31:18 -07:00
ZappoMan
8448e47df8 cleanup dead code 2013-10-17 12:27:23 -07:00
ZappoMan
515dc657fb cleanup dead code 2013-10-17 12:26:01 -07:00
ZappoMan
fbf1a75d07 cleanup dead code 2013-10-17 12:24:53 -07:00
ZappoMan
095b716366 make population stats use public getters and private member variables 2013-10-17 12:16:03 -07:00
Stephen Birarda
628a3ba489 fixes to AvatarMixer for new UUID setup 2013-10-17 12:10:27 -07:00
Stephen Birarda
1c70e09178 repairs to audio exchange for new UUID setup 2013-10-17 11:58:52 -07:00
ZappoMan
c5deed36b0 added ifdefs for HAS_AUDIT_CHILDREN and added more memory tracking stats 2013-10-17 11:56:18 -07:00
Stephen Birarda
a5c837b197 fix domain-server check in from assigned clients 2013-10-17 11:51:42 -07:00
Stephen Birarda
fa146e302d remove 16-bit node IDs and replace with UUIDs 2013-10-17 11:49:41 -07:00
ZappoMan
296f18a844 make offset bounds match 20 bit storage 2013-10-17 09:58:28 -07:00
Stephen Birarda
6805b0e2c6 Merge branch 'master' of github.com:worklist/hifi into assignment 2013-10-17 09:23:25 -07:00
ZappoMan
d2bab77c88 implement support for three children encoding 2013-10-16 21:42:47 -07:00
Stephen Birarda
012fccc72e send ping to AvM and VS for socket activation 2013-10-16 18:01:15 -07:00
Stephen Birarda
7de88898e1 activate appropriate socket after receiving ping reply 2013-10-16 17:51:32 -07:00
Stephen Birarda
849e5817ec remove a couple of spaces 2013-10-16 17:27:16 -07:00
Stephen Birarda
330e78920a use Qt to query interfaces for correct local address 2013-10-16 17:06:39 -07:00
Stephen Birarda
e40ab5d13f add debug of Node's local address 2013-10-16 16:52:05 -07:00
Stephen Birarda
747175311f handle stun response in assigned clients 2013-10-16 16:37:24 -07:00
Stephen Birarda
224b0d9671 domain server accepts custom public address from node 2013-10-16 16:27:13 -07:00
Stephen Birarda
f581d4d976 handle STUN request and response in NodeList 2013-10-16 16:01:23 -07:00
ZappoMan
1e5ce8a7e5 first cut at really getting _children UNION to work 2013-10-16 12:54:37 -07:00
Stephen Birarda
ef655f5e78 clear agent audio injector after send, don't send if empty 2013-10-16 11:50:19 -07:00
ZappoMan
afcf6dd3e0 type squish 2013-10-15 18:28:56 -07:00
Stephen Birarda
1ed2b3d8fe add both fulfilled and queued assignments to DS json 2013-10-15 15:38:43 -07:00
ZappoMan
6fff53a2dc next round of voxelnode size improvements 2013-10-15 14:43:51 -07:00
Stephen Birarda
2ec42a2a5d revise linkage of civetweb for both DS and VS 2013-10-15 14:24:54 -07:00
ZappoMan
9800dc0fde removed dead code 2013-10-15 13:40:55 -07:00
ZappoMan
05c9d4febc added old style voxelnode for size comparison 2013-10-15 13:37:14 -07:00
ZappoMan
9d0ff1595a make voxelnode population statistics static members instead of per node 2013-10-15 13:33:38 -07:00
ZappoMan
86ba5e3064 some size comparison debugging 2013-10-15 12:11:49 -07:00
ZappoMan
9ba39c3a84 removed center from AABox to further save memory 2013-10-15 12:05:54 -07:00
ZappoMan
c9b0edf345 first cut at reducing memory footprint of AABox 2013-10-15 11:29:04 -07:00
ZappoMan
924053f2ec added additional debugging of VoxelNode memory usage, shrunk size of VoxelNode by better alignment 2013-10-14 15:10:56 -07:00
ZappoMan
f0fc973db1 move loading of voxel file to the persist thread so that assignment client will load voxel server faster 2013-10-14 12:42:15 -07:00
ZappoMan
1513003ecd added more stats to voxel server status 2013-10-14 12:20:50 -07:00
ZappoMan
3425685119 first cut at added voxel node memory usage debugging to client and server 2013-10-14 12:09:44 -07:00
Stephen Birarda
5ca805693c reset nodeTypesOfInterest on NodeList reset 2013-10-11 17:48:54 -07:00
Stephen Birarda
0eae0f129c allow audio injection from javascript 2013-10-11 17:37:48 -07:00
Stephen Birarda
515e2d5a23 handle conflicts on merge with upstream master 2013-10-11 14:24:05 -07:00
Stephen Birarda
8be527f85d remove sleep time debug 2013-10-11 11:15:10 -07:00
Stephen Birarda
13ac5472ea fix an idiotic bug with silent node kill thread 2013-10-11 10:23:59 -07:00
Stephen Birarda
60095bcbca add debug on NodeList clear 2013-10-11 10:08:28 -07:00
Philip Rosedale
53e2486d4d Merge pull request #1045 from birarda/data-server 
fix bug with constant avatar kill/adds
 2013-10-10 18:05:23 -07:00
Stephen Birarda
7d68c79fd8 fix bug with constant avatar kill adds 2013-10-10 17:40:01 -07:00
Philip Rosedale
bf3f507301 Merge pull request #1043 from birarda/master 
fix domain jumping with goToUser, remove planet environments
 2013-10-10 17:25:43 -07:00
Stephen Birarda
9cf040780c remove the planets from the VS environment 2013-10-10 16:36:38 -07:00
Stephen Birarda
aa0a97b959 use deleteLater to ensure that AvatarVoxelSystem delete is on correct thread 2013-10-10 16:23:22 -07:00
ZappoMan
c86bad77c9 progress on keep local voxels 2013-10-10 15:23:22 -07:00
ZappoMan
d939d3aaae Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 2013-10-09 14:02:40 -07:00
ZappoMan
c25b03dd58 first cut at keeping local voxels 2013-10-09 14:02:31 -07:00
Andrzej Kapolka
aa353a57ad Fix for mouse ray with off axis projection. 2013-10-09 13:38:06 -07:00
Andrzej Kapolka
5511c02449 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-09 11:53:08 -07:00
Philip Rosedale
3a92856386 Merge pull request #1029 from birarda/nameserver 
initial revision of storing user data in data-server
 2013-10-09 11:36:36 -07:00
Stephen Birarda
36a57e2a98 remove more debugging in NodeList 2013-10-09 10:42:33 -07:00
Stephen Birarda
7d69c6f211 remove extraneous debugging in NodeList 2013-10-09 10:41:33 -07:00
Andrzej Kapolka
dfd5f7d53e Fix for screwy view when you lean too far forward. 2013-10-09 10:40:20 -07:00
Stephen Birarda
6fe0b0b124 don’t have AvatarMixer ask DS for agents 2013-10-09 10:40:19 -07:00
Stephen Birarda
8bac70e4a5 pass UUID from data-server to avatar-mixer 2013-10-08 13:43:31 -07:00
Stephen Birarda
6bd71da84e pack the UUID with the avatar data 2013-10-08 13:31:39 -07:00
Stephen Birarda
892614470e Merge branch 'master' of github.com:worklist/hifi into nameserver 2013-10-08 11:19:32 -07:00
Stephen Birarda
40dd698293 don’t have AvatarMixer ask DS for agents 2013-10-08 11:07:46 -07:00
Stephen Birarda
76cecb43cf Merge branch 'master' of github.com:worklist/hifi into assignment 2013-10-08 09:59:52 -07:00
ZappoMan
8baa863242 fixed PPS bugs in threaded version of PacketSender class 2013-10-07 17:34:41 -07:00
Stephen Birarda
5a7d21f529 add UUID helper class to get UUID string without braces 2013-10-07 10:56:23 -07:00
Stephen Birarda
13232a4c0b stubbing of mechanism to confirm packets sent to data server 2013-10-07 10:45:54 -07:00
Stephen Birarda
4cc9f29c83 initial stub of data server client code in Interface 2013-10-07 09:55:08 -07:00
ZappoMan
5f6fb3a3ae added some timing debugging 2013-10-05 00:55:34 -07:00
ZappoMan
0c70a05732 make view frustum oversend and don't remove oversend in client 2013-10-04 21:36:21 -07:00
Stephen Birarda
f8bb2661c8 Merge branch 'master' of github.com:worklist/hifi into assignment 2013-10-04 13:30:27 -07:00
Stephen Birarda
0477ad79dd add methods to set/get samples and volume 2013-10-03 13:22:02 -07:00
Stephen Birarda
e977d28fe3 replace QVariantMap glm::vec3 setters with conversions for QScriptValue 2013-10-03 11:55:30 -07:00
Stephen Birarda
a07b673f69 beginning of hook of AudioInjector into JS 2013-10-03 11:41:45 -07:00
ZappoMan
84862310d1 fix sendVoxelEditMessage() to honor jurisdictions, cleanup some threading/nonthreading behavior in PacketSender 2013-10-03 10:25:00 -07:00
ZappoMan
529bcc2b4a fix build buster 2013-10-02 20:46:49 -07:00
ZappoMan
9d231a50b6 implement support for process interval hints and handling sending only some packets per call to process in non-threaded mode 2013-10-02 20:39:58 -07:00
ZappoMan
4271fc5d41 removed debug 2013-10-02 17:01:07 -07:00
ZappoMan
f94f535254 make sure sleep is never too long 2013-10-02 17:00:46 -07:00
ZappoMan
90c64ab25c more work on handleing pending packets in VoxelEditPacketSender 2013-10-02 16:33:06 -07:00
ZappoMan
cc0009976b first cut and handling buffering of edit packets when voxel servers are unknown 2013-10-02 15:02:23 -07:00
Philip Rosedale
cebd8e5f4b Merge pull request #997 from birarda/assignment 
file of static assignments for DS
 2013-10-01 13:47:10 -07:00
ZappoMan
df4b64447b cleanup calls to markWithChangedTime() to happen after all changes made 2013-10-01 13:02:32 -07:00
ZappoMan
f1b28b929d fix a couple crashes disable emitting import progress in non-import case 2013-10-01 12:25:34 -07:00
ZappoMan
793a14e25a first cut at new faster voxel pipeline 2013-10-01 10:37:14 -07:00
ZappoMan
0f74d4bda9 change nodeDeleted() to voxelDeleted() to improve readability 2013-09-30 15:50:31 -07:00
Stephen Birarda
94f7b98a5c handle mutli-VS config in DS when creating static file 2013-09-30 14:27:54 -07:00
Stephen Birarda
fb27e37607 have AC making create request use its own UUID 2013-09-30 14:09:46 -07:00
Stephen Birarda
b3bd159d09 don't send create assignment request until connection to DS 2013-09-30 13:57:42 -07:00
Stephen Birarda
774eef1c12 logging touchups in voxel-server 2013-09-30 13:36:36 -07:00
Stephen Birarda
32314ad540 have VS send UUID with check in for static assignment behavior 2013-09-30 13:34:22 -07:00
Stephen Birarda
38873c0693 some assignment debug cleanup 2013-09-30 13:26:31 -07:00
Stephen Birarda
0e5c5886b6 touchups to DS with static assignment file 2013-09-30 13:11:46 -07:00
Philip Rosedale
7a74432bef Merge pull request #994 from ZappoMan/voxel_geo_shader 
removed old normal support from voxel system only using global normals
 2013-09-30 11:37:09 -07:00
Stephen Birarda
a8d55644e9 Assignment as LinkedData, add back to queue on node death 2013-09-30 11:04:42 -07:00
Stephen Birarda
ef1ff01188 resolve conflicts on merge with upstream/master 2013-09-30 10:12:54 -07:00
ZappoMan
b6fe8befdc removed old normal support from voxel system only using global normals 2013-09-30 09:29:04 -07:00
stojce
a0f23d409e Merging changes 2013-09-28 13:16:50 +02:00
stojce
bac228bdb8 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-28 12:47:47 +02:00
ZappoMan
8cffa8d872 add support for global normals for voxels 2013-09-27 15:04:44 -07:00
ZappoMan
eb6af1afbf fix byte normals, fix crashes in switching between voxel shader and normal mode 2013-09-27 09:02:51 -07:00
Philip Rosedale
0fbabe9891 Merge pull request #984 from ZappoMan/voxel_geo_shader 
Voxel Geometry Shader Experiment
 2013-09-26 17:22:55 -07:00
ZappoMan
5695429a78 style fixes 2013-09-26 16:36:59 -07:00
ZappoMan
7845340279 menu cleanup, support for on the fly switching of maxVoxels and useVoxelShader 2013-09-26 16:26:49 -07:00
Stephen Birarda
db1dacbbf4 some refactoring for DS, add create assignments to file 2013-09-26 15:56:41 -07:00
Andrzej Kapolka
91999dfe1f Pupil dilation. 2013-09-26 15:48:11 -07:00
Stephen Birarda
70c5d3e349 decouple DS from main, move to C++11 2013-09-26 15:03:43 -07:00
Stephen Birarda
bed4819313 inital setup for static assignment mapped file 2013-09-24 14:41:26 -07:00
ZappoMan
3d4341cee4 hacking on voxel geometry shader 2013-09-23 15:18:45 -07:00
Stephen Birarda
e774419f8d Merge branch 'master' of github.com:worklist/hifi into assignment 2013-09-20 17:39:03 -07:00
Stephen Birarda
6533d7fcde add method to packet sender to flush queue without sleep 2013-09-20 14:40:09 -07:00
Andrzej Kapolka
318b8c38bc Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-20 09:58:54 -07:00
Stephen Birarda
962dc0616d Merge pull request #966 from ZappoMan/multi_VS_assigments 
remove standalone voxel server
 2013-09-20 09:57:38 -07:00
ZappoMan
b682d3612b remove standalone voxel server 2013-09-19 22:09:03 -05:00
Andrzej Kapolka
5c841616dc Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-19 16:37:26 -07:00
Andrzej Kapolka
a04ced633e Include the face model URL in the same packet as the avatar voxel URL. 2013-09-19 16:35:25 -07:00
Andrzej Kapolka
09fa782c61 More work on FBX reading. 2013-09-19 15:05:17 -07:00
Stephen Birarda
23e7278be5 re-use the check in packet sent to the domain-server, allow reset 2013-09-19 12:58:48 -07:00
Stephen Birarda
92c106a6bb refresh the UUID when sending out new AM assignments 2013-09-19 12:30:40 -07:00
Stephen Birarda
de276eff00 temporary removal of DS packet optimization for NodeList dynamism 2013-09-18 17:56:45 -07:00
Stephen Birarda
3b976500ce stylistic and memory management fixes 2013-09-18 17:55:13 -07:00
Andrzej Kapolka
1bd8ea947a Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-18 17:14:58 -07:00
Stephen Birarda
7b498edcbc remove attached public and local sockets, fully allow custom port 2013-09-18 17:03:14 -07:00
Stephen Birarda
b4f9e393a4 prefer IPv4 address when looking up for domain IP 2013-09-18 15:05:23 -07:00
Stephen Birarda
a9efa169be fix ordering of QHostAdress to s_addr 2013-09-18 14:58:44 -07:00
Stephen Birarda
b0421cb9d3 Merge pull request #953 from ZappoMan/multi_VS_assigments 
Handle --voxelServerConfig properly
 2013-09-18 14:20:12 -07:00
ZappoMan
80b1b810ce spacing fix 2013-09-18 16:13:13 -05:00
ZappoMan
a81d5cd9a7 Merge pull request #954 from birarda/ds-port 
allow setting of custom DS port from DS and clients
 2013-09-18 14:07:11 -07:00
Stephen Birarda
9fa695b71c allow setting of custom port via domainHostname setting 2013-09-18 13:50:14 -07:00
Stephen Birarda
ab85c4109d use QHostInfo and QHostAddress for DS changes in NodeList 2013-09-18 13:29:53 -07:00
ZappoMan
ded7a9504b moved printf to qDebug 2013-09-18 13:28:50 -07:00
ZappoMan
b3bcda2227 Merge branch 'master' of https://github.com/worklist/hifi into multi_VS_assigments 2013-09-18 13:20:17 -07:00
ZappoMan
6355f677f7 have voxel server create assignments for child voxel servers 2013-09-18 13:19:19 -07:00
Stephen Birarda
8c9a14cdbe CR fix to change back to setPayload with const param 2013-09-18 13:09:07 -07:00
Stephen Birarda
7220643fe9 default AC to point to DS on localhost and default port 2013-09-18 12:04:09 -07:00
Stephen Birarda
3fde2887a3 fixes to payload in Assignment 2013-09-18 10:19:45 -07:00
ZappoMan
642b446d6f tweak to payload parsing 2013-09-18 07:30:04 -07:00
ZappoMan
06f739a623 pass voxelServerConfig from domain-server through Assignment _payload to VoxelServer 2013-09-18 07:23:37 -07:00
ZappoMan
4a821d0874 Merge branch 'master' of https://github.com/worklist/hifi into multi_VS_assigments 2013-09-17 17:35:13 -07:00
ZappoMan
3145a543d9 fixed CR feedback 2013-09-17 17:34:47 -07:00
ZappoMan
5f9ac5c280 second constructor 2013-09-17 17:19:39 -07:00
ZappoMan
f75b480b0e correctly hook up VoxelSendThread in VoxelNodeData 2013-09-17 16:40:39 -07:00
Stephen Birarda
001432ec55 have domain-server reject audio and avatar mixers with bad UUID 2013-09-17 16:40:30 -07:00
ZappoMan
49c4075277 Merge branch 'master' of https://github.com/worklist/hifi into multi_VS_assigments 2013-09-17 16:00:32 -07:00
ZappoMan
2b9290a9e3 moving VoxelServer globals to member variables 2013-09-17 15:47:39 -07:00
ZappoMan
e86b4f2d8d moving VoxelServer globals to member variables 2013-09-17 15:47:29 -07:00
Stephen Birarda
89546f7140 repairs to temporary standalone voxel-server for assignment subclass 2013-09-17 15:38:54 -07:00
Andrzej Kapolka
558d3d41a6 First attempt at blending. 2013-09-17 15:22:06 -07:00
Stephen Birarda
17a210813b repairs to subclasses of assignment 2013-09-17 15:20:34 -07:00
Stephen Birarda
d830351ed6 make the assignment targets subclasses of Assignment for access to UUID 2013-09-17 14:54:58 -07:00
ZappoMan
2388cfc8e0 first cut at making VoxelServer class run with configuration or standalone 2013-09-17 14:33:31 -07:00
ZappoMan
25d9281496 Merge branch 'master' of https://github.com/worklist/hifi into multi_VS_assigments 2013-09-17 13:41:44 -07:00
ZappoMan
386250cff8 remove hacked payloads 2013-09-17 13:41:04 -07:00
Stephen Birarda
fb7927d326 cleanup check for attached socket 2013-09-17 13:28:19 -07:00
Stephen Birarda
3f2dc7a28d add a getter for the number of bytes in the payload 2013-09-17 13:27:17 -07:00
Stephen Birarda
94f04a9806 add API to attach payloads to assignments 2013-09-17 13:24:25 -07:00
ZappoMan
4932c3266f moving to Assignment payload style implementation 2013-09-17 13:22:09 -07:00
Stephen Birarda
74a0b8a7b5 resolve conflicts on merge with upstream master 2013-09-17 11:50:30 -07:00
Stephen Birarda
76df707e31 add the ability to ask for multiple instances from JS page 2013-09-17 11:48:08 -07:00
Stephen Birarda
0e19d9a53a add handling for number of instances to domain-server 2013-09-17 11:19:13 -07:00
Andrzej Kapolka
b4ca66eb68 Merge branch 'master' of https://github.com/worklist/hifi into blendface 
Conflicts:
	interface/src/devices/Faceshift.cpp
 2013-09-17 11:05:11 -07:00
Stephen Birarda
17fda717fe move audio and avatar classes into assignment-client target 2013-09-17 11:04:46 -07:00
Stephen Birarda
063896f92a Merge pull request #941 from ZappoMan/voxel_server_assignments 
Voxel Server as a Assignment Client task
 2013-09-17 10:51:31 -07:00
Andrzej Kapolka
5a2d52b530 Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-17 09:59:22 -07:00
Andrzej Kapolka
354c173c9f Disable sending coefficients for now. 2013-09-17 09:58:54 -07:00
ZappoMan
d96fe7a24e added VoxelServerState.h 2013-09-16 23:36:27 -07:00
ZappoMan
4eedc6df29 make TREE_SCALE roughly 10 miles 2013-09-16 22:39:47 -07:00
ZappoMan
100eda6960 allow voxel servers in standalone mode to work with new domain server and assignment client 2013-09-16 19:56:34 -07:00
ZappoMan
92fb393e14 allow standalone voxel-server to specify port and domain, add VoxelServerType to assignment-client 2013-09-16 19:34:07 -07:00
Andrzej Kapolka
1fce6c717b Working on shipping around the complete set of blendshape coefficients. 2013-09-16 17:28:04 -07:00
ZappoMan
b484951cc2 fix build buster? 2013-09-16 16:30:46 -07:00
ZappoMan
3f4245d597 fix local mode option 2013-09-16 16:19:24 -07:00
ZappoMan
023892a4d0 command line options 2013-09-16 16:02:05 -07:00
ZappoMan
c1e93b4bf1 first cut at making VoxelServer a class and library 2013-09-16 12:26:06 -07:00
atlante45
fe12437da9 Fixed double declaration in broadcastData 2013-09-13 16:46:48 -07:00
atlante45
8f27d22f7b Put _isFaceshiftConnected in a bit set 2013-09-13 14:57:30 -07:00
atlante45
c2502d03db Merge branch 'master' of https://github.com/worklist/hifi into add_fs_data_in_head_data 2013-09-13 13:25:41 -07:00
Stephen Birarda
d66e560842 Merge pull request #934 from birarda/assignment 
simple fix to fix path for javascript save
 2013-09-13 12:20:37 -07:00
ZappoMan
bc95f94157 Merge pull request #933 from birarda/assignment 
add handling of Agent assignments to Assignment, DS, AC
 2013-09-13 11:27:36 -07:00
Stephen Birarda
5ac694224e remove extra space at the top of AudioMixer 2013-09-13 11:24:56 -07:00
atlante45
7ae1f649c9 changed packet format 2013-09-13 11:17:55 -07:00
Stephen Birarda
d089991237 add handling of Agent assignments to Assignment, DS, AC 2013-09-13 11:14:00 -07:00
LionTurtle
6f8ab7a6c6 Fix sign error in nudge code that made nudging in the negative Z 
direction buggy.
 2013-09-13 10:50:29 -07:00
atlante45
74e929100a Merge branch 'master' of https://github.com/worklist/hifi into add_fs_data_in_head_data 2013-09-13 10:44:21 -07:00
ZappoMan
3441199f0b Merge pull request #930 from LionTurtle/master 
Fix for copy/cut/paste single voxel leaves.
 2013-09-13 09:18:46 -07:00
atlante45
7cd2f2b06b send faceshift data to avatar mixer 2013-09-12 17:41:26 -07:00
LionTurtle
99db8491ef Get rid of qDebug statements in VoxelTree.cpp. 2013-09-12 17:41:02 -07:00
LionTurtle
71d5f3d2d8 Fix for copy/cut/paste single voxel leaves. 2013-09-12 17:38:16 -07:00
Stephen Birarda
8d7b4ab321 add debugging for assignment send and remove a useless cast 2013-09-12 17:37:37 -07:00
Stephen Birarda
49b72370be fix UUID getter to match the private variable 2013-09-12 17:08:06 -07:00
Stephen Birarda
f878b17798 fix DS reply to node on same box to remove check in AC 2013-09-12 17:03:05 -07:00
Stephen Birarda
2578516940 talk to AC on loopback when on same node 2013-09-12 16:47:06 -07:00
Stephen Birarda
25cd800ab4 create a UUID with assignments, store JS for script 2013-09-12 16:18:53 -07:00
LionTurtle
bb1feab661 Merge remote-tracking branch 'upstream/master' 2013-09-11 16:45:29 -07:00
LionTurtle
cef4837654 Fix voxel erase bug in nudge code. Fix rendering of nudge guide. 2013-09-11 16:43:50 -07:00
Stephen Birarda
dfede2b947 rename direction to command for assignment 2013-09-11 14:43:37 -07:00
Stephen Birarda
b7aa49cf97 have DS act as AS and hand assignments directly 2013-09-11 12:16:47 -07:00
stojce
a362fdc2ed name the current domain server 2013-09-10 21:51:50 +02:00
ZappoMan
befbc1b93a Merge pull request #916 from LionTurtle/master 
Nudge
 2013-09-10 11:16:12 -07:00
LionTurtle
30c8af222d Merge remote-tracking branch 'upstream/master' 2013-09-10 11:10:50 -07:00
LionTurtle
3b464094d9 Remove magic numbers, fix spacing, and other code clean up in nudge code. 2013-09-10 11:09:50 -07:00
Stephen Birarda
fb8c9dbfea fix spacing in Assignment 2013-09-10 09:58:42 -07:00
LionTurtle
f41533fee6 Add nudgeVoxel shading in grid. Fix erase bug. 2013-09-09 18:23:37 -07:00
Stephen Birarda
fa521a5dc9 handle case where AC is on same network as DS but not AS 2013-09-09 18:15:33 -07:00
Stephen Birarda
e53807ca82 store an attached local and public socket with assignment 2013-09-09 17:29:33 -07:00
LionTurtle
b0803c1267 Merge remote-tracking branch 'upstream/master' 2013-09-09 16:54:34 -07:00