Stephen Birarda
|
ef6593eb89
|
update audio-mixer to use new AgentList iterator
|
2013-04-25 15:21:56 -07:00 |
|
Stephen Birarda
|
ad530b4eb8
|
fix bug based on dynamic end of agentList iterator
|
2013-04-25 15:10:08 -07:00 |
|
Stephen Birarda
|
2850d74a84
|
add typedefs for stl iterator implementation
|
2013-04-25 14:48:07 -07:00 |
|
Stephen Birarda
|
836d286b75
|
initial transition from vector to multi-dimensional array in AgentList
|
2013-04-25 13:11:13 -07:00 |
|
Stephen Birarda
|
87386cb05a
|
line the consts back up in AvatarData
|
2013-04-24 13:54:35 -07:00 |
|
Stephen Birarda
|
461ca6ecb4
|
revert some of the const changes that make sense
|
2013-04-24 13:51:27 -07:00 |
|
Stephen Birarda
|
a423d3c38f
|
more const repairs in AvatarData
|
2013-04-24 13:49:24 -07:00 |
|
Stephen Birarda
|
142a8a6f08
|
remove double const in AvatarData.h
|
2013-04-24 13:45:17 -07:00 |
|
Stephen Birarda
|
cfbe8a719c
|
fix getter for hand state in AvatarData
|
2013-04-24 12:39:25 -07:00 |
|
Stephen Birarda
|
a5ea1dca7e
|
fix incorrect debugging of agent local and public addresses
|
2013-04-24 11:16:13 -07:00 |
|
Jeffrey Ventrella
|
428cb89895
|
Merge remote-tracking branch 'upstream/master'
|
2013-04-23 20:44:50 -07:00 |
|
Stephen Birarda
|
11986ca00f
|
add IP address to DS information output
|
2013-04-23 15:58:06 -07:00 |
|
Stephen Birarda
|
3344016212
|
SOLO_AGENT_TYPES needs a defined size
|
2013-04-23 14:12:21 -07:00 |
|
Stephen Birarda
|
ceefda8ce1
|
add cstring for memset and memcpy
|
2013-04-23 14:09:09 -07:00 |
|
Jeffrey Ventrella
|
eb631e2ef6
|
renamed "bodyPosition" to "position". (This corresponds to the position of the avatar on the ground, where y=0). I will next add a new "getBodyPosition" which returns the avatar's center of gravity - is useful for certain purposes, such as setting collision volumes, etc.
|
2013-04-23 14:05:23 -07:00 |
|
Stephen Birarda
|
620615599f
|
fix the const for injectAudio
|
2013-04-23 14:01:19 -07:00 |
|
Stephen Birarda
|
ed5afb3537
|
add const to injectAudio method
|
2013-04-23 13:57:41 -07:00 |
|
Stephen Birarda
|
fd6fb60d24
|
fix pointer var declarations in AudioInjector class
|
2013-04-23 13:55:42 -07:00 |
|
Stephen Birarda
|
ddc74984b5
|
fix pointer var declarations, AudioInjector constructor in eve main
|
2013-04-23 13:52:25 -07:00 |
|
Jeffrey Ventrella
|
a73ea8c255
|
some preparation for adding hand state to avatar interactions
|
2013-04-23 13:48:34 -07:00 |
|
Stephen Birarda
|
42ba5a51d4
|
Merge remote-tracking branch 'upstream/master'
|
2013-04-23 13:38:59 -07:00 |
|
Stephen Birarda
|
7ae320d7e1
|
intial version of eve that says WALL-E every so often
|
2013-04-23 13:37:49 -07:00 |
|
Philip Rosedale
|
5556686875
|
Fixes from brad's review
|
2013-04-23 11:59:43 -07:00 |
|
Stephen Birarda
|
88fe04bcd1
|
hook up the injector to the new AudioInjector class
|
2013-04-23 11:48:01 -07:00 |
|
Philip Rosedale
|
2ef45e8512
|
Avatar head rotation, audio loudness (for facial animation) and hand state (grabbing or not) now sent in broadcast data.
|
2013-04-23 11:15:11 -07:00 |
|
Stephen Birarda
|
beee875e88
|
add a new AudioInjector class that can be leveraged from eve and injector
|
2013-04-23 10:46:05 -07:00 |
|
Stephen Birarda
|
79d547e9d0
|
fix return of bytes read to push pointer forwards
|
2013-04-22 18:41:12 -07:00 |
|
birarda
|
7eee3404c7
|
Merge pull request #113 from birarda/avatar-from-mixer
fix broken build from NULL interface client sockets
|
2013-04-22 18:36:47 -07:00 |
|
Stephen Birarda
|
8201b963d1
|
fix crash for NULL agent sockets
|
2013-04-22 18:36:13 -07:00 |
|
ZappoMan
|
47bfceca31
|
Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
|
2013-04-22 18:08:27 -07:00 |
|
ZappoMan
|
b291b5d1f6
|
fixed bug in initialization of false color (actually true color)
|
2013-04-22 18:07:58 -07:00 |
|
Stephen Birarda
|
4956370d52
|
have parseData return the number of bytes consumed
|
2013-04-22 18:05:27 -07:00 |
|
Stephen Birarda
|
8a3135a084
|
Merge remote-tracking branch 'upstream/master' into avatar-from-mixer
|
2013-04-22 17:56:19 -07:00 |
|
Stephen Birarda
|
d895665d5f
|
create missing agents sent from the avatar mixer
|
2013-04-22 17:55:48 -07:00 |
|
ZappoMan
|
9d17dc0387
|
make view frustum culling default behavior, removed soem debug printf()s for now
|
2013-04-22 17:43:28 -07:00 |
|
ZappoMan
|
978a41f6ca
|
Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
|
2013-04-22 17:22:24 -07:00 |
|
ZappoMan
|
4e0a3e3b58
|
switch to boxInFrustum() instead of pointInFrustum() for more accuracy
|
2013-04-22 17:21:47 -07:00 |
|
Stephen Birarda
|
ea5a247f93
|
view frustum additions means there are now 94 bytes per avatar
|
2013-04-22 16:22:06 -07:00 |
|
Stephen Birarda
|
7375932cc7
|
Merge remote-tracking branch 'upstream/master'
|
2013-04-22 16:17:54 -07:00 |
|
Stephen Birarda
|
2d8997003a
|
include avatar ID on log output
|
2013-04-22 16:16:06 -07:00 |
|
ZappoMan
|
a79659a5d4
|
change VoxelAgentData to not include position, use AvatarData _bodyPosition instead
|
2013-04-22 15:22:41 -07:00 |
|
ZappoMan
|
7c73964836
|
code review cleanup
|
2013-04-22 15:07:46 -07:00 |
|
ZappoMan
|
1b52bb4e20
|
Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
Conflicts:
voxel-server/CMakeLists.txt
|
2013-04-22 14:48:24 -07:00 |
|
ZappoMan
|
030f5328f5
|
First cut at View Frustum Culling between client and server
|
2013-04-22 14:46:25 -07:00 |
|
ZappoMan
|
e1da39e2bb
|
Made several ViewFrustum methods const since they don't modify the class
|
2013-04-22 14:13:56 -07:00 |
|
ZappoMan
|
9b34427570
|
Added camera data to AvatarData class, and include it in interface
|
2013-04-22 14:12:08 -07:00 |
|
Stephen Birarda
|
a558597b6a
|
complete an initial version of eve that sits at 0,0,0
|
2013-04-22 13:10:21 -07:00 |
|
Stephen Birarda
|
c68ec079eb
|
rename AGENT_TYPE_INTERFACE to AGENT_TYPE_AVATAR, more stubbing for eve
|
2013-04-22 11:54:24 -07:00 |
|
ZappoMan
|
400ecf6b86
|
Convert over to standard glm functions for length, normalize, cross, and dot product
|
2013-04-21 22:57:01 -07:00 |
|
ZappoMan
|
358efb472d
|
Clean up AABox to coding standard, made several methods const
- Cleaned up AABox to be consistent with the coding standard
- converted some methods to const and fixed up callers
|
2013-04-21 22:46:13 -07:00 |
|