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

866 commits

Author SHA1 Message Date
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
b3bcda2227 Merge branch 'master' of https://github.com/worklist/hifi into multi_VS_assigments 2013-09-18 13:20:17 -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
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
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
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
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
ZappoMan
92fb393e14 allow standalone voxel-server to specify port and domain, add VoxelServerType to assignment-client 2013-09-16 19:34:07 -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
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
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
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
Stephen Birarda
fb8c9dbfea fix spacing in Assignment 2013-09-10 09:58:42 -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
Stephen Birarda
97803b827e pack destination socket for assignment as tightly as possible 2013-09-09 16:45:44 -07:00
Stephen Birarda
1c792cf46a some newline additions for logging in NodeList 2013-09-09 15:35:28 -07:00
Stephen Birarda
bbc051a764 add doxygen comments to refactored Logging class 2013-09-09 15:27:27 -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
4905032090 allow forking of multiple assignment-clients from the main target 2013-09-09 09:44:43 -07:00
Stephen Birarda
cbf8a2c202 use create time already being stored with assignment to decide on re-send 2013-09-06 16:03:54 -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
9eef894e24 add doxygen documentation for Assignment classes 2013-09-06 14:35:59 -07:00
Stephen Birarda
0262184c12 put back DS port numbers, remove magic IPv numbers 2013-09-06 11:29:04 -07:00
Stephen Birarda
d412e0611d Merge branch 'master' of github.com:worklist/hifi into assignment 2013-09-06 11:04:18 -07:00
Stephen Birarda
eb84bdbeed switch back to the proper assignment server 2013-09-06 11:02:36 -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
f7b0158cfe use deque of pointers, make sure DS silent count is refreshed 2013-09-06 10:26:29 -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
67299b0eea fix some memory management stupidity for Assignments 2013-09-05 17:54:37 -07:00
Stephen Birarda
54b50e0e76 add a destructor for Assignment 2013-09-05 17:42:57 -07:00
Stephen Birarda
21562abfb1 don't add a second instance of a solo node 2013-09-05 17:29:14 -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
9dc3ddc84a a temporary hack to make sure the domain-server address is IPv4 2013-09-05 13:46:57 -07:00
Andrzej Kapolka
4961913fc4 Transmit the eye offset position along with the rest of the frustum 
parameters.
 2013-09-05 12:20:15 -07:00
Stephen Birarda
d5e807ca8e change the default domain server port for ec2 assignment client 2013-09-05 12:13:15 -07:00
Stephen Birarda
bd409abd1f switch assignment server back to ec2 2013-09-05 10:46:20 -07:00
Stephen Birarda
2846d170f7 change default NodeList port to 0 for ephemeral 2013-09-04 16:16:03 -07:00
Stephen Birarda
2c32a1a048 correct handling of IPv6, fix offsets for packet reading 2013-09-04 15:21:20 -07:00
atlante45
5da525fc3e memory wastes and code cleaning PR comments 2013-09-04 15:12:24 -07:00
Stephen Birarda
6e736ff9ed correct assignment packing when there is no pool 2013-09-04 13:14:41 -07:00
Stephen Birarda
fa7f183930 add a domain socket to assignments 2013-09-04 13:00:23 -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
29e5eda358 add notion of pool and direction to Assignment class 2013-09-04 10:43:16 -07:00
atlante45
b03482ead5 Some more memory leaks and codes formatting 2013-09-03 17:16:06 -07:00
atlante45
688bc17954 Fixed avatar related files memory wastes 2013-09-03 13:37:25 -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
Stephen Birarda
ef7e7ae4c5 store senderSocket with assignment to be passed to requestor 2013-08-22 12:08:49 -07:00
Stephen Birarda
2804d286d5 send correctly sized packet for assignment 2013-08-22 11:52:59 -07:00
Stephen Birarda
f52c1c909b send assignment from domain server for audio mixer if it isn't present 2013-08-22 11:38:57 -07:00
Stephen Birarda
f3e4196a81 add an assignment class and begin to hookup AS 2013-08-22 11:21:55 -07:00
ZappoMan
da6bd2e3b0 cleanup, handle no JurisdictionMap case in JurisidictionSender 2013-08-20 11:22:51 -07:00
ZappoMan
436f70ab5d removed dead code 2013-08-20 11:12:22 -07:00
ZappoMan
0f7ea55e82 make animation-server work with jurisdictions 2013-08-20 11:08:20 -07:00
ZappoMan
5e7e6fc9d7 First cut at JurisdictionListener and PACKET_TYPE_VOXEL_JURISDICTION_REQUEST 2013-08-19 20:15:46 -07:00
ZappoMan
2be85d439b Merge branch 'master' of https://github.com/worklist/hifi into animation_server_jurisdictions 
Conflicts:
	interface/src/Application.cpp
	interface/src/VoxelPacketProcessor.cpp
	libraries/voxels/src/VoxelEditPacketSender.cpp
 2013-08-19 11:13:38 -07:00
