Commit graph

149 commits

Author SHA1 Message Date
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
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
ZappoMan
e93ece0f52 Added support for NO_FALSE_COLOR define.
- changed VoxelNode to have implementation option for NO_FALSE_COLOR
Need some help from Stephen and/or Leo on how to make cmake support
building the voxels library in NO_FALSE_COLOR mode for the server
but keep false color support in the client
2013-04-21 19:45:54 -07:00
ZappoMan
a02a75f516 fix bug in definition of frustum planes, and general code cleanup
- Fixed bug in definition of frustum planes, namely making sure the points are
  given in the correct order so that our plane normals point in correct direction
- general code cleanup to match coding standard
2013-04-21 15:21:03 -07:00
ZappoMan
8a150d27b8 Cleanup for coding standard fix bug in creation of plane from points
- cleaned up code to match HiFi Coding standard
- fixed bug in creation of plane related to cross product
2013-04-21 15:18:17 -07:00
ZappoMan
67910a2c29 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-19 20:08:47 -07:00
ZappoMan
7dbc6bc986 Added inline getters for camera attributes 2013-04-19 19:56:53 -07:00
ZappoMan
8ad51b6c08 got rid of a bunch of this-> at Stephen's request. Added debuging for box in view 2013-04-19 19:56:03 -07:00
ZappoMan
2752918573 Fixed LOD bug, added recurseTree helper, change tree to use safe/true/false colors
- Fixed LOD bug in server side sending
- added recurseTreeWithOperation() helper
- changed tree to use new VoxelNode color related API
2013-04-19 18:15:50 -07:00
ZappoMan
3ec920d1b8 added scale() method to AABox 2013-04-19 18:14:10 -07:00
ZappoMan
4085c94aa7 made a version of firstVertexForCode() that doesn't allocate memory, for improved performance and use
- created new copyFirstVertexForCode(code,output) which copies to the output buffer
- converted firstVertexForCode() to behave same way as before, but use copy version
2013-04-19 18:11:28 -07:00
ZappoMan
9c601cedd0 Adding support for false color to voxel nodes, also added AABox to get voxel bounding box 2013-04-19 18:05:38 -07:00
Jeffrey Ventrella
d962230556 fixed sneaky array-out-of-bounds error in avatar bones and cleaned up some of the code for testing hand shake target positions 2013-04-19 12:44:09 -07:00
Stephen Birarda
daac10511e output avatar mixer stats below the voxel stats 2013-04-18 16:58:08 -07:00
Stephen Birarda
d937ef17f6 remove extra debug line 2013-04-18 16:38:46 -07:00
Stephen Birarda
6e540d166b add a decay to the event delta average 2013-04-18 16:30:38 -07:00
Stephen Birarda
cf1254f53b rename the _movingAverage variable so it is more descriptive 2013-04-18 15:45:20 -07:00
Stephen Birarda
d0e3a96485 Merge remote-tracking branch 'upstream/master' into mixer-stats 2013-04-18 15:33:57 -07:00
Stephen Birarda
588fc67cb9 add SimpleMovingAverage to each Agent, collect bytes received stats 2013-04-18 15:02:26 -07:00
Stephen Birarda
b9a1faf284 add a new SimpleMovingAverage class, replaces CounterStats 2013-04-18 14:46:39 -07:00
Philip Rosedale
daac59d64e Merge remote-tracking branch 'upstream/master' 2013-04-18 13:36:43 -07:00
Philip Rosedale
d9099b5f5a removed 2 unneeded debug lines 2013-04-18 13:34:37 -07:00
Jeffrey Ventrella
de6f33efa6 added "_" to all of Philip's old private members and tidied up the formatting in Head.h some 2013-04-18 13:16:36 -07:00
ZappoMan
74c5916519 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
Conflicts:
	interface/src/main.cpp
2013-04-18 10:57:41 -07:00
Stephen Birarda
651f7434a8 don't constantly print hand position to log 2013-04-18 10:46:44 -07:00
Stephen Birarda
b6b35f29e2 switch the Agent printLog back from hexadecimal notation 2013-04-18 10:46:10 -07:00
Philip Rosedale
a834c52b40 Quick attpemt to fix logging code 2013-04-18 07:48:57 -07:00