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

2040 commits

Author SHA1 Message Date
Jeffrey Ventrella
f7a0e8018a Merge remote-tracking branch 'upstream/master' 2013-05-29 16:15:16 -07:00
Jeffrey Ventrella
63434da23c testing avatar touch 2013-05-29 16:14:55 -07:00
birarda
64d02f5f5f Merge pull request #457 from birarda/master 
make it harder to quit accidentally
 2013-05-29 16:06:40 -07:00
Stephen Birarda
b0a8de818d make quit CMD-Q instead of just Q 2013-05-29 16:05:03 -07:00
Jeffrey Ventrella
5750adf6fd test 2013-05-29 15:53:47 -07:00
Stephen Birarda
02333644dc one line fix in AvatarTouch 2013-05-29 15:31:18 -07:00
Jeffrey Ventrella
72688d86ca Merge remote-tracking branch 'upstream/master' 2013-05-29 15:25:05 -07:00
Jeffrey Ventrella
66c7da6552 simplify avatar proximity check for 1p transition 2013-05-29 15:24:37 -07:00
ZappoMan
46c6f2f9b5 latest copy paste 2013-05-29 15:02:28 -07:00
Geenz
c33d2ee25e Coding standard cleanup based upon ZappoMan's suggestions. 2013-05-29 16:46:47 -04:00
ZappoMan
c70ade0cc1 temporary hack fix to not discarding voxels 2013-05-29 12:14:45 -07:00
ZappoMan
377fb1e936 latest copy and paste 2013-05-29 12:06:58 -07:00
Jeffrey Ventrella
ab1c00dac6 Merge remote-tracking branch 'upstream/master' 2013-05-29 11:51:34 -07:00
Jeffrey Ventrella
e34193f1d7 increased hand motion sensitivity 2013-05-29 11:51:16 -07:00
ZappoMan
408fef0de8 Merge pull request #450 from birarda/master 
make audio echo a menu option instead of forcing it with the mirror mode
 2013-05-29 11:47:38 -07:00
Stephen Birarda
b6a0662c98 inline the shouldEchoAudio 2013-05-29 11:47:02 -07:00
Jeffrey Ventrella
ab3b0c8aa3 alpha 2013-05-29 11:43:42 -07:00
Stephen Birarda
a5a30efec9 CR fixes 2013-05-29 11:42:10 -07:00
Jeffrey Ventrella
350bd878fc fix 2013-05-29 11:39:53 -07:00
Stephen Birarda
5d74a865e8 make audio echo a menu option instead of forcing with mirror 2013-05-29 11:35:32 -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
ZappoMan
6b1d37599c Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels 2013-05-29 08:12:07 -07:00
ZappoMan
d1d2e75143 first cut at export and import of voxels 2013-05-28 19:00:02 -07:00
Jeffrey Ventrella
0e329af03e made inline 2013-05-28 18:55:21 -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
Jeffrey Ventrella
e4c0aeb9a0 added AVATAR_FACING_THRESHOLD to avatarTouch 2013-05-28 18:15:29 -07:00
Jeffrey Ventrella
5d9b8c08b3 Merge remote-tracking branch 'upstream/master' 2013-05-28 17:57:42 -07:00
Jeffrey Ventrella
923c39cdc0 fixed third person shift bug 2013-05-28 17:57:11 -07:00
Stephen Birarda
65f10cb99a fix the enum in AABox, fix a warning in Head 2013-05-28 16:26:18 -07:00
Stephen Birarda
8118e3bf69 type squish in Audio.cpp 2013-05-28 16:23:54 -07:00
Stephen Birarda
55954899e6 fix silent audio on client 2013-05-28 16:20:23 -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
5715860f6b added Skeleton class (to be completed soon) 2013-05-27 18:55:23 -07:00
Jeffrey Ventrella
75b57d17a7 fixed some things based on recent code review 2013-05-27 18:54:44 -07:00
Geenz
8ac8335776 Check how many matches were found for the given data type we're checking for. 1 for bool and float, 3 for vec3. Return false and assign default values if this isn't true. 2013-05-27 19:18:36 -04:00
Geenz
5efda079c9 Store settings in an ordered map to allow for runtime getting and setting of settings. Read the setting file on startup, then write on shut down. 2013-05-27 18:48:05 -04:00
Andrzej Kapolka
278ff00926 Fixed Linux build error and a warning on call to Avatar.simulate, moved grid 
size constant to world.h and made gravity bounds match.
 2013-05-27 14:46:16 -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
