Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-16 15:26:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
3436 commits 25 branches 0 tags 1.1 GiB
Commit graph

341 commits

Author SHA1 Message Date
Jeffrey Ventrella
ab3b0c8aa3 alpha 2013-05-29 11:43:42 -07:00
Jeffrey Ventrella
39805db040 Merge remote-tracking branch 'upstream/master' 2013-05-29 11:27:36 -07:00
Jeffrey Ventrella
39499e4a92 fix to head transparency 2013-05-29 11:26:06 -07:00
Philip Rosedale
c31c14c56e Merge remote-tracking branch 'upstream/master' into one-liner 2013-05-29 10:46:55 -07:00
Philip Rosedale
ca8c78162d one line fix for translucent head 2013-05-29 10:46:10 -07:00
Jeffrey Ventrella
31ff768363 fixed some glitches in avatar render alpha transition between 3p and 1p 2013-05-29 08:30:14 -07:00
Jeffrey Ventrella
b98d03337d fixed bug causing camera to not get updated position of other av 2013-05-28 18:49:16 -07:00
Stephen Birarda
badab39ef1 resolve conflict on merge with upstream master 2013-05-28 15:58:57 -07:00
Stephen Birarda
e040c927f5 Merge remote-tracking branch 'upstream/master' into mouth-render 2013-05-28 15:58:11 -07:00
birarda
17e3902d17 Merge pull request #435 from Ventrella/master 
Integrated mohawk code, and did some cleanup and improvements on avatar
 2013-05-28 15:50:48 -07:00
Stephen Birarda
9f2c0adec7 move audioLoudness to HeadData 2013-05-28 12:22:51 -07:00
Jeffrey Ventrella
75b57d17a7 fixed some things based on recent code review 2013-05-27 18:54:44 -07:00
Andrzej Kapolka
1df7806464 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-27 14:40:30 -07:00
Andrzej Kapolka
949befee09 Fix for NaN. 2013-05-27 14:37:07 -07:00
Andrzej Kapolka
cfb66bee95 Capsule/box collisions. 2013-05-27 14:05:44 -07:00
Jeffrey Ventrella
096e465d36 cleaned up some formatting and in-line functions in Avatar.cpp 2013-05-27 10:31:31 -07:00
Geenz
17a5e6a700 First round of settings serialization. Setup an API to load and save different settings to the avatar data file. 
Initial serialized settings:
Gyro look
Mouse look
Transmitter drives
Voxel rendering
Voxel textures
Star rendering
Atmosphere rendering
Avatar rendering
Oculus rift mode
Render stats
Frame stats
Look at vectors
Logging
Frustum debugging
View frustum offset
Camera frustum
 2013-05-27 12:37:42 -04:00
Jeffrey Ventrella
d43c5ca52c normalized body spring tightness 2013-05-26 21:56:21 -07:00
Jeffrey Ventrella
ad5d097ed4 improved neck rendering 2013-05-26 17:44:52 -07:00
Jeffrey Ventrella
883d21a5e4 added facing other av requirement for camera shift to 1p; improved ease-in/out for camera mode shift; did some clean up on the camera code 2013-05-26 15:17:58 -07:00
Andrzej Kapolka
70b25fd6c4 Sphere/box collisions for voxels, various utility functions. 2013-05-25 19:59:07 -07:00
ZappoMan
77e5fbb590 Merge pull request #427 from birarda/oculus 
go into oculus mode when connected, fix the yaw pull
 2013-05-25 15:38:20 -07:00
