Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 01:33:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
4774 commits 25 branches 0 tags 1.1 GiB
Commit graph

2623 commits

Author SHA1 Message Date
Mark Peng
0bbea078b5 Merge remote-tracking branch 'upstream/master' 2013-07-17 13:52:46 -07:00
Mark Peng
5ffe3fa4b4 Rendering of indicator circle in 3D space. Spacing edits in util. 2013-07-17 13:52:05 -07:00
Jeffrey Ventrella
202fb95102 turned off setShowingEmitter 2013-07-17 13:51:00 -07:00
Jeffrey Ventrella
5a0fcb7f6c adding more behavior to the particle system 2013-07-17 13:47:18 -07:00
Eric Johnston
46c5383d10 minor cleanup 2013-07-17 12:54:44 -07:00
Eric Johnston
f9bfc8af82 Merge branch 'master' of https://github.com/worklist/hifi into dev4 
Conflicts:
	interface/src/Hand.cpp
 2013-07-17 12:49:31 -07:00
Andrzej Kapolka
640ecd7f94 Working on integrating LibVPX for VP8 (9?) encoding. 2013-07-17 11:33:36 -07:00
Jeffrey Ventrella
c33e4fe6f7 file mode reverts 2013-07-17 10:15:42 -07:00
Jeffrey Ventrella
98dd83dde8 ahibfasubhdf 2013-07-17 10:02:23 -07:00
Jeffrey Ventrella
0be15231b9 ahibfasubhdf 2013-07-17 10:01:23 -07:00
Philip Rosedale
984332e638 fixes per review 2013-07-17 09:51:04 -07:00
Eric Johnston
f21d2a477d Rave Glove Demo: Restructuring palm and finger data structures 2013-07-17 08:29:50 -07:00
Eric Johnston
39130aef58 Rave Glove demo: activation mode and stage (dark backdrop) drawing. 2013-07-16 18:10:54 -07:00
Andrzej Kapolka
401ef45000 Removed keypoint stuff, fixed stupidity leading to fringed edges (was 
linearly interpolating the missing values).
 2013-07-16 17:56:53 -07:00
Philip Rosedale
2a207f4a30 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-16 17:32:24 -07:00
Eric Johnston
cf38a0e837 Avatar's arm follows real or simulated Leap glove, if present. 
This is a tiny change, and the effect is pretty good.
It's only active if there's a Leap device connected and you're using it, or else if you've used the Debug menu item to fake a Leap glove.
 2013-07-16 17:02:40 -07:00
Philip Rosedale
59810cac99 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-16 16:41:02 -07:00
Philip Rosedale
192ae63789 Colliding with ground, voxels makes interesting sounds and flashes your display 2013-07-16 16:40:50 -07:00
Stephen Birarda
7cec2f5ffd use fprintf instead of printf and flush for qDebug 2013-07-16 15:27:14 -07:00
Stephen Birarda
1e0f3e4d1c Merge pull request #686 from Atlante45/few_avatar_resizing_correction 
Few avatar resizing correction
 2013-07-16 14:31:27 -07:00
Stephen Birarda
8464a013fe fix format string warnings in Application 2013-07-16 13:39:24 -07:00
Stephen Birarda
c78759da16 cleanup printLogs reintroduce on merge with upstream master 2013-07-16 13:37:16 -07:00
Stephen Birarda
9d62e7f187 Merge remote-tracking branch 'upstream/master' into qdebug 2013-07-16 13:34:42 -07:00
Stephen Birarda
ce0c9e2e1a flush stdout in case non new-line output is received 2013-07-16 12:58:16 -07:00
Stephen Birarda
16d603e203 clean up extra new lines and LogDisplay line break 2013-07-16 12:53:43 -07:00
Andrzej Kapolka
fd1671a44f Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-16 12:48:24 -07:00
Stephen Birarda
1b48d4f0fc revert removal of extraneous newlines 2013-07-16 12:46:32 -07:00
Andrzej Kapolka
e81fed2622 Calling glInterleavedArrays enables the client vertex/color array states, so 
we need to disable them afterwards.
 2013-07-16 12:31:58 -07:00
atlante45
b10c395440 Merge branch 'master' of http://github.com/worklist/hifi into few_avatar_resizing_correction 2013-07-16 12:05:11 -07:00
atlante45
f713bb961d Adapt avatar message size to the avatars 2013-07-16 12:04:22 -07:00
atlante45
13762da7d8 Changed shortcuts to ALT+ +/- 2013-07-16 12:03:07 -07:00
Stephen Birarda
063094f96c correctly break on end of qDebug message in LogDisplay 2013-07-16 12:00:14 -07:00
Andrzej Kapolka
905bd9b011 Track features on face, add a mode to render just key points. 2013-07-16 11:54:19 -07:00
Stephen Birarda
51d1e6ae80 add a message handler to send messages over to LogDisplay 2013-07-16 11:50:40 -07:00
Stephen Birarda
89d3cfdb6f remove now extraneous newlines after switch to QDebug 2013-07-16 11:16:51 -07:00
Stephen Birarda
afe49bc756 switch calls to printLog to QDebug 2013-07-16 11:07:22 -07:00
atlante45
2a62f8b4fd Merge branch 'master' of http://github.com/worklist/hifi into scale_in_settings 2013-07-16 10:55:39 -07:00
atlante45
64ba01e23c added scale to settings 2013-07-16 10:54:58 -07:00
Philip Rosedale
be30a27a4f Merge branch 'master' of https://github.com/worklist/hifi 2013-07-16 10:45:21 -07:00
Stephen Birarda
3f9865759c Merge pull request #682 from ZappoMan/bug_fixes 
Import Voxels and Paste Bug fixes
 2013-07-16 10:11:11 -07:00