ZappoMan
e64664c0d1 first cut at JurisdictionSender and related changes 2013-08-19 11:05:29 -07:00
ZappoMan
209c9f93ed remove Application dependency from VoxelEditPacketSender class 2013-08-15 14:21:21 -07:00
ZappoMan
04440d30d8 Merge branch 'master' of https://github.com/worklist/hifi into animation_server_jurisdictions 
Conflicts:
	libraries/voxels/src/JurisdictionMap.h
 2013-08-15 12:27:00 -07:00
Stephen Birarda
443203201e Merge remote-tracking branch 'upstream/master' into menu 2013-08-15 12:22:37 -07:00
ZappoMan
74100ad043 make threads sleep 2013-08-15 12:01:50 -07:00
ZappoMan
8b867df762 style fix 2013-08-15 10:47:59 -07:00
ZappoMan
c157aad775 starting to add PACKET_TYPE_VOXEL_JURISDICTION 2013-08-15 10:44:43 -07:00
ZappoMan
ced61e94d8 added more doxygen comments 2013-08-15 08:48:21 -07:00
ZappoMan
beec5f60d8 renamed class to be more appropriate, added doxygen comments 2013-08-15 08:36:06 -07:00
Stephen Birarda
c7b784aa1f signed UNKNOWN_NODE_ID should be 0 2013-08-14 15:31:23 -07:00
ZappoMan
266d57264b fix build buster 2013-08-14 14:57:23 -07:00
ZappoMan
1730f7f2f6 fix build buster 2013-08-14 14:48:16 -07:00
ZappoMan
18e5d49d75 move move constructors and assignments into IFDEFS for now to fix build buster 2013-08-14 14:46:40 -07:00
ZappoMan
21f521f3a5 fix build buster 2013-08-14 14:33:47 -07:00
ZappoMan
02f2de6101 properly send full jurisdiction details in scene stats 2013-08-13 13:43:46 -07:00
ZappoMan
d3ce3e4e60 some cleanup and fixing of memory issue 2013-08-13 11:37:57 -07:00
ZappoMan
60dedee739 make JurisdictionMap handle copy/move/assigment so that it will work in std::vector<> and std::map<>, switch application to have map of JurisdictionMap objects instead of just root codes 2013-08-13 11:08:43 -07:00
ZappoMan
7d2c69f530 latest work on threaded sending 2013-08-12 16:55:58 -07:00
ZappoMan
ce0c868c89 cleanup naming 2013-08-12 13:40:21 -07:00
ZappoMan
e7b3d41c33 make PacketReceiver derive from GenericThread 2013-08-12 12:04:05 -07:00
ZappoMan
70344cdaf2 move voxel receiving into class 2013-08-12 11:46:57 -07:00
ZappoMan
b5e2bc2093 implement threaded voxel processing 2013-08-10 11:35:59 -07:00
ZappoMan
7e5f03a36f Merge pull request #832 from birarda/assignee 
tweaks to assignment server and AvatarData for assignment to iOS
 2013-08-08 12:13:07 -07:00
Stephen Birarda
2a21ce7945 socket changes to send correct port to pairing server 2013-08-07 16:40:28 -07:00
ZappoMan
9e182bbdc2 removed debug 2013-08-07 11:59:48 -07:00
Stephen Birarda
955b7f0d24 Merge branch 'master' of github.com:worklist/hifi into assignee 2013-08-07 10:26:26 -07:00
ZappoMan
24ec0b0ddc fixed packet header bug in createVoxelEditMessage() 2013-08-06 19:15:05 -07:00
ZappoMan
23461c2e95 fixed crash 2013-08-06 16:26:48 -07:00
ZappoMan
6cf87fc120 Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 
Conflicts:
	interface/src/Application.cpp
 2013-08-06 13:49:42 -07:00