ZappoMan
04f4e499e1 Optimize wire-format for AvatarData 
- moved HandState into semi-nibble in bitItems
- moved KeyState into semi-nibble in bitItems
- moved AudioLoudness into scaled float stored as byte
- overall savings - 5 bytes
 2013-05-27 14:18:10 -07:00
ZappoMan
5d1ba857c5 Optimize View Frustum wire format. 
- Changed View frstum orientaton to be a quaternion
- Implemented packing formats for Orientation Quats, Ratios, and Clipping values
- Changed wire format for View Frustum details to be more efficient 28 bytes vs 64 bytes
 2013-05-27 14:17:34 -07:00
Andrzej Kapolka
cfb66bee95 Capsule/box collisions. 2013-05-27 14:05:44 -07:00
Geenz
94a07b92a7 Documentation for #19308. 2013-05-27 15:54:32 -04:00
Jeffrey Ventrella
096e465d36 cleaned up some formatting and in-line functions in Avatar.cpp 2013-05-27 10:31:31 -07:00
Geenz
93eac0c0dc Setup various debug options. 2013-05-27 12:56:41 -04: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
4e4a672f32 fixed visual glitch where mouth penetrates head sphere 2013-05-26 17:17:15 -07:00
Jeffrey Ventrella
2b31e79a0b cleanup 2013-05-26 15:23:44 -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
Jeffrey Ventrella
622863dbf1 Merge remote-tracking branch 'upstream/master' 2013-05-26 10:19:02 -07:00
Jeffrey Ventrella
9f7e05d407 integrated Philip's mohawk colors into my hair code and added a switch to test each version 2013-05-26 10:18:35 -07:00
Philip Rosedale
7aebbe3047 Merge pull request #434 from ZappoMan/voxel_animation 
Improve "Delta Sending" mode..
 2013-05-26 09:45:54 -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
ZappoMan
1a2921e3e8 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-25 15:32:12 -07:00
ZappoMan
60f2b9a438 removed debug 2013-05-25 15:31:28 -07:00
ZappoMan
f6863081f9 Fix Delta Sending mode by not culling out of view voxels until we STOP moving 
- added isViewChanging() which determines if the view is currently changing
- made hasViewChanged() report false UNTIL we've stopped moving
- changed setupNewVoxelsForDrawing() to only call removeOutOfView() if we're not moving
 2013-05-25 15:29:23 -07:00
Jeffrey Ventrella
1e4771fe27 fix 2013-05-24 18:05:14 -07:00
Jeffrey Ventrella
8c24477a24 Merge remote-tracking branch 'upstream/master' 2013-05-24 18:01:47 -07:00
Jeffrey Ventrella
0c2c90b84d cleanup 2013-05-24 18:01:25 -07:00
Freddy
6a4bcf32fa Code review fixes 2013-05-24 17:58:31 -07:00
Freddy
30e951578e procedural voxel create/delete noises 2013-05-24 17:27:56 -07:00
Jeffrey Ventrella
28f3af4ea5 Merge remote-tracking branch 'upstream/master' 2013-05-24 17:13:10 -07:00
Jeffrey Ventrella
56438435c1 made mouth conform to the head sphere 2013-05-24 17:12:14 -07:00
birarda
82f5e0a3b1 Merge pull request #426 from PhilipRosedale/master 
big ground plane
 2013-05-24 16:37:53 -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
608a4f71bf ground surface is 20 meters across. play on! 2013-05-24 14:51:06 -07:00
Philip Rosedale
995fbcf4f9 mohawk also follows body pitch when accelerating 2013-05-24 14:46:26 -07:00
Philip Rosedale
d796956a96 fix per review 2013-05-24 14:32:56 -07:00
Philip Rosedale
9baf087c9a Avatar renders right arm in 1P mode 2013-05-24 14:29:26 -07:00
Philip Rosedale
31e41260c1 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-24 14:17:44 -07:00
Philip Rosedale
f5c0f84d27 Mohawk is different/stable for each person, and rotates correctly with head 2013-05-24 14:15:53 -07:00
Stephen Birarda
d12bc85376 go directly into oculus mode when the oculus is connected 2013-05-24 14:05:22 -07:00
Philip Rosedale
cb7381fcd1 incremental fix rotation 2013-05-24 12:33:05 -07:00
Philip Rosedale
360c9c8ab1 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-24 12:30:12 -07:00
Philip Rosedale
dc9b2e33b5 Fixing mohawk orientation 2013-05-24 12:30:05 -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
ZappoMan
0a1a86ca94 Merge pull request #418 from PhilipRosedale/master 
More stable gyro averaging
 2013-05-24 12:18:02 -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
