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

167 commits

Author SHA1 Message Date
Stephen Birarda
4738fc888b return Avatar Head by reference so setters actually do something 2013-05-22 16:43:41 -07:00
Jeffrey Ventrella
0b014c5635 cleaned up some stuff 2013-05-22 15:50:36 -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
6b854531aa Merge branch 'master' of https://github.com/worklist/hifi 2013-05-22 14:31:46 -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
Philip Rosedale
ad8246a0f5 Turned log off by default 2013-05-22 13:46:39 -07:00
Philip Rosedale
a03d6f8d80 moved pair to own menu 2013-05-22 12:55:46 -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
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
birarda
63fcb2eeef Merge pull request #367 from ZappoMan/voxel_animation 
Fixes "Delete" voxel behavior
 2013-05-21 17:43:36 -07:00
Stephen Birarda
3ac20849d6 remove old menu code and glew implemenation file 2013-05-21 16:21:33 -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
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
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
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
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
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
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
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
ZappoMan
e1c89aac87 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-20 15:52:04 -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
8c71741843 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-20 15:13:36 -07:00
Jeffrey Ventrella
b42d093b4a Merge remote-tracking branch 'upstream/master' 2013-05-20 14:36:13 -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
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
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
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
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
cfd4100c6e revises log display 2013-05-19 14:52:01 +02: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
Stephen Birarda
391d6dca8e remove the voxel server erase all that's unused 2013-05-17 17:54:04 -07:00
Stephen Birarda
3e65d5a548 inline getters and setters in Avatar 2013-05-17 12:25:00 -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
1c126e2525 resolved conflicts 2013-05-16 17:32:54 -07:00
Philip Rosedale
9f57787ece Fixed jerking on gravity, added mouse pitch, yaw behavior. 2013-05-16 17:05:45 -06:00
Philip Rosedale
31967e8afb Merge pull request #331 from ZappoMan/master 
get rid of the "kill the solar system" feature... protecting us from ourselves!
 2013-05-16 12:59:55 -07:00
ZappoMan
f8dc01a890 removed the - key killing all the planets 2013-05-16 12:56:13 -07:00
Philip Rosedale
a36d32e101 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-16 13:34:54 -06:00
Philip Rosedale
78bd5ab40f Fixes per review 2013-05-16 13:34:48 -06:00
Jeffrey Ventrella
be7be4ad99 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-16 11:18:32 -07:00
Philip Rosedale
1b039c3755 Transmitter V2 drives the hand, and rendering levels with 'l' shows the hand transmitter data. Physics will need to be tuned. 2013-05-16 00:10:10 -06:00
Philip Rosedale
29889725ef Merge branch 'master' of https://github.com/worklist/hifi 2013-05-15 21:17:34 -06:00
Philip Rosedale
1a283c3ac0 Improvements to scope display, added framework for echo analysis over multiple frames 2013-05-15 21:15:55 -06:00
Andrzej Kapolka
cb2acb58e7 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-15 16:22:47 -07:00
Andrzej Kapolka
f0055bd419 Fixes for OS X: GLSL version must be first line in source, don't init glut 
(Qt apparently uses it?)
 2013-05-15 16:19:42 -07:00
Stephen Birarda
fc5e42cf8b add threaded injection of audio via audio injector class 2013-05-15 16:10:59 -07:00
Andrzej Kapolka
f15c670c4e Let's try initializing glut before Qt, since we're getting a warning on OS X. 2013-05-15 16:07:09 -07:00
Philip Rosedale
2820323567 Fixes from merge 2013-05-15 13:48:55 -07:00
Andrzej Kapolka
7211fd7027 Now that we have a Qt context, we can use their shader classes. However, we 
extend the program object class with glm-enabled functions.
 2013-05-15 13:27:37 -07:00
Andrzej Kapolka
3e57aa08c9 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-15 12:48:51 -07:00
Andrzej Kapolka
4292cd9ab3 Moved voxel options into their own menu, switched destructive flag to check 
Qt action.
 2013-05-15 12:05:32 -07:00
Stephen Birarda
e83710e45e prepend audio packets from the mixer with a packet header 2013-05-15 12:00:04 -07:00
Andrzej Kapolka
0ce9e42085 Support dragging when in coloring mode. I tried it in add/delete mode, too, 
but it felt messy.
 2013-05-15 11:48:23 -07:00
Andrzej Kapolka
6317404249 When in add mode and there's no voxel under the cursor, place the mouse voxel 
a fixed distance away.
 2013-05-15 11:21:34 -07:00
Stephen Birarda
4693082db0 refactor Audio to remove requirement of AudioData 2013-05-15 10:54:36 -07:00
Andrzej Kapolka
b05140ee51 Turned the voxel edit commands into menu options for better visibility. 2013-05-15 10:40:41 -07:00
Andrzej Kapolka
1f7b77eb95 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-15 09:55:56 -07:00
Philip Rosedale
124f04820e Removed renderPitch(), and renderYaw() from code/classes - we will use bodyPitch(), headPitch() only. 2013-05-15 09:52:12 -07:00
Philip Rosedale
73c793c0a1 Added optional millisecond onscreen frame timer for easier latency timing with high-speed camera 2013-05-15 09:37:36 -07:00
Jeffrey Ventrella
a0e8c0da74 more work on avatar lookat 2013-05-14 18:15:54 -07:00
Philip Rosedale
5fec8bc8fe Merge branch 'master' of https://github.com/worklist/hifi 2013-05-14 17:11:27 -07:00
Philip Rosedale
6cfdf96dea Added mouse panning in the Yaw direction - at edges of screen. 2013-05-14 17:11:16 -07:00
birarda
6f7d2a6922 Merge pull request #314 from birarda/transmitter 
add new packet header for V2 transmitter data
 2013-05-14 16:30:55 -07:00
Stephen Birarda
aca2ce47b6 add a V2 transmitter data packet for new iOS transmitter 2013-05-14 16:29:39 -07:00
Andrzej Kapolka
45e1d341fa When we add voxels, add them with the selected color. 2013-05-14 16:02:50 -07:00
Philip Rosedale
62a97f23bf Merge branch 'master' of https://github.com/worklist/hifi 2013-05-14 15:11:04 -07:00
Philip Rosedale
b30f7b02bd Removed mouse shift prototype. 2013-05-14 15:10:44 -07:00
Andrzej Kapolka
775fd5bd2e Use the sun location in the environment to set the light position. 2013-05-14 14:53:29 -07:00
Andrzej Kapolka
8e04c17cc2 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Application.cpp
 2013-05-14 14:44:22 -07:00
Andrzej Kapolka
e1016ad902 What matters is the active state, not the focus. 2013-05-14 14:40:18 -07:00
Andrzej Kapolka
b4ca7ca5e3 Just manually request focus. 2013-05-14 14:36:43 -07:00
Andrzej Kapolka
053c0d1ca5 Focus tweak; focus isn't returning to the GL widget after closing the color 
dialog on OS X.
 2013-05-14 14:34:36 -07:00