ZappoMan
88e2e3dd3f added visulization for voxel add/kill 2013-08-06 12:05:43 -07:00
atlante45
32c155ef71 Render a string to show who is following who 2013-08-06 10:53:10 -07:00
ZappoMan
73510ec975 added notifications with jurisdiction details for when voxel servers come and go 2013-08-06 10:33:09 -07:00
Stephen Birarda
51f978196b add back node type unassigned, fix sending of script URL 2013-08-05 17:21:06 -07:00
ZappoMan
01ba5ee81a adding jurisdiction to scene stats to implement add/drop effect, added command line to voxel server to not send environments 2013-08-05 16:30:08 -07:00
ZappoMan
f1a0edb471 Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 2013-08-05 14:57:10 -07:00
Jeffrey Ventrella
96b443ec5d Merge pull request #781 from machinelevel/dev4 
Rave glove demo: Network rave data
 2013-08-05 14:07:57 -07:00
ZappoMan
14b7f58fef Kills local voxels if voxel server is removed from NodeList 
- added notification hooks to NodeList
- implemented hooks in VoxelSystem to kill local voxels when
  voxel server is killed
 2013-08-05 13:47:18 -07:00
Eric Johnston
a3a5c3d6d4 Rave glove demo: Network rave data 
Sending glove modes over the network, and fixed ghost-fingers-left-behind issue.
Issues addressed:
  https://basecamp.com/2151194/projects/2058851-avatar/todos/54607028-bug-phantom-leap
  https://basecamp.com/2151194/projects/2058851-avatar/todos/54633674-demo-make
 2013-08-05 13:25:05 -07:00
Stephen Birarda
45d84add05 cleanup from code review comments 2013-08-05 10:37:23 -07:00
Stephen Birarda
8f876b91ae changes for stub pull request of assignee work 2013-08-05 10:06:50 -07:00
Stephen Birarda
a4ea0f035a resolve conflicts on merge with upstream master 2013-08-05 09:56:07 -07:00
ZappoMan
558fca7936 latest jurisdiction work 2013-08-02 11:12:33 -07:00
ZappoMan
983db5f70d Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 2013-08-01 20:50:24 -07:00
Stephen Birarda
269e040263 Qt5 find package cleanup 2013-08-01 15:27:55 -07:00
Stephen Birarda
121abc40b6 remove newline at end of shared CMakeLists 2013-08-01 15:19:54 -07:00
Stephen Birarda
2b0cfe3c67 resolve conflicts on merge with upstream master 2013-08-01 14:33:23 -07:00
Stephen Birarda
2fde29e04a use a 0 public address to designate server local to DS 2013-08-01 11:53:18 -07:00
Stephen Birarda
9e63b78a69 Merge branch 'master' of github.com:worklist/hifi into qt5 2013-07-31 11:35:24 -07:00
Andrzej Kapolka
c787781efb Send color and depth as separate streams (rather than one on top of the other) 
so that we can control their bitrates separately.
 2013-07-30 15:11:32 -07:00
