Stephen Birarda
|
a433ea3fff
|
Merge branch 'master' of github.com:worklist/hifi
|
2013-09-09 13:11:49 -07:00 |
|
ZappoMan
|
361c8b8cd0
|
Merge pull request #911 from birarda/assignment
change assignment-client forks to have a parent monitor
|
2013-09-09 12:55:34 -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 |
|
ZappoMan
|
218ac4641b
|
Merge pull request #910 from birarda/assignment
more feature additions to assignment
|
2013-09-09 10:15:45 -07:00 |
|
Stephen Birarda
|
d1c602df07
|
remove an extra g
|
2013-09-09 10:10:16 -07:00 |
|
Stephen Birarda
|
64e3c19a8c
|
fix an incorrectly typed const
|
2013-09-09 10:07:31 -07:00 |
|
Stephen Birarda
|
2fd043b55c
|
code review comments
|
2013-09-09 10:02:30 -07:00 |
|
Stephen Birarda
|
4905032090
|
allow forking of multiple assignment-clients from the main target
|
2013-09-09 09:44:43 -07:00 |
|
ZappoMan
|
babec09a16
|
Merge pull request #909 from ey6es/master
Fixes for off-axis projection: handle offset frusta correctly in mirror mode, use an explicit focal length rather than near clip.
|
2013-09-09 08:46:53 -07:00 |
|
Andrzej Kapolka
|
ddf92b39c7
|
Fix for off-axis ambient occlusion.
|
2013-09-08 17:52:35 -07:00 |
|
Andrzej Kapolka
|
699007691b
|
Simplification.
|
2013-09-06 17:50:16 -07:00 |
|
Andrzej Kapolka
|
1a767f3e08
|
Bump up the offset scale for Faceshift.
|
2013-09-06 16:52:32 -07:00 |
|
Stephen Birarda
|
ebd97227af
|
Merge branch 'assignment'
|
2013-09-06 16:44:07 -07:00 |
|
Andrzej Kapolka
|
38dd176506
|
Fix for off-by-one-frame error.
|
2013-09-06 16:43:22 -07:00 |
|
Andrzej Kapolka
|
f475163072
|
I believe this should fix the offset in mirror mode.
|
2013-09-06 16:20:13 -07:00 |
|
Andrzej Kapolka
|
2419802f1a
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-09-06 16:12:16 -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
|
8424c4e38b
|
make DS immediately request assignments instead of waiting one silent loop
|
2013-09-06 15:44:24 -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 |
|
Andrzej Kapolka
|
26411a42b1
|
More focal length bits.
|
2013-09-06 15:07:15 -07:00 |
|
ZappoMan
|
c8210a3d4f
|
Merge pull request #907 from birarda/assignment
doxygen documenation for Assignment classes
|
2013-09-06 14:44:23 -07:00 |
|
Stephen Birarda
|
9eef894e24
|
add doxygen documentation for Assignment classes
|
2013-09-06 14:35:59 -07:00 |
|
Andrzej Kapolka
|
12f82e39c5
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-09-06 11:37:23 -07:00 |
|
ZappoMan
|
1bf4a073d5
|
Merge pull request #906 from birarda/assignment
replace audio-mixer and avatar-mixer with assignment-client
|
2013-09-06 11:33:30 -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
|
dbc6fff73b
|
fix removal of assignment from queue to not remove all
|
2013-09-06 10:28:45 -07:00 |
|
Stephen Birarda
|
f7b0158cfe
|
use deque of pointers, make sure DS silent count is refreshed
|
2013-09-06 10:26:29 -07:00 |
|
Andrzej Kapolka
|
f8a74acb02
|
Special frustum handling for mirrored mode.
|
2013-09-06 10:19:17 -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
|
bb6185ca36
|
add some queue size debugging to assignment-server
|
2013-09-05 17:35:55 -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
|
8c5937dc78
|
only ask for an audio/avatar mixer every 5 iterations
|
2013-09-05 16:58:46 -07:00 |
|
Stephen Birarda
|
d498d97da7
|
maintain a double ended queue of created assignments
|
2013-09-05 16:38:48 -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 |
|
Philip Rosedale
|
ac6cd959f4
|
Merge pull request #905 from ey6es/off
Add option for off-axis projection using Faceshift/LEDs.
|
2013-09-05 16:25:23 -07:00 |
|
Stephen Birarda
|
8dad031c9a
|
add mongoose for demo webserver for DS
|
2013-09-05 15:27:34 -07:00 |
|
Stephen Birarda
|
17727576d8
|
remove the avatar-mixer target from root CMakeLists
|
2013-09-05 14:03:34 -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
|
32af1de3ac
|
For clarity, break the projection matrix update out of resizeGL.
|
2013-09-05 12:34:25 -07:00 |
|