Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-13 06:58:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
8460 commits 74 branches 59 tags 1.2 GiB
Commit graph

4331 commits

Author SHA1 Message Date
Andrzej Kapolka
b84a5679dd Fixed merge error. 2013-10-18 14:31:56 -07:00
Andrzej Kapolka
591cf98821 Merge branch 'master' of https://github.com/worklist/hifi into ossome 
Conflicts:
	interface/src/renderer/FBXReader.cpp
 2013-10-18 14:30:50 -07:00
Andrzej Kapolka
58b4139dbc Added support for RotationOffset, which the Lulu model uses. 2013-10-18 14:26:42 -07:00
Andrzej Kapolka
cd902c5e85 More work on importing the version of FBX exported by Blender. 2013-10-18 14:09:12 -07:00
Stephen Birarda
1965ff286b fix unix build buster for starfield 2013-10-18 09:16:55 -07:00
Stephen Birarda
1ddc52252a fix missing link to starfield implementation files 2013-10-18 09:01:44 -07:00
Lord Waymaster
25d5b38f5f Starfield modification to randomly generate stars 
Starfield now generates stars at startup rather than load them from the
server - approx. 50msec to load 50,000 stars.

STAR_COLORIZATION const in Generator.cpp is used to defined how
colorful the stars should be.

STARFIELD_NUM_STARS and STARFIELD_SEED sets the number of stars and the
random number seed used to generate the starfield.
 2013-10-17 23:24:03 -07:00
ZappoMan
ca7225e525 fix reset of VoxelSystem on eraseAllVoxels() 2013-10-17 18:45:52 -07:00
Andrzej Kapolka
778e432cc4 Merge branch 'master' of https://github.com/worklist/hifi into ossome 2013-10-17 17:33:03 -07:00
Andrzej Kapolka
c8b2ed0213 More progress on reading skeletons. 2013-10-17 17:30:34 -07:00
ZappoMan
001418649f show total memory usage for voxels 2013-10-17 17:08:46 -07:00
ZappoMan
a6664e442c fixed comment 2013-10-17 16:21:22 -07:00
ZappoMan
9b0cc14552 fix voxel nodes to work with new UUID format 2013-10-17 16:14:06 -07:00
Andrzej Kapolka
9ba3c3719f Working on skeleton loading, added support for FBX text format (exported by 
Blender).
 2013-10-17 15:45:57 -07:00
Stephen Birarda
80d2df6a49 fix audio ternary indentations 2013-10-17 15:12:34 -07:00
Stephen Birarda
73d3ecccf3 resolve conflicts on merge with upstream master 2013-10-17 14:37:58 -07:00
Stephen Birarda
8f1135feb7 more repairs to Agent and AvatarData for UUID transition 2013-10-17 14:35:42 -07:00
Philip Rosedale
c48856df52 Merge pull request #1075 from ZappoMan/voxelnode_memory_savings 
VoxelNode memory savings
 2013-10-17 14:26:40 -07:00
ZappoMan
9bd2499317 Merge pull request #1074 from PhilipRosedale/master 
Fixed audio mute not working, visualize gaze direction when showing head mouse
 2013-10-17 12:36:30 -07:00