ZappoMan
95e6fb16d0 cleanup 2013-07-29 16:17:57 -07:00
ZappoMan
69bae24d82 Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 2013-07-29 16:16:04 -07:00
Andrzej Kapolka
4ae4623315 These casts should fix the warnings on OS X. 2013-07-29 16:12:11 -07:00
ZappoMan
c5ab321bd9 Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 2013-07-29 15:54:52 -07:00
ZappoMan
86bf268eef first cut at multiple voxel servers 2013-07-29 14:56:33 -07:00
Andrzej Kapolka
20360ad3e9 Make particle system update/render toggleable, fix GCC compile warnings. 2013-07-29 10:41:45 -07:00
Stephen Birarda
08b94d731f merge branch qt5 with upstream/master 2013-07-25 10:23:22 -07:00
Stephen Birarda
890d2e40ec more fleshing out of Agent class to interpret javascript 2013-07-24 16:58:44 -07:00
Stephen Birarda
f8e7e1de66 modifications to hook shared classes to iOS 2013-07-24 13:05:02 -07:00
Stephen Birarda
7134d13001 tweaks for iOS compatibility 2013-07-24 12:34:32 -07:00
Stephen Birarda
055c644736 Merge branch 'qt5' into assignee 2013-07-24 12:23:08 -07:00
Stephen Birarda
5708188180 fixes for new message handler for qt5 2013-07-24 12:22:02 -07:00
Stephen Birarda
67912cc325 merge with birarda/qt5 and resolve conflicts 2013-07-24 12:14:31 -07:00
Stephen Birarda
9f2b2d09a9 changes to CMakeLists for Qt5 2013-07-24 11:29:12 -07:00
Stephen Birarda
a8afaea542 switch to new qt5 find module setup 2013-07-23 20:49:08 -07:00
Stephen Birarda
e4169665a9 changes to CMakeLists to up to qt5 2013-07-23 20:28:11 -07:00
Stephen Birarda
da0049933b rename Operative to Agent 2013-07-23 20:25:21 -07:00
Stephen Birarda
7a028aa43d cmake changes for update to qt5 2013-07-23 20:23:32 -07:00
ZappoMan
e7fb392f38 Merge branch 'master' of https://github.com/worklist/hifi into audio_select 2013-07-23 20:20:49 -07:00
Stephen Birarda
8d34c707a1 Merge branch 'master' of github.com:worklist/hifi into assignee 2013-07-22 14:04:09 -07:00
ZappoMan
c301b799c5 first cut at selecting audio sources 2013-07-22 13:54:47 -07:00
ZappoMan
dc19a1c5cf Merge branch 'master' of mini:hifi 2013-07-21 16:25:14 -07:00
ZappoMan
76952a9d13 testing 2013-07-21 16:24:23 -07:00
ZappoMan
86ad0da09f Merge branch 'master' of https://github.com/worklist/hifi into voxel_stats 2013-07-20 11:35:10 -07:00
Andrzej Kapolka
f70b4dcab2 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-19 15:49:07 -07:00
ZappoMan
d9c8a59929 send voxel scene stats from server to client 2013-07-19 15:09:38 -07:00
Andrzej Kapolka
b5a8c2710c Merge branch 'master' of https://github.com/worklist/hifi into pointy 
Conflicts:
	interface/src/Application.h
	interface/src/Audio.h
	interface/src/Webcam.cpp
 2013-07-18 18:09:57 -07:00
Stephen Birarda
ef7dc4a39a if the hostname field is left blank reset to DEFAULT_DOMAIN_HOSTNAME 2013-07-18 17:42:25 -07:00
Stephen Birarda
01e6891fd3 save custom domain server hostname to QSettings 2013-07-18 17:23:52 -07:00
Stephen Birarda
45d82dc97c correct reference to new hostname for Qt temp variable changes 2013-07-18 15:20:05 -07:00
Stephen Birarda
67e5a6409e don't not kill NODE_TYPE_VOXEL_SERVER in removeSilentNodes 2013-07-18 14:07:08 -07:00
Andrzej Kapolka
8863645dc9 Working on transmitting and receiving the face video. 2013-07-17 18:02:27 -07:00
Eric Johnston
8ebf5fbd6b Rave & Leap: cleanup and move over to new hand/finger structures 2013-07-17 14:54:18 -07:00
Stephen Birarda
5c279777b6 Merge pull request #694 from ZappoMan/voxel_animation 
Fixed issue of "delta sending" not sending changed/animated voxels
 2013-07-16 17:31:16 -07:00
Stephen Birarda
fa155adc8c register the shared message handler to fix voxel-server output 2013-07-16 15:50:37 -07:00
ZappoMan
fbc59de081 latest cut at dirty bit sending 2013-07-16 15:08:09 -07:00
Stephen Birarda
be32ffff77 merge branch assignee with upstream/master 2013-07-16 14:41:08 -07:00
Stephen Birarda
e66c1ca552 link Qt to the shared library 2013-07-16 13:01:46 -07:00
Stephen Birarda
16d603e203 clean up extra new lines and LogDisplay line break 2013-07-16 12:53:43 -07:00
Stephen Birarda
1b48d4f0fc revert removal of extraneous newlines 2013-07-16 12:46:32 -07:00
Stephen Birarda
51d1e6ae80 add a message handler to send messages over to LogDisplay 2013-07-16 11:50:40 -07:00
Stephen Birarda
89d3cfdb6f remove now extraneous newlines after switch to QDebug 2013-07-16 11:16:51 -07:00
Stephen Birarda
afe49bc756 switch calls to printLog to QDebug 2013-07-16 11:07:22 -07:00
Stephen Birarda
6844490dbe merge branch assignee with upstream/master 2013-07-16 09:17:39 -07:00
ZappoMan
01b7f3868b Merge pull request #672 from birarda/domain-switch 
add an option in preferences to dynamically switch domain servers
 2013-07-15 17:10:18 -07:00
