Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-16 20:26:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85613 commits 24 branches 28 tags 1.2 GiB
Commit graph

3775 commits

Author SHA1 Message Date
Stephen Birarda
0970ed55a8 re-instate positional audio in the audio-mixer 2013-12-16 12:36:55 -08:00
Stephen Birarda
1f9ca00317 drive input from buffer callback and output from network 2013-12-16 11:58:23 -08:00
ZappoMan
c2d5accbc9 implement OctreeScriptingInterface base class to share common behavior for particle and voxel scripting 2013-12-14 13:25:33 -08:00
ZappoMan
e2fbb7beb4 first cut at splitting out scripting engine from agent to add to client 2013-12-14 08:14:38 -08:00
Stephen Birarda
f17ee1af7a cleanup AudioRingBuffer API 2013-12-12 13:37:18 -08:00
Stephen Birarda
6fab49b1b7 change ring buffer to interleaved for stereo 2013-12-11 12:02:22 -08:00
ZappoMan
542019a491 add script to the particle wire and disk format 2013-12-10 15:28:59 -08:00
ZappoMan
2ca628fdf1 first cut at particle renderer cleanup particle jurisdiction listener fix storage of particles 2013-12-09 11:45:32 -08:00
ZappoMan
4df2f2189d moved voxels scripting interface 2013-12-06 16:07:59 -08:00
ZappoMan
91ffb5b167 added node type to jurisdiction messages and more work on particle editing 2013-12-06 15:56:51 -08:00
Stephen Birarda
3f9e00d977 fix a boneheaded mistake in AvatarMixer broadcastAvatarData 2013-12-05 15:10:01 -08:00
Stephen Birarda
b3d6c18902 reset buffer pointers in between sending to nodes 2013-12-05 13:54:46 -08:00
Stephen Birarda
7fab3ea269 don't use static packets in AvatarMixer 2013-12-05 13:50:44 -08:00
Stephen Birarda
5ae30bc1a0 cast integer sample rate so BUFFER_SEND_INTERVAL is correct 2013-12-05 13:12:49 -08:00
Stephen Birarda
d2f7dd2371 resolve conflicts on merge with upstream master 2013-12-05 12:13:11 -08:00
Stephen Birarda
71aca69410 fix rendered scope for new Qt Audio 2013-12-05 11:36:45 -08:00
ZappoMan
0acd9d0fce tweak to cause rebuild 2013-12-04 21:10:01 -08:00
ZappoMan
aec0e9f4aa added basic particle server renamed voxel packet names to fit standard 2013-12-04 21:00:00 -08:00
ZappoMan
bfa8038f18 removed scripts 2013-12-04 19:51:16 -08:00
ZappoMan
5ff12ab8d1 first cut at getting voxel server based on octree server 2013-12-04 17:41:52 -08:00
ZappoMan
37466251d4 added some scripts, latest particle server work 2013-12-04 13:25:50 -08:00
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
Stephen Birarda
457c3cc8d9 remove unneeded VoxelTree in VoxelScriptingInterface 2013-12-04 11:19:16 -08:00
ZappoMan
9faef65ccc first cut at splitting out octree base classes 2013-12-03 17:32:02 -08:00
Stephen Birarda
da580ecbaf fix inclusion of QThread in Assignment 2013-12-03 12:31:39 -08:00
Stephen Birarda
969f782a9b simplify index access of QByteArray in processDatagram 2013-12-03 12:29:31 -08:00
Stephen Birarda
3d14fba7ab have AssignmentFactory return a ThreadedAssignment 2013-12-03 12:14:24 -08:00
Stephen Birarda
5143c68b91 fix packet sending from VoxelScriptingInterface 2013-12-03 12:09:47 -08:00
Stephen Birarda
182c69c7b8 re-write Agent to use new QCA infrastructure 2013-12-03 11:34:54 -08:00
Stephen Birarda
6f7e16dc22 hook VS to new QCA infrastructure 2013-12-03 11:11:08 -08:00
Stephen Birarda
ed854dcb7b re-work AvatarMixer to new QCA infrastructure, closes #1300 2013-12-03 10:58:04 -08:00
Stephen Birarda
606eaa579a switch node pinging to QTimer in QCoreApplication instance 2013-12-03 10:57:31 -08:00
Stephen Birarda
c3b6a7b24c setup subclass for threaded assignments 2013-12-03 10:22:13 -08:00
Stephen Birarda
6ce8c12cb7 remove timing debug for DS check in 2013-12-03 10:09:38 -08:00
Stephen Birarda
6d162ff7a7 process any new events at beginning of Assignment while loop 2013-12-03 10:07:40 -08:00
Stephen Birarda
02732e9a2e cleanup memory leaks and timing on assignment threading 2013-12-03 10:03:56 -08:00
Stephen Birarda
330eff72ce repair usage of DS as STUN server 2013-12-02 17:18:07 -08:00
Stephen Birarda
113ef1b386 fix cleanup of finished assignment 2013-12-02 16:45:13 -08:00
Stephen Birarda
1e279cf99c hook AudioMixer to new event-driven assignment setup 2013-12-02 16:34:38 -08:00
Stephen Birarda
49191826af add check for pending datagrams before read 2013-12-02 14:08:49 -08:00
Stephen Birarda
6d04d0cee1 replace a missing capture of received bytes 2013-12-02 13:37:43 -08:00
Stephen Birarda
141394a664 replace UDPSocket with QUDPSocket 2013-12-02 13:34:29 -08:00
Stephen Birarda
d21583d9c5 make AssignmentClient use event loop, closes #1291 2013-11-26 16:26:41 -06:00
Stephen Birarda
1e3ab1a201 remove cURL from Agent code 2013-11-26 10:36:34 -06:00
Stephen Birarda
7e1a823a25 add AssignmentClient to be correct subclass of QCoreApplication 2013-11-25 16:39:33 -06:00
Andrzej Kapolka
092515e199 Send an explicit kill request to the avatar mixer (which will pass it along to 
the other clients) when we exit.
 2013-11-22 15:19:59 -08:00