Jeffrey Ventrella
6634ad2ed2 thingy 2013-05-24 16:31:17 -07:00
Stephen Birarda
a8b08647d0 require that crotch grabbing be explicit, not implicit 2013-05-24 16:18:36 -07:00
Stephen Birarda
65168e6aec add a yaw offset to the oculus so it can pull body 2013-05-24 15:23:25 -07:00
Philip Rosedale
9baf087c9a Avatar renders right arm in 1P mode 2013-05-24 14:29:26 -07:00
Stephen Birarda
81307939d4 Merge remote-tracking branch 'upstream/master' into owner-pointers 2013-05-24 12:23:12 -07:00
Stephen Birarda
59a6016f4b use a NULL default for owningAvatar to simplify constructors 2013-05-24 12:18:38 -07:00
Stephen Birarda
49b483ef53 maintain a pointer to owning avatar from HeadData 2013-05-24 12:17:48 -07:00
Stephen Birarda
36892da488 keep a pointer to owning agent in AgentData 2013-05-24 12:17:34 -07:00
Philip Rosedale
59ac5ebd66 Head will always render when body does - no decapitation 2013-05-24 11:07:19 -07:00
Philip Rosedale
f961a40d1c Chat message height doubled to clear mohawk 2013-05-24 10:55:26 -07:00
Jeffrey Ventrella
b74ceae61a added avatar hair 2013-05-23 22:52:43 -07:00
Philip Rosedale
37cb914891 You can reset start location with 'G' 2013-05-23 15:02:32 -07:00
Philip Rosedale
eb15aa602c Added amplification of gyro rates when applying to head, for more sensitivity, and to allow easily looking to one side and another 2013-05-23 12:17:24 -07:00
Philip Rosedale
7a0ea8bd59 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-23 11:48:18 -07:00
Philip Rosedale
be1fae5958 Move head back to center when moving 2013-05-23 11:37:27 -07:00
Philip Rosedale
86e3e25663 removed commented line, formatting 2013-05-23 11:26:14 -07:00
Jeffrey Ventrella
649fb72556 Merge remote-tracking branch 'upstream/master' 2013-05-23 10:15:18 -07:00
Jeffrey Ventrella
77324ebb46 made avatars appear to float above the ground 2013-05-23 10:14:46 -07:00
Philip Rosedale
5b3ac504c4 Updated merge conflicts 2013-05-22 19:43:11 -07:00
Stephen Birarda
d7a1cc6ea8 correct the sign for yaw and roll for invensense serial data 2013-05-22 19:38:17 -07:00
Jeffrey Ventrella
549d3a3671 Merge remote-tracking branch 'upstream/master' 2013-05-22 17:25:06 -07:00
Jeffrey Ventrella
8b49cfbf93 added back transitions to first person 2013-05-22 17:24:46 -07:00
ZappoMan
da39f28211 Merge pull request #392 from birarda/oculus 
fix broken head rotation set based on copy return
 2013-05-22 16:51:13 -07:00