Stephen Birarda
c27cd7ae42 couple of type squishes in NodeList 2013-07-15 16:49:36 -07:00
Stephen Birarda
7f6009bb4a make randIntInRange inclusive on the max side 2013-07-15 16:25:09 -07:00
Stephen Birarda
081a44dbff only process new domain list if it comes from current DS 2013-07-15 16:05:23 -07:00
Stephen Birarda
6b83f95f9e conditionally set a new hostname on preferences save 2013-07-15 15:46:04 -07:00
Stephen Birarda
e3d1e5db5d correct reference to mutex to lock in Node 2013-07-15 15:45:27 -07:00
Stephen Birarda
94b6bfccf6 update the private mutex node variable to standard 2013-07-15 15:17:53 -07:00
Stephen Birarda
d389dc6e3a add method to NodeList to set domain IP to local, move mutex lock to node 2013-07-15 15:17:10 -07:00
Stephen Birarda
12697c6b14 add method to clear the NodeList 2013-07-15 14:30:13 -07:00
Stephen Birarda
3fdbf41011 use limits instead of INT16_MAX for unix 2013-07-15 11:50:52 -07:00
Stephen Birarda
a851f32d3e Merge branch 'master' of github.com:worklist/hifi into assignee 2013-07-15 09:39:22 -07:00
Stephen Birarda
28ce4f55c1 have the audio injector return intensity of last frame 2013-07-15 08:56:20 -07:00
atlante45
34cbe317fa Merge branch 'master' of https://github.com/worklist/hifi into the_midget_are_coming 
Conflicts:
	interface/src/Avatar.cpp
	interface/src/Webcam.cpp
 2013-07-12 17:57:20 -07:00