ZappoMan
8560e42357 fix issue with duplicate VBO slots 2013-05-24 12:08:25 -07:00
Philip Rosedale
8b5901d904 simplified per stephens code review 2013-05-24 12:04:17 -07:00
Jeffrey Ventrella
51ddf40ffe cleaned up hair code 2013-05-24 11:54:55 -07:00
Philip Rosedale
17c898c151 Long term averaging of the gyros for better stability 2013-05-24 11:33:00 -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
birarda
05ad7309a1 Merge pull request #411 from ey6es/master 
Fix for starfield rendering on Oculus.
 2013-05-24 10:14:31 -07:00
Philip Rosedale
bf94c88bcc Fixes per review 2013-05-24 10:12:50 -07:00
Philip Rosedale
95e73afc78 Added the avatar mohawk 2013-05-24 00:16:52 -07:00
Jeffrey Ventrella
b74ceae61a added avatar hair 2013-05-23 22:52:43 -07:00
Andrzej Kapolka
add84b2f39 Hide the cursor when in fullscreen Oculus mode. 2013-05-23 17:58:04 -07:00
Andrzej Kapolka
9be4f06e9a Disable voxel textures by default. 2013-05-23 17:32:43 -07:00
Andrzej Kapolka
514c12c7fc Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Application.cpp
 2013-05-23 15:39:04 -07:00
Andrzej Kapolka
9b433c974c Fix for starfield rendering on Oculus: put inter-pupil translation in 
modelview matrix where it belongs, don't reset perspective projection for
starfield.
 2013-05-23 15:35:41 -07:00
Stephen Birarda
b673715aa2 remove the no longer in use AvatarRenderer 2013-05-23 15:18:32 -07:00
Philip Rosedale
37cb914891 You can reset start location with 'G' 2013-05-23 15:02:32 -07:00
Philip Rosedale
235cfc8ab2 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-23 12:33:39 -07:00
Philip Rosedale
32d2418b7a Added display head mouse option (default off) and all camera modes follow head gyros the same way. 2013-05-23 12:33:26 -07:00
ZappoMan
089d8d525e Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-23 12:20:34 -07:00
ZappoMan
6ec61996c9 Merge pull request #405 from PhilipRosedale/master 
Chat in right place above head, not body, tweaks to sensors, reset behavior, gyro pitch back.
 2013-05-23 12:19:43 -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
ZappoMan
473665fb4a Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-23 12:16:29 -07:00
ZappoMan
6e5ed6435b added shortcut key to log menu 2013-05-23 12:06:59 -07:00
Philip Rosedale
7a0ea8bd59 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-23 11:48:18 -07:00
Philip Rosedale
8fec96319c Merge pull request #403 from Ventrella/master 
added effect of avatars floating above the ground with knees bent slightly
 2013-05-23 11:48:00 -07:00
Philip Rosedale
be1fae5958 Move head back to center when moving 2013-05-23 11:37:27 -07:00
Philip Rosedale
85ea48e43a Merge branch 'master' of https://github.com/worklist/hifi 2013-05-23 11:26:26 -07:00
Philip Rosedale
86e3e25663 removed commented line, formatting 2013-05-23 11:26:14 -07:00
Andrzej Kapolka
672f4de496 Avoid colliding with gravityless environments. 2013-05-23 10:36:28 -07:00
Andrzej Kapolka
34b526f15c Restore the original floor behavior. 2013-05-23 10:32:12 -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
c56509e5a2 Re-enabled pitch gyro look in first person, start location is now not reset on sensor reset 2013-05-23 09:30:36 -07:00
Philip Rosedale
6b3f35ef19 Merge pull request #393 from ey6es/master 
Put all environment data in the same packet and only send it off about once a second.
 2013-05-22 21:11:22 -07:00
Stephen Birarda
120c835004 fix head mouse 2013-05-22 19:46:33 -07:00
Philip Rosedale
5b3ac504c4 Updated merge conflicts 2013-05-22 19:43:11 -07:00
Philip Rosedale
f39fade4c7 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-22 19:40:13 -07:00
Philip Rosedale
22b534cd8e Fixed headmouse 2013-05-22 19:39:37 -07:00
Stephen Birarda
d7a1cc6ea8 correct the sign for yaw and roll for invensense serial data 2013-05-22 19:38:17 -07:00
Stephen Birarda
3e192cda9b correct rendering for first-person for oculus 2013-05-22 19:15:52 -07:00
birarda
3e16e6a36c Merge pull request #398 from birarda/master 
correct sign of yaw for oculus
 2013-05-22 18:57:06 -07:00