Stephen Birarda
9657265c24 remove a debug line from setHeadFromGyros 2013-05-22 16:50:17 -07:00
Stephen Birarda
4738fc888b return Avatar Head by reference so setters actually do something 2013-05-22 16:43:41 -07:00
Andrzej Kapolka
b6e78064d8 Disable the righting for now, as well as the "floor" (whose presence makes us 
slide, since the gravity vector isn't pointing straight down).
 2013-05-22 16:29:13 -07:00
Jeffrey Ventrella
4940a6ae9a Merge remote-tracking branch 'upstream/master' 2013-05-22 15:51:03 -07:00
Jeffrey Ventrella
0b014c5635 cleaned up some stuff 2013-05-22 15:50:36 -07:00
Philip Rosedale
56a0471e5f Merge branch 'master' of https://github.com/worklist/hifi 2013-05-22 15:45:21 -07:00
Philip Rosedale
5bee5f07e3 Don't render body if looking in mirror, don't render test sphere over and over again for everyone. 2013-05-22 15:45:15 -07:00
Philip Rosedale
803c41d636 Chat text floats above head, not torso. 2013-05-22 15:28:24 -07:00
Andrzej Kapolka
7a8aa7c04f Restore "floor." 2013-05-22 14:50:11 -07:00
Andrzej Kapolka
53ae8235f3 Fixed threading issue with Environment, more work on avatar righting. 2013-05-22 14:43:25 -07:00
Jeffrey Ventrella
7cae808d29 Merge remote-tracking branch 'upstream/master' 2013-05-22 14:42:25 -07:00
Jeffrey Ventrella
83e2bf2534 added menu option for setting display of lookat vectors 2013-05-22 14:42:03 -07:00
Philip Rosedale
f8c39a8617 Merge pull request #382 from ey6es/master 
Support for multiple environments, each with their own gravity (and currently, collision spheres).
 2013-05-22 14:04:28 -07:00
Jeffrey Ventrella
86a2d2316f added method to set look at vector on/off 2013-05-22 13:44:38 -07:00
Andrzej Kapolka
bcd8e746f2 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-22 13:32:34 -07:00
Andrzej Kapolka
365bb10d6b More work on righting based on gravity vector. 2013-05-22 13:30:30 -07:00
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
Andrzej Kapolka
88bc6caf51 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-22 12:49:35 -07:00
Andrzej Kapolka
30958e3ce6 Working on reorientation. 2013-05-22 12:49:25 -07:00
Philip Rosedale
b95560587a pitch force 4x bigger in transmitter 2013-05-22 12:42:28 -07:00
Philip Rosedale
53dc81e309 Fixes per code review. 2013-05-22 11:57:11 -07:00
Jeffrey Ventrella
493aff3133 more prototyping of head feature geometry 2013-05-22 11:42:35 -07:00
Andrzej Kapolka
0e7c0e08eb Since we're not using deltaTime (yet), don't pass it as a parameter (yet). 2013-05-22 11:29:46 -07:00
Andrzej Kapolka
ada32f1a8b Added back "floor," "bounce." 2013-05-22 11:08:04 -07:00
Andrzej Kapolka
7e5418f8db Fix for default environment, better capsule placement. 2013-05-22 10:53:58 -07:00
Philip Rosedale
0d231b5550 Added lift to transmitter with finger, for true god-like flight! 2013-05-21 23:24:58 -07:00
Philip Rosedale
2edd085941 Added sensor fusion with gravity to transmitter to stabilize drift offset in pitch and roll. 2013-05-21 22:40:13 -07:00
Andrzej Kapolka
a864a6f8c6 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-21 21:34:09 -07:00
Andrzej Kapolka
fd98982fa6 Support for multiple environments, collisions with notional planet surfaces. 2013-05-21 21:33:08 -07:00
Jeffrey Ventrella
9f82b9fb43 test 2013-05-21 17:51:41 -07:00
Jeffrey Ventrella
c32d621d5f improving lookat behavior 2013-05-21 17:38:17 -07:00
Jeffrey Ventrella
c11851b75d cleaned up formatting stuff 2013-05-21 15:02:44 -07:00
Jeffrey Ventrella
ef95b13723 Merge remote-tracking branch 'upstream/master' 2013-05-21 14:21:14 -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
ZappoMan
6f0035b297 Merge pull request #365 from PhilipRosedale/master 
Made Transmitter it's own class, removed V1 Transmitter code (Glass and Android)
 2013-05-21 13:45:15 -07:00
Andrzej Kapolka
1118c06f5d Only do collision checking for own avatar. 2013-05-21 13:01:01 -07:00
Andrzej Kapolka
597769a861 Added basic capsule/sphere collisions between avatar and voxels. 2013-05-21 12:58:02 -07:00
Philip Rosedale
3539ec858e Added hand movement and body motion to transmitter. Feel much better - like dancing. 2013-05-20 23:22:28 -07:00
Philip Rosedale
7728a54d26 Converted Transmitter to separate class, removed V1 (Google Glass, Android) support for V2 (iOS) transmitter 2013-05-20 19:00:49 -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
570dfba934 code review comments, cleanup Avatar constructor 2013-05-20 16:12:38 -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
d144fb7f84 fix 2013-05-20 14:34:39 -07:00
Jeffrey Ventrella
1e9b04d28f cleanup 2013-05-20 12:16:18 -07:00
Jeffrey Ventrella
677f0b5d2e Merge remote-tracking branch 'upstream/master' 2013-05-20 12:13:21 -07:00
Jeffrey Ventrella
a192a21ef0 added _lookatPosition to avatar Data 2013-05-20 12:08:58 -07:00
Jeffrey Ventrella
d384e36af1 test 2013-05-20 11:59:19 -07:00
Jeffrey Ventrella
ffbc70814a preparing to add transmitted lookat position data 2013-05-20 11:41:21 -07:00
Jeffrey Ventrella
7f0d2e572e some preliminary work on avatarRenderer 2013-05-20 07:38:00 -07:00