atlante45
280afed7f0 added scale in avatar packets eand slots to change it from the menu 2013-07-12 17:51:47 -07:00
Stephen Birarda
0235993366 reset default packet version to 0 2013-07-12 16:00:44 -07:00
Stephen Birarda
3147ac3ac4 print packet version mismatch to Log 2013-07-12 15:54:12 -07:00
Stephen Birarda
33b6ca31b0 sent correct position for injected audio, first bird index is 1 2013-07-12 15:10:22 -07:00
Stephen Birarda
8f7379839d set the position of the audio injector to match the current position of the bird 2013-07-12 14:52:16 -07:00
Stephen Birarda
2821112485 randomize bird noise injection 2013-07-12 14:47:47 -07:00
Stephen Birarda
9834c10610 movement to use AudioInjector classes in Operative code 2013-07-11 17:47:35 -07:00
Stephen Birarda
4ebc381e40 update dummy operative code for change to packet type 2013-07-11 14:43:41 -07:00
Stephen Birarda
d6601ad333 resolve conflicts on merge with upstream master 2013-07-11 14:33:50 -07:00
Stephen Birarda
4cf0b7ea66 switch back to statics for domain server check in, fix environment packets 2013-07-11 13:40:29 -07:00
Stephen Birarda
66a998e752 correct use of member variables for DS check in 2013-07-11 13:05:15 -07:00
Stephen Birarda
a0226b2548 avoid static variable thread issue by switching to member variables 2013-07-11 13:02:25 -07:00
Stephen Birarda
a1747725d3 sensible default for checkInPacketSize 2013-07-11 12:28:29 -07:00
Stephen Birarda
544f9c2e7a type squish and magic number removal 2013-07-11 11:15:02 -07:00
Stephen Birarda
6804ab8a33 type squish in NodeList 2013-07-11 11:12:14 -07:00
Stephen Birarda
fcb8865d2e resolve conflicts on merge with upstream master 2013-07-11 10:58:45 -07:00
Stephen Birarda
211204e878 Merge remote-tracking branch 'upstream/master' into timestamps 2013-07-11 09:23:16 -07:00
Stephen Birarda
cbf18160cb include stdint for uint64_t in SimpleMovingAverage 2013-07-11 09:22:08 -07:00
ZappoMan
3d3eca9afa Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-10 17:45:04 -07:00
ZappoMan
4afda27ee0 Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-10 16:28:51 -07:00
Philip Rosedale
dae79d8a55 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-10 12:20:45 -07:00
Philip Rosedale
2e854b5ed7 Tune and smooth 'Touch Look' and always turned on, old mouseLook code removed. Add vec3 speed test. Smooth simulation by passing exact deltaTime to update() 2013-07-10 12:20:26 -07:00
Stephen Birarda
ca8f25955a switch usec timestamps to uint64_t 2013-07-10 11:46:48 -07:00
Stephen Birarda
c5df53ed52 fix cast to 0 for long long in SimpleMovingAverage 2013-07-10 11:26:39 -07:00
Stephen Birarda
0d5fc6a2a4 make operative variables non-globals for start/stop of assignment 2013-07-10 11:24:05 -07:00
Stephen Birarda
8ed518c4a2 add a clear method to the NodeList to delete all nodes 2013-07-10 10:51:21 -07:00
Stephen Birarda
4773e70c15 rewrite Operative stubbed code to be able to be killed 2013-07-09 17:13:21 -07:00
Stephen Birarda
4e9bac4617 change usec timestamp returns to unsigned long long for 32 bit 2013-07-09 16:55:58 -07:00
Stephen Birarda
ccd65ecd67 tell shared where the macro dir is 2013-07-09 12:05:23 -07:00
Stephen Birarda
9304d9060f include glm in shared target for dummy Operative code 2013-07-09 12:03:16 -07:00
Stephen Birarda
68357ab6f7 include correct quaternion header for AudioInjector and Operative 2013-07-09 11:57:54 -07:00
Stephen Birarda
7fa3052308 remove double glm includes 2013-07-08 17:48:46 -07:00
Stephen Birarda
26a2b4672b change NODE_TYPE_ASSIGNEE to NODE_TYPE_UNASSIGNED 2013-07-08 17:21:39 -07:00
Stephen Birarda
ddc684be49 put back sendAssignmentRequest method removed in merge 2013-07-08 17:14:39 -07:00
Stephen Birarda
32b2c231e5 add a node type for assignees 2013-07-08 17:05:32 -07:00
Stephen Birarda
b5a47cddc0 have stubbed Operative check in with DS 2013-07-08 16:48:53 -07:00
Stephen Birarda
6a253f78d1 basic version of operative run to loop and fly the bird 2013-07-08 16:39:48 -07:00
Stephen Birarda
a6894db83a resolve conflicts on merge with upstream/master 2013-07-08 16:22:27 -07:00
Stephen Birarda
aaaba9c42e more packet version refactoring 2013-07-08 15:14:18 -07:00
Stephen Birarda
374fffb151 use packet version helpers for PACKET_TYPE_SET_VOXEL commands 2013-07-08 14:40:15 -07:00
Stephen Birarda
729074b502 use packet header byte methods in NodeList bulk processing 2013-07-08 13:58:20 -07:00
Stephen Birarda
6deaa5fd51 apply refactoring changes to PACKET_TYPE_PING 2013-07-08 13:55:35 -07:00
Stephen Birarda
e3d9289f1f refactor packet version handling and apply to DS 2013-07-08 13:44:01 -07:00
Stephen Birarda
8a684244cc packet versioning for HEAD_DATA packets 2013-07-08 12:53:07 -07:00
Stephen Birarda
5faad80e12 remove ping unknown thread, version for ping reply 2013-07-08 11:58:19 -07:00
Stephen Birarda
693463ae5b voxel-server packet version handling 2013-07-08 11:54:00 -07:00
Stephen Birarda
5062ae8965 rename PACKET_HEADER to PACKET_TYPE, fix DS packet versioning 2013-07-08 11:37:39 -07:00
Stephen Birarda
047d5b5cab add packet version handling for DS packets 2013-07-08 11:17:29 -07:00
Stephen Birarda
d112edab64 resolve conflicts on merge with upstream master 2013-07-08 11:07:42 -07:00
ZappoMan
c0d14d2bd4 Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-03 15:36:41 -07:00
ZappoMan
c795a37be2 tweak perfstats to not display WARNING! when caller asked it to always print (non-warning case) 2013-07-03 10:55:33 -07:00
Stephen Birarda
36c6912de8 your agents are now nodes 2013-07-03 10:35:09 -07:00
ZappoMan
1e19748a1a Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-02 15:52:49 -07:00
Stephen Birarda
11e06dbed2 rename the stat type argument in Logstash 2013-07-02 15:04:22 -07:00
Stephen Birarda
f7f321663a DRY up multiple stat type sending 2013-07-02 14:42:31 -07:00
Stephen Birarda
08c1d54cf3 send count of alive nodes to logstash from DS 2013-07-02 12:18:16 -07:00
Stephen Birarda
64f3b55aaa split logstash stash methods to stat types 2013-07-02 12:10:46 -07:00
Stephen Birarda
2a4d9c98ee add return of number of alive agents from AgentList 2013-07-02 10:34:57 -07:00
ZappoMan
015ff85cea good progress on merging polygons 2013-07-01 21:39:56 -07:00
Stephen Birarda
1c142ecc30 add a stubbed Operative class 2013-07-01 15:57:35 -07:00
Stephen Birarda
eb8faa3667 add sendAssignmentRequest method to AgentList 2013-07-01 15:48:52 -07:00
tosh
f49e63f842 Merge branch 'master' of git://github.com/worklist/hifi into 19377 2013-07-02 00:06:10 +02:00
Stephen Birarda
b9c1525321 add the base of the assignment-server 2013-07-01 14:05:14 -07:00
Stephen Birarda
e59dbfd99b add a setter to change AgentList owner type 2013-07-01 13:35:58 -07:00
Stephen Birarda
23b65a16dd add the assignee agent type 2013-07-01 11:39:45 -07:00
Stephen Birarda
3c51f9cac7 type squishes in Agent socket match 2013-07-01 09:38:39 -07:00
tosh
c18400f8b7 Merge branch 'master' of git://github.com/worklist/hifi into 19377 2013-06-29 15:41:56 +02:00
Stephen Birarda
3349419c68 inital changes to add a version byte to packets 2013-06-28 16:23:35 -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
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
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
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
Stephen Birarda
a9f7d037d1 add a helper to the logstash class to stash a value 2013-06-20 15:33:54 -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
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
c9e1c898c2 Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-06-14 19:50:38 -07:00
Stephen Birarda
a141e3dc5d resolve conflicts on merge with upstream master 2013-06-13 16:31:40 -06:00
ZappoMan
8320925add Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-06-13 13:30:18 -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
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
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
2e58a77180 make originalIndexArray optional in insertIntoSortedArrays() 2013-06-12 12:35:02 -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
b15f5a721b remove hacked method to keep servers alive 2013-06-10 14:03:34 -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
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
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
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
Stephen Birarda
5bbf96d946 allow avatar agents to ask for audio loopback 2013-06-05 17:31:52 -07:00
Andrzej Kapolka
a4aa8e7bde Basic sharing of the avatar voxel URLs. 2013-06-05 14:55:49 -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
Stephen Birarda
6bf6d5a28e cleanup NULL comparisons in AgentList 2013-06-04 17:29:37 -07:00
Stephen Birarda
d02fb65a13 Merge remote-tracking branch 'upstream/master' into cube-injector 2013-06-04 11:25:39 -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
ceb15d407d removed assert 2013-06-03 22:08:19 -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
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
f3ce68e5e4 remove space at the top of PacketHeaders 2013-06-03 12:21:44 -07:00
ZappoMan
7dd217b318 more work on copy and paste 2013-06-03 10:57:18 -07:00
ZappoMan
e5e200345b more work on copy and paste 2013-05-31 11:52:18 -07:00
Andrzej Kapolka
98759c3ba1 Include <unistd.h> to address a build error experienced by Clement. 2013-05-31 10:27:25 -07:00
ZappoMan
b0397e8eb9 Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels 2013-05-30 21:41:55 -07:00
Stephen Birarda
1f4e9f3051 update last heard from time for audio injectors 2013-05-29 18:37:03 -07:00
ZappoMan
46c6f2f9b5 latest copy paste 2013-05-29 15:02:28 -07:00
ZappoMan
377fb1e936 latest copy and paste 2013-05-29 12:06:58 -07:00
ZappoMan
04f4e499e1 Optimize wire-format for AvatarData 
- moved HandState into semi-nibble in bitItems
- moved KeyState into semi-nibble in bitItems
- moved AudioLoudness into scaled float stored as byte
- overall savings - 5 bytes
 2013-05-27 14:18:10 -07:00
