Commit graph

180 commits

Author SHA1 Message Date
tosh
ba4f4b9809 Merge branch 'master' of git://github.com/worklist/hifi 2013-05-21 22:49:39 +02:00
Philip Rosedale
7728a54d26 Converted Transmitter to separate class, removed V1 (Google Glass, Android) support for V2 (iOS) transmitter 2013-05-20 19:00:49 -07:00
tosh
a86b8a1d93 refactors logging 2013-05-21 01:00:10 +02:00
tosh
06288e8366 Merge branch 'master' of git://github.com/worklist/hifi
Conflicts:
	interface/src/Oscilloscope.cpp
2013-05-20 23:15:06 +02:00
Stephen Birarda
dae7bf8674 use AgentList defaults when AIM has no socket or address set 2013-05-20 11:48:50 -07:00
tosh
b3085debb8 further adjusts naming 2013-05-19 13:22:37 +02:00
tosh
fc2de0685b adjusts naming and formatting of class definition 2013-05-19 12:48:17 +02:00
tosh
864d4e6734 Merge branch '19188' of git://github.com/tschw/hifi 2013-05-18 11:02:52 +02:00
birarda
efec33c6a2 Merge pull request #344 from birarda/voxel-noise
include time for srand on UNIX
2013-05-17 15:09:30 -07:00
Stephen Birarda
82c373242f include time for srand on UNIX 2013-05-17 15:09:11 -07:00
birarda
67bab7e73d Merge pull request #342 from birarda/voxel-noise
use stream identifier to match injected audio across packets
2013-05-17 15:07:29 -07:00
Stephen Birarda
85c0c1fa98 fix the mod so we get values up to 255 2013-05-17 15:07:12 -07:00
Philip Rosedale
bb86d7a141 Merge pull request #341 from ZappoMan/voxel_animation
fixed memory leak
2013-05-17 14:40:09 -07:00
ZappoMan
0db62b58f5 fixed memory leak 2013-05-17 14:35:50 -07:00
Stephen Birarda
b7b39c2a6e have addOrUpdateAgent return a pointer to the agent instead of a bool 2013-05-17 14:03:15 -07:00
Philip Rosedale
a08745a9e8 Merge pull request #340 from ZappoMan/voxel_animation
New Animation Server
2013-05-17 13:57:11 -07:00
ZappoMan
316da59da3 first cut at animation server 2013-05-17 12:44:39 -07:00
Stephen Birarda
12bf23e4c8 disallow Agent copying 2013-05-17 12:14:44 -07:00
Stephen Birarda
a2f8d8ae25 break audio out of shared into its own library 2013-05-16 13:00:40 -07:00
Stephen Birarda
5514966d9c add an AudioInjectionManager to handle multiple injections, link eve to it 2013-05-16 12:40:23 -07:00
Stephen Birarda
9b72762eb8 fix missing bytes on read for audio injector 2013-05-15 16:31:43 -07:00
Stephen Birarda
af934e2104 type squishes in UDPSocket implementation 2013-05-15 16:19:45 -07:00
Stephen Birarda
13c10c95e8 type squishes in UDPSocket header 2013-05-15 16:17:38 -07:00
Stephen Birarda
fc5e42cf8b add threaded injection of audio via audio injector class 2013-05-15 16:10:59 -07:00
Stephen Birarda
47766d6c6b add methods to AudioInjector to prepare for procedural injection 2013-05-15 15:20:11 -07:00
Stephen Birarda
db0c1bdba1 another type squish in Agent header 2013-05-15 14:28:43 -07:00
Stephen Birarda
9b8fd55bb7 type squishes in Agent header 2013-05-15 14:28:20 -07:00
Stephen Birarda
80284470ed type squishes in Agent class 2013-05-15 14:20:15 -07:00
Stephen Birarda
12b4b485f0 refactor the Agent copy constructor 2013-05-15 14:19:14 -07:00
Stephen Birarda
f333aaf809 refactor Agent constructor to call member variable constructors 2013-05-15 14:16:15 -07:00
Stephen Birarda
48b57c92bd refactor Agent member variables 2013-05-15 14:12:21 -07:00
Stephen Birarda
2c242a7704 add AGENT_TYPE_AUDIO_INJECTOR to getTypeName, refactor 2013-05-15 14:02:09 -07:00
Stephen Birarda
e4a734fc78 refactor constructor in AudioInjector 2013-05-15 12:01:32 -07:00
Stephen Birarda
e83710e45e prepend audio packets from the mixer with a packet header 2013-05-15 12:00:04 -07:00
Stephen Birarda
ce34a8f3e0 add packet headers and agent types for audio clarity 2013-05-15 11:43:49 -07:00
Stephen Birarda
4693082db0 refactor Audio to remove requirement of AudioData 2013-05-15 10:54:36 -07:00
tosh
168bd24342 comments out logging, after testing all is fine 2013-05-15 16:16:53 +02:00
tosh
6a47db91da tidies up UrlReader component 2013-05-15 15:29:02 +02:00
birarda
6f7d2a6922 Merge pull request #314 from birarda/transmitter
add new packet header for V2 transmitter data
2013-05-14 16:30:55 -07:00
Stephen Birarda
aca2ce47b6 add a V2 transmitter data packet for new iOS transmitter 2013-05-14 16:29:39 -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
2c1518144a added setAtBit() utility 2013-05-14 11:09:53 -07:00
ZappoMan
b196227385 Added wantResIn and wantColor feature between client and server
- Updated Voxel Server to support non-res-in version of voxel distribution
- Updated agent data to allow client to send desired res-in and color state
- added menu items to client debug menu to toggle wantResIn and wantColor
2013-05-13 15:02:46 -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
f4565b329a lengthOfVoxelData already includes the length of the color data. 2013-05-11 15:37:06 -07:00
Philip Rosedale
527b65f6a4 Log cleanup. removed star field meridians. 2013-05-09 22:06:32 -07:00
Stephen Birarda
23f861f5e2 fixes per code review comments 2013-05-09 13:30:11 -07:00
Stephen Birarda
cd69297af2 some refactoring for member variables in AudioRingBuffer 2013-05-09 13:04:42 -07:00
Stephen Birarda
a8eb9187f1 underscore the sample length variables in AudioRingBuffer 2013-05-09 12:48:20 -07:00