Stephen Birarda
997a10c981 correct the sign of yaw for oculus 2013-05-22 18:56:38 -07:00
Jeffrey Ventrella
83c12ae9af etc 2013-05-22 18:31:22 -07:00
Jeffrey Ventrella
b7613497eb fixed pitch yaw (not roll) 2013-05-22 18:14:18 -07:00
Jeffrey Ventrella
2f943b697a cleanup 2013-05-22 17:27:48 -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
Andrzej Kapolka
a68c8c6389 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-22 17:11:03 -07:00
Andrzej Kapolka
629c7b0146 Send all environment data in the same packet and only send it about once a 
second.
 2013-05-22 17:09:35 -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
a1b556d6a2 space out if 2013-05-22 16:49:26 -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
Andrzej Kapolka
96fdc015c5 Fix for OS X; the structure wasn't being zero-initialized as I expected. 2013-05-22 16:12:14 -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
d89939e0bd Merge branch 'master' of https://github.com/worklist/hifi 2013-05-22 15:17:13 -07:00
ZappoMan
f3855e54f9 Merge pull request #388 from birarda/master 
DRY up the resource copying
 2013-05-22 15:04:45 -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
Stephen Birarda
200d81e0eb DRY up resource subdir copying for OS X bundle 2013-05-22 14:40:01 -07:00
Andrzej Kapolka
dd101b393d Merge branch 'master' of https://github.com/worklist/hifi 2013-05-22 14:33:31 -07:00
Philip Rosedale
6b854531aa Merge branch 'master' of https://github.com/worklist/hifi 2013-05-22 14:31:46 -07:00
birarda
9ec04855f8 Merge pull request #386 from ZappoMan/voxel_animation 
Fix some crashing issues on delete
 2013-05-22 14:27:29 -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
d786fd155f clean up 2013-05-22 13:52:29 -07:00
Philip Rosedale
ad8246a0f5 Turned log off by default 2013-05-22 13:46:39 -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
c6c0f6d727 Merge remote-tracking branch 'upstream/master' 2013-05-22 13:24:40 -07:00
Jeffrey Ventrella
4d95d0a426 more cleanup on lookat 2013-05-22 13:24:19 -07:00
ZappoMan
06f2528d6a fix crashing on deleting voxels in server and client 2013-05-22 13:23:01 -07:00
ZappoMan
cbd3497c5c Merge pull request #385 from birarda/master 
non-DRY fix for resources copy on OS X
 2013-05-22 13:18:34 -07:00
Stephen Birarda
62cf452e3d non-DRY fix for correct copy of resources for OS X bundle 2013-05-22 13:16:55 -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
Philip Rosedale
e411b41be7 oops moving stdint to header file 2013-05-22 13:02:07 -07:00
Philip Rosedale
a03d6f8d80 moved pair to own menu 2013-05-22 12:55:46 -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
bcf13b9754 hopefully fix linux broken build by including stdint in transmitter 2013-05-22 12:48:36 -07:00
Philip Rosedale
b95560587a pitch force 4x bigger in transmitter 2013-05-22 12:42:28 -07:00
Stephen Birarda
b0ff1029f6 Merge branch 'master' of github.com:worklist/hifi 2013-05-22 12:40:48 -07:00
Stephen Birarda
0fdbfe8ea8 move gen_stars to the tools folder 2013-05-22 12:39:27 -07:00
Philip Rosedale
4ad2f9a943 Merge pull request #381 from Geenz/19319 
Code Review for Job #19319
 2013-05-22 12:32:47 -07:00
ZappoMan
6733d83f2d Merge pull request #379 from PhilipRosedale/master 
Sensor fusion to better stabilize transmitter roll, pitch
 2013-05-22 12:00:08 -07:00
