Commit graph

228 commits

Author SHA1 Message Date
Jeffrey Ventrella
4d95d0a426 more cleanup on lookat 2013-05-22 13:24:19 -07:00
Jeffrey Ventrella
9de6060d0f Merge remote-tracking branch 'upstream/master' 2013-05-22 13:14:09 -07:00
Jeffrey Ventrella
3c3a3fc82e cleaning up look at code - Stephen helped find a transmission bug - fixed. 2013-05-22 13:12:11 -07:00
Jeffrey Ventrella
493aff3133 more prototyping of head feature geometry 2013-05-22 11:42:35 -07:00
Jeffrey Ventrella
9f82b9fb43 test 2013-05-21 17:51:41 -07:00
Jeffrey Ventrella
006fc3268e thingy 2013-05-21 17:44:24 -07:00
Jeffrey Ventrella
6e5f036eeb test 2013-05-21 17:41:50 -07:00
Jeffrey Ventrella
c32d621d5f improving lookat behavior 2013-05-21 17:38:17 -07:00
Jeffrey Ventrella
0b7e0ef43d test 2013-05-21 16:13:41 -07:00
Philip Rosedale
f7e75ee57c Fixed conflict 2013-05-21 15:47:15 -07:00
Philip Rosedale
6ff4b88ea4 starting tweaks to head gyro motion 2013-05-21 15:46:11 -07:00
Jeffrey Ventrella
b881507f51 fixed mouth and added a test for transmitting look at 2013-05-21 15:43:40 -07:00
Jeffrey Ventrella
2781a354a8 reversed gyro for head (didn't know the headset was on backwards :) 2013-05-21 15:27:03 -07:00
Jeffrey Ventrella
6840ce0bbe thingy 2013-05-21 15:09:05 -07:00
Jeffrey Ventrella
c11851b75d cleaned up formatting stuff 2013-05-21 15:02:44 -07:00
Jeffrey Ventrella
d21b48ad6e cleaned up a lot of pitch/yaw/roll confusion in Head and made new versions of eyes, eyebrows and mouth (Head still needs work) 2013-05-21 14:20:44 -07:00
Jeffrey Ventrella
9d3e76efe2 operating on head. patient under anesthesia 2013-05-20 17:53:55 -07:00
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
bbeac7701a small fix 2013-05-18 14:43:23 -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
ce7918108c remove a lingering comment 2013-05-17 11:09:23 -07:00
Stephen Birarda
194035e464 repair indentation in Head constructor 2013-05-17 11:08:44 -07:00
Stephen Birarda
a11ddee974 fix the width and height for the new iris texture 2013-05-17 10:55:11 -07:00
Stephen Birarda
b2518e0595 change the iris texture 2013-05-17 10:51:29 -07:00
Stephen Birarda
c214e9b179 use the default Avatar destructor, comment out unused consts in Head 2013-05-17 10:46:59 -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
7e0877e753 cleanup 2013-05-17 08:48:54 -07:00
Jeffrey Ventrella
1c126e2525 resolved conflicts 2013-05-16 17:32: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
Philip Rosedale
9f57787ece Fixed jerking on gravity, added mouse pitch, yaw behavior. 2013-05-16 17:05:45 -06:00
Philip Rosedale
78bd5ab40f Fixes per review 2013-05-16 13:34:48 -06:00
Jeffrey Ventrella
cd248188d9 thingy 2013-05-16 12:19:20 -07:00
Jeffrey Ventrella
aafb557b02 turned off look at behavior - until it is finished and working correctly 2013-05-16 12:14:36 -07:00
Jeffrey Ventrella
04828c8224 cleaned up copyright header notifications in several files 2013-05-16 12:06:36 -07:00
Philip Rosedale
72d657b51d Preventing render bug with mis-scaled mouth (part of screen all black) 2013-05-15 10:00:30 -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
b2d5bfab2b clean up from headotomy 2013-05-10 17:12:16 -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
a9ff483d3d fix 2013-04-24 15:35:11 -07:00
Jeffrey Ventrella
e93430d553 fix 2013-04-24 14:56:29 -07:00
Jeffrey Ventrella
bfc4befb9b Merge remote-tracking branch 'upstream/master' 2013-04-24 14:55:25 -07:00