ZappoMan
5d1ba857c5 Optimize View Frustum wire format. 
- Changed View frstum orientaton to be a quaternion
- Implemented packing formats for Orientation Quats, Ratios, and Clipping values
- Changed wire format for View Frustum details to be more efficient 28 bytes vs 64 bytes
 2013-05-27 14:17:34 -07:00
Stephen Birarda
6158410658 provide a getter for the owning agent in AgentData 2013-05-24 12:32:00 -07:00
Stephen Birarda
59a6016f4b use a NULL default for owningAvatar to simplify constructors 2013-05-24 12:18:38 -07:00
Stephen Birarda
36892da488 keep a pointer to owning agent in AgentData 2013-05-24 12:17:34 -07:00
Andrzej Kapolka
629c7b0146 Send all environment data in the same packet and only send it about once a 
second.
 2013-05-22 17:09:35 -07:00
birarda
9ec04855f8 Merge pull request #386 from ZappoMan/voxel_animation 
Fix some crashing issues on delete
 2013-05-22 14:27:29 -07:00
ZappoMan
c2ebd6fc95 CR feedback 2013-05-22 14:23:27 -07:00
Andrzej Kapolka
f70b2ceb76 Reverted change that would have added glm to shared library. 2013-05-22 11:23:55 -07:00
Andrzej Kapolka
8b1362636e Merge branch 'master' of https://github.com/worklist/hifi 2013-05-21 22:29:46 -07:00
Philip Rosedale
8b65fcae75 Merge pull request #352 from tschw/master 
refactors logging, adds comments, and revises names & formatting in all submitted code
 2013-05-21 22:10:10 -07:00