Philip Rosedale
53dc81e309 Fixes per code review. 2013-05-22 11:57:11 -07:00
Jeffrey Ventrella
f7b101b4aa Merge remote-tracking branch 'upstream/master' 2013-05-22 11:43:12 -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
Geenz
fb553fce80 Refactor startup timing a little by getting the current time the moment the application enters its main function, then passing that to Application's constructor. Also fix the titlebar bug by setting the title bar at the end of initializeGL() instead of at the end of the first frame (which would actually further the inaccuracy of the startup time). 2013-05-22 10:53:35 -04:00
Philip Rosedale
0d231b5550 Added lift to transmitter with finger, for true god-like flight! 2013-05-21 23:24:58 -07:00
ZappoMan
a311e40f25 hopefully fix unix build buster 2013-05-21 23:10:57 -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
8d255f7685 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-21 22:38:23 -07:00
Andrzej Kapolka
c7e840e0d4 The end parameter to glDrawRangeElements is inclusive. 2013-05-21 22:36:27 -07:00
Andrzej Kapolka
8b1362636e Merge branch 'master' of https://github.com/worklist/hifi 2013-05-21 22:29:46 -07:00
Philip Rosedale
8b65fcae75 Merge pull request #352 from tschw/master 
refactors logging, adds comments, and revises names & formatting in all submitted code
 2013-05-21 22:10:10 -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
Philip Rosedale
47d9035def Merge branch 'master' of https://github.com/worklist/hifi 2013-05-21 20:34:55 -07:00
Jeffrey Ventrella
9f82b9fb43 test 2013-05-21 17:51:41 -07:00
Jeffrey Ventrella
e219cd8223 Merge remote-tracking branch 'upstream/master' 2013-05-21 17:44:45 -07:00
Jeffrey Ventrella
006fc3268e thingy 2013-05-21 17:44:24 -07:00
birarda
63fcb2eeef Merge pull request #367 from ZappoMan/voxel_animation 
Fixes "Delete" voxel behavior
 2013-05-21 17:43:36 -07:00
Jeffrey Ventrella
6e5f036eeb test 2013-05-21 17:41:50 -07:00
Jeffrey Ventrella
25dfc7bc4b Merge remote-tracking branch 'upstream/master' 2013-05-21 17:38:36 -07:00
Jeffrey Ventrella
c32d621d5f improving lookat behavior 2013-05-21 17:38:17 -07:00
Stephen Birarda
3ac20849d6 remove old menu code and glew implemenation file 2013-05-21 16:21:33 -07:00
Jeffrey Ventrella
7bb94ae8de Merge remote-tracking branch 'upstream/master' 2013-05-21 16:14:01 -07:00
Jeffrey Ventrella
0b7e0ef43d test 2013-05-21 16:13:41 -07:00
Philip Rosedale
8e73abe6e6 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-21 15:47:47 -07:00
Philip Rosedale
f7e75ee57c Fixed conflict 2013-05-21 15:47:15 -07:00
birarda
31a11e8221 Merge pull request #374 from birarda/master 
include QtGui dir with isystem flag to get rid of compiler warning in Xcode
 2013-05-21 15:46:44 -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
Stephen Birarda
910683c047 remove an extra space 2013-05-21 15:43:29 -07:00
Stephen Birarda
d2c2150b8f include QtGui dir with isystem flag to remove warning 2013-05-21 15:39:57 -07:00
Jeffrey Ventrella
16a1dd103d Merge remote-tracking branch 'upstream/master' 2013-05-21 15:27:37 -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
ZappoMan
4f0aca4b0c Merge pull request #372 from birarda/master 
refactor FindGLM to not check twice, revert the previous audio change
 2013-05-21 15:12:43 -07:00
Jeffrey Ventrella
e09e01b81e Merge remote-tracking branch 'upstream/master' 2013-05-21 15:09:23 -07:00
Jeffrey Ventrella
6840ce0bbe thingy 2013-05-21 15:09:05 -07:00
Philip Rosedale
dc8dea727a Merge branch 'master' of https://github.com/worklist/hifi 2013-05-21 15:04:24 -07:00
Philip Rosedale
330c59b36b Fixed conflicts 2013-05-21 15:04:12 -07:00
Jeffrey Ventrella
1f82d339d0 Merge remote-tracking branch 'upstream/master' 2013-05-21 15:03:06 -07:00
Jeffrey Ventrella
c11851b75d cleaned up formatting stuff 2013-05-21 15:02:44 -07:00
Stephen Birarda
95cef67e33 Revert "remove unused variable in Audio" 
This reverts commit bbdd601855.
 2013-05-21 15:01:08 -07:00
