Commit graph

69 commits

Author SHA1 Message Date
Jeffrey Ventrella
5595bb8cf6 Merge remote-tracking branch 'upstream/master' 2013-04-17 15:34:00 -07:00
Jeffrey Ventrella
0306b63af4 added more cleanup and preparation for switching over to quaternions 2013-04-17 15:32:16 -07:00
Jeffrey Ventrella
754856227d Merge pull request #69 from PhilipRosedale/master
Added hand position to transmission
2013-04-17 15:29:18 -07:00
Stephen Birarda
1a3df2be5f comment cleanup in AvatarData 2013-04-17 15:25:05 -07:00
Philip Rosedale
952cb2f2ae Added head _isMine variable, added hand position transmission! 2013-04-17 15:14:30 -07:00
Jeffrey Ventrella
a44ff94f85 Merge remote-tracking branch 'upstream/master' 2013-04-17 12:50:41 -07:00
Jeffrey Ventrella
4f0ca2f33e added quaternions to avatar body and bone structure (but not using them yet) 2013-04-17 12:31:03 -07:00
ZappoMan
eca7863cd9 Merge pull request #64 from birarda/master
fix reference to resources directory via switchToResourcesParentIfRequired
2013-04-17 12:04:25 -07:00
Stephen Birarda
e9592c45c7 fix reference to resources directory on OS X 2013-04-17 11:56:32 -07:00
Philip Rosedale
e558f45426 Merge pull request #63 from Ventrella/master
fixed orientation contrstuctor
2013-04-17 11:21:50 -07:00
Jeffrey Ventrella
53796d067f changed Ori constructor to include setIdentity 2013-04-17 11:11:05 -07:00
Stephen Birarda
0768785cfd fix mutex movement when resizing AgentList vector 2013-04-17 11:01:08 -07:00
Jeffrey Ventrella
1fb8d0b268 consolidated some code in Head.cpp 2013-04-16 20:35:50 -07:00
Jeffrey Ventrella
e825764304 added instrumentation to Orientation class to test for normalized and orthogonal vectors 2013-04-16 19:53:48 -07:00
ZappoMan
4422ade9ff Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-16 12:50:04 -07:00
Stephen Birarda
f8ab33ccc7 add missing packet header for broadcast head data 2013-04-16 12:48:47 -07:00
ZappoMan
4a28e5889b Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-16 12:39:58 -07:00
Stephen Birarda
8129c2477a fix broken voxel server build, change some char* to unsigned char* 2013-04-16 12:35:49 -07:00
Stephen Birarda
c921fd9b87 remove unnecessary SharedUtil include 2013-04-16 12:26:44 -07:00
Stephen Birarda
0182c29e7b switch Util for SharedUtil in ViewFrustum 2013-04-16 12:25:23 -07:00
Stephen Birarda
598bed3b55 include cstring and stdint in AvatarData UNIX build 2013-04-16 12:22:09 -07:00
Stephen Birarda
e7e7bd290a remove debugging on voxel deletion 2013-04-16 12:04:56 -07:00
Stephen Birarda
1dd21a450e Merge remote-tracking branch 'upstream/master' 2013-04-16 12:00:55 -07:00
Stephen Birarda
e71f21b7bf fix broken builds from last commit, pull new avatar data in VoxelAgentData 2013-04-16 11:59:03 -07:00
Stephen Birarda
5c091a51a6 change signature of parseData to use unsigned char*, include packet header always 2013-04-16 11:51:36 -07:00
ZappoMan
dcca1699d3 Adding first cut at ViewFrustum pointIn,SphereIn,BoxIn code.
- Added Plane class
- Added AABox class
- Removed some experimental "slightly inside" code from view frustum
2013-04-16 11:29:31 -07:00
ZappoMan
a3fabaf300 Merge pull request #50 from tschw/19188
19188
2013-04-16 08:25:07 -07:00
tosh
7c2cff824f renames AngleUtils -> AngleUtil for consistency with the rest of the files 2013-04-16 14:07:19 +02:00
tosh
ac55c610be tidies changeset 2013-04-16 14:06:03 +02:00
Stephen Birarda
861c8e76ee grab jeffrey's changes to Util consts 2013-04-15 18:35:46 -07:00
Stephen Birarda
61cf17da73 update agent-mixer to use new AvatarData class 2013-04-15 18:19:01 -07:00
Stephen Birarda
a5a93443c6 re-work AvatarData to handle body position and rotation 2013-04-15 18:05:22 -07:00
ZappoMan
3b994cbdcf Latest work on ViewFrustum
- added support for specifying lens attributes (fov, near, far, ratio)
- changed constructor and calculate methods to be separate
- coding standard cleanup
2013-04-15 17:54:44 -07:00
Stephen Birarda
ed3f308a0e pass ROOT_DIR to IncludeGLM macro instead of MACRO_DIR, include glm for AM 2013-04-15 16:08:35 -07:00
Stephen Birarda
af1071b374 comments to AvatarData and avatar-mixer before pack/unpack refactor 2013-04-15 16:07:46 -07:00
Stephen Birarda
a4011934c6 move Orientation class to avatars library, constants to SharedUtil 2013-04-15 15:39:23 -07:00
Stephen Birarda
2dfe49a885 moved AvatarAgentData to AvatarData 2013-04-15 15:05:55 -07:00
Stephen Birarda
4702e6ade0 remove the unecessary trailing slash when setting root dir 2013-04-15 14:59:48 -07:00
Stephen Birarda
d0eed92699 add an avatars library and move AvatarAgentData there 2013-04-15 14:51:34 -07:00
Stephen Birarda
d094c6fc3b refactor LinkHifiLibrary, add SetupHifiLibrary macro 2013-04-15 14:41:59 -07:00
Stephen Birarda
24689e97ab fix packing and unpacking of agent IDs 2013-04-15 11:12:31 -07:00
ZappoMan
27165be902 tweak starting fov adjust to 1.65 which seems correct 2013-04-13 13:19:48 -07:00
ZappoMan
4cb986b3f9 tweaks to ViewFrustum's default FOV, added comments 2013-04-13 13:09:20 -07:00
ZappoMan
1264bdf63d Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-12 18:28:17 -07:00
ZappoMan
505b2db935 some spacing cleanup 2013-04-12 17:27:54 -07:00
Stephen Birarda
cb233e843c Merge branch 'master' of github.com:worklist/hifi into reorganize 2013-04-12 17:25:41 -07:00
ZappoMan
54ba0d0224 cleaned up spacing for code review 2013-04-12 17:23:23 -07:00
ZappoMan
ca4286590e fixed column width to match codeing standard 2013-04-12 17:14:08 -07:00
ZappoMan
5a8c5ff011 coding standards clean up 2013-04-12 16:55:57 -07:00
Stephen Birarda
787bebb5fc don't call constructor and assignment operator 2013-04-12 16:51:59 -07:00