ZappoMan
977b730fc0 add support for tuning the size of packets used by VoxelEditPacketSender 2013-11-10 12:44:20 -08:00
ZappoMan
eb73de6b67 added a couple more JS APIs and removed some debug code 2013-11-10 12:33:54 -08:00
ZappoMan
43a4253689 added interface points to VoxelScriptingInterface to access stats from _voxelPacketSender 2013-11-10 12:23:44 -08:00
ZappoMan
8043970df7 bug fixes to JurisdictionListener, PacketSender, addition of packetsToSendCount() to Voxels JS 2013-11-08 02:22:10 -08:00
Stephen Birarda
ce52395a08 actually create the QCoreApplication instance 2013-11-07 15:06:11 -08:00
Stephen Birarda
9aacda7d56 fix for AC lack of QCoreApplication 2013-11-07 14:34:01 -08:00
ZappoMan
05d647557b Merge pull request #1213 from birarda/master 
temp remove audio from agent, mutate GOL placeholder
 2013-11-07 14:12:38 -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
fe962e6be1 only call deleteLater for linkedData if we have a QCoreApplication instance 2013-11-07 12:38:28 -08:00
Stephen Birarda
4cbb98028f temp remove audio from agent, fix GOL placeholder 2013-11-07 12:07:34 -08:00
Jeroen Baert
ae3364289c Glibc Linux compilation fix 2013-11-06 15:02:58 +01:00
Stephen Birarda
771021995b add helper to ping with inactive socket 2013-11-05 12:34:56 -08:00
Stephen Birarda
9e3de05e97 activate public socket if a node sends data to VS and AM 2013-10-31 13:55:26 -07:00
Stephen Birarda
94728d0afb fix packetData memory leak in AvatarMixer 2013-10-29 15:12:23 -07:00
Stephen Birarda
d97292a4f1 run the silent node removal thread in the agent 2013-10-25 14:07:50 -07:00
Stephen Birarda
3df07d344f have assignment client pay attention to jurisdictions 2013-10-25 11:39:21 -07:00
Stephen Birarda
67050f5cd2 fix Assignment ctor from data to properly parse payload 2013-10-25 10:34:58 -07:00
Stephen Birarda
b64d7b967d make sure the AC fails if script code is 4XX 2013-10-24 16:42:47 -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
Stephen Birarda
cb2cb05688 remove the STK library as it is no longer needed 2013-10-21 16:32:32 -07:00
Stephen Birarda
73a42fbfde remove dependency on Stk library and TwoPole effect 2013-10-21 16:30:01 -07:00
Stephen Birarda
00446076b5 remove audio injectors that are starved and not added 2013-10-21 16:04:13 -07:00
Stephen Birarda
fbb097accb remove leftover listening mode, fix UUID push in InjectedAudioRingBuffer 2013-10-21 15:03:07 -07:00
Stephen Birarda
1b129a43b5 initial changes to allow for multiple buffers per client 2013-10-21 14:27:55 -07:00
Stephen Birarda
7da1f5a235 add AudioMixerClientData to hold vector of PositionalAudioRingBuffer 2013-10-18 17:32:53 -07:00
Stephen Birarda
fc36e38d1c fix a crash in AudioMixer with active socket but no linked data 2013-10-18 10:03:02 -07:00
Stephen Birarda
9c950d4c23 trivial change to Agent to trigger re-deploy 2013-10-18 09:53:23 -07:00
Stephen Birarda
acbd664cab fix audio send to wrong socket 2013-10-18 09:34:38 -07:00
Stephen Birarda
2fcdd708cb fix for audio-mixer crash with node from DS 2013-10-18 09:28:36 -07:00
Stephen Birarda
ded7735572 remove crazy debug from testing 2013-10-17 17:54:25 -07:00
Stephen Birarda
79451f974a add debug to AvatarMixer, not AudioMixer 2013-10-17 17:44:32 -07:00
Stephen Birarda
ce934b0684 add packet receive debug 2013-10-17 17:43:44 -07:00
Stephen Birarda
14e258c357 don't send audio to nodes who don't have an active socket 2013-10-17 16:57:59 -07:00
Stephen Birarda
b4ef3dbd8a add ping/reply to assignment-client servers 2013-10-17 16:56:52 -07:00
Stephen Birarda
80d2df6a49 fix audio ternary indentations 2013-10-17 15:12:34 -07:00
Stephen Birarda
3b4231208a remove firstDomainCheckIn bool that is no longer required 2013-10-17 14:41:13 -07:00
Stephen Birarda
8f1135feb7 more repairs to Agent and AvatarData for UUID transition 2013-10-17 14:35:42 -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
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
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
Stephen Birarda
6805b0e2c6 Merge branch 'master' of github.com:worklist/hifi into assignment 2013-10-17 09:23:25 -07:00
Stephen Birarda
747175311f handle stun response in assigned clients 2013-10-16 16:37:24 -07:00
Stephen Birarda
ef655f5e78 clear agent audio injector after send, don't send if empty 2013-10-16 11:50:19 -07:00
Stephen Birarda
2ec42a2a5d revise linkage of civetweb for both DS and VS 2013-10-15 14:24:54 -07:00
Stephen Birarda
2bbaf7d31e remove static instance set from Agent.cpp 2013-10-11 17:40:28 -07:00
Stephen Birarda
cdfb232078 remove the Agent static instance 2013-10-11 17:40:02 -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
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
6fe0b0b124 don’t have AvatarMixer ask DS for agents 2013-10-09 10:40:19 -07:00
Stephen Birarda
40dd698293 don’t have AvatarMixer ask DS for agents 2013-10-08 11:07:46 -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
b3171679b2 less aggressive debugging of waiting for assignment 2013-10-04 13:25:51 -07:00
Stephen Birarda
a07b673f69 beginning of hook of AudioInjector into JS 2013-10-03 11:41:45 -07:00
ZappoMan
5a356340e0 call setProcessCallIntervalHint() in JS Agent, so the non-threaded voxel sender knows how often we plan to call it 2013-10-02 20:55:38 -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
4e66e4ed7c new releaseQueuedMessages() api 2013-10-02 15:03:58 -07:00
Stephen Birarda
e8b0790b3e updates to VoxelScriptingInterface for smarter packet sending 2013-10-02 11:42:27 -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
Philip Rosedale
7772b91aa8 Merge pull request #1001 from birarda/forked-js-ac 
use libcurl to download JS in forked ACs
 2013-10-01 13:10:56 -07:00
