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
tosh
1e6352593a
Merge branch 'master' of git://github.com/worklist/hifi into 19262
...
Conflicts:
interface/src/Head.cpp
interface/src/Util.cpp
interface/src/main.cpp
libraries/avatars/src/Orientation.cpp
2013-04-18 12:38:35 +02:00
ZappoMan
532dc285e7
Changed render_view_frustum() to handle broken camera yaw
...
- I discovered that the Camera class has a Yaw that is actually
180deg off of true yaw. So when the avatar is facing at a yaw
of 0deg, we were setting the camera to 180. This was causing
the direction vectors to be rotated from where we expected them
to be, and as a result the frustum was wrong
- I did not fix the camera and the calls to glRotate() since I
don't yet understan how these work. BUT. I did fix the frustum
code to fix up this yaw before calculating the vectors
2013-04-18 01:16:54 -07:00
Philip Rosedale
1dd2fcf37d
Merge pull request #81 from ZappoMan/view_frustum_work
...
Updated Orientation class to use Philip's technique.
2013-04-18 00:18:19 -07:00
ZappoMan
309eb08490
Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
2013-04-17 23:53:47 -07:00
ZappoMan
8b9e252246
Updated Orientation class to use Philip's technique.
...
- Changed Orientation class to use Philip's technique for determining vectors
- updated main.cpp to take command line option to run Orientation tests
- tweaked eulerToOrthonormals() to return right vector instead of left vector
2013-04-17 23:21:12 -07:00
Jeffrey Ventrella
bca2460395
Merge remote-tracking branch 'upstream/master'
2013-04-17 23:20:08 -07:00
Jeffrey Ventrella
4e12f26467
added _isMine check for my _bodyYaw update
2013-04-17 18:10:32 -07:00
Philip Rosedale
6ad12e15ed
Merge remote-tracking branch 'upstream/master'
2013-04-17 17:51:32 -07:00
Jeffrey Ventrella
de3de7b878
Merge remote-tracking branch 'upstream/master'
2013-04-17 17:50:08 -07:00
Philip Rosedale
557bf79e0a
body yaw debugging (commented out)
2013-04-17 17:49:26 -07:00
Jeffrey Ventrella
aba20c6afd
a few debugging changes
2013-04-17 17:48:08 -07:00
birarda
3819185bc2
Merge pull request #75 from birarda/master
...
fix unpack of angle in AvatarData
2013-04-17 17:42:11 -07:00
Stephen Birarda
4340f127e1
cast max uint16_t to float for angle unpack
2013-04-17 17:41:37 -07:00
Jeffrey Ventrella
d7f37e5972
Merge remote-tracking branch 'upstream/master'
2013-04-17 17:04:24 -07:00
Philip Rosedale
db95b0d726
Merge remote-tracking branch 'upstream/master'
2013-04-17 17:00:10 -07:00
birarda
8d4061dd72
Merge pull request #72 from birarda/master
...
a better interim solution for bytes per avatar
2013-04-17 16:58:49 -07:00
Stephen Birarda
e75add411c
use a constant number of BYTES_PER_AVATAR as an interim solution
2013-04-17 16:58:16 -07:00
Jeffrey Ventrella
ecb5047e7c
removed initializeAvatar() method in Head class (deprecated). and also un-negated the pos in the rendering of other avatars (same fix as Philip just made)
2013-04-17 16:58:04 -07:00
Philip Rosedale
6b03622e29
Fixed bug having other people showing up at negative of their transmitted position.
2013-04-17 16:49:39 -07:00
Jeffrey Ventrella
5aeb307be2
including Philips hand position transmission code
2013-04-17 15:36:40 -07:00
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
4f0ca2f33e
added quaternions to avatar body and bone structure (but not using them yet)
2013-04-17 12:31:03 -07:00
tosh
bf5f54c9d0
integrates logging for 'avatars' library, fixes missig return in Log.cpp, adds _lib suffix for log callback namespaces and reverts voxels -> voxLib rename in main
2013-04-17 20:14:29 +02:00
Jeffrey Ventrella
53796d067f
changed Ori constructor to include setIdentity
2013-04-17 11:11:05 -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
Stephen Birarda
8129c2477a
fix broken voxel server build, change some char* to unsigned char*
2013-04-16 12:35:49 -07:00
Stephen Birarda
598bed3b55
include cstring and stdint in AvatarData UNIX build
2013-04-16 12:22:09 -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
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
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
d0eed92699
add an avatars library and move AvatarAgentData there
2013-04-15 14:51:34 -07:00