ZappoMan
440352c584 white space 2013-07-16 10:02:27 -07:00
ZappoMan
42e5440b7b CR feedback 2013-07-16 10:00:55 -07:00
Philip Rosedale
edf031b985 improve collision sounds, difference between ground and voxels 2013-07-15 22:42:55 -07:00
Philip Rosedale
d05108e26d Merge branch 'master' of https://github.com/worklist/hifi 2013-07-15 19:59:26 -07:00
Eric Johnston
802abade4f Fixed problem in idle(), causing events to stack up. 
The problem was that idle() was set on a zero-ms timer (using idleTimer->start(0)), and the time is then self-regulated by returning early if it's not time yet.
Because of this, Qt stays perpetually in the timer servicing, instead of processing events. This causes keys and menu items to be delayed if the user drags the mouse before activating them, especially at low frame rates. It also causes very-delayed multitouch response.

The fix I've applied is to reset the idle timer after servicing the idle. I've set it to 2ms because I noticed that 1ms didn't always clear out all of the events. We can tune it to whatever we need, or even calculate it based on the time it took us to service the idle.
 2013-07-15 18:16:50 -07:00
ZappoMan
e4b7ba7428 Merge branch 'master' of https://github.com/worklist/hifi into bug_fixes 2013-07-15 17:58:45 -07:00
Jeffrey Ventrella
b765de6990 Merge remote-tracking branch 'upstream/master' into particles 2013-07-15 17:58:38 -07:00
Jeffrey Ventrella
0481a81ca7 moved finger particles over to hand.cpp 2013-07-15 17:58:17 -07:00
ZappoMan
a3009981d0 added Import Voxels to Clipboard 2013-07-15 17:54:50 -07:00
Stephen Birarda
9f9d8e59bd don't accept voxel packet if rendering is turned off, correct boolean for kill 2013-07-15 17:12:44 -07:00
Stephen Birarda
38d8041bfb kill local voxels when voxel rendering is turned off 2013-07-15 17:12:24 -07:00
ZappoMan
01b7f3868b Merge pull request #672 from birarda/domain-switch 
add an option in preferences to dynamically switch domain servers
 2013-07-15 17:10:18 -07:00
ZappoMan
31875abcab Merge branch 'master' of https://github.com/worklist/hifi into bug_fixes 2013-07-15 17:05:10 -07:00
Andrzej Kapolka
d8d9f5e315 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-15 16:54:29 -07:00
Stephen Birarda
c27cd7ae42 couple of type squishes in NodeList 2013-07-15 16:49:36 -07:00
Philip Rosedale
eee8c3e570 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-15 16:27:51 -07:00
Philip Rosedale
26c0eb2dea Start to add heartbeat 2013-07-15 16:27:46 -07:00
ZappoMan
1fb1622beb added sleep to sendVoxelOperation() to keep from overwhelming server 2013-07-15 16:27:23 -07:00
Philip Rosedale
7075258317 Merge pull request #673 from Atlante45/better_import 
Better import
 2013-07-15 16:20:01 -07:00
