Jeffrey Ventrella
|
6e994ed425
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-20 17:33:27 -07:00 |
|
Jeffrey Ventrella
|
72f8f447a1
|
starting a rework of Head renderer
|
2013-05-20 17:30:13 -07:00 |
|
Stephen Birarda
|
564244ddd3
|
move _leanSideways and _leanForwards to HeadData
|
2013-05-20 17:13:40 -07:00 |
|
Stephen Birarda
|
de84b7803f
|
move _lookAtPosition to HeadData class
|
2013-05-20 15:51:40 -07:00 |
|
Stephen Birarda
|
257a1d1f2e
|
move head rotations to new HeadData class to be used for transmission
|
2013-05-20 15:21:02 -07:00 |
|
Jeffrey Ventrella
|
5a4813d5c9
|
improved algorithm for rotating eyes to look at target
|
2013-05-18 14:31:27 -07:00 |
|
Jeffrey Ventrella
|
f2af37801e
|
tidied up the head class and fixed a negated pitch value in orientation
|
2013-05-17 14:56:14 -07:00 |
|
Stephen Birarda
|
0e7c0776f2
|
refactor the Head class to remove _sphere and use default copy constructor
|
2013-05-17 10:43:26 -07:00 |
|
Jeffrey Ventrella
|
ade5b7bec3
|
formatting changes
|
2013-05-17 09:52:19 -07:00 |
|
Jeffrey Ventrella
|
7e0877e753
|
cleanup
|
2013-05-17 08:48:54 -07:00 |
|
Jeffrey Ventrella
|
750a48bb73
|
cleaned up head class - made most members private. Added copy constructor
|
2013-05-16 17:20:00 -07:00 |
|
Jeffrey Ventrella
|
04828c8224
|
cleaned up copyright header notifications in several files
|
2013-05-16 12:06:36 -07:00 |
|
Jeffrey Ventrella
|
a0e8c0da74
|
more work on avatar lookat
|
2013-05-14 18:15:54 -07:00 |
|
Jeffrey Ventrella
|
f53b49c496
|
working on lookat (eye contact)
|
2013-05-14 17:30:41 -07:00 |
|
Jeffrey Ventrella
|
acda87502e
|
more work on camera shifting between modes
|
2013-05-14 11:43:51 -07:00 |
|
Jeffrey Ventrella
|
ab9fa0a556
|
cleaned up some code
|
2013-05-10 22:31:51 -07:00 |
|
Jeffrey Ventrella
|
847bfbdadd
|
mode cleanup after head operation
|
2013-05-10 17:29:04 -07:00 |
|
Jeffrey Ventrella
|
7fc2756257
|
I just did a headotomy (removed all head-related stuff from Avatar and made it its own class)
|
2013-05-10 17:05:52 -07:00 |
|
Jeffrey Ventrella
|
e54fd0dd7d
|
renamed "Head" to "Avatar" and did a bunch a cleanups, including removing the three-lined comments
|
2013-04-24 16:54:07 -07:00 |
|
Jeffrey Ventrella
|
86086ef20c
|
just did a fairly major re-ordering of avatar interaction logic in Head.cpp
|
2013-04-24 14:52:04 -07:00 |
|
Jeffrey Ventrella
|
eca6999c2c
|
added behavior in Eve for alternating between grasping and ungrasping hand (tho unable to test transmission). Also, improved readability of hand grasping logic in Head.cpp
|
2013-04-24 11:02:23 -07:00 |
|
Jeffrey Ventrella
|
61d7a82fc6
|
made lots of changes in the logic of how my avatar encounters other avatars and detects hand state
|
2013-04-23 20:44:12 -07:00 |
|
Jeffrey Ventrella
|
a73ea8c255
|
some preparation for adding hand state to avatar interactions
|
2013-04-23 13:48:34 -07:00 |
|
Jeffrey Ventrella
|
a1e3149d6a
|
Merge remote-tracking branch 'upstream/master'
|
2013-04-23 12:20:26 -07:00 |
|
Philip Rosedale
|
90c56e796b
|
One... last.... const....
|
2013-04-23 12:07:12 -07:00 |
|
Philip Rosedale
|
5556686875
|
Fixes from brad's review
|
2013-04-23 11:59:43 -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 |
|
Jeffrey Ventrella
|
8df6a7e056
|
added collision code for avatar (not operational yet). and some cleanup.
|
2013-04-23 11:12:38 -07:00 |
|
Philip Rosedale
|
9760b7d410
|
First commit to re-enable gyros, removed various old head_mirror variables, now use 'lookingInMirror', etc. Local gyros now correctly drive own head.
|
2013-04-23 09:47:52 -07:00 |
|
Jeffrey Ventrella
|
ca2840f905
|
Cleaned up some const values in Head.h, implemented avatar gravity and ground collision, improved test sphere collision, added _usingBodySprings test to getHeadPosition, improved camera settings in main.cpp, cleaned up commented-out code in main.cpp
|
2013-04-22 15:39:31 -07:00 |
|
Jeffrey Ventrella
|
60f0e6581d
|
improved test sphere collision algorithm
|
2013-04-22 14:04:36 -07:00 |
|
Jeffrey Ventrella
|
b7d6ce9747
|
fixed avatar hand position by making avatars simulate all the time,and also fixing logic of _isMine
|
2013-04-22 13:15:46 -07:00 |
|
Jeffrey Ventrella
|
2e402c3b17
|
added - and then removed - some orientation-related tests
|
2013-04-22 10:29:14 -07:00 |
|
Jeffrey Ventrella
|
08105c3898
|
I did a major cleanup of the Head class, including putting all the "head"-related members into a single structure. We may consider making a separate class just to handle the head.
|
2013-04-19 17:09:28 -07:00 |
|
Jeffrey Ventrella
|
06f8990d42
|
removed avatar structure from Head class (leftover from the start of the prototyping phase)
|
2013-04-19 14:52:06 -07:00 |
|
Jeffrey Ventrella
|
9a93ab7d7c
|
cleaned up logic for body springs mode and moving hand mode
|
2013-04-19 14:34:01 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Philip Rosedale
|
952cb2f2ae
|
Added head _isMine variable, added hand position transmission!
|
2013-04-17 15:14:30 -07:00 |
|
Philip Rosedale
|
5729ecb3f4
|
Merge remote-tracking branch 'upstream/master'
|
2013-04-17 14:23:43 -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 |
|
Philip Rosedale
|
2e928166ed
|
Merge remote-tracking branch 'upstream/master'
|
2013-04-17 10:00:17 -07:00 |
|
Jeffrey Ventrella
|
a6f82e1236
|
moved renderOrientstionDiretions to Utils
|
2013-04-16 23:39:43 -07:00 |
|
Jeffrey Ventrella
|
1fb8d0b268
|
consolidated some code in Head.cpp
|
2013-04-16 20:35:50 -07:00 |
|