Philip Rosedale
5443d80c6f
Removed negation of front vector which was reversing yaw in avatar skeleton.
2013-04-18 14:00:48 -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
ZappoMan
894715598c
fixed a comment
2013-04-18 08:49:07 -07:00
Philip Rosedale
a834c52b40
Quick attpemt to fix logging code
2013-04-18 07:48:57 -07:00
Philip Rosedale
8e19caf21c
Merge remote-tracking branch 'upstream/master'
2013-04-18 07:23:06 -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
f0d891b641
Merge pull request #80 from PhilipRosedale/master
...
Stars back on
2013-04-18 01:38:42 -07: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
a1d51f8db8
Merge remote-tracking branch 'upstream/master'
2013-04-18 00:20:47 -07:00
Philip Rosedale
ad30abdf20
sphere on
2013-04-18 00:20:22 -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
Philip Rosedale
23dc5f435b
Merge remote-tracking branch 'upstream/master'
2013-04-17 23:45:36 -07:00
ZappoMan
44e6fcc5e9
remove pitch from camera since it still breaks Orientation
2013-04-17 23:42:39 -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
bd0eb9f69c
renamed Yaw Pitch Roll to _headYaw, _headPitch, _headRoll, in Head class. And also added a "bigSphere avatar collision test", also added a bone radius (for collision detection)
2013-04-17 23:18:36 -07:00
Philip Rosedale
f70429e575
Added a translucent ground plane, and made a few more grid lines. Easier to see when 'standing' on.
2013-04-17 22:47:58 -07:00
Philip Rosedale
bb2cc54c97
Stars turned back on by default - lemme know if anyone sees problems.
2013-04-17 22:23:19 -07:00
Philip Rosedale
b7346474d0
Merge pull request #71 from tschw/19188
...
19188
2013-04-17 22:15:39 -07:00
ZappoMan
e51031c464
Merge pull request #78 from ZappoMan/view_frustum_work
...
Added more tests for Orientation
2013-04-17 21:14:37 -07:00
Philip Rosedale
d200936615
Added eulerToOrthonormals function for Brad in Util.cpp, sample execution at start of main.
2013-04-17 21:10:31 -07:00
Jeffrey Ventrella
46c95ea4af
did some code cleanup in Head class and added some _isMine checks to differentiate between my av and others
2013-04-17 18:28:26 -07:00
ZappoMan
a64fca17c5
Added more tests for Orientation
2013-04-17 18:25:12 -07:00
Jeffrey Ventrella
6b8fe0cba1
Merge remote-tracking branch 'upstream/master'
2013-04-17 18:11:38 -07:00
Jeffrey Ventrella
4e12f26467
added _isMine check for my _bodyYaw update
2013-04-17 18:10:32 -07:00
Stephen Birarda
3538e2cf5b
fix the number of bytes used for head broadcast
2013-04-17 17:59:59 -07:00
Jeffrey Ventrella
aba20c6afd
a few debugging changes
2013-04-17 17:48:08 -07:00
Stephen Birarda
484ab53764
fix the flipped sign for agentHead translate
2013-04-17 17:04:29 -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
tosh
3175ba7d45
Merge branch 'master' of git://github.com/worklist/hifi into 19188
2013-04-18 00:18:38 +02:00
Philip Rosedale
952cb2f2ae
Added head _isMine variable, added hand position transmission!
2013-04-17 15:14:30 -07:00
tosh
38d229ab67
reiterates starfield:
...
o allows UrlReader to cache the downloaded content in a local (updating it
automatically when the server indicates a newer time stamp)
o retires the FieldOfView class
o makes the stars move again
o fixes bad deletion in UrlReader (delete instead of delete[])
o allows UrlReader to advertise supported compression algorithms to the server
2013-04-18 00:13:41 +02:00
Philip Rosedale
5729ecb3f4
Merge remote-tracking branch 'upstream/master'
2013-04-17 14:23:43 -07:00
Stephen Birarda
4b1ce1158f
fix number of bytes for avatar processBulkAgentData
2013-04-17 13:15:44 -07:00
Jeffrey Ventrella
a44ff94f85
Merge remote-tracking branch 'upstream/master'
2013-04-17 12:50:41 -07:00
Jeffrey Ventrella
3856a70b7e
added "_" to several members in Head class, and cleaned up some code formatting (housecleaning :)
2013-04-17 12:48:47 -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