Philip Rosedale
f47b5a196a Added missing transmitter files 2013-05-21 15:00:22 -07:00
birarda
ca9738a101 Merge pull request #370 from birarda/master 
remove unused varible in Audio
 2013-05-21 14:52:45 -07:00
Stephen Birarda
bbdd601855 remove unused variable in Audio 2013-05-21 14:52:05 -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
tosh
0ab2d4c741 Merge branch 'master' of git://github.com/worklist/hifi 2013-05-21 23:13:21 +02:00
ZappoMan
fdba349d9b temporary hack fix to busted build 2013-05-21 13:57:54 -07:00
tosh
ba4f4b9809 Merge branch 'master' of git://github.com/worklist/hifi 2013-05-21 22:49:39 +02:00
ZappoMan
0bcd629c8a Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-21 13:46:04 -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
ZappoMan
9f23f846a9 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-21 12:47:46 -07:00
Philip Rosedale
71a875042a Updated transmitter class to handle correct orientation of gyros 2013-05-21 11:57:14 -07:00
ZappoMan
7c9be4b9f5 cleanup code 2013-05-21 11:42:13 -07:00
ZappoMan
a7f0a66aee code cleanup 2013-05-21 11:31:47 -07:00
ZappoMan
0dde5b6411 remove dead code, comment cleanup 2013-05-21 11:28:12 -07:00
ZappoMan
4f9c7fed59 removed UI for want exists bits, defaults to true 2013-05-21 11:25:50 -07:00
ZappoMan
ef2d27aba6 getting closer to working delete 2013-05-21 10:43:31 -07:00
Philip Rosedale
340882a330 Changed 1P view to turn off head rendering when close/inside head rather than showing disembodied neck 2013-05-21 10:22:05 -07:00
Andrzej Kapolka
b15162abfd Merge branch 'master' of https://github.com/worklist/hifi 2013-05-21 09:49:12 -07:00
tosh
bfaeb4a4d9 Merge branch 'master' of git://github.com/worklist/hifi 
Conflicts:
	libraries/avatars/src/AvatarData.cpp
 2013-05-21 18:46:20 +02: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
Philip Rosedale
6392bb0045 Merge pull request #363 from birarda/head-changes 
move lean sideways and lean forwards to the head data class
 2013-05-20 17:25:05 -07:00
Andrzej Kapolka
1be859ede9 Use glDrawRangeElements, which indicates the range of used indices. It may or 
may not make a difference in performance, but it won't hurt.
 2013-05-20 17:14:41 -07:00
Stephen Birarda
564244ddd3 move _leanSideways and _leanForwards to HeadData 2013-05-20 17:13:40 -07:00
ZappoMan
d1554e0150 Merge pull request #361 from birarda/head-changes 
add a HeadData class to reduce redundancy for head member variables
 2013-05-20 17:08:09 -07:00
Andrzej Kapolka
5b0640bbbf Whoops--fixed a matrix stack issue that was breaking Oculus rendering. 2013-05-20 16:52:40 -07:00
Stephen Birarda
570dfba934 code review comments, cleanup Avatar constructor 2013-05-20 16:12:38 -07:00
tosh
a86b8a1d93 refactors logging 2013-05-21 01:00:10 +02:00
tosh
4385fc31e8 adds missing include "InterfaceConfig.h" for OpenGL types 2013-05-21 00:59:29 +02:00
ZappoMan
e1c89aac87 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-20 15:52:04 -07:00
ZappoMan
a53f84fcb9 latest hacking 2013-05-20 15:51:47 -07:00
Stephen Birarda
de84b7803f move _lookAtPosition to HeadData class 2013-05-20 15:51:40 -07:00
Andrzej Kapolka
06c78c2f12 Tweak: let the reader know when it needs to load the full VBO. 2013-05-20 15:41:19 -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
Andrzej Kapolka
8d522cd3ed I believe the problem with voxel rendering is caused by the update thread's 
writing the data while the render thread is attempting to read it.  This
should fix the issue.
 2013-05-20 15:15:44 -07:00
Andrzej Kapolka
8c71741843 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-20 15:13:36 -07:00
tosh
e70efe7481 fixes improper merge / changes 2013-05-20 23:37:06 +02:00
Jeffrey Ventrella
b42d093b4a Merge remote-tracking branch 'upstream/master' 2013-05-20 14:36:13 -07:00
Jeffrey Ventrella
d144fb7f84 fix 2013-05-20 14:34:39 -07:00
tosh
06288e8366 Merge branch 'master' of git://github.com/worklist/hifi 
Conflicts:
	interface/src/Oscilloscope.cpp
 2013-05-20 23:15:06 +02:00