Andrzej Kapolka
a864a6f8c6 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-21 21:34:09 -07:00
Andrzej Kapolka
fd98982fa6 Support for multiple environments, collisions with notional planet surfaces. 2013-05-21 21:33:08 -07:00
birarda
63fcb2eeef Merge pull request #367 from ZappoMan/voxel_animation 
Fixes "Delete" voxel behavior
 2013-05-21 17:43:36 -07:00
Stephen Birarda
944e7a32e9 trivial fix for the continously dying animation server 2013-05-21 15:53:58 -07:00
tosh
ba4f4b9809 Merge branch 'master' of git://github.com/worklist/hifi 2013-05-21 22:49:39 +02:00
ZappoMan
0bcd629c8a Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-21 13:46:04 -07:00
ZappoMan
7c9be4b9f5 cleanup code 2013-05-21 11:42:13 -07: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
ZappoMan
4298b922a2 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 
Conflicts:
	libraries/avatars/src/AvatarData.cpp
 2013-05-20 13:55:01 -07:00
ZappoMan
321d1952d6 first cut at exists bits 2013-05-20 12:56:59 -07: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
ZappoMan
8ef78fde83 Merge pull request #259 from birarda/mixer-crash 
fix the audio-mixer crash for uninitialized _shouldLoopbackForAgent variable
 2013-05-09 11:49:42 -07:00
Stephen Birarda
a92571bdee initialize the _shouldLoopbackForAgent variable 2013-05-09 11:45:59 -07:00
Stephen Birarda
d9a5bba1d1 remove the unhelpful stack trace setup, using gdb on server for now 2013-05-09 11:21:16 -07:00
Jeffrey Ventrella
bbd85664d6 Merge remote-tracking branch 'upstream/master' 2013-05-08 19:24:07 -07:00
Jeffrey Ventrella
7a24c50063 put orientation back in avatar folder (this should be put in a more logical place at some point) - also did some work on avatar renderer 2013-05-08 19:22:21 -07:00
Andrzej Kapolka
1c8b835bb8 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-08 13:15:21 -07:00
ZappoMan
0b873dddc8 Merge pull request #244 from Ventrella/master 
moved Orientation class to shared folder
 2013-05-08 12:51:26 -07:00
ZappoMan
7a5ce57b4e added alwaysDisplay mode to PerformanceWarnings class 2013-05-08 12:01:55 -07:00
Andrzej Kapolka
c34b6df2f4 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	voxel-server/src/main.cpp
 2013-05-08 11:56:03 -07:00
ZappoMan
9a9656708c CR cleanup 2013-05-08 10:03:05 -07:00
Jeffrey Ventrella
9e60c8a36e increased GRAVITY_SCALE to 10.0; tidied-up avatar code; moved Orientation class to shared folder 2013-05-08 08:59:29 -07:00
ZappoMan
de969891d8 Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-08 01:19:35 -07:00
ZappoMan
b459cbc8ea Fixed a couple bugs in pointToVoxel() 
- fixed a byte packing bug related to having exactly 7 bits of octal data
  where we weren't correctly packing the last bit and moving the byte count
  forward. This resulted in bogus colors being written
- fixed a bug for points that exactly match an octet boundary test creating
  voxels that are one a unit smaller than they should be
 2013-05-08 01:16:07 -07:00
Andrzej Kapolka
44f596653e Merge branch 'master' of https://github.com/worklist/hifi 2013-05-07 17:50:27 -07:00