Andrzej Kapolka
d5abb3e6eb Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-15 16:15:12 -07:00
Andrzej Kapolka
4f1e786392 Fix for iris rendering; was broken by scale change. 2013-07-15 16:12:23 -07:00
Andrzej Kapolka
fdeb63c121 More work on face points. 2013-07-15 16:09:49 -07:00
atlante45
bf328c8532 Improved import system copying to clipboard 2013-07-15 16:07:50 -07:00
Stephen Birarda
33ddda2558 correct reference to audio mixer sockaddr_in 2013-07-15 16:02:36 -07:00
Stephen Birarda
a204a8b872 lock the audioMixer to avoid crash when grabbing socket 2013-07-15 16:01:05 -07:00
Stephen Birarda
9fe1c7c63d lock the voxel server when receiving data to avoid race crash 2013-07-15 15:59:31 -07:00
Stephen Birarda
6c2682833e lock on the solo voxelServer before deleting local voxels 2013-07-15 15:53:25 -07:00
Stephen Birarda
6b83f95f9e conditionally set a new hostname on preferences save 2013-07-15 15:46:04 -07:00
Jeffrey Ventrella
56d0c7d7e4 added array of finger emitters for particle system 2013-07-15 15:45:31 -07:00
Stephen Birarda
d389dc6e3a add method to NodeList to set domain IP to local, move mutex lock to node 2013-07-15 15:17:10 -07:00
Jeffrey Ventrella
408edc7dca Merge remote-tracking branch 'upstream/master' into particles 2013-07-15 14:36:32 -07:00
Jeffrey Ventrella
c0f319f077 merge 2013-07-15 14:36:11 -07:00
Eric Johnston
e937f86822 Build fail fix when Leap libs are not present. 2013-07-15 14:33:09 -07:00
Jeffrey Ventrella
f75ce72aca Merge remote-tracking branch 'upstream/master' into particles 2013-07-15 14:30:19 -07:00
Eric Johnston
0239341127 updated per feedback 2013-07-15 14:27:58 -07:00
Philip Rosedale
f8f6b29559 Audio collision sounds are played locally as well as injected 2013-07-15 14:24:21 -07:00
Eric Johnston
c61966ebcd made Leap unit-conversion method public 2013-07-15 14:12:52 -07:00
Jeffrey Ventrella
7d5ade33a3 Merge remote-tracking branch 'upstream/master' into particles 2013-07-15 13:58:12 -07:00
Jeffrey Ventrella
84b6adf5b0 more work on particle emitter API 2013-07-15 13:57:39 -07:00
Eric Johnston
86faa33f83 Added fake Leap finger generation so that Ryan and Jeffrey can work on Leap glove-code without needing a Leap sensor at all times. 2013-07-15 13:56:37 -07:00
Andrzej Kapolka
6c587af6ac Merge branch 'master' of https://github.com/worklist/hifi into pointy 
Conflicts:
	interface/src/avatar/Head.cpp
 2013-07-15 13:13:51 -07:00
Andrzej Kapolka
5c590638f3 Working on mesh rendering for faces. 2013-07-15 13:12:22 -07:00
atlante45
423a0eaac8 Fixed typo 2013-07-15 12:28:22 -07:00
atlante45
fbcacc8cf7 Few pre-review change for avatar resizing 2013-07-15 12:11:29 -07:00
atlante45
bf3c4fa1f8 Avatar resizing final commit 2013-07-15 12:04:24 -07:00
atlante45
078a47b006 Merge branch 'master' of https://github.com/worklist/hifi into the_midget_are_coming 2013-07-15 12:03:04 -07:00
ZappoMan
f415f4081a Fixed a bug in LOD boundaries 
- changed the way we calculate whether or not to render a parent "average" voxel so
  that if any of it's most distant child would not be visible, then it's used instead
  of it's children
- added precalculated value for topFarLeft corner of AABox (optimization)
- changed VoxelSystem::newTreeToArrays() and VoxelTree::encodeTreeBitstreamRecursion()
  to use the same help function for determining this LOD boundary behavior
- deleted old dead code in voxel-server and VoxelTree for picking which node to start
  sending with, since it wasn't being used
- added VoxelNode::furthestDistanceToCamera() which tells you not the distance to the
  center of the voxel, but the distance from the camera to the furthest corner relative
  to the camera.
- added ViewFrustum::getFurthestPointFromCamera() which given an axis-aligned box will
  tell you which vertex of the box is furthest from the camera
 2013-07-15 01:32:14 -07:00
Andrzej Kapolka
a59fbfbf3e Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-14 18:21:50 -07:00
Andrzej Kapolka
411cb92300 Working on face rendering as point cloud. 2013-07-14 15:54:29 -07:00
tosh
ac3b95efe7 fixes sliced-away initialization (crashes program during shutdown when running without audio device) 2013-07-13 22:51:57 +02:00
Philip Rosedale
8b9e0426b2 Simple glassy collision sound 2013-07-12 21:34:48 -07:00
Jeffrey Ventrella
3bc6b4c0d4 merge 2013-07-12 18:56:54 -07:00
Jeffrey Ventrella
915cb1e5bd Merge remote-tracking branch 'upstream/master' into particles 2013-07-12 18:56:37 -07:00
Jeffrey Ventrella
ae99ca5ec8 added more API for the particle system 2013-07-12 18:55:42 -07:00
atlante45
34cbe317fa Merge branch 'master' of https://github.com/worklist/hifi into the_midget_are_coming 
Conflicts:
	interface/src/Avatar.cpp
	interface/src/Webcam.cpp
 2013-07-12 17:57:20 -07:00
atlante45
280afed7f0 added scale in avatar packets eand slots to change it from the menu 2013-07-12 17:51:47 -07:00
Philip Rosedale
832e81b45f Less skeleton averaging, can see first person arms 2013-07-12 17:00:47 -07:00
Jeffrey Ventrella
3649c89c12 more developing on the API for the particle system 2013-07-12 16:19:31 -07:00
Andrzej Kapolka
763e6a2fa1 Merge branch 'master' of https://github.com/worklist/hifi into pointy 
Conflicts:
	interface/src/Application.h
 2013-07-12 15:34:55 -07:00
atlante45
35c00c739c resizing avatar now handle the camera 2013-07-12 14:53:51 -07:00