ZappoMan
4298b922a2 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 
Conflicts:
	libraries/avatars/src/AvatarData.cpp
 2013-05-20 13:55:01 -07:00
ZappoMan
321d1952d6 first cut at exists bits 2013-05-20 12:56:59 -07:00
Stephen Birarda
6aafcc752d re-arrange member variable constructors for compiler warning 2013-05-20 12:51:21 -07:00
Jeffrey Ventrella
1e9b04d28f cleanup 2013-05-20 12:16:18 -07:00
Stephen Birarda
7b21b8520e Merge branch 'master' of github.com:worklist/hifi 2013-05-20 12:16:10 -07:00
Andrzej Kapolka
616285f4c7 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-20 12:13:53 -07:00
Andrzej Kapolka
3f0fd2f976 Added toggle for voxel textures; they may be slowing some machines down. 2013-05-20 12:13:23 -07:00
Jeffrey Ventrella
677f0b5d2e Merge remote-tracking branch 'upstream/master' 2013-05-20 12:13:21 -07:00
Jeffrey Ventrella
f09cbca00b cleanup 2013-05-20 12:12:46 -07:00
Jeffrey Ventrella
a192a21ef0 added _lookatPosition to avatar Data 2013-05-20 12:08:58 -07:00
Andrzej Kapolka
85dc14bb94 Drag support for adding/removing (as well as coloring) voxels. I had to 
ensure that the "last" voxel edited was the one under the cursor after the
operation, not the one operated on.
 2013-05-20 12:01:33 -07:00