ZappoMan
d566026026 Merge branch 'master' of https://github.com/worklist/hifi into voxelnode_memory_savings 2013-10-17 12:31:31 -07:00
Stephen Birarda
fa146e302d remove 16-bit node IDs and replace with UUIDs 2013-10-17 11:49:41 -07:00
PhilipRosedale
f6efccea06 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-17 11:07:45 -07:00
Andrzej Kapolka
36d4be4e3b These should actually start at two pi (that's the maximum distance). 2013-10-17 11:05:52 -07:00
PhilipRosedale
9643c1262c Fix mute button, visualize gaze direction when showing headMouse 2013-10-17 11:03:12 -07:00
Andrzej Kapolka
b25020b84a Need to halve the target angle, because both participants will be moving. 
Use randomness to resolve cases where two participants are on top of one
another.
 2013-10-17 10:58:33 -07:00
Stephen Birarda
6805b0e2c6 Merge branch 'master' of github.com:worklist/hifi into assignment 2013-10-17 09:23:25 -07:00
Stephen Birarda
012fccc72e send ping to AvM and VS for socket activation 2013-10-16 18:01:15 -07:00
Stephen Birarda
7de88898e1 activate appropriate socket after receiving ping reply 2013-10-16 17:51:32 -07:00
Andrzej Kapolka
121a7f8270 Widen the circle influence, increase the approach rate. 2013-10-16 17:48:28 -07:00
Andrzej Kapolka
a5a81a585e Fix for glow flickering. 2013-10-16 17:47:39 -07:00
Andrzej Kapolka
89d6c7905b Decrease the distance between members, increase the influence of the circle, 
don't rotate members.
 2013-10-16 17:21:09 -07:00
Philip Rosedale
c324933b8a Move to 'european' comfort distance for chat circle 2013-10-16 16:49:33 -07:00
Andrzej Kapolka
7a1f845189 Another rate adjustment. 2013-10-16 15:48:25 -07:00
Andrzej Kapolka
6df245908c Reduce the approach rate. 2013-10-16 15:41:38 -07:00
Andrzej Kapolka
50216ca4ad Base the number of people we include in the circle on whether we would 
actually fall in its radius (plus an expansion factor).
 2013-10-16 15:37:59 -07:00
Andrzej Kapolka
11fea386b6 First stab at chat circling mechanism. 2013-10-16 14:07:36 -07:00
Andrzej Kapolka
c9344d4382 Have textures default to white when they fail to load. 2013-10-16 11:00:41 -07:00
Philip Rosedale
67e035ee95 Merge pull request #1065 from machinelevel/dev4 
Add left-arm movement to remote avatars without changing network packet structure
 2013-10-16 09:29:01 -07:00
Eric Johnston
36f06720d0 Add left-arm movement to remote avatars without changing network packet structure. 
Move MyAvatar leap hand arm-movement into Avatar::updateLeapHandPositions(), to enable remote avatars to position fingertips and IK-arms based on Leap hand data.
 2013-10-16 08:21:35 -07:00
Andrzej Kapolka
6a265eacf2 Keep normal and dilatable textures in separate maps to fix crash on manly 
"man" model.
 2013-10-15 16:40:35 -07:00
Andrzej Kapolka
8631cc3264 Try to apply the blendshape scale. 2013-10-15 16:29:28 -07:00
Andrzej Kapolka
b04ed72b83 I forgot that the children are in reverse order. 2013-10-15 16:17:56 -07:00
Andrzej Kapolka
ba25087b3e Support for multiple mesh "parts" (with different materials), fix for 
untextured meshes.
 2013-10-15 15:58:34 -07:00
ZappoMan
6fff53a2dc next round of voxelnode size improvements 2013-10-15 14:43:51 -07:00
Andrzej Kapolka
0a5ba79bbe Merge branch 'master' of https://github.com/worklist/hifi into skinny 2013-10-15 14:01:53 -07:00
Andrzej Kapolka
66250ed488 Eye tweak. 2013-10-15 13:43:27 -07:00
Andrzej Kapolka
ce0d13feb4 Working on the neck transform. 2013-10-15 12:59:52 -07:00
Andrzej Kapolka
053c116481 Removed unused variable. 2013-10-15 11:57:42 -07:00
Andrzej Kapolka
d06acdd169 Per-pixel shading, material tweaks. 2013-10-15 11:50:29 -07:00
Philip Rosedale
746bce8626 All onscreen text, overlay OFF when stats are off 2013-10-15 11:01:22 -07:00
Andrzej Kapolka
e97cfb8cf8 Per-pixel specular for blend faces. 2013-10-14 19:59:13 -07:00
Andrzej Kapolka
124966d2e4 More progress on skinning. 2013-10-14 18:39:19 -07:00
Andrzej Kapolka
db30e729d4 More work towards skinning. 2013-10-14 16:46:17 -07:00
ZappoMan
924053f2ec added additional debugging of VoxelNode memory usage, shrunk size of VoxelNode by better alignment 2013-10-14 15:10:56 -07:00
ZappoMan
3425685119 first cut at added voxel node memory usage debugging to client and server 2013-10-14 12:09:44 -07:00
ZappoMan
8c5c1aeae7 Merge pull request #1058 from ZappoMan/hide_cursor 
make mouse cursor hiding more aware of focused window and bounds
 2013-10-14 11:50:21 -07:00
ZappoMan
6f9fdfba2f make mouse cursor hiding more aware of focused window and bounds 2013-10-14 11:39:48 -07:00
Andrzej Kapolka
ed0acd24f7 Merge branch 'master' of https://github.com/worklist/hifi into skinny 2013-10-14 10:40:30 -07:00
Eric Johnston
d5885acd75 Cleanup and simplification per feedback 2013-10-14 10:09:08 -07:00
Eric Johnston
7bc2cf6fa9 Leap interface and Avatar: left-hand IK works for Leap interface. 
This is in and smooth, and there's a decision to be made:
In the case where only one hand is visible, we have to decide if it's the left or right hand. Currently it's simple, based on which side it's detected on.
So far this seems to work best, in the (very) common case where hands go in/out of the sensor's field frequently.
We could also use a history-based heuristic to hold one hand as left/right, but that means that when it guesses wrong the error lingers.
Detecting handedness based on where the thumbs are would be better, but is unreliable on the Leap.
I went for the simple/clear version, but we can do whatever we want.
 2013-10-14 09:01:50 -07:00
Andrzej Kapolka
adc5d4d256 Merge branch 'master' of https://github.com/worklist/hifi into skinny 2013-10-11 17:55:38 -07:00
Andrzej Kapolka
cec0ee0b22 Working on processing the cluster/skin information. 2013-10-11 17:51:29 -07:00
Stephen Birarda
dc4548a91b Merge pull request #1054 from PhilipRosedale/i-can-always-move 
better movement near others
 2013-10-11 17:49:52 -07:00
Philip Rosedale
b071776c22 Merge pull request #1051 from ZappoMan/keep_local_voxels 
Clean up some crashes in client side handling of voxels
 2013-10-11 17:15:41 -07:00
Philip Rosedale
3cd4415e6d Merge pull request #1052 from ZappoMan/hide_cursor 
implement hide cursor on no mouse movement
 2013-10-11 17:14:29 -07:00
Philip Rosedale
6281a28f69 better movement near others 2013-10-11 17:00:25 -07:00
Stephen Birarda
6369e9959f change goToUser shortcut to @ 2013-10-11 15:25:17 -07:00
ZappoMan
e91127bc5c implement hide cursor on no mouse movement 2013-10-11 14:56:37 -07:00
stojce
355a1f3da3 Merge branch 'master' of https://github.com/worklist/hifi into 19435 
Conflicts:
	interface/src/avatar/Head.cpp
	interface/src/avatar/Head.h
 2013-10-11 22:54:59 +02:00
ZappoMan
f2ef80b704 Merge pull request #1049 from stojce/19426 
Code Review for Job #19426
 2013-10-11 12:54:13 -07:00
ZappoMan
c6df36a40b Merge pull request #1047 from stojce/19434 
Code Review for Job #19434
 2013-10-11 12:52:13 -07:00
ZappoMan
dfe23c9342 merge cleanup 2013-10-11 12:49:50 -07:00
stojce
112ae2bb89 #19437 Adjust bandwith meter to be fixed width, not rescaling 2013-10-11 20:25:58 +02:00
ZappoMan
4da19531ca Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 2013-10-11 10:49:57 -07:00
Stephen Birarda
eebd38189b add killing of local voxels to domain change 2013-10-11 10:07:42 -07:00
stojce
a87346d39c Merge branch 'master' of https://github.com/worklist/hifi into 19426 2013-10-11 14:19:31 +02:00
ZappoMan
4be07ececb fixed a couple crashes and cleaned up some code 2013-10-11 01:30:09 -07:00
Philip Rosedale
bf3f507301 Merge pull request #1043 from birarda/master 
fix domain jumping with goToUser, remove planet environments
 2013-10-10 17:25:43 -07:00
Philip Rosedale
77cf08b8f8 Merge pull request #1044 from birarda/data-server 
don't goToUser without domain and position
 2013-10-10 17:21:58 -07:00
Stephen Birarda
2c181011b3 don't attempt to go to user without domain AND position 2013-10-10 16:48:26 -07:00
ZappoMan
fbcf66b232 Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 
Conflicts:
	interface/src/Menu.h
 2013-10-10 16:37:07 -07:00
Stephen Birarda
6f868a00eb reset environment on domain-server change 2013-10-10 16:34:35 -07:00
Stephen Birarda
aa0a97b959 use deleteLater to ensure that AvatarVoxelSystem delete is on correct thread 2013-10-10 16:23:22 -07:00
Andrzej Kapolka
6e012ea6d2 When computing average model color, skip eyes and weight rest by number of 
vertices.
 2013-10-10 16:04:42 -07:00
Philip Rosedale
43e01ee105 Merge pull request #1039 from birarda/data-server 
add ability to jump to a user's domain and location
 2013-10-10 15:37:21 -07:00
ZappoMan
c5d3f53bd6 Merge pull request #1037 from birarda/infoview 
fix InfoView full screen bug
 2013-10-10 15:29:55 -07:00
ZappoMan
3ad2a6edaa remove dead code 2013-10-10 15:28:55 -07:00
ZappoMan
f3aa82624f progress on keep local voxels 2013-10-10 15:28:06 -07:00
ZappoMan
0a6ddf108f progress on keep local voxels 2013-10-10 15:25:33 -07:00
ZappoMan
c86bad77c9 progress on keep local voxels 2013-10-10 15:23:22 -07:00
Andrzej Kapolka
42d3ee450b Fix for seg fault on exit. 2013-10-10 15:15:28 -07:00
Stephen Birarda
33e6e1925e handle get of multiple values in single packet 2013-10-10 13:50:03 -07:00
Andrzej Kapolka
4c073426c8 Ball and cone color from average geometry colors. 2013-10-10 13:41:50 -07:00
Stephen Birarda
7851251e5d indicate number of values being put to data-server 2013-10-10 11:51:18 -07:00
Stephen Birarda
d37ae7da1b include the number of keys with data-server get 2013-10-10 11:49:14 -07:00
Andrzej Kapolka
14dfa72284 Rotation fix. 2013-10-10 11:25:11 -07:00
Stephen Birarda
11437054a6 add line to fix InfoView full screen bug 2013-10-10 11:01:07 -07:00
Andrzej Kapolka
052c8246fa Let's use the "eye level" position. 2013-10-10 10:49:19 -07:00
Andrzej Kapolka
0881cd4c92 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-10 10:32:19 -07:00
Andrzej Kapolka
ea639afe44 Use the head joint position so that lean affects camera position in first 
person mode.
 2013-10-10 10:31:34 -07:00
Philip Rosedale
72273d1469 indent 2013-10-10 10:14:35 -07:00
Philip Rosedale
dd09d686fc indents 2013-10-10 09:53:43 -07:00
Philip Rosedale
d8dcb6aa44 bracket placement 2013-10-09 23:26:44 -07:00
Philip Rosedale
632dd2fa7d code review, added Doxygen style comments 2013-10-09 23:23:20 -07:00
Philip Rosedale
27a892fa55 Removed old head rotation code, menu items, added ability to turn off faceshift head rotation 2013-10-09 22:46:34 -07:00
Philip Rosedale
1d1e1f6d41 spacing 2013-10-09 17:21:39 -07:00
Philip Rosedale
5509324ffd Change particles to use vertex arrays, further speedups 2013-10-09 17:18:22 -07:00
Stephen Birarda
fb39ad0a55 comment out data-server packet queueing until sequencing is implemented 2013-10-09 17:03:02 -07:00
Stephen Birarda
4c148c6f3a ask data-server for domain + position of user from goToUser 2013-10-09 16:58:27 -07:00
Stephen Birarda
cd504e2293 use QString for DataServerClient keys 2013-10-09 16:50:54 -07:00
Stephen Birarda
3231776e76 add API for Profile userString and multiple value requests 2013-10-09 16:45:02 -07:00
Philip Rosedale
cabb5112dd Merge branch 'master' of https://github.com/worklist/hifi 2013-10-09 16:03:38 -07:00
Philip Rosedale
ab4b09ca39 More coding standard fixes to particle cloud 2013-10-09 16:03:06 -07:00
Stephen Birarda
d66137e314 add a Go To User option to the menu 2013-10-09 15:36:33 -07:00
Stephen Birarda
f7a0dd514e load NodeList and Profile settings with menu settings load 2013-10-09 15:23:07 -07:00
Andrzej Kapolka
083c5e34b2 Fix for non-Faceshift eye and mouth movement. 2013-10-09 15:11:14 -07:00
Philip Rosedale
4afa82d626 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-09 15:10:16 -07:00
Philip Rosedale
85a15a22fa Further code cleanup on particle cloud 2013-10-09 15:10:03 -07:00
Stephen Birarda
d3b95d19a1 send the user's last domain and position to data-server 2013-10-09 15:09:57 -07:00
Andrzej Kapolka
dfa3ea78da Reverse direction of eye offset. 2013-10-09 14:38:05 -07:00
Philip Rosedale
58d6c4c97a Cleaning up particle code 2013-10-09 14:28:00 -07:00
ZappoMan
d939d3aaae Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 2013-10-09 14:02:40 -07:00
ZappoMan
c25b03dd58 first cut at keeping local voxels 2013-10-09 14:02:31 -07:00
Stephen Birarda
9112efaa36 move username change to Login, add lastPosition and lastDomain 2013-10-09 13:00:05 -07:00
Philip Rosedale
bcb3e082f6 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-09 12:17:43 -07:00
Andrzej Kapolka
604d6399eb Fix for grow/shrink rates. 2013-10-09 11:58:27 -07:00
Andrzej Kapolka
5511c02449 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-09 11:53:08 -07:00
Andrzej Kapolka
0a54c2f1e9 Tweaking the growing heads. 2013-10-09 11:52:56 -07:00
Philip Rosedale
8dc84fc841 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-09 11:44:56 -07:00
Stephen Birarda
478214f9da fix Profile include from DataServerClient 2013-10-09 11:14:26 -07:00
Andrzej Kapolka
a679517596 Fix for jaundiced eyes. 2013-10-09 11:10:51 -07:00
Stephen Birarda
268a64d3d5 change data-server hostname to hifi global data-server 2013-10-09 10:27:02 -07:00
Stephen Birarda
f09888dd1b Merge branch 'master' of github.com:worklist/hifi into nameserver 2013-10-09 10:21:25 -07:00
Andrzej Kapolka
1b4daa8eb9 No glow on own avatar, only on others when farther than five units away. 2013-10-09 10:17:41 -07:00
Philip Rosedale
906f3c8c60 got basic cloud working 2013-10-08 23:15:29 -07:00
Philip Rosedale
afd553330a Merge branch 'master' of https://github.com/worklist/hifi 2013-10-08 22:24:34 -07:00
Philip Rosedale
ce2e31ddd5 reconnecting particle cloud 2013-10-08 22:21:55 -07:00
Philip Rosedale
69277ec8ba Added back field and cloud files 2013-10-08 21:49:13 -07:00
Stephen Birarda
9c6cdcc70b complete setting of user model from data-server 2013-10-08 15:39:04 -07:00
Andrzej Kapolka
87bdd2fb1a When in mirror mode and using a blend face, try to position the camera so as 
to look directly into the face's eyes.
 2013-10-08 15:09:56 -07:00
Stephen Birarda
233c1599bd leverage existing URL update rate for interim face model update solution 2013-10-08 14:25:53 -07:00
Andrzej Kapolka
3cca3dc894 Reset fix. 2013-10-08 14:06:04 -07:00
Stephen Birarda
10f29dfe90 ask the data-server for a face mesh on UUID change 2013-10-08 14:02:57 -07:00
Stephen Birarda
15ddd9989b ovverride UUID setter in Avatar for DataServerClient get request 2013-10-08 13:59:28 -07:00
Andrzej Kapolka
15f7b70269 Let's actually use the transform we constructed. 2013-10-08 13:54:54 -07:00
Stephen Birarda
b17e12460c shift get/set of face model URL to Profile class 2013-10-08 13:52:04 -07:00
Stephen Birarda
8bac70e4a5 pass UUID from data-server to avatar-mixer 2013-10-08 13:43:31 -07:00
Andrzej Kapolka
60306af3e9 Default springiness, allow springiness on non-blended meshes. 2013-10-08 13:35:02 -07:00
Stephen Birarda
6bd71da84e pack the UUID with the avatar data 2013-10-08 13:31:39 -07:00
Stephen Birarda
97966592e1 Merge branch 'master' of github.com:worklist/hifi into nameserver 2013-10-08 13:19:55 -07:00
Stephen Birarda
f5912f07a8 make sure username is not empty before requesting faceMesh 2013-10-08 12:45:18 -07:00
Stephen Birarda
d843285db7 save profile to settings, fix UUID storage 2013-10-08 12:40:09 -07:00
Stephen Birarda
ae59ce22b7 send an empty key when making a UUID request 2013-10-08 12:22:02 -07:00
Stephen Birarda
85edb93710 add a Profile class to hold user data from data-server 2013-10-08 12:13:45 -07:00
Stephen Birarda
56b71eb61a re-send data-server GET requests if they are unmatched 2013-10-08 11:33:14 -07:00
Andrzej Kapolka
506f667083 More springy, more damp. Removed unused variable. 2013-10-08 11:26:15 -07:00
Andrzej Kapolka
acaf7d4f88 Merge branch 'master' of https://github.com/worklist/hifi into springy 2013-10-08 11:22:03 -07:00
Andrzej Kapolka
6a043145d3 Merge branch 'master' of https://github.com/worklist/hifi into springy 
Conflicts:
	interface/src/renderer/FBXReader.cpp
 2013-10-08 11:21:47 -07:00
ZappoMan
5e6e15db41 Merge pull request #1025 from ZappoMan/voxel_render_modes 
two possible crash fixes
 2013-10-08 11:21:10 -07:00
Stephen Birarda
892614470e Merge branch 'master' of github.com:worklist/hifi into nameserver 2013-10-08 11:19:32 -07:00
Andrzej Kapolka
e3436eed91 Fixes for eyes rolling back in head, macaw head without mapping file. 2013-10-08 11:18:12 -07:00
Andrzej Kapolka
ce23b415e0 Fix for macaw head without mapping file. 2013-10-08 11:11:01 -07:00
Andrzej Kapolka
b22334730d Fix for eyes rolling back in head. 2013-10-08 11:01:31 -07:00
Andrzej Kapolka
184e0f4439 Merge branch 'master' of https://github.com/worklist/hifi into springy 2013-10-08 10:34:53 -07:00
ZappoMan
89a4ea6470 two possible crash fixes 2013-10-08 09:56:47 -07:00
stojce
a795a5b88f #19435 - Remove 'Perlin Face' option from menus and code 2013-10-08 18:23:51 +02:00
ZappoMan
aa80ec3497 cleanup code for PR 2013-10-07 19:46:52 -07:00
ZappoMan
54364a235d tighten up mutex locks to keep at 60 fps 2013-10-07 19:43:45 -07:00
Andrzej Kapolka
b0bc122a48 Got some actual damped oscillation going. 2013-10-07 18:02:03 -07:00
Stephen Birarda
7964f360ab add method to DataServerClient to resend unmatched packets 2013-10-07 17:52:21 -07:00
ZappoMan
f6981feacf added various render mode options, including voxels as points 2013-10-07 17:46:22 -07:00
Andrzej Kapolka
3448ceccd2 Progress towards a spring-mass model. 2013-10-07 17:25:46 -07:00
Stephen Birarda
26d5e2cfec clear the face model URL if the username is changed in preferences 2013-10-07 17:24:07 -07:00
Stephen Birarda
4b62026c25 shore up receipt of face mesh URL from data-server 2013-10-07 17:06:38 -07:00
Stephen Birarda
b33843fddc ask for a mesh if username is present on login or is changed 2013-10-07 13:52:46 -07:00
Stephen Birarda
e9e77d8276 set username instead of UUID in Interface preferences 2013-10-07 13:35:16 -07:00
Stephen Birarda
f36fd47ef7 store username and not UUID for MyAvatar 2013-10-07 12:17:47 -07:00
stojce
16d10775dc #19434 restore window position on start 
- store position and size on app end
- restore position and size on app start
 2013-10-07 21:04:36 +02:00
Stephen Birarda
98f435ccc2 link mesh URL and UUID in prefs to data server client 2013-10-07 12:03:04 -07:00
Stephen Birarda
fea3ca8229 pack string representation of UUID for data server communication 2013-10-07 10:58:26 -07:00
Stephen Birarda
5a7d21f529 add UUID helper class to get UUID string without braces 2013-10-07 10:56:23 -07:00
Stephen Birarda
13232a4c0b stubbing of mechanism to confirm packets sent to data server 2013-10-07 10:45:54 -07:00
Stephen Birarda
4cc9f29c83 initial stub of data server client code in Interface 2013-10-07 09:55:08 -07:00
stojce
61b213804a #19426 - Add a mute control to the interface 
- OpenGL overlay icon
- mute control
- icons
 2013-10-05 13:18:35 +02:00
ZappoMan
5f6fb3a3ae added some timing debugging 2013-10-05 00:55:34 -07:00
ZappoMan
3001917e10 added debugging 2013-10-04 22:49:05 -07:00
ZappoMan
6fce838e2e remove comment 2013-10-04 21:38:47 -07:00
ZappoMan
0c70a05732 make view frustum oversend and don't remove oversend in client 2013-10-04 21:36:21 -07:00
Andrzej Kapolka
a704a29864 Include a mapping for the names generated by the FBX export. 2013-10-04 17:56:36 -07:00
Andrzej Kapolka
08426fbd9c Handle index-to-direct normals (exported by the Faceshift rig FBX). 2013-10-04 17:49:18 -07:00
Andrzej Kapolka
325ac73d0a Apply color to ambient material property, too. 2013-10-04 17:04:50 -07:00
Andrzej Kapolka
5f26177560 Fix for URLs' not being sent: setting the scale calls createMohawk, which 
reseeds the random number generator, breaking "shouldDo."
 2013-10-04 13:42:03 -07:00
Andrzej Kapolka
b281facf45 Remove references to ambient, use the requested alpha. 2013-10-04 10:53:19 -07:00
Andrzej Kapolka
51c868fd28 Apply (some) FBX material properties to rendered meshes. 2013-10-03 18:12:58 -07:00
Philip Rosedale
c99f1646db Merge pull request #1015 from ZappoMan/voxel_render_pipeline_improvement 
Fixes to delete/add voxel sometimes not rendering
 2013-10-03 16:08:12 -07:00
ZappoMan
608c24e258 fix build buster 2013-10-03 15:58:15 -07:00
Andrzej Kapolka
2fc1af8c1a Fix for relative texture paths. 2013-10-03 15:47:43 -07:00
ZappoMan
2450d64016 Merge branch 'master' of https://github.com/worklist/hifi into voxel_render_pipeline_improvement 2013-10-03 15:09:28 -07:00
Andrzej Kapolka
813fa1030b Merge branch 'master' of https://github.com/worklist/hifi 2013-10-03 14:39:13 -07:00
Andrzej Kapolka
b2b9e1e0bf Need to allow multiple blendshape mappings per shape index. 2013-10-03 14:35:58 -07:00
Andrzej Kapolka
cc5cc1a409 Fixed incorrect capitalization. 2013-10-03 14:16:28 -07:00
ZappoMan
1c664b311d fixed behavior of voxel delete and some cases of voxel add in fast pipeline mode 2013-10-03 14:15:13 -07:00
Andrzej Kapolka
5756733aef Load mapping and use it for offset, joint mappings, blendshape mappings. 2013-10-03 14:03:01 -07:00
Philip Rosedale
e9a21e284a Merge pull request #1011 from ZappoMan/voxeleditsender_improvements 
VoxelEditPacketSender class improvements
 2013-10-02 21:25:10 -07:00
ZappoMan
8a439fabed Merge pull request #1008 from PhilipRosedale/master 
Head-driven mouse works with Faceshift
 2013-10-02 21:17:43 -07:00
ZappoMan
aac6d409d2 delete voxels locally on edit to match add behavior 2013-10-02 17:00:19 -07:00
Andrzej Kapolka
1994f9cc91 Missed a spot. 2013-10-02 15:10:35 -07:00
Andrzej Kapolka
97762b21c4 Change order of transformations so that head offset is consistent with scale. 2013-10-02 15:03:33 -07:00
ZappoMan
51fa5f4f47 Merge branch 'master' of https://github.com/worklist/hifi into voxeleditsender_improvements 2013-10-02 15:02:33 -07:00
ZappoMan
cc0009976b first cut and handling buffering of edit packets when voxel servers are unknown 2013-10-02 15:02:23 -07:00
Andrzej Kapolka
c98dec8a65 Dilate our network-downloaded textures. 2013-10-02 11:59:14 -07:00
PhilipRosedale
26618f45f8 use clamp instead of min, max 2013-10-02 10:50:41 -07:00
PhilipRosedale
6d2585a732 faceshift drives head mouse, improved reticle 2013-10-02 10:46:31 -07:00
Andrzej Kapolka
d87fe204e0 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-02 10:23:43 -07:00
Andrzej Kapolka
97cbef1d59 Avoid warnings on invalid URLs, delete reply when reference is deleted. 2013-10-02 10:23:04 -07:00
Andrzej Kapolka
40a3268d7c Fixed an OS X warning and a misplaced parenthesis. 2013-10-01 16:31:57 -07:00
PhilipRosedale
99c866dba4 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-01 16:10:30 -07:00
PhilipRosedale
7dd1a7525e starting to add faceshift head mouse 2013-10-01 16:10:22 -07:00
Andrzej Kapolka
6ccd406a35 Experimenting with the pivot points. 2013-10-01 15:20:18 -07:00
Andrzej Kapolka
3c6fb2914f Use inheritance type flags. Getting closer to the correct transforms. 2013-10-01 15:03:29 -07:00
Philip Rosedale
cebd8e5f4b Merge pull request #997 from birarda/assignment 
file of static assignments for DS
 2013-10-01 13:47:10 -07:00
Philip Rosedale
64151975f2 Merge pull request #1002 from ZappoMan/voxel_render_pipeline_improvement 
Voxel render pipeline improvement
 2013-10-01 13:13:11 -07:00
ZappoMan
1aa7855166 cleanup 2013-10-01 12:43:30 -07:00
ZappoMan
8ceee2ec1e more cleanup of faster voxel pipeline 2013-10-01 11:51:25 -07:00
Philip Rosedale
4cd3abfb86 Merge pull request #1000 from birarda/master 
some deletions and cleanup
 2013-10-01 11:44:28 -07:00
Andrzej Kapolka
3c3cf0b002 Basic geometry sharing/texture loading. 2013-10-01 10:50:09 -07:00
ZappoMan
793a14e25a first cut at new faster voxel pipeline 2013-10-01 10:37:14 -07:00
ZappoMan
0f74d4bda9 change nodeDeleted() to voxelDeleted() to improve readability 2013-09-30 15:50:31 -07:00
Stephen Birarda
43eed32e1d end is important, put it back 2013-09-30 15:42:07 -07:00
Stephen Birarda
ca68846c1b some deletions and cleanup based on Xcode analysis 2013-09-30 15:36:23 -07:00
ZappoMan
865bb7555f fix hang on preference dialog box 2013-09-30 15:27:02 -07:00
Stephen Birarda
617b905385 Merge pull request #996 from ey6es/master 
Transformation rejiggery to support Ryan's alien model.
 2013-09-30 14:34:26 -07:00
Andrzej Kapolka
71d68796f3 Remove whitespace. 2013-09-30 13:27:10 -07:00
Andrzej Kapolka
5dc7b64c03 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-30 13:22:59 -07:00
Andrzej Kapolka
40d195595f Include the neck pivot when we get the eye locations. 2013-09-30 13:20:28 -07:00
Andrzej Kapolka
d4c4cbc981 Get the neck joint and position blend face relative to that. 2013-09-30 13:15:59 -07:00
Philip Rosedale
a22b3d28bf Merge branch 'master' of https://github.com/worklist/hifi 2013-09-30 12:44:07 -07:00
Philip Rosedale
f30ff1704a Fix to make touch-look MUCH smoother for flying around 2013-09-30 12:43:25 -07:00
Andrzej Kapolka
d4203ff3d3 Pivot fix. 2013-09-30 12:01:27 -07:00
Philip Rosedale
7a74432bef Merge pull request #994 from ZappoMan/voxel_geo_shader 
removed old normal support from voxel system only using global normals
 2013-09-30 11:37:09 -07:00
Andrzej Kapolka
1592aac177 Getting closer to the correct set of transforms. 2013-09-30 11:24:41 -07:00
Stephen Birarda
bb32da12f1 complete removal of fervor and C++11 array 2013-09-30 10:30:18 -07:00
ZappoMan
b6fe8befdc removed old normal support from voxel system only using global normals 2013-09-30 09:29:04 -07:00
Philip Rosedale
9645cd9831 Click on voxels as way of moving around 2013-09-28 15:18:59 -07:00
stojce
a0f23d409e Merging changes 2013-09-28 13:16:50 +02:00
stojce
bac228bdb8 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-28 12:47:47 +02:00
Andrzej Kapolka
f8d26f207d Include the local transforms from the FBX file when rendering meshes. 2013-09-27 17:57:18 -07:00
ZappoMan
5dd4d8a8e1 Merge pull request #990 from PhilipRosedale/master 
Smooth flying, fixed spinning problem, top speed about Mach 1
 2013-09-27 16:22:49 -07:00
Philip Rosedale
1189ac2216 Merge pull request #989 from ZappoMan/voxel_geo_shader 
add support for global normals for voxels
 2013-09-27 15:10:53 -07:00
Freddy
c78aa591c5 Fix spinning while flying, top speed now about Mach 1 2013-09-27 15:08:10 -07:00
ZappoMan
8cffa8d872 add support for global normals for voxels 2013-09-27 15:04:44 -07:00
Philip Rosedale
549b863665 Merge pull request #988 from ZappoMan/voxel_geo_shader 
voxel rendering performance and debugging improvements
 2013-09-27 13:27:29 -07:00
ZappoMan
605c2f30cf add memory usage debugging 2013-09-27 10:17:10 -07:00
ZappoMan
eb6af1afbf fix byte normals, fix crashes in switching between voxel shader and normal mode 2013-09-27 09:02:51 -07:00
ZappoMan
fb85add6b4 Merge pull request #986 from PhilipRosedale/master 
Faceshift rotates body, slow near others for easier positioning
 2013-09-27 07:01:00 -07:00
Freddy
f88a3633a5 Slow down when near other avatars for easier positioning 2013-09-27 00:40:41 -07:00
Freddy
6b0f9314ba Faceshift drives body rotation, remove gyro-driven rotation 2013-09-26 23:52:44 -07:00
ZappoMan
2487a55be9 add support for use of Byte normals 2013-09-26 19:04:19 -07:00
Freddy
462d0b90c1 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-26 17:26:59 -07:00
Philip Rosedale
0fbabe9891 Merge pull request #984 from ZappoMan/voxel_geo_shader 
Voxel Geometry Shader Experiment
 2013-09-26 17:22:55 -07:00
Freddy
e74950db24 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-26 17:07:41 -07:00
ZappoMan
3f8e55da28 style cleanup 2013-09-26 16:46:34 -07:00
ZappoMan
5695429a78 style fixes 2013-09-26 16:36:59 -07:00
ZappoMan
fd0cc3b417 style fixes 2013-09-26 16:33:37 -07:00
ZappoMan
7845340279 menu cleanup, support for on the fly switching of maxVoxels and useVoxelShader 2013-09-26 16:26:49 -07:00
Freddy
ddcec39f04 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-26 15:58:06 -07:00
Andrzej Kapolka
91999dfe1f Pupil dilation. 2013-09-26 15:48:11 -07:00
ZappoMan
552d9fadd8 rearranged menus, some hacking on voxel shader 2013-09-26 14:51:57 -07:00
Andrzej Kapolka
4dec183262 Enlarge heads when they're moused over. 2013-09-26 12:07:13 -07:00
Andrzej Kapolka
3ccf276137 Merge branch 'master' of https://github.com/worklist/hifi into grower 2013-09-25 18:06:27 -07:00
Andrzej Kapolka
0ae614fa7b Fix to load Ryan's alien model (handle per-vertex normals). 2013-09-25 17:55:22 -07:00
Andrzej Kapolka
63efeccb13 Renaming for clarity. 2013-09-25 17:38:37 -07:00
Freddy
b4fa1dc7c2 Merge remote-tracking branch 'upstream/master' 2013-09-25 16:49:04 -07:00
Freddy
1dbc8459f8 adding measured angular velocity to faceshift 2013-09-25 16:46:26 -07:00
Andrzej Kapolka
736dae0c81 Use shaders for eyes (like the ones for the iris). 2013-09-25 15:26:29 -07:00
Andrzej Kapolka
7d14aaeea4 Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-25 14:39:43 -07:00
Andrzej Kapolka
6e8df9584e Faceshift starts reporting failure to track under load, so determine active 
state based on the amount of time elapsed since last successful tracking data
received.
 2013-09-25 14:37:53 -07:00
Andrzej Kapolka
402f65fc00 Use the blend face eye locations for the eye vectors, when possible. 2013-09-25 14:12:50 -07:00
Andrzej Kapolka
9a16d44a47 Render the eye textures. 2013-09-25 13:47:03 -07:00
Andrzej Kapolka
4567b8afdf Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-25 11:40:16 -07:00
Andrzej Kapolka
2c7bb1a3d9 Slight fix: make sure we set isEye on each mesh. 2013-09-25 11:38:00 -07:00
Andrzej Kapolka
85ab9b7576 Use the texture coordinates when rendering the eyes. 2013-09-25 11:35:02 -07:00
Andrzej Kapolka
7ff5167bb7 Read in the texture coordinates, too. 2013-09-25 11:02:56 -07:00
Andrzej Kapolka
71ec6f75e5 Move the eyeball meshes according to the lookat direction (not really visible 
yet since the eyeballs have no textures).
 2013-09-24 18:57:37 -07:00
Andrzej Kapolka
452eb9be47 Extract the pivot points from the limb nodes, make sure we extract the vector 
elements in the right order.
 2013-09-24 16:50:38 -07:00
Andrzej Kapolka
b44e962ac7 Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-24 14:30:57 -07:00
Andrzej Kapolka
4666c736d8 Remove unused variable. 2013-09-24 14:24:57 -07:00
Andrzej Kapolka
1b9444cb39 As a temporary hack, render the mesh with the most blendshapes with the head 
color (other meshes white).
 2013-09-24 14:22:01 -07:00
Andrzej Kapolka
fd41a075ed Added support for multiple blended meshes. 2013-09-24 13:53:19 -07:00
Andrzej Kapolka
ad69a9547f Remove the pose bits, at least for now. 2013-09-24 11:12:59 -07:00
Freddy
6bbe34a8c4 missing space 2013-09-23 23:06:32 -07:00
Freddy
36104d0b06 remove unused older voxel grab thrust 2013-09-23 23:04:27 -07:00
Freddy
027811e37c Increase thrust while holding keys down to allow very fast speeds 2013-09-23 22:53:35 -07:00
Andrzej Kapolka
aa6eb7b3d8 Render the "other" meshes as separate, static, white. 2013-09-23 16:34:28 -07:00
ZappoMan
3d4341cee4 hacking on voxel geometry shader 2013-09-23 15:18:45 -07:00
Andrzej Kapolka
9034eb1e72 Experimenting with the simplest method of including the other meshes. 2013-09-23 14:37:48 -07:00
Andrzej Kapolka
255e5179ae Let's actually use the variable we initialized. 2013-09-23 13:02:00 -07:00
Andrzej Kapolka
1a55c64299 Scale the normal contributions down. For some reason, their magnitudes are 
higher than one would expect.
 2013-09-23 12:42:58 -07:00
Andrzej Kapolka
807f6aaf14 Temporarily render the normals for debugging. 2013-09-23 12:20:19 -07:00
Andrzej Kapolka
c7bb523fc5 Apply the skin color to the blend face. 2013-09-23 12:15:02 -07:00
Andrzej Kapolka
1893fdba29 Revert "Trying a different method of updating the normals." 
This reverts commit 8e2be380f6.
 2013-09-23 11:47:59 -07:00
Andrzej Kapolka
8e2be380f6 Trying a different method of updating the normals. 2013-09-23 11:17:12 -07:00
Andrzej Kapolka
0fa2eca02d Remove option to use Faceshift rig (using the "macaw" model has much the same 
result, and it lets other people see it).
 2013-09-23 10:43:20 -07:00
Andrzej Kapolka
8c963ed6a7 Blend the normals, too. 2013-09-23 10:30:03 -07:00
Andrzej Kapolka
24bf1e2036 Don't render neck/neck base when blend face is active. 2013-09-20 17:55:31 -07:00
Andrzej Kapolka
133ba3a00a Set normals based on indices, cache face models. 2013-09-20 17:40:15 -07:00
Andrzej Kapolka
ddb0d916ae Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-20 16:50:38 -07:00
Andrzej Kapolka
9c2d851650 Fixed bug in decoding: newer versions of Qt streaming use whatever precision 
the stream is set at for both floats and doubles.
 2013-09-20 16:38:44 -07:00
Andrzej Kapolka
120f8f729c Find the mesh that corresponds to the blendshapes. 2013-09-20 15:28:08 -07:00
Stephen Birarda
f8f0e3db1b remove the sphere from the ground plane 2013-09-20 14:04:18 -07:00
Andrzej Kapolka
fe0d93102e Another slight face fix: clear the face when set, before loading the new one. 2013-09-20 13:46:29 -07:00
Andrzej Kapolka
df0b2f4eec Fix for face model sending. 2013-09-20 13:28:50 -07:00
Andrzej Kapolka
77d9e21162 Meant to include this in the last commit. 2013-09-20 10:06:34 -07:00
Andrzej Kapolka
2f5a5a4b27 Remove unnecessary, unlucky "13," add note explaining arbitrary translation. 2013-09-20 09:52:15 -07:00
Andrzej Kapolka
9d28aaefae Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-19 18:00:46 -07:00
Andrzej Kapolka
94d6f00f65 Parenting the info view to the menu is preventing the menu from showing up on 
Linux.  Let's try not doing that.
 2013-09-19 17:47:50 -07:00
Andrzej Kapolka
c049665090 Removed temporary comment. 2013-09-19 16:42:25 -07:00
Andrzej Kapolka
5c841616dc Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-19 16:37:26 -07:00
Andrzej Kapolka
a04ced633e Include the face model URL in the same packet as the avatar voxel URL. 2013-09-19 16:35:25 -07:00
Andrzej Kapolka
fff10375a9 Map the blendshapes by name. 2013-09-19 15:48:33 -07:00
Andrzej Kapolka
116a4e0bad Subtract the deltas. 2013-09-19 15:18:45 -07:00
Andrzej Kapolka
09fa782c61 More work on FBX reading. 2013-09-19 15:05:17 -07:00
Andrzej Kapolka
1bd8ea947a Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-18 17:14:58 -07:00
Stephen Birarda
bbbdc4f88c fixes for InfoView ownership and display 2013-09-18 16:42:51 -07:00
Andrzej Kapolka
dfea69ab8f Basic FBX parser. 2013-09-18 16:26:35 -07:00
Stephen Birarda
5393d75281 remove call to re-set default setting in InfoView 2013-09-18 14:39:35 -07:00
Stephen Birarda
8a901382a3 get rid of local and domain options in interface 2013-09-18 14:01:32 -07:00
Stephen Birarda
9fa695b71c allow setting of custom port via domainHostname setting 2013-09-18 13:50:14 -07:00
Stephen Birarda
ab85c4109d use QHostInfo and QHostAddress for DS changes in NodeList 2013-09-18 13:29:53 -07:00
Andrzej Kapolka
6be03ac3df Working on downloading the faces. 2013-09-18 10:10:24 -07:00
Andrzej Kapolka
596d0ac471 Subtract the neutral position from the blendshapes. 2013-09-17 17:01:17 -07:00
Andrzej Kapolka
617b3d67cf I think we need to treat the blend shapes as offsets from neutral. 2013-09-17 16:11:07 -07:00
Andrzej Kapolka
558d3d41a6 First attempt at blending. 2013-09-17 15:22:06 -07:00
Andrzej Kapolka
1afece81c5 Use quads as well as triangles, apply scale. 2013-09-17 11:49:50 -07:00
Andrzej Kapolka
b4ca66eb68 Merge branch 'master' of https://github.com/worklist/hifi into blendface 
Conflicts:
	interface/src/devices/Faceshift.cpp
 2013-09-17 11:05:11 -07:00
Andrzej Kapolka
262365f15f Only render the Perlin face for the local user. 2013-09-17 10:51:33 -07:00
Andrzej Kapolka
a4f79390f4 Fixed initialization order. 2013-09-17 10:25:27 -07:00
Andrzej Kapolka
1fce6c717b Working on shipping around the complete set of blendshape coefficients. 2013-09-16 17:28:04 -07:00
Andrzej Kapolka
f9426cbecc Working on reading and rendering the rig from Faceshift. 2013-09-16 15:49:40 -07:00
atlante45
ac0ee6c7d6 another merge commit 2013-09-14 14:41:03 -07:00
ZappoMan
facd60799e Merge pull request #931 from Atlante45/add_fs_data_in_head_data 
Add fs data in head data
 2013-09-14 14:04:37 -07:00
ZappoMan
2d545c8adb Merge pull request #924 from stojce/19418 
Code Review for Job #19418
 2013-09-14 14:00:09 -07:00
stojce
316f8a0345 Brace placement fix 2013-09-14 08:39:21 +02:00
atlante45
d6981bfa20 Andrejz Faceshift modif merge 2013-09-13 18:18:41 -07:00
LionTurtle
6613ad0591 Arrow keys now also control nudge guide. Avatar position is now fixed 
during nudge.
 2013-09-13 18:10:52 -07:00
LionTurtle
394e660ac3 Use WASD to move nudge guide instead of mouse. 
Nudge can be completed with return/enter key now.
Nudge is now accessible in any voxelEditMode.
 2013-09-13 17:51:10 -07:00
atlante45
7a2a79f6f5 Temp code for Brad to look at 2013-09-13 15:17:17 -07:00
atlante45
9ae7fab95f Merge branch 'master' of https://github.com/worklist/hifi into add_fs_data_in_head_data 2013-09-13 14:59:17 -07:00
LionTurtle
67bbcc4d9b Put upper bound on increasing nudge precision (i.e. making the nudge 
less precise).
 2013-09-13 14:08:21 -07:00
LionTurtle
86d1666d6a Add ifdef for OS X to show delete hotkey in edit menu 2013-09-13 13:49:19 -07:00
LionTurtle
0251349221 Change nudge UI to be more consistent with classic editing UI. 
Add menu option for Delete and fix delete for VoxelSelectMode.
 2013-09-13 13:41:26 -07:00
atlante45
683cfd6c8b Fixed Eye Open 2013-09-13 11:21:13 -07:00
stojce
4b993ec931 CR fixes 2013-09-13 20:10:27 +02:00
atlante45
87b4528e2c removed unmeant committed files 2013-09-12 17:54:57 -07:00
atlante45
7cd2f2b06b send faceshift data to avatar mixer 2013-09-12 17:41:26 -07:00
stojce
921e88ea5d Merge branch 'master' of https://github.com/worklist/hifi into 19418 
Merge branch 'master'
 2013-09-12 21:11:30 +02:00
stojce
eefe08e733 non OS X menu 
added help + about menu for non OS X
 2013-09-12 19:39:34 +02:00
LionTurtle
bb1feab661 Merge remote-tracking branch 'upstream/master' 2013-09-11 16:45:29 -07:00
LionTurtle
cef4837654 Fix voxel erase bug in nudge code. Fix rendering of nudge guide. 2013-09-11 16:43:50 -07:00
atlante45
64b462a4f0 Improved smile 2013-09-11 15:19:01 -07:00
stojce
330b1cdaf1 About menu 
added About menu - OS X version only
 2013-09-11 22:08:07 +02:00
atlante45
88e8ef7c7c eye opening and some better memory handling 2013-09-11 12:57:58 -07:00
atlante45
5618a784c7 Fixed perlin's face eyes 2013-09-11 10:51:31 -07:00
Andrzej Kapolka
80cc278bfa Increase the eye open scale. 2013-09-11 10:49:12 -07:00
Andrzej Kapolka
feecb4fa25 Fix for eyelids, change Faceshift menu option to indicate that it applies 
specifically to TCP connection.
 2013-09-11 10:44:38 -07:00
atlante45
ae5173a730 Added Jaw 2013-09-10 18:32:39 -07:00
atlante45
117565934c added smooth normals for lighting 2013-09-10 17:54:59 -07:00
Andrzej Kapolka
4b19e3d0fe Incorporate the "eye open" coefficients for eye widening. 2013-09-10 17:43:06 -07:00
RyanDowne
13c228e796 Added Smile 2013-09-10 17:33:22 -07:00
Andrzej Kapolka
b9878bbbd6 Adjustment to UDP code. 2013-09-10 16:55:59 -07:00
atlante45
61f9088d3e eyelib handling for faceshift 2013-09-10 16:35:14 -07:00
Andrzej Kapolka
5c7913068e Support for UDP input from Faceshift. 2013-09-10 16:21:08 -07:00
atlante45
85c3d54718 mouth handling on perlin faces 2013-09-10 15:33:09 -07:00
atlante45
4e3484021e PerlinFace implementation 2013-09-10 15:31:58 -07:00
stojce
a362fdc2ed name the current domain server 2013-09-10 21:51:50 +02:00
Andrzej Kapolka
cea645dfc7 Tweak to blink angles. 2013-09-10 12:34:41 -07:00
stojce
114cc065bd Merge branch 'master' of https://github.com/worklist/hifi into 19418 2013-09-10 21:05:44 +02:00
Andrzej Kapolka
6614a13c64 Align the eyelids to the top of the iris. 2013-09-10 11:58:45 -07:00
Andrzej Kapolka
7e98e3f4e3 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-10 11:26:07 -07:00
Andrzej Kapolka
db8575b59a Reduced the restore rate. 2013-09-10 11:25:30 -07:00
ZappoMan
befbc1b93a Merge pull request #916 from LionTurtle/master 
Nudge
 2013-09-10 11:16:12 -07:00
Andrzej Kapolka
c56778c3bf When devices become inactive (including when Faceshift reports loss of 
tracking), smoothly restore neutral head rotation/lean.
 2013-09-10 11:14:36 -07:00
LionTurtle
30c8af222d Merge remote-tracking branch 'upstream/master' 2013-09-10 11:10:50 -07:00
LionTurtle
3b464094d9 Remove magic numbers, fix spacing, and other code clean up in nudge code. 2013-09-10 11:09:50 -07:00
Philip Rosedale
4245f33c3c Merge pull request #915 from ey6es/master 
Subtract the long term average from the eye gaze directions.  Best solution I've found so far for aligning the gaze.
 2013-09-10 09:36:04 -07:00
LionTurtle
f41533fee6 Add nudgeVoxel shading in grid. Fix erase bug. 2013-09-09 18:23:37 -07:00
LionTurtle
b0803c1267 Merge remote-tracking branch 'upstream/master' 2013-09-09 16:54:34 -07:00
LionTurtle
ac878c9c63 UI for nudge completed! 2013-09-09 16:53:31 -07:00
Andrzej Kapolka
6e447415df Merge branch 'master' of https://github.com/worklist/hifi 2013-09-09 15:49:55 -07:00
stojce
54e7de8e96 remove empty line 2013-09-10 00:44:16 +02:00
stojce
19c8084b64 dynamic height 2013-09-10 00:38:43 +02:00
Stephen Birarda
613334074f leverage qDebug and custom message handler for verbose logging 2013-09-09 15:11:11 -07:00
stojce
7bd565f1f2 removed unused variable 2013-09-10 00:01:09 +02:00
stojce
1a32bf7428 centering fix 2013-09-09 23:59:44 +02:00
stojce
6b81620098 removed redundant this keyword 2013-09-09 23:54:25 +02:00
stojce
7c7cf667ae WindowModal 2013-09-09 23:38:51 +02:00
Andrzej Kapolka
f8aee88a5b Let's try subtracting the long-term average from the eye directions. 2013-09-09 14:30:26 -07:00
stojce
a081f081f8 popup layot 
- center position
- resizable
 2013-09-09 23:27:03 +02:00
Andrzej Kapolka
8fec78d82a Disable random saccades for own eyes. 2013-09-09 13:48:46 -07:00
stojce
29c62d366f QtWebKitWidgets fix #2 2013-09-09 22:41:03 +02:00
stojce
52f413b59c QtWebKitWidgets reference fix 2013-09-09 22:11:44 +02:00
Andrzej Kapolka
597c57a117 Revert "Try using the eye coefficients rather than the eye directions reported by" 
This reverts commit 37aa909322.
 2013-09-09 12:17:12 -07:00
Andrzej Kapolka
37aa909322 Try using the eye coefficients rather than the eye directions reported by 
Faceshift.
 2013-09-09 11:22:46 -07:00
Andrzej Kapolka
ddf92b39c7 Fix for off-axis ambient occlusion. 2013-09-08 17:52:35 -07:00
stojce
3b2b09a67e removed QDebug 2013-09-08 21:31:14 +02:00
stojce
fef70098a3 #19418 Load a local HTML file in a web view within Interface 2013-09-08 21:28:30 +02:00
Andrzej Kapolka
699007691b Simplification. 2013-09-06 17:50:16 -07:00
Andrzej Kapolka
1a767f3e08 Bump up the offset scale for Faceshift. 2013-09-06 16:52:32 -07:00
Andrzej Kapolka
38dd176506 Fix for off-by-one-frame error. 2013-09-06 16:43:22 -07:00
Andrzej Kapolka
f475163072 I believe this should fix the offset in mirror mode. 2013-09-06 16:20:13 -07:00
Andrzej Kapolka
26411a42b1 More focal length bits. 2013-09-06 15:07:15 -07:00
LionTurtle
d965789812 Switching nudge to cut/paste implementation. Preliminary. 2013-09-06 11:40:35 -07:00
Andrzej Kapolka
f8a74acb02 Special frustum handling for mirrored mode. 2013-09-06 10:19:17 -07:00
LionTurtle
59943dc2e8 Merge branch 'nudge' 
Conflicts:
	interface/src/Menu.cpp
	libraries/voxels/src/VoxelTree.h
 2013-09-05 17:58:39 -07:00
LionTurtle
868ef8bec6 Add VoxelNudgeMode and preliminary UI grid for nudging. 2013-09-05 17:42:25 -07:00
Andrzej Kapolka
32af1de3ac For clarity, break the projection matrix update out of resizeGL. 2013-09-05 12:34:25 -07:00
Andrzej Kapolka
4961913fc4 Transmit the eye offset position along with the rest of the frustum 
parameters.
 2013-09-05 12:20:15 -07:00
Andrzej Kapolka
dd8a40decd Need to call resizeGL in order to update the projection matrix. 2013-09-05 11:41:16 -07:00
LionTurtle
647bd5b704 Got rid of delete in nudge. Create is already destructive. 2013-09-05 11:30:23 -07:00
LionTurtle
6e37bc3644 Nudge code working for nudge that is greater than or equal to leaf size. 2013-09-05 11:06:12 -07:00
Andrzej Kapolka
3a195951db Merge branch 'master' of https://github.com/worklist/hifi into off 2013-09-05 10:56:02 -07:00
Andrzej Kapolka
03ead34642 Code review cleanup. 2013-09-05 10:34:43 -07:00
Andrzej Kapolka
79408560d9 Tweaking the off-axis positions. 2013-09-04 17:48:54 -07:00
Andrzej Kapolka
1532b5d91a Apply eye offset position based on Faceshift/webcam. 2013-09-04 17:33:57 -07:00
Andrzej Kapolka
a60be83fc7 Merge branch 'master' of https://github.com/worklist/hifi into shifty 2013-09-04 16:12:34 -07:00
Andrzej Kapolka
9ed698e04c Remove debug statement. 2013-09-04 16:10:13 -07:00
Andrzej Kapolka
54116cbc85 Testing audio shutdown before menu destruction. 2013-09-04 16:04:36 -07:00
Andrzej Kapolka
834b671f5a Merge branch 'master' of https://github.com/worklist/hifi into shifty 2013-09-04 15:32:15 -07:00
atlante45
b8c18bee2d merge 2013-09-04 15:31:12 -07:00
atlante45
5da525fc3e memory wastes and code cleaning PR comments 2013-09-04 15:12:24 -07:00
Andrzej Kapolka
0a9db6a5ee Moved device-related files to "devices" folder. 2013-09-04 12:15:36 -07:00
Andrzej Kapolka
5e23c79192 Tweaked feature scales, send recalibrate request on reset. 2013-09-04 11:55:55 -07:00
Andrzej Kapolka
679926ce42 Working on brow/mouth mapping. 2013-09-04 11:40:53 -07:00
Andrzej Kapolka
f84d6f4f37 Fix for eye pitch, track blinking locally. 2013-09-04 10:59:53 -07:00
Andrzej Kapolka
2c2f2fad5a Lookat adjustment. 2013-09-04 10:53:07 -07:00
Andrzej Kapolka
0d593c4a3f When Faceshift is active, use its eye directions rather than the mouse ray. 2013-09-04 10:46:11 -07:00
atlante45
1781abe937 Added Menu instance deletion in Application destructor. 2013-09-04 10:40:42 -07:00
atlante45
a1e433e189 Updated Application destructor 2013-09-04 10:24:10 -07:00
Andrzej Kapolka
697484d0bb Another coordinate tweak. 2013-09-03 18:29:46 -07:00
Andrzej Kapolka
3423053612 Coordinate system tweaks. 2013-09-03 18:23:02 -07:00
Andrzej Kapolka
650e9c4267 Silencio! 2013-09-03 18:15:51 -07:00
atlante45
b03482ead5 Some more memory leaks and codes formatting 2013-09-03 17:16:06 -07:00
Andrzej Kapolka
6a3b2c7ad0 Get the blendshape names and read the blink amounts. 2013-09-03 16:44:06 -07:00
atlante45
06119990e8 Fixed ui related files memory wastes 2013-09-03 14:47:50 -07:00
Andrzej Kapolka
b406dc7311 Log when attempting to connect and on failure. Wait a second before 
attempting to reconnect.
 2013-09-03 14:20:47 -07:00
Andrzej Kapolka
734cb83e81 Read Faceshift head translation/rotation. 2013-09-03 13:56:04 -07:00
atlante45
7688dc4779 Fixed renderer related files memory wastes 2013-09-03 13:50:01 -07:00
atlante45
688bc17954 Fixed avatar related files memory wastes 2013-09-03 13:37:25 -07:00
Andrzej Kapolka
213a8fcd63 Working on Faceshift integration. 2013-09-03 11:52:32 -07:00
Andrzej Kapolka
7c3bb4ecc4 Merge branch 'master' of https://github.com/worklist/hifi into shifty 2013-09-03 11:00:29 -07:00
Andrzej Kapolka
843d5656bd Fix for compile warnings on Linux: check return values on read/write. 2013-09-03 10:45:33 -07:00
atlante45
15a3a8d252 Some more code reformatting. 2013-09-03 10:32:38 -07:00
atlante45
26691118de Some code reformatting. 2013-09-03 10:30:46 -07:00
Andrzej Kapolka
c57118a64d De-magicked a number. 2013-08-30 15:57:32 -07:00
Andrzej Kapolka
54f0a30290 Remove video stuff used in testing. 2013-08-30 15:56:16 -07:00
atlante45
77799fce54 Merge branch 'master' of https://github.com/worklist/hifi into some_more_work_on_imports 2013-08-30 15:28:33 -07:00
atlante45
229821e211 Removed frustum display in preview mode 2013-08-30 15:28:10 -07:00
Andrzej Kapolka
86561b98cc Merge branch 'master' of https://github.com/worklist/hifi into led 2013-08-30 15:16:22 -07:00
atlante45
f21a2798ff Fixed _sharedVoxelSystemTree deleted twice 2013-08-30 10:37:55 -07:00
Stephen Birarda
b46bd1fd41 display the Avatar's hand in first person 2013-08-30 10:28:30 -07:00
LionTurtle
62b29d26d2 Nudge function added. Testing nudge. 2013-08-29 18:17:06 -07:00
atlante45
fc991bf1ac Some code reformating 2013-08-29 18:11:16 -07:00
atlante45
1dc8d8dd0c Added LOD to preview + Shared voxelSystem for reduced memory consumption 2013-08-29 17:59:36 -07:00
Andrzej Kapolka
fe47c6c387 Thresholding, more transform tweaks. 2013-08-29 16:44:56 -07:00
atlante45
7d9d36a66e Merge branch 'master' of https://github.com/worklist/hifi into some_more_work_on_imports 2013-08-29 11:23:06 -07:00
Andrzej Kapolka
c23eb92da9 Tweaking the transforms. 2013-08-29 10:45:55 -07:00
Andrzej Kapolka
28431b4c57 Testing transformation with video from FreeTrack project. 2013-08-28 15:02:33 -07:00
Andrzej Kapolka
b01f6df408 Tweaks for better LED tracking. 2013-08-27 17:53:36 -07:00
Andrzej Kapolka
e5e2f7ca00 Bump up the line width to make it easier to see the blobs. 2013-08-27 17:00:55 -07:00
Andrzej Kapolka
4d9954b2f4 More work on getting the transform. 2013-08-27 13:56:23 -07:00
Andrzej Kapolka
614f7cd28b Merge branch 'master' of https://github.com/worklist/hifi into led 2013-08-27 13:12:54 -07:00
Andrzej Kapolka
18e91de7c6 Working on the code to get the transform from the blob locations. 2013-08-27 13:08:58 -07:00
Andrzej Kapolka
4720eac922 Use green rather than red for better blob visibility. 2013-08-26 17:01:04 -07:00
Andrzej Kapolka
799d2b487f Initialization order fix. 2013-08-26 16:53:12 -07:00
Andrzej Kapolka
455565a9b9 Basic blob tracking for LEDs. 2013-08-26 16:49:20 -07:00
Andrzej Kapolka
8d8ba532e1 These initializers are in the wrong order. 2013-08-26 14:52:21 -07:00
Andrzej Kapolka
4ca8a10296 Starting on LED tracking. 2013-08-26 14:36:19 -07:00
ZappoMan
0df11124b3 tweak to how activateWindow() is called after dialog boxes 2013-08-26 14:24:42 -07:00
ZappoMan
943e1f9110 added Go To Domain, Go To Location, and tweaks to TREE_SCALE settings 2013-08-26 14:06:23 -07:00
ZappoMan
a9edf09f39 Merge pull request #889 from birarda/new-menu 
implementing @problem's refactored menu setup
 2013-08-23 16:30:44 -07:00
Stephen Birarda
818355dc1a implementing @problem's proposed changes to menus 2013-08-23 15:18:06 -07:00
Andrzej Kapolka
28ffd8eca7 Render the ball heads with the voxeltar bodies. 2013-08-23 14:22:00 -07:00
Andrzej Kapolka
3682e32eb1 Yes, these should be consts. 2013-08-22 17:40:55 -07:00
Andrzej Kapolka
2cff4b6b3a "Laser pointer" for transmitter. 2013-08-22 17:09:23 -07:00
atlante45
99321b3e09 Fixed VBOs not being deleted in VoxelSystem destructor 2013-08-22 15:43:58 -07:00
Andrzej Kapolka
3dfefefeae Make the surrounding spheres glow when moving, too. 2013-08-22 14:00:50 -07:00
Andrzej Kapolka
2eaaee673f Argh, forgot to return the result of the superclass implementation. 2013-08-22 13:52:10 -07:00
Andrzej Kapolka
7da9556815 Glow when moving. 2013-08-22 11:23:28 -07:00
Andrzej Kapolka
ff245427fd Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/avatar/Avatar.cpp
 2013-08-22 10:40:15 -07:00
Andrzej Kapolka
165342bcc3 Have the local avatar glow when moving. 2013-08-22 10:35:21 -07:00
Stephen Birarda
6206d9e8db fix for collisions when wearing Oculus 2013-08-21 17:42:13 -07:00
ZappoMan
69842ef82f Merge pull request #878 from LionTurtle/master 
Add MyAvatar class, subclass of Avatar class.
 2013-08-21 16:55:24 -07:00
LionTurtle
3eb0a1a190 Magic number removal... 2013-08-21 16:35:16 -07:00
LionTurtle
e252d3b2ac Style and spacing changes in MyAvatar/Avatar classes. 2013-08-21 16:32:06 -07:00
Andrzej Kapolka
6dbaedd921 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Application.cpp
 2013-08-21 15:46:14 -07:00
Andrzej Kapolka
d63bb3afaa Fixed glow/ambient occlusion with Oculus. 2013-08-21 15:44:57 -07:00
LionTurtle
a6109d411b Remove unnecessary comments and spaces. 2013-08-21 13:47:19 -07:00
ZappoMan
18dbfd5cc7 Merge pull request #877 from Atlante45/separate_import_with_preview 
New paste behaviour
 2013-08-21 13:44:17 -07:00
LionTurtle
bb9af3103c Remove unused setNoise() function in MyAvatar.h that was causing 
build error.
 2013-08-21 13:44:01 -07:00
LionTurtle
de9bd9e1b8 Add MyAvatar and resolve merge conflicts. 2013-08-21 13:38:23 -07:00
LionTurtle
1300bf7de2 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	interface/src/avatar/Avatar.cpp
	interface/src/avatar/Avatar.h
 2013-08-21 13:36:28 -07:00
LionTurtle
f4109b3fb4 Add MyAvatar subclass. For functions such as render() and simulate(), 
they have been edited so that there are MyAvatar and Avatar specific
versions in their respective classes. isMyAvatar() has been removed.
 2013-08-21 13:24:54 -07:00
atlante45
bae0f7fa1b New paste behaviour 2013-08-21 13:21:15 -07:00
ZappoMan
4bdaf7589f Merge branch 'master' of https://github.com/worklist/hifi into animation_server_jurisdictions 2013-08-21 12:16:09 -07:00
atlante45
bda6e03117 Changed name of copySubTreeIntoNewTree destinationTree argument 2013-08-21 12:11:34 -07:00
atlante45
9003a7d40b PR comments 2013-08-21 12:06:47 -07:00
Andrzej Kapolka
f39050ae28 Enable lookat vectors by default and make them glow. 2013-08-21 11:37:57 -07:00
atlante45
9fb864a699 Merge branch 'master' of https://github.com/worklist/hifi into separate_import_with_preview 2013-08-21 11:37:18 -07:00
atlante45
867303e673 Code cleanup 2013-08-21 11:33:10 -07:00
atlante45
27b0338294 Fixed clipboard not being previewed 2013-08-21 10:31:56 -07:00
atlante45
3eb5ace715 merge + few efficiency ameliorations to importDialog 2013-08-20 18:04:25 -07:00
Andrzej Kapolka
571131d42e No glow effect on the avatar, fixed OS X warning. 2013-08-20 17:25:54 -07:00
Andrzej Kapolka
590672d035 Fewer texture lookups when diffusing. 2013-08-20 17:02:35 -07:00
Andrzej Kapolka
49da612a4e Turns out we do have to initialize the "odd frame" field. 2013-08-20 16:37:23 -07:00
Andrzej Kapolka
ecc6d41523 Merge branch 'master' of https://github.com/worklist/hifi 2013-08-20 16:07:54 -07:00
Andrzej Kapolka
d5c66f6b67 Default to diffuse/add mode, fix for interacting with ambient occlusion. 
Unfortunately, I managed to break the diffusion somehow.
 2013-08-20 16:07:12 -07:00
ZappoMan
a6a38b4ebe Merge pull request #872 from ey6es/ssao 
Performance improvement for the SSAO blur step, cleanup.
 2013-08-20 15:40:48 -07:00
ZappoMan
b61e2810b2 Merge branch 'master' of https://github.com/worklist/hifi into animation_server_jurisdictions 2013-08-20 15:37:51 -07:00
atlante45
22a2603eaa Several VoxelSystems can have different view frustum 2013-08-20 15:28:08 -07:00
Andrzej Kapolka
11be8c752b Cleanup. 2013-08-20 13:40:45 -07:00
Andrzej Kapolka
edd119ccdc Merge branch 'master' of https://github.com/worklist/hifi into ssao 2013-08-20 13:24:32 -07:00
Stephen Birarda
146e9176eb switch to one channel from PortAudio to resolve USB error 2013-08-20 13:06:30 -07:00
ZappoMan
af140bbeb2 fixed build buster 2013-08-20 12:16:25 -07:00
ZappoMan
96bdcd6a4a attempt to fix build buster 2013-08-20 12:10:34 -07:00
Andrzej Kapolka
22598ceb4f Optimizations for occlusion blur (the main one being that we only need to 
sample the texture four, not sixteen, times if we turn on linear filtering
and sample between the texels).
 2013-08-20 11:52:43 -07:00
ZappoMan
d5f94d0f05 Merge branch 'master' of https://github.com/worklist/hifi into animation_server_jurisdictions 2013-08-20 11:42:51 -07:00
ZappoMan
f581b58fbc spacing fix 2013-08-20 11:11:28 -07:00
Andrzej Kapolka
8ded40476e Merge branch 'master' of https://github.com/worklist/hifi into ssao 2013-08-20 10:54:17 -07:00
Andrzej Kapolka
1d74860877 Need to #ifdef this out to avoid linking against nonexistent quazip on Linux. 2013-08-20 10:51:55 -07:00
Andrzej Kapolka
7f4557fe1a Add blur scale uniform. 2013-08-20 10:50:25 -07:00
Stephen Birarda
d0ab8317c4 Merge pull request #865 from ey6es/ssao 
Basic screen space ambient occlusion effect.  Defaults to off, because at the moment it slows things down substantially.
 2013-08-20 10:37:01 -07:00
Stephen Birarda
71edaa2472 replace appcast url with highfidelity s3 bucket link 2013-08-20 09:55:48 -07:00
ZappoMan
5e7e6fc9d7 First cut at JurisdictionListener and PACKET_TYPE_VOXEL_JURISDICTION_REQUEST 2013-08-19 20:15:46 -07:00
Stephen Birarda
329253d8e4 move update checking later in init, add menu option 2013-08-19 17:17:26 -07:00
Stephen Birarda
65a63fb73e move checkForUpdates to menu to have option in menu 2013-08-19 16:16:27 -07:00
atlante45
24531fdd10 Dialogbox for import fully functionnal 2013-08-19 15:54:51 -07:00
Andrzej Kapolka
222e026662 Use a small default lean scale. 2013-08-19 13:18:20 -07:00
Andrzej Kapolka
8d65323345 Restore the gyro-only lean behavior based on linear accelerometer data. 2013-08-19 13:14:35 -07:00
Andrzej Kapolka
dec4a4c422 Added toggle for ambient occlusion (defaults to off). 2013-08-19 11:45:43 -07:00
ZappoMan
2be85d439b Merge branch 'master' of https://github.com/worklist/hifi into animation_server_jurisdictions 
Conflicts:
	interface/src/Application.cpp
	interface/src/VoxelPacketProcessor.cpp
	libraries/voxels/src/VoxelEditPacketSender.cpp
 2013-08-19 11:13:38 -07:00
Andrzej Kapolka
89b13417e5 Merge branch 'master' of https://github.com/worklist/hifi into ssao 2013-08-19 11:03:41 -07:00
Andrzej Kapolka
fe2484ba68 Added back the glow mode cycle command that got removed in the menu reshuffle. 2013-08-19 11:01:57 -07:00
atlante45
b4157593c5 Merge branch 'master' of https://github.com/worklist/hifi into separate_import_with_preview 2013-08-19 10:54:35 -07:00
Andrzej Kapolka
c9f9be5d9a Merge branch 'master' of https://github.com/worklist/hifi into ssao 2013-08-19 10:53:33 -07:00
Andrzej Kapolka
60b410cecd We must set the window menu bar in order for it to show up on Linux/Windows. 2013-08-19 10:51:41 -07:00
Andrzej Kapolka
2c9a8dfebc Merge branch 'master' of https://github.com/worklist/hifi into ssao 
Conflicts:
	interface/src/Application.h
 2013-08-19 10:42:12 -07:00
Andrzej Kapolka
e7dab88d69 Square vector lengths to bunch them up towards the center, add a minimum 
length, include the URL of the SSAO tutorial.
 2013-08-19 10:32:56 -07:00
atlante45
6b58e1bfec merge 2013-08-16 20:24:18 -07:00
Andrzej Kapolka
b41fa1e03c Basic ambient occlusion effect up and running; needs tweaking and 
optimization.
 2013-08-16 17:26:47 -07:00
Stephen Birarda
98b144d675 Merge remote-tracking branch 'upstream/master' into menu 2013-08-16 15:59:09 -07:00
ZappoMan
6c1601c4eb Merge pull request #862 from birarda/master 
changes for UCSF installer build
 2013-08-16 15:58:38 -07:00
Stephen Birarda
4d9075f21c optionally check /usr/local/lib for plugins 2013-08-16 13:58:22 -07:00
LionTurtle
c579f70611 Render lookatIndicator for cursor select even when gyros are on for 
more consistent behavior.
 2013-08-16 11:44:23 -07:00
atlante45
2eb29ee56b Added ImportDialog.* 2013-08-16 10:21:12 -07:00
ZappoMan
68845da901 added doxygen comments and cleanup for VoxelSceneStats class 2013-08-16 10:10:17 -07:00
Andrzej Kapolka
3ddab484e0 Beginnings of ambient occlusion. Looks like an architectural drawing. 2013-08-15 17:52:31 -07:00
atlante45
68a1c56ad6 More work on import interface 2013-08-15 17:21:23 -07:00
Stephen Birarda
5b02125d5f remove an extra g 2013-08-15 16:10:34 -07:00
Stephen Birarda
d4951b0223 fix getter for Hand and Head 2013-08-15 16:09:44 -07:00
Stephen Birarda
9816e1d9a8 some spacing cleanup in Head 2013-08-15 16:09:00 -07:00
Stephen Birarda
6cbe0ca3d0 some spacing cleanup in Avatar header 2013-08-15 16:04:42 -07:00
Stephen Birarda
4a13f3b75a move swatch reset to Menu 2013-08-15 15:52:47 -07:00
Stephen Birarda
0ec2b761e9 remove some extra methods after menu cleanup 2013-08-15 15:44:03 -07:00
Stephen Birarda
e2ae85176f make settings methods slots in Menu so they are accessible 2013-08-15 15:41:25 -07:00
Stephen Birarda
0667190d00 hook settings options in menu 2013-08-15 15:40:17 -07:00
Stephen Birarda
e18be2cb36 hook audio listening modes and complete cleanup for debug 2013-08-15 15:37:09 -07:00
Stephen Birarda
154c6b4f32 fix disabling of occlusion culling from menu 2013-08-15 15:32:44 -07:00
Stephen Birarda
b288cc43a2 fix disabling of delta sending and low res while moving 2013-08-15 15:29:05 -07:00
Stephen Birarda
c930d058b1 fix monochrome option menu hook 2013-08-15 15:23:26 -07:00
Stephen Birarda
b4da77028b fix true colorization of voxels 2013-08-15 15:16:58 -07:00
Stephen Birarda
80967e6941 fix by source false colorization 2013-08-15 15:16:13 -07:00
Stephen Birarda
2742e723e0 fix V2 occlusion false coloring 2013-08-15 15:15:43 -07:00
Stephen Birarda
e77aae157b fix in view and occluded false colorization 2013-08-15 15:15:19 -07:00
Stephen Birarda
c7be2e13cd repair false coloring by distance 2013-08-15 15:12:05 -07:00
Stephen Birarda
cf5c53281b repair first couple of false colorize methods 2013-08-15 15:07:49 -07:00
atlante45
90a44acbc1 Merge branch 'master' of https://github.com/worklist/hifi into separate_import_with_preview 2013-08-15 14:59:51 -07:00
Stephen Birarda
f72f9d8735 fix hook to render pipeline warnings and kill local voxels 2013-08-15 14:57:40 -07:00
Stephen Birarda
474b0465a7 hook tree stat calculation to menu 2013-08-15 14:50:12 -07:00
Stephen Birarda
eb4508aafb hook timing tests to Menu 2013-08-15 14:46:25 -07:00
Stephen Birarda
87bb260dcc hook menu to voxel cut/copy/paste operations 2013-08-15 14:42:41 -07:00
Stephen Birarda
cd000cb7c1 remove the particle system from ground plane 2013-08-15 14:37:27 -07:00
ZappoMan
7045dff7d3 moved VoxelEditPacketSender to libraries 2013-08-15 14:26:31 -07:00
ZappoMan
209c9f93ed remove Application dependency from VoxelEditPacketSender class 2013-08-15 14:21:21 -07:00
Andrzej Kapolka
cceeb1c6ff Merge branch 'master' of https://github.com/worklist/hifi into ssao 2013-08-15 13:11:12 -07:00
Andrzej Kapolka
28d306a228 Remove the code here; will be replacing it based on glow effect work. 2013-08-15 13:10:48 -07:00
ZappoMan
82782b6ec5 switched to using Application singleton 2013-08-15 13:10:41 -07:00
Stephen Birarda
89248cdf8d fix voxel paint color assignment 2013-08-15 12:56:25 -07:00
Stephen Birarda
f864b6436d fix isVoxelModeChecked comparisons 2013-08-15 12:51:33 -07:00
Stephen Birarda
0e4d54d5b0 voxel mode actions group cannot be exclusive 2013-08-15 12:48:48 -07:00
Stephen Birarda
4903122432 fix hooks to voxel stats dialog 2013-08-15 12:38:26 -07:00
Stephen Birarda
d1bc2058bc fix hook to open bandwidth details 2013-08-15 12:30:29 -07:00
Stephen Birarda
d257b70103 fixes for new Menu class after merge with upstream/master 2013-08-15 12:29:04 -07:00
Stephen Birarda
443203201e Merge remote-tracking branch 'upstream/master' into menu 2013-08-15 12:22:37 -07:00
ZappoMan
2ae5a56b6e Merge pull request #854 from ey6es/glow 
Three other glow techniques, with menu option to cycle between them.
 2013-08-15 12:21:11 -07:00
Stephen Birarda
811fc87294 move avatar size changes to Avatar slots 2013-08-15 12:18:19 -07:00
Stephen Birarda
92b6459e4b hooks for cycle of voxel mode and face mode 2013-08-15 11:54:56 -07:00
Stephen Birarda
3a42bda0f2 repairs after merge with upstream master 2013-08-15 11:42:30 -07:00
ZappoMan
4f16157e51 CR feedback 2013-08-15 11:39:00 -07:00
Stephen Birarda
a2ed48ed1d Merge remote-tracking branch 'upstream/master' into menu 2013-08-15 11:38:33 -07:00
Stephen Birarda
bbe239694e move Avatar goHome to Avatar slot 2013-08-15 11:36:12 -07:00
Stephen Birarda
ce3afbcb32 fix hooks for webcam mode cycle and texture 2013-08-15 11:31:25 -07:00
Stephen Birarda
f5079374f3 fix hooks for skeleton tracking and collisions 2013-08-15 11:29:10 -07:00
Stephen Birarda
9e4e1f3edc fix hook to Webcam toggle from Menu 2013-08-15 11:19:45 -07:00
Stephen Birarda
c6baa56022 update Q_OS_MAC ifdefs for Qt 5 2013-08-15 11:12:17 -07:00
Stephen Birarda
10109fff10 inlined spacing cleanup in Head, remove noise 2013-08-15 11:04:18 -07:00
Stephen Birarda
eb7714f6c4 change signature of Menu helper for cleaner code in ctor 2013-08-15 10:56:37 -07:00
ZappoMan
8e07bd42ea removed app from SendVoxelsOperationArgs since its available as singleton 2013-08-15 10:51:56 -07:00
ZappoMan
8b867df762 style fix 2013-08-15 10:47:59 -07:00
Stephen Birarda
46b064b7d6 initial decoupling of menu from Application 2013-08-15 10:46:51 -07:00
Andrzej Kapolka
94e5c8d4a1 Missed a spot in the merge. 2013-08-15 10:10:14 -07:00
Andrzej Kapolka
3ad0b8b99d Merge branch 'master' of https://github.com/worklist/hifi into ssao 
Conflicts:
	interface/src/Application.h
 2013-08-15 10:06:22 -07:00
ZappoMan
ced61e94d8 added more doxygen comments 2013-08-15 08:48:21 -07:00
ZappoMan
beec5f60d8 renamed class to be more appropriate, added doxygen comments 2013-08-15 08:36:06 -07:00
Andrzej Kapolka
95fee434a7 Don't make the avatars glow; that was just for testing. 2013-08-14 17:37:50 -07:00
Andrzej Kapolka
ab9d414340 Doxygen comment fix. 2013-08-14 17:22:43 -07:00
Andrzej Kapolka
690e2c1965 Blur/add should be the default. 2013-08-14 16:58:04 -07:00
Andrzej Kapolka
7cd1360ba7 Doxygen-style comments. 2013-08-14 16:48:00 -07:00
Andrzej Kapolka
a9ccca3f72 Diffuse/add glow mode. 2013-08-14 16:13:30 -07:00
ZappoMan
d19e2d7490 merge repair 2013-08-14 14:23:13 -07:00
ZappoMan
153f444c32 merge repair 2013-08-14 14:22:50 -07:00
ZappoMan
4227d75942 merge repair 2013-08-14 14:21:25 -07:00
ZappoMan
4305ad552d fix issue with JurisdictionMap being passed across wire 2013-08-14 14:19:06 -07:00
Andrzej Kapolka
15f129f32d Added simple additive/blur-with-persist glow modes, means to cycle through 
modes.
 2013-08-14 14:14:47 -07:00
ZappoMan
a43615e9dc repair bad merge 2013-08-14 13:20:22 -07:00
ZappoMan
4477289501 repair bad merge 2013-08-14 13:18:41 -07:00
ZappoMan
f09dcfa4b7 Merge branch 'master' of https://github.com/worklist/hifi into voxel_sending_helper 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2013-08-14 13:12:23 -07:00
Andrzej Kapolka
581b60995a Merge branch 'master' of https://github.com/worklist/hifi into glow 2013-08-13 14:37:10 -07:00
atlante45
c095b6b0b3 Merge branch 'master' of https://github.com/worklist/hifi into separate_import_with_preview 2013-08-13 14:30:57 -07:00
Andrzej Kapolka
48bee0e52c Gonna access that vector from two threads? Need to lock it. 2013-08-13 14:29:49 -07:00
Andrzej Kapolka
01cd0d2a1f Have the glow effect add half of the original texture, too, and use it on the 
follow indicator.
 2013-08-13 14:22:29 -07:00
Andrzej Kapolka
f6209b702c Use glow effect for follow indicator. 2013-08-13 13:16:59 -07:00
Andrzej Kapolka
b05b43f027 Render to texture first, rather than copying from the frame buffer. Copying 
from the frame buffer requires it to have an alpha channel, which actually
does something on OS X (meaning we have to set it to 1.0).  We're going to
want to render to texture anyway for SSAO (or other effects).
 2013-08-13 12:27:52 -07:00
ZappoMan
d3ce3e4e60 some cleanup and fixing of memory issue 2013-08-13 11:37:57 -07:00
ZappoMan
60dedee739 make JurisdictionMap handle copy/move/assigment so that it will work in std::vector<> and std::map<>, switch application to have map of JurisdictionMap objects instead of just root codes 2013-08-13 11:08:43 -07:00
Andrzej Kapolka
c1f6794295 Merge branch 'master' of https://github.com/worklist/hifi into glow 2013-08-13 09:49:18 -07:00
ZappoMan
7d2c69f530 latest work on threaded sending 2013-08-12 16:55:58 -07:00
ZappoMan
4ea0de1637 deleting old dead code 2013-08-12 13:39:01 -07:00
Stephen Birarda
5b181bd351 add new Menu class for Application cleanup 2013-08-12 12:29:01 -07:00
ZappoMan
e7b3d41c33 make PacketReceiver derive from GenericThread 2013-08-12 12:04:05 -07:00
ZappoMan
70344cdaf2 move voxel receiving into class 2013-08-12 11:46:57 -07:00
ZappoMan
d56fa5a933 Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 2013-08-12 09:12:43 -07:00
ZappoMan
55f03608ab make voxel fade shorter elapsed time and logarithmic instead of linear 2013-08-10 12:20:01 -07:00
ZappoMan
8e2fcffd5c enabled Low Res sending while moving by default 2013-08-10 11:58:25 -07:00
ZappoMan
b5e2bc2093 implement threaded voxel processing 2013-08-10 11:35:59 -07:00
atlante45
f2305fd969 Added VoxelImporter class 2013-08-09 23:11:04 -07:00
Andrzej Kapolka
a3cee5d052 More efficiency for glow effect. 2013-08-09 16:16:02 -07:00
Andrzej Kapolka
9189a206b8 Merge branch 'master' of https://github.com/worklist/hifi into glow 2013-08-09 10:12:47 -07:00
Andrzej Kapolka
1828a105d4 Basic glow effect. 2013-08-08 16:55:45 -07:00
Stephen Birarda
da97cf75b4 Merge pull request #842 from Atlante45/master 
Follow mode improvements
 2013-08-08 16:32:35 -07:00
atlante45
521eb19625 PR comments + Changed MIN and MAX scale 2013-08-08 16:22:26 -07:00
Stephen Birarda
60119ddd52 Merge pull request #843 from PhilipRosedale/master 
Better collision and click voxel sounds
 2013-08-08 16:16:19 -07:00
Philip Rosedale
0e1149a8ef Fixes per review 2013-08-08 16:11:51 -07:00
Philip Rosedale
d5a0b2ff93 Fixes per review 2013-08-08 16:10:07 -07:00
ZappoMan
2c96296936 fixed LOD disappear on backing up 2013-08-08 16:08:06 -07:00
Philip Rosedale
43ad461275 Merge branch 'master' of https://github.com/worklist/hifi 2013-08-08 16:01:02 -07:00
Philip Rosedale
45961b2b64 Collision and click sounds improved 2013-08-08 16:00:50 -07:00
atlante45
f5fe965093 Position based follow mode whith head movement 2013-08-08 15:49:35 -07:00
atlante45
b1e975e96b Don't show pie menu when on voxel 2013-08-08 15:48:33 -07:00
Stephen Birarda
80cf39e437 Merge pull request #836 from ZappoMan/master 
Fixed voxel server "down" case for last voxel server
 2013-08-08 14:33:33 -07:00
ZappoMan
6d4ebda1ff fix delete local voxels in case of last voxel server going away 2013-08-08 14:30:46 -07:00
ZappoMan
48e35ec6cb fix delete local voxels in case of last voxel server going away 2013-08-08 14:29:58 -07:00
Andrzej Kapolka
5bca763c14 Merge branch 'master' of https://github.com/worklist/hifi into glow 2013-08-08 13:58:53 -07:00
Andrzej Kapolka
c929f67cc4 Update the *other* avatar mixer bandwidth stats. 2013-08-08 12:33:31 -07:00
Andrzej Kapolka
cb89f05a39 Merge branch 'master' of https://github.com/worklist/hifi into glow 2013-08-08 12:01:03 -07:00
Andrzej Kapolka
29912d053a Merge branch 'master' of https://github.com/worklist/hifi 2013-08-08 11:02:59 -07:00
Andrzej Kapolka
aca15d4aef Disable specular highlights for ground and voxels. 2013-08-08 10:59:01 -07:00
ZappoMan
647c176631 make voxel server fades slightly smaller than bounds to prevent z-fighting 2013-08-08 09:57:48 -07:00
ZappoMan
f2a9d0563a Merge pull request #827 from machinelevel/dev4 
Rave tweak: noise reduction
 2013-08-07 21:16:59 -07:00
Eric Johnston
97d1c5bcbf Rave tweak: noise reduction 
…by putting a smart cap on particle chain distances
 2013-08-07 18:03:59 -07:00
Andrzej Kapolka
55a010a1a0 And also, close the file descriptor and print a message. 2013-08-07 18:02:38 -07:00
Andrzej Kapolka
f171b76f69 Fix for gyros' freaking out when disconnected. 2013-08-07 17:54:02 -07:00
Eric Johnston
a20668951a Merge branch 'master' of git://github.com/worklist/hifi into dev4 2013-08-07 17:06:43 -07:00
ZappoMan
62f5bb0212 Merge pull request #826 from birarda/master 
socket changes to send proper port to pairing server
 2013-08-07 16:47:07 -07:00
Stephen Birarda
655a27b257 Merge pull request #825 from Atlante45/master 
Fix other avatar not rendered in first person
 2013-08-07 16:44:23 -07:00
Stephen Birarda
2a21ce7945 socket changes to send correct port to pairing server 2013-08-07 16:40:28 -07:00
atlante45
4449b46466 Fix other avatar not rendered in first person 2013-08-07 16:38:02 -07:00
Eric Johnston
524e5dd130 Fixed fencepost error to make trails slightly cleaner 2013-08-07 16:33:38 -07:00
Andrzej Kapolka
9dbec35f6a Merge pull request #823 from ZappoMan/master 
Display Frustum and resizeGL() cleanup
 2013-08-07 16:29:34 -07:00
ZappoMan
cb211fbb04 CR feedback 2013-08-07 16:27:43 -07:00
Eric Johnston
a01b36c7a5 Merge branch 'master' of git://github.com/worklist/hifi into dev4 2013-08-07 16:22:21 -07:00
Eric Johnston
52b33cb466 Rave tweaks: Improvements to finger trails and hand rendering 2013-08-07 16:19:54 -07:00
ZappoMan
9f5f7d96da Merge pull request #820 from Atlante45/master 
Display leap hand and rave glove in first person mode
 2013-08-07 16:17:37 -07:00
ZappoMan
85d5f86046 Merge pull request #821 from PhilipRosedale/master 
Rotation stops faster
 2013-08-07 16:16:54 -07:00
ZappoMan
f4820143d7 cleanup resizeGL, and Display Frustum menus 2013-08-07 16:12:03 -07:00
Hifi Test Account
38651a6a40 Translate half cylinder backing rather than rotate a 2nd one. 2013-08-07 16:04:45 -07:00
ZappoMan
40025618e0 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Application.cpp
	interface/src/Camera.cpp
 2013-08-07 15:49:34 -07:00
Hifi Test Account
8cadca4ce7 Resize half cylinder backing to texture in full frame mode. 2013-08-07 15:35:12 -07:00
atlante45
b6adb14a16 Merge branch 'master' of https://github.com/worklist/hifi 2013-08-07 14:51:09 -07:00
atlante45
20fea6b0ad Height relative collision rdius when not in first person 2013-08-07 14:50:35 -07:00
ZappoMan
d2d8bad241 simplified frustum camera mode, fixed resizeGL in case of frustum being on 2013-08-07 14:47:36 -07:00
Philip Rosedale
a4d1bc5b6e Merge branch 'master' of https://github.com/worklist/hifi 2013-08-07 14:43:49 -07:00
Andrzej Kapolka
a8099c93c0 Merge pull request #806 from LionTurtle/master 
Add renderHalfCylinder function and render a static half cylinder behind the face in full frame mode.
 2013-08-07 14:43:04 -07:00
Philip Rosedale
0445da3221 Stop rotating more quickly, display avatar position and yaw stats 2013-08-07 14:42:57 -07:00
atlante45
6fb76d3dfe Merge branch 'master' of https://github.com/worklist/hifi 2013-08-07 14:30:18 -07:00
atlante45
c48652c2c3 Display leap hand and rave glove in first person mode 2013-08-07 14:28:21 -07:00
Andrzej Kapolka
d3b7a31e3b Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Camera.cpp
 2013-08-07 14:27:17 -07:00
Andrzej Kapolka
e9b3cca3de OpenGL fields of view are vertical, not horizontal. 2013-08-07 14:26:22 -07:00
atlante45
81446f13d5 Fix head not colliding with voxels and environement 2013-08-07 14:18:02 -07:00
Andrzej Kapolka
597842eba2 Starting on glow effect. 2013-08-07 14:17:52 -07:00
atlante45
d0461e36f1 Fix no collision when offset camera on from the beginning 2013-08-07 14:16:49 -07:00
Philip Rosedale
0d26bb4266 Camera always stops moving when using gyro's 2013-08-07 14:08:30 -07:00
Hifi Test Account
cd8047b01a Remove unused vars in Face class. 2013-08-07 13:54:38 -07:00
ZappoMan
153e8afd44 Merge pull request #816 from Atlante45/master 
Fix objects coming into near clip
 2013-08-07 12:39:01 -07:00
ZappoMan
393723d8fb changed delete voxel fade color 2013-08-07 12:36:26 -07:00
atlante45
3bc9dd116e - Compute collisions radius only when collisions are on 2013-08-07 12:31:31 -07:00
Hifi Test Account
5f90e1a4e9 Fix the last commit. Remove compile error and increased buffer size to 
to account for the increased size of vertexData.
 2013-08-07 12:30:45 -07:00
atlante45
35557e1973 - Change collision radius according to near clip so nothing comes inside 2013-08-07 12:25:31 -07:00
atlante45
19b9be3361 - Now P switch between first and third person view 2013-08-07 12:24:13 -07:00
Hifi Test Account
edf4579d0e Merge remote-tracking branch 'upstream/master' 2013-08-07 12:08:43 -07:00
Hifi Test Account
1e7dbbbccd Fix renderHalfCylinder so that normals are correct now. Add facePosition and faceRotation storage to Face class. 2013-08-07 12:07:41 -07:00
ZappoMan
451b2bc595 added Sending Mode to on screen stats 2013-08-07 12:07:39 -07:00
ZappoMan
11b7e84a80 Merge pull request #811 from ey6es/master 
Several minor fixes for depth camera code.
 2013-08-07 12:01:01 -07:00
Andrzej Kapolka
e17149a49d Merge pull request #812 from Atlante45/master 
Rendering changes
 2013-08-07 11:46:43 -07:00
Andrzej Kapolka
80481747fa Fix for enabling depth-only webcam after startup. 2013-08-07 11:15:37 -07:00
Andrzej Kapolka
377adb30ae Merge branch 'master' of https://github.com/worklist/hifi 2013-08-07 11:14:48 -07:00
Eric Johnston
5373f85d30 Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-08-07 11:13:42 -07:00
atlante45
ce12c51fce Merge branch 'master' of https://github.com/worklist/hifi 2013-08-07 11:13:26 -07:00
ZappoMan
96e6c2f9bd Merge pull request #810 from ZappoMan/master 
quick fix crash in parseVoxelStats()
 2013-08-07 11:11:46 -07:00
atlante45
08309e3aac Merge branch 'master' of https://github.com/worklist/hifi 2013-08-07 11:11:29 -07:00
ZappoMan
ccf3498ae5 quick fix crash in parseVoxelStats() 2013-08-07 11:11:03 -07:00
Eric Johnston
10e4174ce3 Rave tweak: keep the right arm on the right-most Leap hand. 2013-08-07 11:08:14 -07:00
atlante45
dcdae6c6a0 - Add a translucide sphere around avatars far away with radius relative to average loudness 2013-08-07 11:00:20 -07:00
atlante45
f151b2cfc1 - Don't render body when in first person view 2013-08-07 10:58:30 -07:00
atlante45
132d03e291 Moved string when following to chest 2013-08-07 10:56:32 -07:00
atlante45
414af9811a - Add fading to lookAt vectors 2013-08-07 10:54:52 -07:00
ZappoMan
d893d4cf16 Merge pull request #807 from machinelevel/dev4 
Rave tweaks: change the look of the hands, fix screen-darken
 2013-08-07 10:49:59 -07:00
Eric Johnston
1fc4f17f7a Rave tweaks: change the look of the hands, fix screen-darken 
Screen-darken is now a simple fullscreen draw
Leap hands are now visible and match body lighting
Fingertips are hidden and hand coloring matches body and arm
"fake hands" aren't active unless they're chosen from the Debug menu.
 2013-08-07 10:29:31 -07:00
Jeffrey Ventrella
6997d0174a clean up in mohawk code 2013-08-07 10:24:21 -07:00
Andrzej Kapolka
ca939fb6b8 Merge branch 'master' of https://github.com/worklist/hifi 2013-08-07 10:18:45 -07:00
Jeffrey Ventrella
b007ab11d4 Merge remote-tracking branch 'upstream/master' into particles 2013-08-07 10:18:32 -07:00
Jeffrey Ventrella
253154ce6d fixed mohawk physics bug 2013-08-07 10:17:53 -07:00
Andrzej Kapolka
f20ac7f4bc Include received video data in bandwidth usage, clear webcam bits when it's 
been turned off.
 2013-08-07 10:17:04 -07:00
Hifi Test Account
988faeff54 Render static halfCylinder backing to face in full frame mode. 2013-08-07 10:14:35 -07:00
Philip Rosedale
cdfabd7647 Merge pull request #805 from ZappoMan/master 
Tweaks for Grayson
 2013-08-07 10:01:58 -07:00
ZappoMan
61560af28f cleanup 2013-08-06 19:21:46 -07:00
ZappoMan
a5f472254d removed ground plane grid, and changed start position 2013-08-06 19:15:26 -07:00
Hifi Test Account
05d933bf33 Successful static half cylinder backing. 2013-08-06 18:38:41 -07:00
Hifi Test Account
d725bcdbff Fix renderHalfCylinder so it only has 2 args now. 2013-08-06 18:09:51 -07:00
Hifi Test Account
24e47755d4 Merge texture render code to improve PrimeSense. 2013-08-06 17:42:26 -07:00
Eric Johnston
35465686db Rave tweaks: Use separate light settings for avatars and particles 2013-08-06 17:39:56 -07:00
Philip Rosedale
7583e1cd14 Merge pull request #802 from ey6es/master 
Added a textured rendering mode for depth data that doesn't use video input; rather, it computes normals from the depth and uses local lighting.
 2013-08-06 17:13:50 -07:00
Eric Johnston
378cb343ae Rave tweaks per Ryan's request: Mood lighting for the avatars. This also sets us up to have light coming from the effects, if we want. 2013-08-06 16:45:15 -07:00
Andrzej Kapolka
2f2eaf8ae5 Merge branch 'master' of https://github.com/worklist/hifi 2013-08-06 16:28:22 -07:00
Andrzej Kapolka
63aeb4df75 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Application.cpp
 2013-08-06 16:28:14 -07:00
Andrzej Kapolka
bd3c235fe4 Switching between textured and untextured modes. 2013-08-06 16:23:58 -07:00
atlante45
558255ca3d - Made collision On by default 2013-08-06 16:13:31 -07:00
Philip Rosedale
426abbb55a Merge pull request #799 from ZappoMan/fun_fade 
add fade effect to voxel add and delete, fix crash with audio injector
 2013-08-06 15:09:43 -07:00
ZappoMan
634b69b545 Merge pull request #797 from machinelevel/dev4 
Rave demo changes per Ryan's request: Darken the world when you're in ra...
 2013-08-06 15:00:26 -07:00
ZappoMan
05452dc2aa Merge pull request #796 from PhilipRosedale/touchLook 
Tune gyros, always fly in direction of sight, head always moves with gyros, adjustable view sensitivity
 2013-08-06 14:59:28 -07:00
ZappoMan
facc9e1ee7 add fade effect to voxel add and delete, fix crash with audio injector 2013-08-06 14:55:40 -07:00
Eric Johnston
2e5dade413 Rave demo changes per Ryan's request: Darken the world when you're in rave mode, but leave the avatars and effects un-darkened. 
Also fixed a warning in AvatarData.cpp initialization
 2013-08-06 14:29:30 -07:00
ZappoMan
6cf87fc120 Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 
Conflicts:
	interface/src/Application.cpp
 2013-08-06 13:49:42 -07:00
ZappoMan
c93c6687bf fix build buster 2013-08-06 13:48:30 -07:00
ZappoMan
fb2a1cce50 Merge pull request #795 from machinelevel/dev4 
Rave glove adjustments per Ryan's requests: hide fingers and arms when r...
 2013-08-06 13:45:42 -07:00
Andrzej Kapolka
720ae561df Working on support for a textured face mode that doesn't rely on the video 
stream.
 2013-08-06 13:27:54 -07:00
Eric Johnston
9a4a0e2819 Rave glove adjustments per Ryan's requests: hide fingers and arms when raving, center hands in front of face. 2013-08-06 12:44:29 -07:00
Philip Rosedale
ebd5c4832a Merge branch 'master' of https://github.com/worklist/hifi into touchLook 2013-08-06 12:34:55 -07:00
Philip Rosedale
120bbbd506 Tuned gyro look, added better preferences 2013-08-06 12:34:45 -07:00
ZappoMan
c93ed450a2 Merge pull request #791 from Atlante45/stalking_indicator 
Stalking indicator
 2013-08-06 12:33:26 -07:00
Philip Rosedale
abf64f3e7f Merge pull request #792 from Atlante45/turn_off_collisions 
Add option to turn collisions on and off
 2013-08-06 12:27:27 -07:00
Philip Rosedale
bb15eb664c Merge pull request #793 from machinelevel/dev4 
Rave glove: Fix initialization issues and activate mode switch.
 2013-08-06 12:15:01 -07:00
ZappoMan
88e2e3dd3f added visulization for voxel add/kill 2013-08-06 12:05:43 -07:00
Eric Johnston
ab31c3f82d Rave glove: Fix initialization issues and activate mode switch. 
Note that this change will have no effect until the Avatar Mixer gets it, because the mixer will continue to send "glove mode 0" until it receives this update.
 2013-08-06 11:59:58 -07:00
atlante45
ddf1b06bf9 Add option to turn collisions on and off 2013-08-06 11:33:59 -07:00
atlante45
eb9f32b7cb Merge branch 'master' of https://github.com/worklist/hifi into stalking_indicator 2013-08-06 11:07:58 -07:00
atlante45
32c155ef71 Render a string to show who is following who 2013-08-06 10:53:10 -07:00
ZappoMan
13408b607e Merge pull request #790 from PhilipRosedale/touchLook 
Touch-driven pitch happens immediately even when wearing gyros
 2013-08-06 10:39:57 -07:00
ZappoMan
73510ec975 added notifications with jurisdiction details for when voxel servers come and go 2013-08-06 10:33:09 -07:00
Philip Rosedale
58cb852597 Touch-driven pitch happens immediately even when wearing gyros 2013-08-06 10:06:40 -07:00
Eric Johnston
16aae5993a Rave glove fixes: removed double-stored glove mode members 
Uncommented glove mode switch, which now calls a non-crashing method.
Fixed overlapping method names for very different methods (setRaveGloveMode becomes activateNewRaveGloveMode).
 2013-08-06 07:33:18 -07:00
Mark Peng
147d5fc454 Merge remote-tracking branch 'upstream/master' 2013-08-05 19:52:55 -07:00
Mark Peng
57efea40ee Add untested renderHalfCylinder function to GeometryCache/ 2013-08-05 19:52:02 -07:00
Philip Rosedale
e5de67152e Merge pull request #786 from Ventrella/particles 
Added member variables to Hand.cpp to manage rave glove mode switching
 2013-08-05 19:26:55 -07:00
Philip Rosedale
d7dc07502c Merge pull request #787 from machinelevel/dev4 
Rave glove demo: network-glove fixes
 2013-08-05 18:58:04 -07:00
Jeffrey Ventrella
f9f925b70b removed printf 2013-08-05 17:30:04 -07:00
Eric Johnston
d85ce81313 Rave glove demo: network-glove fixes 
After this change, people can see each other's rave glove performances.
1. Moved hand->simulate call into avatar->simulate so that it gets called on all avatars, not just mine.
2. Hide the rave stage, so it's out of the way while we figure out the best way to darken the world, if that's still desired.
 2013-08-05 17:27:42 -07:00
Jeffrey Ventrella
cba42808c1 fixed initial rave glove mode 2013-08-05 17:24:31 -07:00
Jeffrey Ventrella
4ceba28632 working with Eric to fix transmission of hand data 2013-08-05 17:00:50 -07:00
ZappoMan
b016c08578 Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 
Conflicts:
	libraries/avatars/src/HandData.h
 2013-08-05 16:53:41 -07:00
ZappoMan
acd3acb81e correctly handle freeing of memory for _jurisdictionRoot in VoxelSceneStats 2013-08-05 16:51:01 -07:00
Jeffrey Ventrella
2dbd0f7f31 Merge branch 'master' of https://github.com/worklist/hifi into particles 2013-08-05 16:31:49 -07:00
Jeffrey Ventrella
f51db292a4 ya 2013-08-05 16:26:32 -07:00
ZappoMan
07a61a3c8e Merge pull request #782 from Atlante45/master 
few fixes on rescaling and following
 2013-08-05 15:44:15 -07:00
atlante45
55e34558cb Merge branch 'master' of https://github.com/worklist/hifi 2013-08-05 15:26:43 -07:00
Andrzej Kapolka
36ae7dbd48 Normalize when we render the ground. This shouldn't be necessary, but it 
looks like various parts of the code rely on RESCALE_NORMAL, which is set but
not unset in avatar/Head/Hand.  We'll have to look at that more closely later
on.
 2013-08-05 15:24:21 -07:00
atlante45
29062c51b2 - changed according to review comments 
- added reset scale option
 2013-08-05 15:23:40 -07:00
ZappoMan
7a3d254aca small tweak 2013-08-05 15:02:24 -07:00
ZappoMan
f1a0edb471 Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 2013-08-05 14:57:10 -07:00
ZappoMan
7021d3c6a5 Merge pull request #777 from Ventrella/particles 
Added BendyLine
 2013-08-05 14:55:26 -07:00
ZappoMan
7ccab1a32c Merge pull request #783 from LionTurtle/master 
Render other avatar's lookat to point at my camera if the other avatar is looking at my head.
 2013-08-05 14:53:27 -07:00
Mark Peng
1790b0595c Render other avatar's lookat to point at my camera if the other avatar 
is looking at my head.
 2013-08-05 14:26:39 -07:00
atlante45
6c0ea0cf9c Merge branch 'master' of https://github.com/worklist/hifi 2013-08-05 14:11:14 -07:00
Jeffrey Ventrella
1a2c8f9875 Merge remote-tracking branch 'upstream/master' into particles 2013-08-05 14:10:28 -07:00
Jeffrey Ventrella
96b443ec5d Merge pull request #781 from machinelevel/dev4 
Rave glove demo: Network rave data
 2013-08-05 14:07:57 -07:00
atlante45
3d853f5b90 - Smooth rescaling 
- stop following when leading avatar disconnect
- set max far clip for no more crash with really big avatars
 2013-08-05 14:05:58 -07:00
ZappoMan
14b7f58fef Kills local voxels if voxel server is removed from NodeList 
- added notification hooks to NodeList
- implemented hooks in VoxelSystem to kill local voxels when
  voxel server is killed
 2013-08-05 13:47:18 -07:00
Eric Johnston
a3a5c3d6d4 Rave glove demo: Network rave data 
Sending glove modes over the network, and fixed ghost-fingers-left-behind issue.
Issues addressed:
  https://basecamp.com/2151194/projects/2058851-avatar/todos/54607028-bug-phantom-leap
  https://basecamp.com/2151194/projects/2058851-avatar/todos/54633674-demo-make
 2013-08-05 13:25:05 -07:00
ZappoMan
fe877b0ec8 Merge pull request #779 from birarda/rave-audio 
fix resetting of song mix menu item after import is done
 2013-08-05 12:27:47 -07:00
Stephen Birarda
25537f78a1 reset the song mix menu item after clip is done 2013-08-05 12:18:59 -07:00
Jeffrey Ventrella
405cb516f6 removed 3 magic numbers in particle system 2013-08-05 12:05:15 -07:00
Andrzej Kapolka
e8365c6b04 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-08-05 11:42:17 -07:00
Andrzej Kapolka
03de2f3ea7 Render a green plane with fog, per Grayson's request. 2013-08-05 11:41:42 -07:00
Jeffrey Ventrella
e2ba8e22d5 added BendyLine 2013-08-05 11:35:02 -07:00
Jeffrey Ventrella
7693165578 merge 2013-08-05 11:28:59 -07:00
Jeffrey Ventrella
6e69c4fbbb improved particle rainbow color cycle mode 2013-08-05 11:28:10 -07:00
ZappoMan
92f6fe6bd8 CR feedback 2013-08-05 11:14:30 -07:00
ZappoMan
bdabe709af added more color groups for false colorization from source 2013-08-05 11:11:10 -07:00
Stephen Birarda
035f1c81b9 Merge pull request #770 from ZappoMan/tile_import 
made import work better when tile locations not included in file name
 2013-08-05 10:56:53 -07:00
ZappoMan
1c45845842 Merge pull request #772 from birarda/assignee 
initial stub of assignment work
 2013-08-05 10:56:31 -07:00
atlante45
1ee870be38 Fix pie menu appearing in selection mode 2013-08-05 10:35:10 -07:00
ZappoMan
cc9e4eaf45 CR feedback 2013-08-05 10:24:52 -07:00
Stephen Birarda
fdd0e25a60 Merge pull request #771 from ZappoMan/bugfixes 
fixed disappearing voxel bug
 2013-08-05 10:15:56 -07:00
Stephen Birarda
a4ea0f035a resolve conflicts on merge with upstream master 2013-08-05 09:56:07 -07:00
ZappoMan
edfd5cd543 fixed disappearing voxel bug 2013-08-05 09:45:00 -07:00
ZappoMan
abc8bc332c made import work better when tile locations not included in file name 2013-08-02 20:12:13 -07:00
ZappoMan
ce937247d1 added back getUprightEyeLevelPosition() 2013-08-02 18:47:21 -07:00
ZappoMan
fd81053e33 fixed compiler warnings 2013-08-02 18:33:41 -07:00
Mark Peng
5ef965018c Fix bug where the lookatIndicator would draw and no longer update. 2013-08-02 18:13:49 -07:00
Mark Peng
da31cd441e Merge remote-tracking branch 'upstream/master' 2013-08-02 18:08:28 -07:00
Mark Peng
26d6e826c5 Merge remote-tracking branch 'upstream/master' 2013-08-02 18:03:34 -07:00
Mark Peng
71a919f226 Switch back to avatar.getEyePosition() rather than 
avatar.getHead().getEyePosition() because of mysterious lag.
 2013-08-02 18:02:37 -07:00
atlante45
ff27ee1c53 Merge branch 'master' of https://github.com/worklist/hifi into fix_key_press_event 2013-08-02 18:00:42 -07:00
atlante45
be83bf5635 Fixed fucked up merge 2013-08-02 17:57:53 -07:00
Stephen Birarda
8704964a0f resolve conflicts on merge with upstream master 2013-08-02 17:56:19 -07:00
Stephen Birarda
222a46189f some comments and _songFileBytes reset 2013-08-02 17:50:08 -07:00
Stephen Birarda
d259180778 add option to audio menu to stop the mixed audio 2013-08-02 17:46:23 -07:00
atlante45
84eae284ea Changed shifted and meta variable name 2013-08-02 17:44:21 -07:00
Mark Peng
ff67367221 Remove extra parenthesis. 2013-08-02 17:42:12 -07:00
Mark Peng
e0b7773521 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	interface/src/Application.cpp
	interface/src/avatar/Head.cpp
 2013-08-02 17:35:29 -07:00
atlante45
466d50ea4b Merge branch 'master' of https://github.com/worklist/hifi into fix_key_press_event 2013-08-02 17:30:59 -07:00
Stephen Birarda
d56b715432 add menu option to mix RAW audio with microphone audio 2013-08-02 17:30:49 -07:00
Mark Peng
d7cd88a9a7 Fix camera positioning so that it is in between avatar's eyes. Plus 
some code clean up.
 2013-08-02 17:30:26 -07:00
Philip Rosedale
1309e72553 Merge pull request #758 from Ventrella/particles 
Added avatar nose
 2013-08-02 17:26:10 -07:00
atlante45
bceb416d8a merge 2013-08-02 17:18:35 -07:00
atlante45
d765b58551 Merge branch 'master' of https://github.com/worklist/hifi into fix_key_press_event 2013-08-02 17:17:35 -07:00
atlante45
e9a53ed9b4 Changed avatar resizing shortcuts to plus and minus. 2013-08-02 17:14:57 -07:00
Andrzej Kapolka
4a122c6dca Merge pull request #761 from ey6es/pointy 
Adjusted bitrate for full frame video, fix for underflow errors.
 2013-08-02 17:05:00 -07:00
Stephen Birarda
447e332b6f Merge pull request #760 from Atlante45/fix_key_press_event 
Fix key press event
 2013-08-02 16:45:25 -07:00
Philip Rosedale
936209fd31 When no hovered voxel, lookAt vectors point to distant horizon 2013-08-02 16:37:49 -07:00
atlante45
8c112cbec3 Merge branch 'master' of https://github.com/worklist/hifi into fix_key_press_event 2013-08-02 16:37:18 -07:00
atlante45
1b4cdc003d Fix shortcuts : done 2013-08-02 16:36:53 -07:00
Philip Rosedale
639b6be01a Merge branch 'master' of https://github.com/worklist/hifi into Remove-body 2013-08-02 16:08:16 -07:00
Jeffrey Ventrella
d87b4a8e1e Merge remote-tracking branch 'upstream/master' into particles 2013-08-02 16:08:01 -07:00
Jeffrey Ventrella
95f15fceb5 added avatar nose 2013-08-02 16:07:33 -07:00
Philip Rosedale
8aa8b5dbfe Marker lines all the way out to 128Meters 2013-08-02 16:03:34 -07:00
Philip Rosedale
b9a8d6080e Render world box goes out to edge of world. 2013-08-02 15:43:37 -07:00
atlante45
eb2a1ecedd merge 2013-08-02 15:41:32 -07:00
atlante45
2e150b97de Fixed shortcuts issues on mac 2013-08-02 15:24:09 -07:00
Andrzej Kapolka
574752c774 Use saturate_cast when converting from YV12 to RGB to prevent overflow errors. 2013-08-02 14:58:59 -07:00
ZappoMan
db55160f9a Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 2013-08-02 14:40:39 -07:00
Andrzej Kapolka
5df4fc95f1 Up the bitrate for full frame video to 4x. 2013-08-02 14:21:21 -07:00
atlante45
f441295eb1 Merge branch 'pie_menu' of https://github.com/Atlante45/hifi into stalking_option 2013-08-02 14:15:07 -07:00
atlante45
1cae9fc6c7 merge 2013-08-02 14:14:21 -07:00
Jeffrey Ventrella
17f1c82e6f cleanup 2013-08-02 14:12:32 -07:00
Andrzej Kapolka
8de709a2c6 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-08-02 14:09:27 -07:00
Jeffrey Ventrella
f80a9fdf31 Merge remote-tracking branch 'upstream/master' into particles 2013-08-02 14:09:22 -07:00
Jeffrey Ventrella
90502a3ce5 removed rendering of finger root positions 2013-08-02 14:08:56 -07:00
ZappoMan
55f7028726 Merge pull request #744 from PhilipRosedale/master 
Smoother movement, rotation, less distracting collision noises.  Play sound on click voxel
 2013-08-02 14:03:51 -07:00
Jeffrey Ventrella
29c5511a54 test 2013-08-02 13:49:50 -07:00
Jeffrey Ventrella
28dd38c013 Merge remote-tracking branch 'upstream/master' into particles 2013-08-02 13:36:01 -07:00
Jeffrey Ventrella
a9ec94de49 fixed a problem with emitters not being coordinated with Leap fingers 2013-08-02 13:35:35 -07:00
ZappoMan
4c15964cdc Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 2013-08-02 11:44:09 -07:00
Andrzej Kapolka
def4318817 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-08-02 11:12:59 -07:00
Andrzej Kapolka
61da1826c7 Reduce bitrate for full frame mode. 2013-08-02 11:12:41 -07:00
Jeffrey Ventrella
6ebe33bb0b Merge remote-tracking branch 'upstream/master' into particles 2013-08-02 11:00:10 -07:00
Mark Peng
6cf42674d5 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	interface/src/Application.cpp
	interface/src/Webcam.cpp
	interface/src/Webcam.h
 2013-08-02 11:00:05 -07:00
Jeffrey Ventrella
8fc800acff some work on hands 2013-08-02 10:59:04 -07:00
Andrzej Kapolka
11664f9446 Have the particle system default to off. 2013-08-02 10:12:21 -07:00
Philip Rosedale
1b5c79aa8a Merge branch 'master' of https://github.com/worklist/hifi into Remove-body 2013-08-02 09:37:08 -07:00
Philip Rosedale
56e66f8020 Merge pull request #752 from ey6es/pointy 
Depth smoothing, full frame video support (along with ability cycle between no video, just face, full frame).
 2013-08-01 21:11:09 -07:00
ZappoMan
983db5f70d Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 2013-08-01 20:50:24 -07:00
Andrzej Kapolka
323e21ad4a Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-08-01 19:28:34 -07:00
Andrzej Kapolka
69cac69067 Go ahead and show the leap hand by default, but don't include the fingers if 
the palms are inactive (!)
 2013-08-01 18:56:14 -07:00
Philip Rosedale
8f95534644 Fix jittering in view from body slowly following head 2013-08-01 16:04:38 -07:00
Andrzej Kapolka
0052221c33 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-08-01 15:52:58 -07:00
atlante45
fdd01a6551 merge 2013-08-01 15:48:57 -07:00
ZappoMan
0a4fcdccb5 Merge branch 'master' of https://github.com/worklist/hifi into tile_import 
Conflicts:
	interface/src/Application.cpp
 2013-08-01 15:44:28 -07:00
ZappoMan
a0ba788679 implement grid landscape import 2013-08-01 15:40:39 -07:00
Andrzej Kapolka
12f42358d5 Allow cycling between video send modes. 2013-08-01 15:39:53 -07:00
Philip Rosedale
9defa6255a disable mouse wheel voxel scale change 2013-08-01 15:31:09 -07:00
atlante45
b6049c9a10 Merge branch 'master' of https://github.com/worklist/hifi into pie_menu 2013-08-01 15:28:35 -07:00
Mark Peng
6a6c51f80e Add skeleton tracking toggle in options menu in interface. 2013-08-01 15:04:58 -07:00
Philip Rosedale
ef8daffa4d Merge branch 'master' of https://github.com/worklist/hifi 2013-08-01 15:00:27 -07:00
Philip Rosedale
fcf20a7ebc Sound on click, but not on hover 2013-08-01 15:00:08 -07:00
Stephen Birarda
2b0cfe3c67 resolve conflicts on merge with upstream master 2013-08-01 14:33:23 -07:00
Mark Peng
9ba0e3bb0c Add reference lines to mouse voxel when adding/deleting voxels. 2013-08-01 13:03:17 -07:00
Andrzej Kapolka
ba9b5888d2 More work on full frame sending. 2013-08-01 13:00:01 -07:00
Philip Rosedale
bc1ac6b455 turn down collision sounds 2013-08-01 12:49:10 -07:00
Jeffrey Ventrella
5c38f78afc Merge remote-tracking branch 'upstream/master' into particles 2013-08-01 10:53:49 -07:00
Jeffrey Ventrella
0cd1018e76 some experimental work on hand rendering 2013-08-01 10:53:20 -07:00
Philip Rosedale
ba2c98a3eb Merge branch 'master' of https://github.com/worklist/hifi 2013-08-01 10:12:13 -07:00
Stephen Birarda
71ab8ae4f8 some necessary changes for AvatarData transmission 2013-08-01 10:07:10 -07:00
Andrzej Kapolka
a86ceb2759 More work on full frame video. 2013-07-31 18:18:37 -07:00
Jeffrey Ventrella
8f8d230761 Merge remote-tracking branch 'upstream/master' into particles 2013-07-31 17:59:37 -07:00
Jeffrey Ventrella
5b2693f99c added emitter active bool for switching emitters on/off when Leap loses fingers 2013-07-31 17:59:15 -07:00
Andrzej Kapolka
d18a9dc499 Working on full frame video support. 2013-07-31 17:06:09 -07:00
ZappoMan
55988ab802 Merge pull request #738 from Ventrella/particles 
Changed rave glove modes to use names suggested by Brad
 2013-07-31 16:21:04 -07:00
Stephen Birarda
493eda8dd0 Merge pull request #737 from birarda/qt5 
fix automoc error for OpenNI header
 2013-07-31 16:18:32 -07:00
Stephen Birarda
8166ed3a77 move OpenNI include 2013-07-31 16:15:39 -07:00
Stephen Birarda
b3fc378a0f don't include XnCppWrapper if Q_MOC_RUN is defined 2013-07-31 16:14:17 -07:00