Stephen Birarda
d401cf39ce expose Agent.stop() to JS to complete execution 2013-10-01 11:44:07 -07:00
Stephen Birarda
bb0d28141a use libcurl to download JS in forked ACs 2013-10-01 11:41:01 -07:00
Stephen Birarda
29ae5beb54 add a voxel delete to VoxelScriptingInterface 2013-09-30 15:11:02 -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
ad8c676fea sensibly initialize _shouldStop to false 2013-09-27 16:23:07 -07:00
Stephen Birarda
313410ae0d updates to Agent class needed for game of life 2013-09-23 09:57:05 -07:00
Stephen Birarda
dd4215d0fd add a destructive voxel add command to VoxelScriptingInterface 2013-09-23 09:55:31 -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
3d1c77d047 expose the TREE_SCALE to JS 2013-09-20 14:47:36 -07:00
Stephen Birarda
6533d7fcde add method to packet sender to flush queue without sleep 2013-09-20 14:40:09 -07:00
Stephen Birarda
04c4dabd3d unblock socket receive in Agent, add destructive voxel add to VS scripting 2013-09-20 14:35:25 -07: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
7b498edcbc remove attached public and local sockets, fully allow custom port 2013-09-18 17:03:14 -07:00
Stephen Birarda
5479c5b40f use qDebug for too much time message in AudioMixer 2013-09-18 15:20:55 -07:00
Stephen Birarda
ab85c4109d use QHostInfo and QHostAddress for DS changes in NodeList 2013-09-18 13:29:53 -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
f0b834881b de-refs assignments for proper logging 2013-09-18 10:59:52 -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
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
Stephen Birarda
8bb77ecc9e type squish for deployed assignment 2013-09-17 15:23:49 -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
Stephen Birarda
2cfa45e4f8 allow the assignment-client to specify the type of assignment it desires 2013-09-17 12:09:10 -07:00
Stephen Birarda
74a0b8a7b5 resolve conflicts on merge with upstream master 2013-09-17 11:50:30 -07:00
Stephen Birarda
17fda717fe move audio and avatar classes into assignment-client target 2013-09-17 11:04:46 -07:00
Stephen Birarda
75c59c4863 add doxygen comments to VoxelScriptingInterface 2013-09-17 10:54:44 -07:00
Stephen Birarda
a45d64a214 add ability to send a voxel in JS via VoxelScriptingInterface 2013-09-17 10:49:51 -07:00
Stephen Birarda
df862c152b add a VoxelScriptingInterface to accept voxel addition in JS 2013-09-17 10:24:15 -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
Stephen Birarda
d089991237 add handling of Agent assignments to Assignment, DS, AC 2013-09-13 11:14:00 -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
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
Stephen Birarda
e53807ca82 store an attached local and public socket with assignment 2013-09-09 17:29:33 -07:00
Stephen Birarda
93ca5278da cleanup is assignment-client destination socket handling 2013-09-09 16:47:48 -07:00
Stephen Birarda
613334074f leverage qDebug and custom message handler for verbose logging 2013-09-09 15:11:11 -07:00
Stephen Birarda
b0c9dfeddc more leveraging of standardized logging 2013-09-09 14:47:15 -07:00
Stephen Birarda
fe8fabee38 add a static method to the Logging class to change target name 2013-09-09 14:31:27 -07:00
Stephen Birarda
8077963bb1 add standardized logging and leverage forked assignment clients 2013-09-09 14:21:33 -07:00
Stephen Birarda
3f941a3371 add a missing include for waitpid 2013-09-09 12:42:18 -07:00
Stephen Birarda
f770dd623b have parent assignment-client make sure there are always n 2013-09-09 12:31:53 -07:00
Stephen Birarda
bb073bdff3 fork off n children and keep the parent process as a monitor 2013-09-09 11:59:58 -07:00
Stephen Birarda
4905032090 allow forking of multiple assignment-clients from the main target 2013-09-09 09:44:43 -07:00
Stephen Birarda
65ef778efd allow passing of custom assignment-server to DS and AC 2013-09-06 15:31:21 -07:00
Stephen Birarda
3b78678a76 cleanup pool grabbing for DS and AC 2013-09-06 15:21:55 -07:00
Stephen Birarda
f18a40dc89 correct timing for assignment-client check in 2013-09-06 15:12:53 -07:00
Stephen Birarda
d8611e408e clear stale assignments from queue, fix CPU usage in client 2013-09-06 10:59:20 -07:00
Stephen Birarda
9244ec1c25 have client keep track of number of silent DS checkins 2013-09-06 09:41:27 -07:00
Stephen Birarda
5e4d4b4651 remove static local domain IP address 2013-09-05 16:29:56 -07:00
Stephen Birarda
b88c74c1a1 remove the mongoose webserver 2013-09-05 16:25:42 -07:00
Stephen Birarda
8b601cac0a moved the AvatarMixer to a class the assignment-client can handle 2013-09-05 14:01:05 -07:00
Stephen Birarda
2c32a1a048 correct handling of IPv6, fix offsets for packet reading 2013-09-04 15:21:20 -07:00
Stephen Birarda
fa7f183930 add a domain socket to assignments 2013-09-04 13:00:23 -07:00
Stephen Birarda
94367dd7c7 use QDebug << operator for assignment debug 2013-09-04 12:28:33 -07:00
Stephen Birarda
36c2f42b5c correct copying of assignment pool across targets 2013-09-04 11:50:39 -07:00
Stephen Birarda
ebc7de3a90 add methods for packing and unpacking of Assignments 2013-09-04 11:37:11 -07:00
Stephen Birarda
9260bee653 add assignment pool passing to DS, cleanup in AS 2013-09-04 11:13:37 -07:00
Stephen Birarda
bc5ad37395 allow passing of pool to assignment-client via cl param 2013-09-04 11:00:59 -07:00
Stephen Birarda
29e5eda358 add notion of pool and direction to Assignment class 2013-09-04 10:43:16 -07:00
Stephen Birarda
232f79489d decouple AM logic from main.cpp to be assignable 2013-08-22 13:12:53 -07:00
Stephen Birarda
97bee1eb82 add a stubbed assignment client to request assignments 2013-08-22 12:30:11 -07:00