Jeffrey Ventrella
d384e36af1 test 2013-05-20 11:59:19 -07:00
Philip Rosedale
956ffe223f Merge branch 'master' of https://github.com/worklist/hifi 2013-05-20 11:56:47 -07:00
Philip Rosedale
28581e33cc turn off audio echo rendering (it's for debug) 2013-05-20 11:56:40 -07:00
Philip Rosedale
50ee9b9ee4 Added options menu choice for 'MouseLook', defaults off 2013-05-20 11:50:04 -07:00
Stephen Birarda
dae7bf8674 use AgentList defaults when AIM has no socket or address set 2013-05-20 11:48:50 -07:00
Jeffrey Ventrella
aa9783a88d Merge remote-tracking branch 'upstream/master' 2013-05-20 11:41:45 -07:00
Jeffrey Ventrella
ffbc70814a preparing to add transmitted lookat position data 2013-05-20 11:41:21 -07:00
Andrzej Kapolka
0f2f4ee8f9 Add the discussed four lines to disable blending and enable backface culling. 2013-05-20 11:32:32 -07:00
Andrzej Kapolka
85bca558f5 Tabs -> spaces, spacing fix. 2013-05-20 09:38:01 -07:00
Jeffrey Ventrella
7f0d2e572e some preliminary work on avatarRenderer 2013-05-20 07:38:00 -07:00
Andrzej Kapolka
ae02004ef6 Use M rather than L, since L is taken by the level display. 2013-05-19 22:40:53 -07:00
Andrzej Kapolka
0539739720 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-19 18:38:09 -07:00
Andrzej Kapolka
dd3e8d524a Support for eye offset position/orientation in camera/frustum. 2013-05-19 18:37:21 -07:00
tosh
e99a41f41b revises oscilloscope 2013-05-19 16:28:49 +02:00
tosh
fbdda8bce4 adds comments 2013-05-19 15:07:48 +02:00
tosh
cfd4100c6e revises log display 2013-05-19 14:52:01 +02:00
tosh
2120ab9b1e puts member variables last but first 2013-05-19 13:23:04 +02:00
tosh
de665c2d48 adjusts names 2013-05-19 13:01:57 +02:00
Jeffrey Ventrella
bbeac7701a small fix 2013-05-18 14:43:23 -07:00
Jeffrey Ventrella
64392d0a78 Merge remote-tracking branch 'upstream/master' 2013-05-18 14:32:28 -07:00
Jeffrey Ventrella
5a4813d5c9 improved algorithm for rotating eyes to look at target 2013-05-18 14:31:27 -07:00
Philip Rosedale
5475b19a9e Merge branch 'master' of https://github.com/worklist/hifi 2013-05-18 12:33:31 -07:00
Philip Rosedale
d9cc07cf17 Working on audio echo cancellation 2013-05-18 12:33:21 -07:00
ZappoMan
0ff65b44b5 Merge pull request #337 from tschw/19165 
19165
 2013-05-18 10:45:15 -07:00
tosh
4f3f5e1abe clarifies some names 2013-05-18 13:35:06 +02:00
tosh
989256aad0 clarifies some names 2013-05-18 13:33:01 +02:00
tosh
2cc5f732ce Merge branch '19165' of git://github.com/tschw/hifi 2013-05-18 11:03:09 +02:00
tosh
864d4e6734 Merge branch '19188' of git://github.com/tschw/hifi 2013-05-18 11:02:52 +02:00
Stephen Birarda
c504e8aa1a fix incorrect ordering of member variables in Head 2013-05-17 18:30:41 -07:00
Stephen Birarda
391d6dca8e remove the voxel server erase all that's unused 2013-05-17 17:54:04 -07:00
Jeffrey Ventrella
f099702d2a Merge remote-tracking branch 'upstream/master' 2013-05-17 14:56:51 -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
fc0448a148 disallow copying of VoxelSystem objects 2013-05-17 12:32:42 -07:00
Stephen Birarda
3e65d5a548 inline getters and setters in Avatar 2013-05-17 12:25:00 -07:00
Stephen Birarda
1ba1b56b2c disallow copying of Avatar objects 2013-05-17 12:15:19 -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
a1ea7b58dd remove unused GLUQuadric sphere from Avatar class 2013-05-17 10:45:26 -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
Andrzej Kapolka
58a9a05ef7 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-17 10:17:37 -07:00
Andrzej Kapolka
3ed99f40a6 Working on support for off-axis projection. 2013-05-17 10:17:21 -07:00
Jeffrey Ventrella
ade5b7bec3 formatting changes 2013-05-17 09:52:19 -07:00
Jeffrey Ventrella
0edf72a2be trying to fix merge conflicts 2013-05-17 09:20:42 -07:00
Jeffrey Ventrella
7e0877e753 cleanup 2013-05-17 08:48:54 -07:00
tosh
7115975c41 Merge branch 'master' of git://github.com/worklist/hifi into 19165 
Conflicts:
	interface/src/Oscilloscope.cpp
 2013-05-17 12:28:34 +02:00
Philip Rosedale
c43847946c Tweaked mouse camera movement a bit 2013-05-16 20:31:17 -06:00
Philip Rosedale
e55efb81a8 Added acceleration decay of pitch (you look up/straight if you start moving) 2013-05-16 19:12:48 -06: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
Andrzej Kapolka
a23ed58a53 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-16 16:25:05 -07:00
ZappoMan
068e863fb4 Merge pull request #334 from PhilipRosedale/master 
Mouse moves pitch, yaw when near screen edge, gravity bouncing fixed!
 2013-05-16 16:24:42 -07:00
Andrzej Kapolka
00171eccbb Slight fix for shadows; we were drawing an unnecessary layer of text. 2013-05-16 16:23:11 -07:00
Philip Rosedale
aad5f3bfff Merge branch 'master' of https://github.com/worklist/hifi 2013-05-16 17:21:24 -06:00
Philip Rosedale
d8578ebb42 Merge pull request #335 from ey6es/master 
Added gray background for chat entry, shadow/outline effects for text rendering.  Enabled shadows for text contrast.
 2013-05-16 16:21:10 -07:00
Andrzej Kapolka
700d3de4aa Merge branch 'master' of https://github.com/worklist/hifi 2013-05-16 16:11:48 -07:00
Andrzej Kapolka
26badc56e0 Added shadow and outline effects to TextRenderer, use the shadow effect in 
our text to separate it from the background.
 2013-05-16 16:10:38 -07:00
Philip Rosedale
9011484590 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-16 17:06:40 -06:00
Philip Rosedale
9f57787ece Fixed jerking on gravity, added mouse pitch, yaw behavior. 2013-05-16 17:05:45 -06:00
Andrzej Kapolka
191c533ad2 Provide a gray background for the chat entry, so that we can see what we're 
typing.
 2013-05-16 14:24:18 -07:00
ZappoMan
d58a811844 Merge pull request #332 from birarda/audio-injection-manager 
add an AudioInjectionManager to handle memory management for multiple injectors
 2013-05-16 14:12:24 -07:00
Philip Rosedale
7866c803fb Merge branch 'master' of https://github.com/worklist/hifi 2013-05-16 14:44:15 -06:00