Andrzej Kapolka
6e76179ca3
Place hand based on mouse position, but make sure we don't point above the
...
shoulders.
2013-10-28 15:59:04 -07:00
Andrzej Kapolka
4f34d89c4a
Added left hand/hand rotation setters in preparation for Leap integration.
2013-10-28 14:38:09 -07:00
Andrzej Kapolka
b56d47929b
Extremely basic IK based on implementation of the cyclic coordinate descent
...
algorithm. Actually seems to work pretty well.
2013-10-28 13:38:22 -07:00
ZappoMan
1c2e5eecd6
send VOXEL_QUERY to out of view voxel servers with PPS of 0
2013-10-28 12:07:02 -07:00
stojce
4fe9964e5a
reset view
...
- reset icon
- resetView signal
2013-10-28 18:19:31 +01:00
stojce
b09e657ecc
click mirror behaviour
...
- shrink function - restore mirror window view and set forward
fullscreen view
2013-10-27 09:57:00 +01:00
stojce
f675b198cb
RearView Tools
...
- moved to separate class
- new icon/button for restore view
-
2013-10-26 21:10:05 +02:00
Stephen Birarda
99ee614d04
Merge pull request #1126 from donpdonp/19444
...
19444 manage the window title, watch for username changes
2013-10-25 13:59:38 -07:00
Don Park
e44b0af9b6
make updateWindowTitle public, call it after Menu loads data into the Profile
2013-10-25 11:36:50 -07:00
Don Park
248f59325c
update the window title when the domain changes or the username changes
2013-10-25 11:05:50 -07:00
Andrzej Kapolka
b6f2498364
Pull the mirror camera back and narrow its field of view to reduce distortion.
...
Also, have it point at the avatar's eyes like the full screen mirror.
2013-10-25 11:04:34 -07:00
Andrzej Kapolka
09240dba27
Limit the eye rotation to 22.5 degrees.
2013-10-25 10:55:08 -07:00
Andrzej Kapolka
1e5ec3e84f
Fix for models exported from Blender: remove type prefix from IDs.
2013-10-25 10:18:40 -07:00
Don Park
dc420beaf2
updateWindowTitle()
2013-10-25 10:09:34 -07:00
Philip Rosedale
6957d990e2
Merge pull request #1120 from ZappoMan/rate_control
...
Only send PACKET_TYPE_VOXEL_QUERY messages to voxel servers that are in view.
2013-10-24 22:17:41 -07:00
ZappoMan
660edddf66
only send PACKET_TYPE_VOXEL_QUERY to voxel servers in view
2013-10-24 18:38:33 -07:00
ZappoMan
37584244e6
only send PACKET_TYPE_VOXEL_QUERY to voxel servers in view
2013-10-24 18:37:31 -07:00
Philip Rosedale
bf07ffd714
Merge pull request #1118 from ZappoMan/rate_control
...
add basic rate control, evenly divide packets per second between all connected voxel servers
2013-10-24 18:08:33 -07:00
ZappoMan
76fb3c18a2
add basic rate control, evenly divide packets per second between all connected voxel servers
2013-10-24 17:35:30 -07:00
Andrzej Kapolka
08db294a5b
Smooth gaze direction relative to window.
2013-10-24 17:23:21 -07:00
Andrzej Kapolka
4f3bacdd4c
Use calculated eye position here.
2013-10-24 16:16:45 -07:00
Andrzej Kapolka
5f696bd72e
Need to set lookat position to camera position before simulating in mirror
...
mode.
2013-10-24 16:06:44 -07:00
Andrzej Kapolka
8b6174f1fe
Merge branch 'master' of https://github.com/worklist/hifi
2013-10-24 15:30:11 -07:00
Andrzej Kapolka
145e9337a2
Let's try actually using the average eye position as the camera location for
...
first person and mirror mode.
2013-10-24 15:20:46 -07:00
Philip Rosedale
f8369ea29a
Merge pull request #1113 from ZappoMan/rate_control
...
first cut at splitting out PACKET_TYPE_VOXEL_QUERY from PACKET_TYPE_HEAD_DATA
2013-10-24 14:48:16 -07:00
Andrzej Kapolka
6554868fd8
Merge branch 'master' of https://github.com/worklist/hifi into attach
2013-10-24 14:23:48 -07:00
Andrzej Kapolka
bae4a17605
Voxel attachments.
2013-10-24 13:59:04 -07:00
ZappoMan
015adeedcb
first cut at splitting out PACKET_TYPE_VOXEL_QUERY from PACKET_TYPE_HEAD_DATA
2013-10-24 13:22:31 -07:00
ZappoMan
8ac5f5070c
Merge branch 'master' of https://github.com/worklist/hifi into view_is_similar
2013-10-23 17:59:00 -07:00
ZappoMan
b4c88a85f8
improvements to subtle moves for view frustum and voxel serving
2013-10-23 17:49:58 -07:00
Stephen Birarda
faa1c38820
update DS in data-server on profile change
2013-10-23 16:16:24 -07:00
Andrzej Kapolka
240f65b7c5
Scale fixes.
2013-10-23 16:15:03 -07:00
Andrzej Kapolka
a9df8a6b29
Partial fix for textures in exports from 3D Studio Max.
2013-10-23 15:56:09 -07:00
Andrzej Kapolka
41f73b5e9d
Support for attaching models to joints.
2013-10-23 15:16:29 -07:00
ZappoMan
3efc277aae
wrap more displaySide() items for not rendering when in mini rear view mode
2013-10-23 14:19:25 -07:00
ZappoMan
d31c3854ad
fix merge issue
2013-10-23 12:06:11 -07:00
ZappoMan
ea844634a6
Merge branch 'master' of https://github.com/worklist/hifi into fix_mirror_mode
2013-10-23 11:59:47 -07:00
ZappoMan
55294e1de7
Merge pull request #1103 from ey6es/master
...
As a temporary measure, restore the full screen mirror as a menu option.
2013-10-23 11:59:39 -07:00
ZappoMan
46eadb5fb7
Merge branch 'master' of https://github.com/worklist/hifi into fix_mirror_mode
2013-10-23 11:58:47 -07:00
ZappoMan
161367c899
fix rear view mirror mode to only render self
2013-10-23 11:58:01 -07:00
Andrzej Kapolka
183a866e9e
Remove code that will be added back in fullscreen mirror request.
2013-10-23 11:44:28 -07:00
Andrzej Kapolka
e8885332f2
Code review fixes.
2013-10-23 11:39:30 -07:00
Andrzej Kapolka
665551d690
Merge branch 'master' of https://github.com/worklist/hifi into ossome
2013-10-23 11:26:23 -07:00
Andrzej Kapolka
5334d9021e
Merge branch 'master' of https://github.com/worklist/hifi
2013-10-23 11:22:04 -07:00
Andrzej Kapolka
71b4b8fe46
Use lowercase h to toggle full screen mirror, capital H for inset.
2013-10-23 10:54:39 -07:00
Philip Rosedale
b1364f589a
Merge pull request #1102 from ZappoMan/keep_local_voxels
...
added support for forceFullFrustum in hideOutOfView() this fixes inconci...
2013-10-23 10:33:54 -07:00
Andrzej Kapolka
adc79be81c
Add back the full screen mode as a menu option, temporarily.
2013-10-23 10:30:42 -07:00
ZappoMan
b05d6e25e3
remove two debug outs
2013-10-23 10:23:07 -07:00
ZappoMan
5d18b68a2e
added support for forceFullFrustum in hideOutOfView() this fixes inconcistancies with voxel hiding showing
2013-10-23 10:14:41 -07:00
Andrzej Kapolka
cf78e21ea4
Merge branch 'master' of https://github.com/worklist/hifi into ossome
...
Conflicts:
interface/src/Application.cpp
2013-10-23 10:06:56 -07:00
Andrzej Kapolka
a568e71e37
Merge pull request #1099 from stojce/19433
...
Code Review for Job #19433
2013-10-23 10:03:36 -07:00
Andrzej Kapolka
251b80b514
Merge branch 'master' of https://github.com/worklist/hifi into ossome
2013-10-23 10:03:22 -07:00
ZappoMan
6e31f74236
tweak to menu text order
2013-10-23 06:00:26 -07:00
ZappoMan
306b23d489
make Fast Voxel Pipeline the default behavior
2013-10-23 05:58:47 -07:00
ZappoMan
1430a083d1
make DontRemoveOutOfView the default behavior
2013-10-23 05:44:20 -07:00
ZappoMan
3c8e30c956
make HideOutOfView the default behavior
2013-10-23 05:38:33 -07:00
ZappoMan
1786049710
make use delta frustum in culling the default behavior
2013-10-23 05:30:15 -07:00
ZappoMan
370fe3dad9
make constant culling the default mode
2013-10-23 05:22:29 -07:00
stojce
9382268ee3
CR fixes
2013-10-23 09:30:26 +02:00
Andrzej Kapolka
247dfd3750
Merge branch 'master' of https://github.com/worklist/hifi into ossome
2013-10-22 17:27:14 -07:00
Andrzej Kapolka
cf98d900f9
Removed unused variable.
2013-10-22 17:26:42 -07:00
Andrzej Kapolka
9dd41f4206
Render sticks, use avatar colors.
2013-10-22 16:52:44 -07:00
Andrzej Kapolka
2e06965b1c
I think this does the trick, finally.
2013-10-22 15:50:42 -07:00
Andrzej Kapolka
41775912d8
Back to using matrices.
2013-10-22 15:39:45 -07:00
Andrzej Kapolka
1f8bed9d9c
More transform rejiggery.
2013-10-22 15:31:27 -07:00
Andrzej Kapolka
d393bdcea6
Wheeee, let's try a different way of applying the lean rotation.
2013-10-22 15:04:49 -07:00
Andrzej Kapolka
02a21ae9c0
New plan: let's get the skeleton working first, then work on the face.
2013-10-22 14:33:27 -07:00
Andrzej Kapolka
cd4b88acaa
More rotation tweaks.
2013-10-22 13:39:51 -07:00
stojce
b728689c6d
more camera fixes
2013-10-22 22:18:56 +02:00
stojce
1cea3b403b
Fixed camera view options
...
- fixed camera lens angle
- xamera distance
2013-10-22 22:02:17 +02:00
Andrzej Kapolka
a33c7ce20c
More work on extracting rotations.
2013-10-22 12:54:32 -07:00
stojce
2fcb246923
close button on rear mirror view
2013-10-22 20:42:31 +02:00
Philip Rosedale
d44a82fce1
Merge pull request #1097 from ZappoMan/keep_local_voxels
...
Fixed bug in Keep Local Voxels
2013-10-22 09:35:47 -07:00
ZappoMan
96cd8c5d97
fixed issue with delta frustums on hide out of view
2013-10-22 09:25:01 -07:00
Philip Rosedale
cab9e7f658
Merge pull request #1094 from birarda/assignment
...
allow multiple buffers to be hooked to an individual node
2013-10-21 20:29:10 -07:00
Andrzej Kapolka
9d89baa506
Apply the neck position.
2013-10-21 17:30:26 -07:00
Andrzej Kapolka
b5f2dcfa55
Use the head position from the loaded skeleton, if available.
2013-10-21 16:58:01 -07:00
ZappoMan
f618b3a88d
removed some old comments
2013-10-21 16:19:03 -07:00
Andrzej Kapolka
349f7b363a
More work on custom skeletons.
2013-10-21 16:14:38 -07:00
ZappoMan
f5efe2dd7f
removed some old comments
2013-10-21 16:14:34 -07:00
ZappoMan
22a1d0a699
small tweak
2013-10-21 16:07:34 -07:00
Stephen Birarda
00446076b5
remove audio injectors that are starved and not added
2013-10-21 16:04:13 -07:00
ZappoMan
1b302f60f8
Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels
2013-10-21 16:03:53 -07:00
ZappoMan
b8dfc387b4
added reset settings for Old vs New voxel culling mode
2013-10-21 16:02:10 -07:00
ZappoMan
2979a8e738
better working version of hideOutOfView voxel support
2013-10-21 15:30:14 -07:00
stojce
890313b8ca
- fixed aspect ratio on mirror view
...
- stop rendering voxel selectors on mirror view
2013-10-21 23:55:08 +02:00
ZappoMan
f5a3fc07c4
added some debugging
2013-10-21 14:41:46 -07:00
ZappoMan
be67d6f8aa
added some new debug menus
2013-10-21 14:41:07 -07:00
ZappoMan
023a521948
some debug timing and voxel stats display
2013-10-21 14:39:05 -07:00
Andrzej Kapolka
49acca3587
Fixes to load my test model.
2013-10-21 11:20:27 -07:00
stojce
7a0d828364
Merge branch 'master' of https://github.com/worklist/hifi into 19433
2013-10-21 17:46:28 +02:00
stojce
b45525ae21
Mirror View initial setup
2013-10-21 08:28:38 +02:00
ZappoMan
b0bfba3043
Merge pull request #1090 from PhilipRosedale/master
...
Faceshift only notifies log on first fail to connect
2013-10-20 21:28:30 -07:00
stojce
652892522e
Merge branch 'master' of https://github.com/worklist/hifi into 19437
2013-10-19 09:06:41 +02:00
Andrzej Kapolka
871f97bd81
The Blender FBX has models that are also meshes.
2013-10-18 19:06:56 -07:00
Andrzej Kapolka
b294f5b13e
Fix for weird links in Blender exports.
2013-10-18 18:43:07 -07:00
Andrzej Kapolka
b3384d0869
More fixes for text FBXs.
2013-10-18 18:23:08 -07:00
Andrzej Kapolka
a6a4ceebe4
Just check the last entry for the type.
2013-10-18 18:03:28 -07:00
Andrzej Kapolka
ec17b80b52
Adapt to the *other* kind of cluster.
2013-10-18 17:54:54 -07:00
Andrzej Kapolka
ea50d6f22e
Forgot these guys.
2013-10-18 17:49:34 -07:00
Philip Rosedale
7ac9a87ad4
Merge pull request #1092 from birarda/master
...
fix for Qt 5.1.1 preferences bug
2013-10-18 17:33:40 -07:00
Andrzej Kapolka
7e174093e4
Factoring the FBX model code out to a shared base class.
2013-10-18 17:26:03 -07:00
Stephen Birarda
b6c4599a55
cleaup some unecessary defaults in Menu
2013-10-18 16:10:03 -07:00
Stephen Birarda
bdfc7fdb64
fix for preferences bug on 5.1.1
2013-10-18 16:07:05 -07:00
Philip Rosedale
bf842f01ba
Merge branch 'master' of https://github.com/worklist/hifi
2013-10-18 14:37:49 -07:00
Philip Rosedale
e43758a115
Faceshift fail to connect only notifies log once
2013-10-18 14:36:57 -07:00
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
Jeffrey Ventrella
be8a587d49
named rave glove effects
2013-07-31 16:07:21 -07:00
Jeffrey Ventrella
6c1cc911d5
Merge remote-tracking branch 'upstream/master' into particles
2013-07-31 15:12:54 -07:00
Jeffrey Ventrella
5b1ba56d67
toggle debug print statements for Leap fingers
2013-07-31 15:12:29 -07:00
Andrzej Kapolka
415949cc26
Terminology change to reflect the fact that we're no longer using the mean.
2013-07-31 14:40:33 -07:00
Jeffrey Ventrella
0aaeb4550a
cleanup
2013-07-31 13:07:52 -07:00
Jeffrey Ventrella
89f36a7eb7
cleanup
2013-07-31 12:38:40 -07:00
Jeffrey Ventrella
2901b58059
changed variable name from t to effectsTimer
2013-07-31 12:34:43 -07:00
Andrzej Kapolka
729158f882
Added depth smoothing, experimenting with using depth minimum rather than
...
mean.
2013-07-31 12:19:14 -07:00
Jeffrey Ventrella
482c5f0f4a
turned on leap hand diagram
2013-07-31 12:09:46 -07:00
Stephen Birarda
9e63b78a69
Merge branch 'master' of github.com:worklist/hifi into qt5
2013-07-31 11:35:24 -07:00
Jeffrey Ventrella
1f48de891b
Merge remote-tracking branch 'upstream/master' into particles
2013-07-31 11:06:31 -07:00
Philip Rosedale
549832467c
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-30 16:42:21 -07:00
Andrzej Kapolka
353d674ad9
Masking tweak.
2013-07-30 15:56:47 -07:00
Andrzej Kapolka
96bd7dbe25
Removed the magic from a number.
2013-07-30 15:30:34 -07:00
Andrzej Kapolka
c787781efb
Send color and depth as separate streams (rather than one on top of the other)
...
so that we can control their bitrates separately.
2013-07-30 15:11:32 -07:00
Philip Rosedale
98ec2efc01
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-30 14:55:33 -07:00
Andrzej Kapolka
f8ba1c4be1
Use the V channel to provide masking information, indicating invalid depths.
2013-07-30 13:42:29 -07:00
atlante45
1b2f236d42
Follow mode operationnal
2013-07-30 12:30:15 -07:00
ZappoMan
93a8e1782d
cleanup
2013-07-30 12:13:45 -07:00
ZappoMan
c7e3fe5ef6
Added false colorization by voxel server source
...
- switched readBitstreamToTree() to take params struct for future expansion
- switched readNodeData() to take params for future expansion
- added sourceID to VoxelNode
- fixed false colorize routines to correctly redraw by marking tree as dirty
2013-07-30 11:08:48 -07:00
Andrzej Kapolka
3c437076a7
When we have a mean face depth, use that rather than the face size to
...
estimate the z coordinate.
2013-07-30 11:07:33 -07:00
Andrzej Kapolka
3b4a4daec3
Ignore maximum values when computing the depth.
2013-07-29 18:26:51 -07:00
Andrzej Kapolka
9c0e29b5e6
Use only valid values to compute mean, and use the post-warp data to avoid
...
breaking on head tilt (because we were using the bounds of the rotated rect,
which included too much background).
2013-07-29 18:16:10 -07:00
Jeffrey Ventrella
c6d301c591
cleanup
2013-07-29 17:21:45 -07:00
ZappoMan
620fe12358
support for multiple voxel servers in ping stats
2013-07-29 16:31:14 -07:00
Jeffrey Ventrella
df32c18994
cleanup
2013-07-29 16:15:44 -07:00
Andrzej Kapolka
de52342a14
Working on depth data processing.
2013-07-29 16:04:15 -07:00
ZappoMan
c5ab321bd9
Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers
2013-07-29 15:54:52 -07:00
Jeffrey Ventrella
4b07d656f4
Merge remote-tracking branch 'upstream/master' into particles
2013-07-29 15:47:22 -07:00
Jeffrey Ventrella
79823c6fed
cleanup
2013-07-29 15:47:01 -07:00
Andrzej Kapolka
3b3801915b
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-07-29 15:44:41 -07:00
Andrzej Kapolka
6bc3e9b808
Merge pull request #726 from ZappoMan/bug_fixes
...
fix bug with dragonfly leaving trailing bits
2013-07-29 15:44:31 -07:00
ZappoMan
1a73485e36
Improved VoxelNode delete callback based on CR feedback
...
- changed hooks to use a virtual base class approach
- switched account of hooks to use a vector instead of home grown solution
- added support for VoxelNode to know what VoxelSystem it belongs to
2013-07-29 15:30:30 -07:00
Jeffrey Ventrella
a1eba53678
cleanup
2013-07-29 15:09:38 -07:00
Jeffrey Ventrella
f8392c0843
Merge remote-tracking branch 'upstream/master' into particles
2013-07-29 15:07:56 -07:00
Jeffrey Ventrella
37ff8ae030
added color modulation
2013-07-29 15:07:05 -07:00
ZappoMan
86bf268eef
first cut at multiple voxel servers
2013-07-29 14:56:33 -07:00
Andrzej Kapolka
fac3ff1089
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-07-29 14:35:31 -07:00
ZappoMan
03a75ab295
fixed spacing
2013-07-29 13:08:05 -07:00
ZappoMan
97aaa738c3
fixed typo
2013-07-29 13:07:12 -07:00
ZappoMan
d6428a8145
removed unneeded cast
2013-07-29 13:03:42 -07:00
ZappoMan
6a2bab2a2c
Merge branch 'master' of https://github.com/worklist/hifi into bug_fixes
2013-07-29 13:02:14 -07:00
Mark Peng
bfd7f3a6c9
Remove rendering of your own avatar's lookatVectors. This fixes the
...
behavior where if you are moving and jumping, you will occasionally see
your own lookatVectors on your screen.
2013-07-29 12:25:01 -07:00
Mark Peng
bd663a8c22
Merge remote-tracking branch 'upstream/master'
2013-07-29 12:09:27 -07:00
Mark Peng
d01f694d49
Remove extra semicolon in avatar.cpp
2013-07-29 11:52:29 -07:00
Andrzej Kapolka
1f076cc268
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-07-29 10:50:55 -07:00
Andrzej Kapolka
20360ad3e9
Make particle system update/render toggleable, fix GCC compile warnings.
2013-07-29 10:41:45 -07:00
Andrzej Kapolka
b02c5f103d
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-07-29 10:14:39 -07:00
Andrzej Kapolka
5812747ef8
Double the bitrate to see if we can reduce the blockiness.
2013-07-29 10:06:03 -07:00
Jeffrey Ventrella
f83ee1e0b5
cleanup
2013-07-29 09:48:28 -07:00
Mark Peng
dd2655825a
Fix first person camera positioning to correspond to eyelevel.
...
This makes sure the lookatVectors don't seem to point upwards when
looking at you.
2013-07-26 16:08:17 -07:00
Jeffrey Ventrella
a5a9784e6b
cleanup
2013-07-26 15:44:32 -07:00
Jeffrey Ventrella
65278609f2
cleanup
2013-07-26 15:40:06 -07:00
Jeffrey Ventrella
937574a6b5
cleanup
2013-07-26 15:25:13 -07:00
Jeffrey Ventrella
05e0bf3e84
added collision plane
2013-07-26 15:21:10 -07:00
Jeffrey Ventrella
8cecd67731
cleanup
2013-07-26 12:46:27 -07:00
Jeffrey Ventrella
ad00747c29
cleanup
2013-07-26 12:44:17 -07:00
Jeffrey Ventrella
9890cf72ce
added keyboard mode switching for rave glove effects
2013-07-26 12:37:37 -07:00
ZappoMan
4cca7e2572
Fixed issue with freeing up abandoned VBO slots when not moving with animation
2013-07-26 11:44:19 -07:00
ZappoMan
0c95dc4adf
Fixed voxel trails from animations
...
- removed stageForDeletion behavior of VoxelNode
- replaced with VoxelNodeDeletionHook strategy
- VoxelSystem now cleans up previously used VBO index slots via hook
2013-07-26 11:12:48 -07:00
atlante45
f3c87b81ec
Avatar can follow but don't look at the same point for the moment
2013-07-25 16:14:47 -07:00
Stephen Birarda
08b94d731f
merge branch qt5 with upstream/master
2013-07-25 10:23:22 -07:00
Jeffrey Ventrella
1d5bf20b80
clean up
2013-07-24 17:03:35 -07:00
Jeffrey Ventrella
5e2dcfee53
cleaned up some magic numbers
2013-07-24 16:52:37 -07:00
Jeffrey Ventrella
aee29a0ab1
cleaning up the particle system more
2013-07-24 16:37:13 -07:00
atlante45
68194f2037
Slot calling when pie menu on avatar.
2013-07-24 13:50:00 -07:00
Jeffrey Ventrella
288a218ae2
Merge remote-tracking branch 'upstream/master' into particles
2013-07-24 12:41:32 -07:00
Jeffrey Ventrella
2f28f3ea4b
made some extra checks for bogus data coming in, and added more particle effects to rave glove hand
2013-07-24 12:41:01 -07:00
atlante45
d165891fe6
New design for pie menus
2013-07-24 12:38:35 -07:00
Stephen Birarda
7134d13001
tweaks for iOS compatibility
2013-07-24 12:34:32 -07:00
Stephen Birarda
f27eb5e1d8
small code changes for qt5 compatibility
2013-07-24 12:06:55 -07:00
atlante45
177471e83b
First step toward follow mode
2013-07-24 11:24:28 -07:00
atlante45
fec25d374f
merge
2013-07-24 10:35:57 -07:00
ZappoMan
31a1e3e7b5
Merge pull request #720 from LionTurtle/master
...
Fix eyePosition so that lookatVectors point directly to eyes,
2013-07-24 01:19:49 -07:00
Mark Peng
7177b71bc7
Replace var in renderLookatIndicator with const IDENTITY_UP
2013-07-24 00:19:25 -07:00
Jeffrey Ventrella
f85690c1c4
Merge remote-tracking branch 'upstream/master' into particles
2013-07-23 20:46:34 -07:00
Jeffrey Ventrella
903a248061
cleaned up some code and added asserts to help track down a crash
2013-07-23 20:46:09 -07:00
ZappoMan
e7fb392f38
Merge branch 'master' of https://github.com/worklist/hifi into audio_select
2013-07-23 20:20:49 -07:00
ZappoMan
eb8c565350
dry up code
2013-07-23 20:08:57 -07:00
ZappoMan
9507cd8955
switched to vector
2013-07-23 19:54:29 -07:00
ZappoMan
a162643e1e
more removing of SourceID from classes
2013-07-23 19:21:43 -07:00
ZappoMan
13ba913fab
made listen mode a typedef
2013-07-23 18:28:30 -07:00
Stephen Birarda
fb05726323
Merge pull request #718 from ZappoMan/voxel_stats
...
Sends Voxel Stats from server to client
2013-07-23 18:16:57 -07:00
Jeffrey Ventrella
062ee657ca
added extra mode and started prototyping "ribbon" effect
2013-07-23 14:41:52 -07:00
ZappoMan
c969570e8c
working on selected audio
2013-07-22 23:05:42 -07:00
Mark Peng
4e641eed2f
LookatIndicator now scales with the avatar's scale.
2013-07-22 17:11:11 -07:00
Mark Peng
0f1ac2b226
Fix eyePosition so that lookatVectors point directly to eyes,
...
even when looking at someone from above.
2013-07-22 16:46:06 -07:00
Jeffrey Ventrella
90bc3e9a37
um, ok whatever
2013-07-22 14:08:41 -07:00
Jeffrey Ventrella
9f99bff791
Merge remote-tracking branch 'upstream/master' into particles
2013-07-22 14:08:19 -07:00
Jeffrey Ventrella
fdebe166ba
fixed it so both leap hands produce particles
2013-07-22 14:07:51 -07:00
ZappoMan
d3c46cce8f
CR feedback
2013-07-22 14:01:47 -07:00
ZappoMan
307cfcc7a2
CR feedback
2013-07-22 13:58:15 -07:00
ZappoMan
c301b799c5
first cut at selecting audio sources
2013-07-22 13:54:47 -07:00
Jeffrey Ventrella
8a55db53ce
merge
2013-07-22 10:42:18 -07:00
Jeffrey Ventrella
5f0d52ce89
uh, whatever
2013-07-22 10:35:02 -07:00
Jeffrey Ventrella
13e6f2e6fa
added sphere resolution to emitter attributes
2013-07-22 10:31:23 -07:00
Eric Johnston
9ab8fecff5
Minor tweaks to Rave Glove mode, per Ryan's testing
...
1. Improve response by using unfiltered data from Leap library
2. Reduce distracting arm-flail by only attaching the arm to che glove when we're not in rave mode.
2013-07-22 07:19:25 -07:00
atlante45
13952a6f24
Merge with pie_menu
2013-07-21 15:22:43 -07:00
ZappoMan
c3fa37019e
replaced old voxel stats with new voxel stats
2013-07-21 05:18:35 -07:00
ZappoMan
86ad0da09f
Merge branch 'master' of https://github.com/worklist/hifi into voxel_stats
2013-07-20 11:35:10 -07:00
ZappoMan
e0f115298d
additional stats items
2013-07-20 11:28:12 -07:00
Jeffrey Ventrella
ad0ca748bb
added extra mode and improved particle system
2013-07-20 09:48:55 -07:00
Eric Johnston
d10ffd4f2d
Small .h fix after testing without Leap libs
2013-07-19 19:53:30 -07:00
Eric Johnston
0cdad1a313
Merge branch 'master' of https://github.com/worklist/hifi into dev4
2013-07-19 19:48:52 -07:00
Eric Johnston
b8cf4a9775
Rave glove: stabilization of Leap hands
2013-07-19 19:47:07 -07:00
ZappoMan
4e8ce1b193
tweaks to stats dialog
2013-07-19 18:15:06 -07:00
Jeffrey Ventrella
05039b4e3e
adding rave glove modes and changing API of particle system to accommodate
2013-07-19 18:02:48 -07:00
ZappoMan
83290bc8b7
first cut at real voxel stats dialog box
2013-07-19 17:28:37 -07:00
atlante45
72774a5e20
First step toward pie menus
2013-07-19 17:01:38 -07:00
Jeffrey Ventrella
ed2780062b
clean up
2013-07-19 16:23:02 -07:00
Jeffrey Ventrella
6e84481931
Merge remote-tracking branch 'upstream/master' into particles
2013-07-19 16:08:43 -07:00
Jeffrey Ventrella
7f3750f1f0
clean up
2013-07-19 16:08:19 -07:00
ZappoMan
2cc42f6773
support piggybacking voxel and voxel stats messages into single packet
2013-07-19 15:59:47 -07:00
Andrzej Kapolka
353f16b2d0
Style fixes.
2013-07-19 15:56:04 -07:00
Jeffrey Ventrella
d2d8019e73
Merge remote-tracking branch 'upstream/master' into particles
2013-07-19 15:51:14 -07:00
Jeffrey Ventrella
87d9aae328
improvements to particle system
2013-07-19 15:50:40 -07:00
Andrzej Kapolka
f70b4dcab2
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-07-19 15:49:07 -07:00
ZappoMan
d9c8a59929
send voxel scene stats from server to client
2013-07-19 15:09:38 -07:00
Eric Johnston
262851346c
Rave Glove Demo: Leap Rework (simplification and elimination of redundant data passing)
...
This version matches fingers based on Leap serialized ID's, avoiding finger-replacement-crosstalk.
2013-07-19 09:31:45 -07:00
Eric Johnston
28bf0b5147
Merge branch 'master' of https://github.com/worklist/hifi into dev4
2013-07-19 08:47:37 -07:00
Mark Peng
a14768bb29
Remove more unnecessary additions.
2013-07-19 01:00:55 -07:00
Mark Peng
ceb743a65d
Remove unncessary import math.h (for reals).
2013-07-19 00:56:12 -07:00
Mark Peng
fc22240525
Remove unnecessary import math.h.
2013-07-19 00:55:31 -07:00
Mark Peng
a84c1c9e21
Merge remote-tracking branch 'upstream/master'
2013-07-19 00:46:52 -07:00
Mark Peng
927aea8bb4
Bug fix on lookatVectors (fixed scale in head.cpp). Added bool
...
isLookingAtOtherAvatar. Basic halo indicator in Application.cpp.
2013-07-19 00:44:23 -07:00
Andrzej Kapolka
ff0d63173c
Pass the aspect ratio into the shader, since it no longer necessarily
...
corresponds to the texture rectangle's aspect ratio.
2013-07-18 21:25:11 -07:00
Mark Peng
cfcb31172c
Merge remote-tracking branch 'upstream/master'
2013-07-18 21:08:08 -07:00
Andrzej Kapolka
0ae6887c4a
The depth texture needs nearest neighbor filtering.
2013-07-18 21:06:38 -07:00
Andrzej Kapolka
b15724665b
Removed unused variable, fixed shader comments.
2013-07-18 18:16:45 -07:00
Andrzej Kapolka
b5a8c2710c
Merge branch 'master' of https://github.com/worklist/hifi into pointy
...
Conflicts:
interface/src/Application.h
interface/src/Audio.h
interface/src/Webcam.cpp
2013-07-18 18:09:57 -07:00
Stephen Birarda
ef7dc4a39a
if the hostname field is left blank reset to DEFAULT_DOMAIN_HOSTNAME
2013-07-18 17:42:25 -07:00
Andrzej Kapolka
b8be66c6fc
Now able to stream depth data.
2013-07-18 17:39:49 -07:00
Stephen Birarda
01e6891fd3
save custom domain server hostname to QSettings
2013-07-18 17:23:52 -07:00
Philip Rosedale
c74287160f
merged
2013-07-18 16:52:56 -07:00
Philip Rosedale
4af92d46f3
Set lookAt to hovered voxel
2013-07-18 16:50:37 -07:00
Stephen Birarda
a00b95666a
don't listen to VS packets not from current VS
2013-07-18 15:49:07 -07:00
Stephen Birarda
45d82dc97c
correct reference to new hostname for Qt temp variable changes
2013-07-18 15:20:05 -07:00
Stephen Birarda
4dd6afc08f
fix grabbing of domain server hostname from QString
2013-07-18 14:59:11 -07:00
Stephen Birarda
04a2dd3b86
clear environment data on domain server switch
2013-07-18 14:36:55 -07:00
Mark Peng
fe01067473
Merge remote-tracking branch 'upstream/master'
2013-07-18 14:35:41 -07:00
Mark Peng
7ee0d8da2e
Render circle in 3D space for lookatIndicator. Still not normal to the screen.
2013-07-18 14:34:51 -07:00
Andrzej Kapolka
7ce04444fc
Most of the way towards working video encoding.
2013-07-18 14:14:44 -07:00
Eric Johnston
06aeba7d29
Merge branch 'master' of https://github.com/worklist/hifi into dev4
2013-07-18 12:27:47 -07:00
Philip Rosedale
b3b8ef3347
Gyros don't move view for small head movements
2013-07-18 11:24:39 -07:00
Philip Rosedale
0b10169915
More audio collision on hover experiments
2013-07-18 11:13:16 -07:00
Philip Rosedale
e6cd90fa37
Merge pull request #704 from Ventrella/particles
...
more code cleanup
2013-07-18 11:08:18 -07:00
Stephen Birarda
2ad99f3129
point to stars file on non-SSL for easier RV redirect
2013-07-18 10:26:08 -07:00
Jeffrey Ventrella
f89b1fcd4c
more clean up of particle system
2013-07-17 18:10:30 -07:00
Andrzej Kapolka
8863645dc9
Working on transmitting and receiving the face video.
2013-07-17 18:02:27 -07:00
Mark Peng
6006b8e96b
Merge remote-tracking branch 'upstream/master'
2013-07-17 17:28:12 -07:00
Mark Peng
125bcc46f4
Circle drawn with camera orientation as its normal for lookatIndicator.
2013-07-17 17:27:15 -07:00
Philip Rosedale
3111303c32
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-17 17:15:25 -07:00
Philip Rosedale
5f51464230
Start clicking on voxels makes sound
2013-07-17 17:15:19 -07:00
Jeffrey Ventrella
9c2ea6e7e4
more clean up
2013-07-17 17:07:53 -07:00
Eric Johnston
cb6f542b9f
First-pass finger motion trails
2013-07-17 17:00:23 -07:00
Jeffrey Ventrella
1264b3ce66
removed deprecated code
2013-07-17 17:00:18 -07:00
Jeffrey Ventrella
ea7e16660c
Merge remote-tracking branch 'upstream/master' into particles
2013-07-17 16:43:57 -07:00
Jeffrey Ventrella
be5612711b
clean up of particle system
2013-07-17 16:43:34 -07:00
Eric Johnston
57c2f16894
Merge branch 'master' of https://github.com/worklist/hifi into dev4
...
Conflicts:
interface/src/Hand.cpp
2013-07-17 16:42:11 -07:00
Eric Johnston
aa0cab2180
Code review issues addressed.
2013-07-17 16:09:24 -07:00
Jeffrey Ventrella
4389389f17
Merge remote-tracking branch 'upstream/master' into particles
2013-07-17 16:03:38 -07:00
Jeffrey Ventrella
1f1259cec5
added particle life stages
2013-07-17 16:03:10 -07:00
Eric Johnston
1a4a165c8b
Merge branch 'master' of https://github.com/worklist/hifi into dev4
2013-07-17 15:55:20 -07:00
Philip Rosedale
52d8ece38a
remove old pre-movement of avatar in gravity
2013-07-17 15:03:56 -07:00
Philip Rosedale
c0ef05f69f
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-17 14:58:21 -07:00
Philip Rosedale
4272f4da57
Tiny sliding with gravity removed
2013-07-17 14:57:29 -07:00
Eric Johnston
8ebf5fbd6b
Rave & Leap: cleanup and move over to new hand/finger structures
2013-07-17 14:54:18 -07:00
Jeffrey Ventrella
d0dffb464b
added emitter particle
2013-07-17 14:51:11 -07:00
Mark Peng
0bbea078b5
Merge remote-tracking branch 'upstream/master'
2013-07-17 13:52:46 -07:00
Mark Peng
5ffe3fa4b4
Rendering of indicator circle in 3D space. Spacing edits in util.
2013-07-17 13:52:05 -07:00
Jeffrey Ventrella
202fb95102
turned off setShowingEmitter
2013-07-17 13:51:00 -07:00
Jeffrey Ventrella
5a0fcb7f6c
adding more behavior to the particle system
2013-07-17 13:47:18 -07:00
Eric Johnston
46c5383d10
minor cleanup
2013-07-17 12:54:44 -07:00
Eric Johnston
f9bfc8af82
Merge branch 'master' of https://github.com/worklist/hifi into dev4
...
Conflicts:
interface/src/Hand.cpp
2013-07-17 12:49:31 -07:00
Andrzej Kapolka
640ecd7f94
Working on integrating LibVPX for VP8 (9?) encoding.
2013-07-17 11:33:36 -07:00
Jeffrey Ventrella
c33e4fe6f7
file mode reverts
2013-07-17 10:15:42 -07:00
Jeffrey Ventrella
98dd83dde8
ahibfasubhdf
2013-07-17 10:02:23 -07:00
Jeffrey Ventrella
0be15231b9
ahibfasubhdf
2013-07-17 10:01:23 -07:00
Philip Rosedale
984332e638
fixes per review
2013-07-17 09:51:04 -07:00
Eric Johnston
f21d2a477d
Rave Glove Demo: Restructuring palm and finger data structures
2013-07-17 08:29:50 -07:00
Eric Johnston
39130aef58
Rave Glove demo: activation mode and stage (dark backdrop) drawing.
2013-07-16 18:10:54 -07:00
Andrzej Kapolka
401ef45000
Removed keypoint stuff, fixed stupidity leading to fringed edges (was
...
linearly interpolating the missing values).
2013-07-16 17:56:53 -07:00
Philip Rosedale
2a207f4a30
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-16 17:32:24 -07:00
Eric Johnston
cf38a0e837
Avatar's arm follows real or simulated Leap glove, if present.
...
This is a tiny change, and the effect is pretty good.
It's only active if there's a Leap device connected and you're using it, or else if you've used the Debug menu item to fake a Leap glove.
2013-07-16 17:02:40 -07:00
Philip Rosedale
59810cac99
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-16 16:41:02 -07:00
Philip Rosedale
192ae63789
Colliding with ground, voxels makes interesting sounds and flashes your display
2013-07-16 16:40:50 -07:00
Stephen Birarda
7cec2f5ffd
use fprintf instead of printf and flush for qDebug
2013-07-16 15:27:14 -07:00
Stephen Birarda
1e0f3e4d1c
Merge pull request #686 from Atlante45/few_avatar_resizing_correction
...
Few avatar resizing correction
2013-07-16 14:31:27 -07:00
Stephen Birarda
8464a013fe
fix format string warnings in Application
2013-07-16 13:39:24 -07:00
Stephen Birarda
c78759da16
cleanup printLogs reintroduce on merge with upstream master
2013-07-16 13:37:16 -07:00
Stephen Birarda
9d62e7f187
Merge remote-tracking branch 'upstream/master' into qdebug
2013-07-16 13:34:42 -07:00
Stephen Birarda
ce0c9e2e1a
flush stdout in case non new-line output is received
2013-07-16 12:58:16 -07:00
Stephen Birarda
16d603e203
clean up extra new lines and LogDisplay line break
2013-07-16 12:53:43 -07:00
Andrzej Kapolka
fd1671a44f
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-07-16 12:48:24 -07:00
Stephen Birarda
1b48d4f0fc
revert removal of extraneous newlines
2013-07-16 12:46:32 -07:00
Andrzej Kapolka
e81fed2622
Calling glInterleavedArrays enables the client vertex/color array states, so
...
we need to disable them afterwards.
2013-07-16 12:31:58 -07:00
atlante45
b10c395440
Merge branch 'master' of http://github.com/worklist/hifi into few_avatar_resizing_correction
2013-07-16 12:05:11 -07:00
atlante45
f713bb961d
Adapt avatar message size to the avatars
2013-07-16 12:04:22 -07:00
atlante45
13762da7d8
Changed shortcuts to ALT+ +/-
2013-07-16 12:03:07 -07:00
Stephen Birarda
063094f96c
correctly break on end of qDebug message in LogDisplay
2013-07-16 12:00:14 -07:00
Andrzej Kapolka
905bd9b011
Track features on face, add a mode to render just key points.
2013-07-16 11:54:19 -07:00
Stephen Birarda
51d1e6ae80
add a message handler to send messages over to LogDisplay
2013-07-16 11:50:40 -07:00
Stephen Birarda
89d3cfdb6f
remove now extraneous newlines after switch to QDebug
2013-07-16 11:16:51 -07:00
Stephen Birarda
afe49bc756
switch calls to printLog to QDebug
2013-07-16 11:07:22 -07:00
atlante45
2a62f8b4fd
Merge branch 'master' of http://github.com/worklist/hifi into scale_in_settings
2013-07-16 10:55:39 -07:00
atlante45
64ba01e23c
added scale to settings
2013-07-16 10:54:58 -07:00
Philip Rosedale
be30a27a4f
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-16 10:45:21 -07:00
Stephen Birarda
3f9865759c
Merge pull request #682 from ZappoMan/bug_fixes
...
Import Voxels and Paste Bug fixes
2013-07-16 10:11:11 -07:00
ZappoMan
440352c584
white space
2013-07-16 10:02:27 -07:00
ZappoMan
42e5440b7b
CR feedback
2013-07-16 10:00:55 -07:00
Philip Rosedale
edf031b985
improve collision sounds, difference between ground and voxels
2013-07-15 22:42:55 -07:00
Philip Rosedale
d05108e26d
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-15 19:59:26 -07:00
Eric Johnston
802abade4f
Fixed problem in idle(), causing events to stack up.
...
The problem was that idle() was set on a zero-ms timer (using idleTimer->start(0)), and the time is then self-regulated by returning early if it's not time yet.
Because of this, Qt stays perpetually in the timer servicing, instead of processing events. This causes keys and menu items to be delayed if the user drags the mouse before activating them, especially at low frame rates. It also causes very-delayed multitouch response.
The fix I've applied is to reset the idle timer after servicing the idle. I've set it to 2ms because I noticed that 1ms didn't always clear out all of the events. We can tune it to whatever we need, or even calculate it based on the time it took us to service the idle.
2013-07-15 18:16:50 -07:00
ZappoMan
e4b7ba7428
Merge branch 'master' of https://github.com/worklist/hifi into bug_fixes
2013-07-15 17:58:45 -07:00
Jeffrey Ventrella
b765de6990
Merge remote-tracking branch 'upstream/master' into particles
2013-07-15 17:58:38 -07:00
Jeffrey Ventrella
0481a81ca7
moved finger particles over to hand.cpp
2013-07-15 17:58:17 -07:00
ZappoMan
a3009981d0
added Import Voxels to Clipboard
2013-07-15 17:54:50 -07:00
Stephen Birarda
9f9d8e59bd
don't accept voxel packet if rendering is turned off, correct boolean for kill
2013-07-15 17:12:44 -07:00
Stephen Birarda
38d8041bfb
kill local voxels when voxel rendering is turned off
2013-07-15 17:12:24 -07:00
ZappoMan
01b7f3868b
Merge pull request #672 from birarda/domain-switch
...
add an option in preferences to dynamically switch domain servers
2013-07-15 17:10:18 -07:00
ZappoMan
31875abcab
Merge branch 'master' of https://github.com/worklist/hifi into bug_fixes
2013-07-15 17:05:10 -07:00
Andrzej Kapolka
d8d9f5e315
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-07-15 16:54:29 -07:00
Stephen Birarda
c27cd7ae42
couple of type squishes in NodeList
2013-07-15 16:49:36 -07:00
Philip Rosedale
eee8c3e570
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-15 16:27:51 -07:00
Philip Rosedale
26c0eb2dea
Start to add heartbeat
2013-07-15 16:27:46 -07:00
ZappoMan
1fb1622beb
added sleep to sendVoxelOperation() to keep from overwhelming server
2013-07-15 16:27:23 -07:00
Philip Rosedale
7075258317
Merge pull request #673 from Atlante45/better_import
...
Better import
2013-07-15 16:20:01 -07:00
Andrzej Kapolka
d5abb3e6eb
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-07-15 16:15:12 -07:00
Andrzej Kapolka
4f1e786392
Fix for iris rendering; was broken by scale change.
2013-07-15 16:12:23 -07:00
Andrzej Kapolka
fdeb63c121
More work on face points.
2013-07-15 16:09:49 -07:00
atlante45
bf328c8532
Improved import system copying to clipboard
2013-07-15 16:07:50 -07:00
Stephen Birarda
33ddda2558
correct reference to audio mixer sockaddr_in
2013-07-15 16:02:36 -07:00
Stephen Birarda
a204a8b872
lock the audioMixer to avoid crash when grabbing socket
2013-07-15 16:01:05 -07:00
Stephen Birarda
9fe1c7c63d
lock the voxel server when receiving data to avoid race crash
2013-07-15 15:59:31 -07:00
Stephen Birarda
6c2682833e
lock on the solo voxelServer before deleting local voxels
2013-07-15 15:53:25 -07:00
Stephen Birarda
6b83f95f9e
conditionally set a new hostname on preferences save
2013-07-15 15:46:04 -07:00
Jeffrey Ventrella
56d0c7d7e4
added array of finger emitters for particle system
2013-07-15 15:45:31 -07:00
Stephen Birarda
d389dc6e3a
add method to NodeList to set domain IP to local, move mutex lock to node
2013-07-15 15:17:10 -07:00
Jeffrey Ventrella
408edc7dca
Merge remote-tracking branch 'upstream/master' into particles
2013-07-15 14:36:32 -07:00
Jeffrey Ventrella
c0f319f077
merge
2013-07-15 14:36:11 -07:00
Eric Johnston
e937f86822
Build fail fix when Leap libs are not present.
2013-07-15 14:33:09 -07:00
Jeffrey Ventrella
f75ce72aca
Merge remote-tracking branch 'upstream/master' into particles
2013-07-15 14:30:19 -07:00
Eric Johnston
0239341127
updated per feedback
2013-07-15 14:27:58 -07:00
Philip Rosedale
f8f6b29559
Audio collision sounds are played locally as well as injected
2013-07-15 14:24:21 -07:00
Eric Johnston
c61966ebcd
made Leap unit-conversion method public
2013-07-15 14:12:52 -07:00
Jeffrey Ventrella
7d5ade33a3
Merge remote-tracking branch 'upstream/master' into particles
2013-07-15 13:58:12 -07:00
Jeffrey Ventrella
84b6adf5b0
more work on particle emitter API
2013-07-15 13:57:39 -07:00
Eric Johnston
86faa33f83
Added fake Leap finger generation so that Ryan and Jeffrey can work on Leap glove-code without needing a Leap sensor at all times.
2013-07-15 13:56:37 -07:00
Andrzej Kapolka
6c587af6ac
Merge branch 'master' of https://github.com/worklist/hifi into pointy
...
Conflicts:
interface/src/avatar/Head.cpp
2013-07-15 13:13:51 -07:00
Andrzej Kapolka
5c590638f3
Working on mesh rendering for faces.
2013-07-15 13:12:22 -07:00
atlante45
423a0eaac8
Fixed typo
2013-07-15 12:28:22 -07:00
atlante45
fbcacc8cf7
Few pre-review change for avatar resizing
2013-07-15 12:11:29 -07:00
atlante45
bf3c4fa1f8
Avatar resizing final commit
2013-07-15 12:04:24 -07:00
atlante45
078a47b006
Merge branch 'master' of https://github.com/worklist/hifi into the_midget_are_coming
2013-07-15 12:03:04 -07:00
ZappoMan
f415f4081a
Fixed a bug in LOD boundaries
...
- changed the way we calculate whether or not to render a parent "average" voxel so
that if any of it's most distant child would not be visible, then it's used instead
of it's children
- added precalculated value for topFarLeft corner of AABox (optimization)
- changed VoxelSystem::newTreeToArrays() and VoxelTree::encodeTreeBitstreamRecursion()
to use the same help function for determining this LOD boundary behavior
- deleted old dead code in voxel-server and VoxelTree for picking which node to start
sending with, since it wasn't being used
- added VoxelNode::furthestDistanceToCamera() which tells you not the distance to the
center of the voxel, but the distance from the camera to the furthest corner relative
to the camera.
- added ViewFrustum::getFurthestPointFromCamera() which given an axis-aligned box will
tell you which vertex of the box is furthest from the camera
2013-07-15 01:32:14 -07:00
Andrzej Kapolka
a59fbfbf3e
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-07-14 18:21:50 -07:00
Andrzej Kapolka
84bb2aa265
Started on C++ side of SSAO effect.
2013-07-14 18:21:18 -07:00
Andrzej Kapolka
411cb92300
Working on face rendering as point cloud.
2013-07-14 15:54:29 -07:00
tosh
ac3b95efe7
fixes sliced-away initialization (crashes program during shutdown when running without audio device)
2013-07-13 22:51:57 +02:00
Philip Rosedale
8b9e0426b2
Simple glassy collision sound
2013-07-12 21:34:48 -07:00
Jeffrey Ventrella
3bc6b4c0d4
merge
2013-07-12 18:56:54 -07:00
Jeffrey Ventrella
915cb1e5bd
Merge remote-tracking branch 'upstream/master' into particles
2013-07-12 18:56:37 -07:00
Jeffrey Ventrella
ae99ca5ec8
added more API for the particle system
2013-07-12 18:55:42 -07:00
atlante45
34cbe317fa
Merge branch 'master' of https://github.com/worklist/hifi into the_midget_are_coming
...
Conflicts:
interface/src/Avatar.cpp
interface/src/Webcam.cpp
2013-07-12 17:57:20 -07:00
atlante45
280afed7f0
added scale in avatar packets eand slots to change it from the menu
2013-07-12 17:51:47 -07:00
Philip Rosedale
832e81b45f
Less skeleton averaging, can see first person arms
2013-07-12 17:00:47 -07:00
Jeffrey Ventrella
3649c89c12
more developing on the API for the particle system
2013-07-12 16:19:31 -07:00
Andrzej Kapolka
763e6a2fa1
Merge branch 'master' of https://github.com/worklist/hifi into pointy
...
Conflicts:
interface/src/Application.h
2013-07-12 15:34:55 -07:00
atlante45
35c00c739c
resizing avatar now handle the camera
2013-07-12 14:53:51 -07:00
Jeffrey Ventrella
48bf26fb28
Merge remote-tracking branch 'upstream/master' into particles
2013-07-12 14:41:48 -07:00
Jeffrey Ventrella
e6b751e538
more work on particle system
2013-07-12 14:32:14 -07:00
atlante45
16647e3591
Resolve conflict
2013-07-12 13:27:46 -07:00
ZappoMan
006929e45b
Merge pull request #660 from PhilipRosedale/master
...
Add speed brakes for better flying/walking
2013-07-12 13:15:22 -07:00
Jeffrey Ventrella
c348c5ec35
Merge remote-tracking branch 'upstream/master' into particles
2013-07-12 12:12:25 -07:00
Jeffrey Ventrella
106d7c225a
turned on particle system viewing for pull request
2013-07-12 12:11:51 -07:00
Philip Rosedale
e756fdbee6
Add speed brakes for better flying/walking
2013-07-12 08:28:50 -07:00
Philip Rosedale
4e9530f946
Body slowly turns to follow touch look
2013-07-11 22:31:31 -07:00
Philip Rosedale
4e89c679b9
Oculus will work with touch look (hopefully)
2013-07-11 21:51:13 -07:00
Philip Rosedale
d2dd41ba0f
make thrust be in direction of head/view
2013-07-11 21:46:13 -07:00
Philip Rosedale
6609a850eb
Gyros and touch look now work at same time
2013-07-11 21:34:42 -07:00
Philip Rosedale
670de73384
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-11 19:52:39 -07:00
Philip Rosedale
4b95f2bae5
Better thrust values and no jittering when standing
2013-07-11 19:10:34 -07:00
Atlante45
08b0afd466
Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming
2013-07-11 18:17:06 -07:00
Atlante45
d84963040e
avatar resized + physic adapted
2013-07-11 18:16:55 -07:00
Stephen Birarda
76dc01e84e
fix audio silence on receive bail
2013-07-11 17:55:59 -07:00
Atlante45
12bbec66af
Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming
2013-07-11 17:22:36 -07:00
Eric Johnston
58b50067ad
Some Leap finger fixes, but also temporarily disable Leap data sending, due to a crash.
...
Will resolve the crash before re-enabling.
2013-07-11 16:06:31 -07:00
Philip Rosedale
678b30f494
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-11 15:53:19 -07:00
Philip Rosedale
79b2703e1c
Improve avatar movement, added Physics.cpp for routines to help with physics calculations
2013-07-11 15:53:07 -07:00
Andrzej Kapolka
61f6b8b974
Moved all the avatar bits to their own subdirectory.
2013-07-11 14:53:46 -07:00
Atlante45
7f0ab0289e
Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming
2013-07-11 14:10:40 -07:00
Andrzej Kapolka
c3242598f5
Merge pull request #655 from ZappoMan/occlusion_culling
...
Make Delta Sending Default, Added option for "Low Res" mode while moving
2013-07-11 14:08:22 -07:00
ZappoMan
c26e39764a
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-07-11 13:50:33 -07:00
Atlante45
beefd57b54
Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming
2013-07-11 13:25:42 -07:00
Andrzej Kapolka
08d2c70db5
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-11 13:19:07 -07:00
ZappoMan
cb59df4b9e
Merge pull request #653 from birarda/master
...
refactor sendDomainServerCheckIn to avoid static variable threading issue
2013-07-11 13:08:15 -07:00
ZappoMan
57ce20d3ce
add support for Low Res sending while moving
2013-07-11 12:43:43 -07:00
Stephen Birarda
b201d13e31
refactor ping packet sending to push past version byte
2013-07-11 12:42:45 -07:00
Andrzej Kapolka
ee77f59f48
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-11 12:25:51 -07:00
Andrzej Kapolka
4e524d7125
Compass tweaks: better initial extents, scale extents to compensate for
...
anisotropy, converge more quickly on compass heading.
2013-07-11 12:10:15 -07:00
Atlante45
a335eb2552
Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming
2013-07-11 11:34:07 -07:00
Andrzej Kapolka
aa3f4c6f2c
Merge branch 'master' of https://github.com/worklist/hifi into kinected
2013-07-11 11:21:59 -07:00
Andrzej Kapolka
baca4353a8
Removed stray block.
2013-07-11 11:19:28 -07:00
Andrzej Kapolka
c6d01e0acc
Merge branch 'master' of https://github.com/worklist/hifi into kinected
2013-07-11 11:16:09 -07:00
Stephen Birarda
38a33e0283
couple more type squishes
2013-07-11 11:11:39 -07:00
Andrzej Kapolka
b23875a952
Make sure we shutdown before quitting.
2013-07-11 11:10:14 -07:00
Stephen Birarda
430f255730
type squish in Audio class
2013-07-11 11:10:03 -07:00
Atlante45
409728d665
Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming
2013-07-11 11:04:45 -07:00
Stephen Birarda
64887f2a36
Merge branch 'master' of github.com:worklist/hifi into packet-versions
2013-07-11 11:02:49 -07:00
Stephen Birarda
fcb8865d2e
resolve conflicts on merge with upstream master
2013-07-11 10:58:45 -07:00
Andrzej Kapolka
cf7408505f
Shut down the webcam when it's turned off, but don't delete the grabber (since
...
it has expensive-to-init state like the face cascade).
2013-07-11 10:53:51 -07:00
Mark Peng
9749e5edd6
Add const var to represent magic num in eyecontact code when gyros
...
are on.
2013-07-11 10:53:38 -07:00
Atlante45
b3f8711f95
Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming
2013-07-11 10:53:27 -07:00
ZappoMan
04cd340f0b
add back in correct isViewChanging()
2013-07-11 10:50:17 -07:00
Mark Peng
24d32bcdc8
Fix style mistakes according to code review for eyecontact code.
2013-07-11 10:40:57 -07:00
ZappoMan
9aed3d3cc6
enable delta sending by default
2013-07-11 10:37:28 -07:00
Atlante45
5608a0a3b2
Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming
2013-07-11 10:33:55 -07:00
Mark Peng
29d1e08f48
Merge remote-tracking branch 'upstream/master'
2013-07-11 10:33:21 -07:00
Andrzej Kapolka
d4abceba2b
Merge branch 'master' of https://github.com/worklist/hifi into kinected
2013-07-11 10:28:26 -07:00
Andrzej Kapolka
b62d2d85c3
Let's try actually releasing the camera when we turn it off.
2013-07-11 10:28:09 -07:00
Mark Peng
083e0e9d06
Merge remote-tracking branch 'upstream/master'
2013-07-11 10:20:41 -07:00
Mark Peng
f145a1eac4
Add condition to updateAvatar() where if another avatar's head is at
...
the center of the screen, the lookAtPosition is set to the eye level
of that avatar.
2013-07-11 10:17:45 -07:00
Atlante45
6e2422a547
Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming
2013-07-11 10:13:29 -07:00
Stephen Birarda
beb89e3d2b
change some timing types from int to uint64_t to avoid costly assumptions
2013-07-11 10:09:00 -07:00
Stephen Birarda
4ed231670f
put back the missing voxels
2013-07-11 10:04:27 -07:00
Stephen Birarda
211204e878
Merge remote-tracking branch 'upstream/master' into timestamps
2013-07-11 09:23:16 -07:00
Philip Rosedale
cf665e10b3
Merge pull request #644 from ZappoMan/occlusion_culling
...
Latest Revision of Occlusion Culling & Delta Sending Work - now it's always better and never worse
2013-07-11 09:05:03 -07:00
Philip Rosedale
8ea2b46264
Merge pull request #641 from ZappoMan/bug_fixes
...
Two small bug fixes
2013-07-11 07:46:57 -07:00
ZappoMan
dc70675c22
removed obsolete ResIn mode
2013-07-10 19:04:28 -07:00
Jeffrey Ventrella
6c3644a2fc
merge
2013-07-10 18:32:59 -07:00
Jeffrey Ventrella
420ecddafb
Merge remote-tracking branch 'upstream/master' into particles
2013-07-10 18:32:42 -07:00
Jeffrey Ventrella
980a5b7980
cleanup
2013-07-10 18:32:17 -07:00
Jeffrey Ventrella
171c10dabe
raised home position
2013-07-10 18:04:19 -07:00
Jeffrey Ventrella
8ae10a6614
added emitter
2013-07-10 17:55:42 -07:00
ZappoMan
3d3eca9afa
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-07-10 17:45:04 -07:00
Atlante45
5ae24fc660
Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming
...
Conflicts:
interface/src/Head.cpp
2013-07-10 17:39:31 -07:00
Atlante45
906fc04e35
first step toward resizing avatars
2013-07-10 17:35:39 -07:00
Andrzej Kapolka
d59b9ce955
Flip x when in mirror mode, rather than special-casing all the head rotations.
...
Also fixed sideways leaning (was correct in mirror mode, incorrect in world).
2013-07-10 17:31:21 -07:00
Mark Peng
3909217815
Remove unused #include for glm intersect in Application.cpp
2013-07-10 17:24:47 -07:00
ZappoMan
78611e30e7
make occlusion culling default
2013-07-10 17:21:40 -07:00
Mark Peng
c832662807
Remove random print statements from eyecontact code in Application.cpp
2013-07-10 17:20:46 -07:00
Jeffrey Ventrella
84a7a78b8d
made a test particle system
2013-07-10 17:15:03 -07:00
ZappoMan
a48f353f2f
whitespace cleaned up
2013-07-10 17:07:55 -07:00
ZappoMan
1831cc0de3
removed level param from recursion
2013-07-10 17:06:22 -07:00
Mark Peng
baf9edecc9
Merge remote-tracking branch 'upstream/master'
2013-07-10 16:51:53 -07:00
Andrzej Kapolka
a03a46ad16
Merge branch 'master' of https://github.com/worklist/hifi into kinected
2013-07-10 16:36:21 -07:00
Andrzej Kapolka
100f7c19c3
Merge pull request #636 from PhilipRosedale/master
...
Touchlook tuned and always on!
2013-07-10 16:36:10 -07:00
ZappoMan
6694ef3869
fixed some compiler warnings
2013-07-10 16:33:27 -07:00
ZappoMan
4afda27ee0
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-07-10 16:28:51 -07:00
ZappoMan
78c62f29c3
lazy load stars file only if stars render enabled
2013-07-10 16:12:34 -07:00
ZappoMan
d8f368a50c
lazy load stars file only if stars render enabled
2013-07-10 16:06:23 -07:00
Mark Peng
62570f0804
Merge remote-tracking branch 'upstream/master'
2013-07-10 16:01:28 -07:00
Mark Peng
0b334f9e5d
Make lookAtVectors lock on other avatar's eyes if the mouse is over
...
the other avatar's head.
Add rayIntersectsSphere function to Util. glm::intersectRaySphere was buggy.
2013-07-10 15:56:23 -07:00
Andrzej Kapolka
67afc61fd8
Merge branch 'master' of https://github.com/worklist/hifi into kinected
2013-07-10 15:16:38 -07:00
Andrzej Kapolka
559dc4bb5d
Flush the queue so that we don't get any funny data on the initial read.
2013-07-10 15:07:39 -07:00
Andrzej Kapolka
2ffd151a1f
Ryan likes the eyelids starting at forty degrees.
2013-07-10 14:40:45 -07:00
Andrzej Kapolka
6a5fb4f535
Removed unused variables, added motion driver library for OS X.
2013-07-10 14:28:06 -07:00
Andrzej Kapolka
0aa1b396db
Merge branch 'master' of https://github.com/worklist/hifi into kinected
2013-07-10 14:08:03 -07:00
Andrzej Kapolka
6fe9a71868
Basic compass fusion.
2013-07-10 14:06:12 -07:00
ZappoMan
09f77279e2
add shortcut key to enable wants occlusion culling
2013-07-10 13:42:43 -07:00
Atlante45
7d94f65448
Linked ZLIB to voxels library
2013-07-10 13:00:16 -07:00
Atlante45
d79acea6a7
Merge branch 'master' of git://github.com/worklist/hifi into 19373
2013-07-10 12:46:50 -07:00
Stephen Birarda
70ccef0733
remove avatar data read and write to file
2013-07-10 12:37:23 -07:00
Philip Rosedale
dae79d8a55
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-10 12:20:45 -07:00
Philip Rosedale
2e854b5ed7
Tune and smooth 'Touch Look' and always turned on, old mouseLook code removed. Add vec3 speed test. Smooth simulation by passing exact deltaTime to update()
2013-07-10 12:20:26 -07:00
Mark Peng
4b6e7f1079
Merge remote-tracking branch 'upstream/master' into eyecontact
2013-07-10 11:57:08 -07:00
Mark Peng
e4e7966075
Add print statements to debug eyecontact code in Application.cpp.
2013-07-10 11:56:16 -07:00
Stephen Birarda
ca8f25955a
switch usec timestamps to uint64_t
2013-07-10 11:46:48 -07:00
ZappoMan
a9b1aa727f
added back stars file loading
2013-07-10 11:11:21 -07:00
ZappoMan
abd7dfde8b
added vector math timing test
2013-07-10 11:10:03 -07:00
Stephen Birarda
488a4affd3
fix member variable initialization order to remove warnings
2013-07-10 09:59:14 -07:00
Andrzej Kapolka
a116f5a636
Use InvenSense code to handle the rather complicated business of talking the
...
sensor into giving us the compass reading. We're getting it now, but I still
have to figure out how to incorporate it.
2013-07-09 17:28:23 -07:00
Mark Peng
61ad33d9d0
Merge remote-tracking branch 'upstream/master' into eyecontact
2013-07-09 16:29:56 -07:00
Mark Peng
2a25c97446
Change LookAtPosition of Head to the eye level of another avatar,
...
if looking at another avatar in Application.cpp.
Add eyePosition to Head class and bool isLookingAtOther.. in Application.cpp.
2013-07-09 16:22:41 -07:00
ZappoMan
44357fcfb9
add 'level' param to tree recursion
2013-07-09 13:17:21 -07:00
atlante45
2e036a0e46
Merge branch 'master' of git://github.com/worklist/hifi into 19373
2013-07-09 17:56:18 +02:00
atlante45
dbdbd7a8c4
Incorporating comments for code review (minecraft import)
2013-07-09 17:55:55 +02:00
atlante45
3433cf5a98
Merge branch 'master' of git://github.com/worklist/hifi into 19373
2013-07-09 16:34:12 +02:00
atlante45
2c438e8af3
Fixed broken shortcut (Turn on/off voxels is now Shift + V)
2013-07-09 16:20:55 +02:00
atlante45
b3c0f3fedb
More code review for UI job
2013-07-09 15:29:12 +02:00
atlante45
c3b0be5c63
More consts for UI job
2013-07-09 14:49:01 +02:00
atlante45
3c4f8f5120
put hard coded numbers into variables for UI job
2013-07-09 14:17:42 +02:00
atlante45
5d4d0ba43e
Merge branch 'master' of git://github.com/worklist/hifi into 19373
2013-07-09 12:56:27 +02:00
atlante45
5703a60797
Merge branch 'master' of git://github.com/worklist/hifi into 19368
2013-07-09 10:25:58 +02:00
atlante45
d38c1f081c
Modified code according to review for UI job
2013-07-09 10:25:46 +02:00
Philip Rosedale
e9f8e50d49
Merge pull request #623 from machinelevel/dev4
...
Added safety checks to processEvents(), which was causing problems. Also...
2013-07-08 17:04:06 -07:00
Philip Rosedale
4936676cc1
Merge pull request #627 from ey6es/kinected
...
Basic depth camera support (only built in when OpenNI is available).
2013-07-08 16:57:10 -07:00
Eric Johnston
c298f78ae9
Fixed multi-touch event loop problems by selectively processing just the touch events.
2013-07-08 16:31:28 -07:00
Eric Johnston
7de2281226
Merge branch 'master' of https://github.com/worklist/hifi into dev4
2013-07-08 16:29:51 -07:00
Stephen Birarda
c2ad02def2
Merge pull request #625 from PhilipRosedale/master
...
Tuned smooth gyro look to feel better
2013-07-08 15:55:52 -07:00
Eric Johnston
14374fb0df
Merge branch 'master' of https://github.com/worklist/hifi into dev4
2013-07-08 15:31:11 -07:00
Stephen Birarda
aaaba9c42e
more packet version refactoring
2013-07-08 15:14:18 -07:00
Stephen Birarda
185d5bb0a2
use packet version helpers for PACKET_TYPE_TRANSMITTER_DATA
2013-07-08 15:01:57 -07:00
Stephen Birarda
202d446f07
use packet version helpers for PACKET_TYPE_AVATAR_VOXEL_URL
2013-07-08 14:59:00 -07:00
Stephen Birarda
374fffb151
use packet version helpers for PACKET_TYPE_SET_VOXEL commands
2013-07-08 14:40:15 -07:00
Stephen Birarda
b816761a74
use packet version helpers for PACKET_TYPE_MICROPHONE
2013-07-08 14:24:08 -07:00
Stephen Birarda
81e6bccd08
use packet version helpers in parseData methods
2013-07-08 14:13:36 -07:00
Andrzej Kapolka
5f3a37139f
Merge branch 'master' of https://github.com/worklist/hifi into kinected
2013-07-08 14:04:42 -07:00
Stephen Birarda
c64a961a38
packet version handling in VoxelSystem parseData
2013-07-08 14:01:10 -07:00
Andrzej Kapolka
c5c9debed5
Fix for combined gyro/depth camera.
2013-07-08 13:03:53 -07:00
Andrzej Kapolka
c43994fe03
Orientation -> rotation.
2013-07-08 12:54:27 -07:00
Stephen Birarda
8a684244cc
packet versioning for HEAD_DATA packets
2013-07-08 12:53:07 -07:00
Stephen Birarda
5faad80e12
remove ping unknown thread, version for ping reply
2013-07-08 11:58:19 -07:00
Stephen Birarda
5062ae8965
rename PACKET_HEADER to PACKET_TYPE, fix DS packet versioning
2013-07-08 11:37:39 -07:00
Andrzej Kapolka
4a22154737
Fix for leaning, smoothing.
2013-07-08 11:35:42 -07:00
Stephen Birarda
047d5b5cab
add packet version handling for DS packets
2013-07-08 11:17:29 -07:00
Stephen Birarda
d112edab64
resolve conflicts on merge with upstream master
2013-07-08 11:07:42 -07:00
atlante45
013aabc65c
Merge branch 'master' of git://github.com/worklist/hifi into 19373
2013-07-08 15:54:37 +02:00
atlante45
1f78c6461d
Merge branch 'master' of git://github.com/worklist/hifi into 19373
2013-07-08 13:37:55 +02:00
atlante45
6c840a9ec3
Functionnal version of minecraft import
2013-07-08 13:37:47 +02:00
Eric Johnston
4341e8596f
Merge branch 'master' of https://github.com/worklist/hifi into dev4
2013-07-07 22:19:13 -07:00
Andrzej Kapolka
357ac05d35
Removed debug logging.
2013-07-05 22:58:57 -07:00
Andrzej Kapolka
f9f2c66115
Merge branch 'master' of https://github.com/worklist/hifi into kinected
...
Conflicts:
interface/src/Application.cpp
interface/src/Avatar.cpp
interface/src/Avatar.h
libraries/avatars/src/AvatarData.h
2013-07-05 22:52:42 -07:00
Andrzej Kapolka
9c6e5b23e0
Alignment fixes.
2013-07-05 22:44:47 -07:00
Andrzej Kapolka
9c977450e3
Finally got the rotations figured out; I had forgotten the default pose/bind
...
pose distinction.
2013-07-05 22:14:32 -07:00
Andrzej Kapolka
ff5d1455aa
More work on joint tracking.
2013-07-05 17:45:29 -07:00
tosh
c2e2ff0ffe
changes broadcast function in Application to use a different name but the same signature as in NodeList
2013-07-05 14:16:50 +02:00
tosh
2da132be65
upstream merge
2013-07-04 21:21:11 +02:00
tosh
689794259d
Merge branch 'master' of git://github.com/worklist/hifi into 19376
...
Conflicts:
interface/src/Application.cpp
2013-07-04 21:20:36 +02:00
Philip Rosedale
d70eb38542
Properly make the goHome() function in slot group
2013-07-03 23:43:53 -07:00
Philip Rosedale
5df09b2932
remove debugging printf
2013-07-03 23:20:55 -07:00
Philip Rosedale
0f312d4c9b
Tuned smooth gyro look values to feel better.
2013-07-03 23:17:43 -07:00
Philip Rosedale
92cec4cfa0
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-03 22:55:09 -07:00
Philip Rosedale
2de6d3eb6a
Make 'Go Home' an option from the options because it conflicts with 'G' for gravity on/off
2013-07-03 22:55:01 -07:00
Andrzej Kapolka
43258f9dcd
Use 15 blinks per minute as a base/maximum frequency.
2013-07-03 17:12:43 -07:00
Andrzej Kapolka
30f77975cf
Trying to get the right rotations, send them on the wire.
2013-07-03 17:07:22 -07:00
ZappoMan
c0d14d2bd4
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-07-03 15:36:41 -07:00
Eric Johnston
3ea100e595
Added safety checks to processEvents(), which was causing problems. Also narrowed the scope of the events processed.
...
It can now be disabled in the interface by un-checking touch-look, which most people don't use yet.
Also, the event processing time should be limited to 1 ms.
2013-07-03 15:33:18 -07:00
Stephen Birarda
0be42698b5
resolve conflicts on merge with upstream master
2013-07-03 15:12:50 -07:00
Stephen Birarda
c8b86c651f
Merge pull request #622 from birarda/master
...
remove an extra g
2013-07-03 15:06:23 -07:00
Stephen Birarda
8a4dc8446b
what is July 3rdg
2013-07-03 15:05:51 -07:00
ZappoMan
f0fdacbba8
Merge pull request #621 from birarda/master
...
remove pre-build fervor error, comment out process event bug
2013-07-03 15:05:46 -07:00
Stephen Birarda
e85e49ef3b
add a comment to disable of processEvents
2013-07-03 14:31:28 -07:00
Stephen Birarda
c44e231ab5
Merge pull request #620 from machinelevel/dev4
...
[trivial] small bracket fix per request in https://github.com/worklist/h ...
2013-07-03 14:29:59 -07:00
Stephen Birarda
0e68942674
comment out processEvents to remove event receipt bug
2013-07-03 14:27:07 -07:00
Eric Johnston
fe46a3f0c9
[trivial] small bracket fix per request in https://github.com/worklist/hifi/pull/618/files
2013-07-03 13:11:26 -07:00
Philip Rosedale
3388fccc86
Fixes per code review
2013-07-03 13:09:55 -07:00
Philip Rosedale
c309774e3c
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-03 13:01:21 -07:00
Eric Johnston
e8ee041f20
Virtual method warning removal.
...
Warning was "Delete called on HifiLeapListener that has virtual functions but non-virtual destructor"
2013-07-03 11:46:53 -07:00
Eric Johnston
acef2bc669
Fixed two-finger touch delay, and all other hidden event-pile-up.
...
Added a processEvents() call in the idle, because otherwise calling idle updates starves the event handlers.
2013-07-03 11:37:38 -07:00
Philip Rosedale
7880c74304
smooth gyro look on by default if not in settings
2013-07-03 11:17:06 -07:00
Philip Rosedale
bf4bc22fbf
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-03 11:11:00 -07:00
Philip Rosedale
1868717520
Improve gyro look to smoothly follow the head and not move for small movements
2013-07-03 11:10:40 -07:00
ZappoMan
2d6e522c35
debug stats
2013-07-03 10:59:36 -07:00
Stephen Birarda
36c6912de8
your agents are now nodes
2013-07-03 10:35:09 -07:00
Andrzej Kapolka
e866c22518
Merge branch 'master' of https://github.com/worklist/hifi into kinected
...
Conflicts:
interface/src/Avatar.cpp
2013-07-03 10:15:11 -07:00
Andrzej Kapolka
ebab09e535
More work on joints.
2013-07-03 10:13:10 -07:00
Eric Johnston
fd2009738b
Merge branch 'master' of https://github.com/worklist/hifi into dev4
2013-07-03 09:56:00 -07:00
Stephen Birarda
00fa688aba
Merge pull request #614 from machinelevel/dev4
...
(changed per requests and re-merged) Two Leap-related crashes fixed, plu...
2013-07-03 09:53:40 -07:00
tosh
a542ebc851
bandwidth meter - avoid division by zero
2013-07-03 14:01:09 +02:00
Eric Johnston
cf8257d3e9
fixed curly-braces per request
2013-07-02 17:49:43 -07:00
Stephen Birarda
4a804a9960
Merge pull request #615 from ey6es/master
...
Fixes for gyros/webcam: restore rotation amplification, don't bother with gyro position or fusing webcam roll, blink faster.
2013-07-02 17:33:11 -07:00
Andrzej Kapolka
4ecb4ab3c6
Restore the amplification; blink faster.
2013-07-02 17:14:54 -07:00
Andrzej Kapolka
a1d0f255cc
Not crazy about the rotation amplification.
2013-07-02 17:03:37 -07:00
Eric Johnston
5d59bcbec7
(changed per requests and re-merged) Two Leap-related crashes fixed, plus Leap improvements
...
1. Fixed thread-crash at terminate() time by terminating the LeapManager properly
2. Fixed an intermittent thread-crash when Leap active by removing auto-connection between controller and listener
3. Added fingerRoot positions to display and data packet
4. Introduced a vec3-based convention so that more finger data may be added without causing trouble for old clients and servers
5. My avatar's fingers are different color from others
2013-07-02 17:03:32 -07:00
Andrzej Kapolka
b660336b2a
Fix for camera movement with webcam enabled; don't bother using roll from
...
webcam if we have the gyros; reinstate head orientation scaling; don't bother
using gyro position.
2013-07-02 16:59:03 -07:00
ZappoMan
af1de263a4
fixed FOV preference to work with view frustum code properly
2013-07-02 16:58:31 -07:00
ZappoMan
f45f0610f5
fixed FOV preference with projection matrix
2013-07-02 16:54:55 -07:00
Andrzej Kapolka
1fdfca727d
More work on Kinect-driven joints.
2013-07-02 16:49:07 -07:00
ZappoMan
1e19748a1a
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-07-02 15:52:49 -07:00
ZappoMan
c7ff073686
more progress on merging
2013-07-02 15:50:40 -07:00
Andrzej Kapolka
4f01db6dc7
Merge branch 'master' of https://github.com/worklist/hifi into kinected
2013-07-02 14:52:22 -07:00
Andrzej Kapolka
bf4757663c
Merge pull request #609 from birarda/domain-stats
...
rework Logstash to handle various stat types, add domain server node count stat
2013-07-02 14:52:08 -07:00
Andrzej Kapolka
c4deeed121
Merge branch 'master' of https://github.com/worklist/hifi into kinected
2013-07-02 14:51:45 -07:00
Andrzej Kapolka
52e7ff9a68
Working on filling in missing joint data.
2013-07-02 14:51:27 -07:00
Stephen Birarda
f7f321663a
DRY up multiple stat type sending
2013-07-02 14:42:31 -07:00
ZappoMan
147f090d56
Merge pull request #599 from PhilipRosedale/master
...
3P transition turned off, field of view now in preferences
2013-07-02 14:19:09 -07:00
Tomáš Horáček
6f6f0423a0
Merge remote-tracking branch 'worklist/master' into 19385
2013-07-02 23:05:50 +02:00
Stephen Birarda
64f3b55aaa
split logstash stash methods to stat types
2013-07-02 12:10:46 -07:00
Andrzej Kapolka
2a0d3310de
Merge branch 'master' of https://github.com/worklist/hifi into kinected
2013-07-02 09:46:07 -07:00
atlante45
b062295ecb
Merge with master
2013-07-02 16:22:39 +02:00
atlante45
78aa3ac9f9
Added UI responsivness
2013-07-02 16:17:25 +02:00
tosh
f3ab3b6c83
prevents voxel data from being sent or received (read: requested) when voxel rendering is disabled
...
also adds a menu option under "Tools" to enable/disable the Oscilloscope
2013-07-02 12:41:34 +02:00
Philip Rosedale
e7113d26f8
Add field of view as an option in preferences
2013-07-01 23:00:39 -07:00
Philip Rosedale
6fbab462f0
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-01 22:30:06 -07:00
ZappoMan
015ff85cea
good progress on merging polygons
2013-07-01 21:39:56 -07:00
tosh
f062319c2b
introduces named constants for bandwidth meter channel indices / max. drag length
2013-07-02 03:53:49 +02:00
Tomáš Horáček
66de431d67
re #19385 : add hot-fix to allow import of big PNGs
...
sendVoxelsOperation() is sending data too fast, printf slows it down.
Better fix is required.
2013-07-02 02:57:55 +02:00
Andrzej Kapolka
d2e9686c81
Need to resize this.
2013-07-01 17:52:17 -07:00
Andrzej Kapolka
095782af45
Smooth the joints, get the head position/orientation from there.
2013-07-01 17:46:05 -07:00
Tomáš Horáček
b5e5806988
re #19385 : fill gaps between neighbourhood voxels
2013-07-02 01:16:20 +02:00
Tomáš Horáček
c4c2d46847
re #19385 : first version of PNG import
...
works for size <= 128px
2013-07-02 01:16:20 +02:00
Andrzej Kapolka
da6a9a342a
Need to wrap the using statement in ifdef, too.
2013-07-01 15:07:10 -07:00
Andrzej Kapolka
182f4e70af
More work on skeleton tracking.
2013-07-01 15:01:36 -07:00
tosh
7ebd912788
improves defaults and inline documentation of bandwidth meter layout constants
2013-07-01 23:38:00 +02:00
Andrzej Kapolka
4e9595f794
Merge branch 'master' of https://github.com/worklist/hifi into kinected
2013-07-01 09:49:01 -07:00
Andrzej Kapolka
a1cab3ddc6
Working on getting skeleton data.
2013-07-01 09:48:36 -07:00
atlante45
8cc3f202ab
Merge with upstream master
2013-07-01 17:12:05 +02:00
atlante45
45e13fda15
More UI improvements
2013-07-01 16:34:43 +02:00
Grayson Stebbins
60bea894d8
UI improvements
2013-07-01 10:32:36 -07:00
tosh
3f62edd68e
makes bandwidth details dialog properly close (and reopen) on ESC key
2013-07-01 10:53:49 +02:00
tosh
639858dfc9
Merge branch 'master' of git://github.com/worklist/hifi into 19377
2013-07-01 10:29:56 +02:00
tosh
98589adef5
Bandwidth meter: Bytes -> bits, number formatting (colors, digits, aligment) on dialog
2013-07-01 10:28:17 +02:00
Philip Rosedale
138b8d7f64
Merge pull request #585 from birarda/owning-agent
...
boolean helper for Avatar isMyAvatar check
2013-06-30 23:26:32 -07:00
Philip Rosedale
d464ae4158
Merge pull request #578 from birarda/fervor
...
add an autoupdater for release OS X builds
2013-06-30 23:25:42 -07:00
tosh
fdf9f10e82
increases height of bandwidth meters by 8 pixels
2013-06-30 17:32:44 +02:00
tosh
f1e5a56347
adds code to show bandwidth details upon click and adds a checkbox to the menu to set visibility of the bandwidth bars
2013-06-30 17:08:01 +02:00
tosh
435b958671
polishes bandwidth meter
2013-06-29 20:52:07 +02:00
tosh
46f8136f2e
combined bandwidth display at automatic scale
2013-06-29 20:30:12 +02:00
tosh
c88642bac2
keeps audio from crashing when sound device is unavailable
2013-06-29 15:58:25 +02:00
tosh
c18400f8b7
Merge branch 'master' of git://github.com/worklist/hifi into 19377
2013-06-29 15:41:56 +02:00
ZappoMan
c7e691a010
cleaned up CoverageMapV2 recursion code, fixes crazy false occlusion
2013-06-29 00:15:57 -07:00
ZappoMan
73ad854235
latest version of quadtree coverage map
2013-06-28 22:05:32 -07:00
Andrzej Kapolka
b4b09b0070
Back up and running, now with OpenNI rather than libfreenect.
2013-06-28 17:31:49 -07:00
Andrzej Kapolka
ea9566596a
Build OpenNI/NITE into interface if available.
2013-06-28 16:47:08 -07:00
Philip Rosedale
5025e89c25
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-28 16:36:08 -07:00
Philip Rosedale
c2ef960a9e
Changed horizontal field of view to a constant, made it 90 degrees
2013-06-28 16:31:59 -07:00
Stephen Birarda
800bcdfd18
Merge pull request #598 from LionTurtle/master
...
Added menu toggle for displaying ping
2013-06-28 16:26:10 -07:00
Stephen Birarda
3349419c68
inital changes to add a version byte to packets
2013-06-28 16:23:35 -07:00
Philip Rosedale
c09fa3cc62
Turned avatar balls off
2013-06-28 16:22:56 -07:00
Philip Rosedale
8bac3b6a2b
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-28 16:20:23 -07:00
Mark Peng
be2e6518a1
Fixed if statement formatting in displayStats() and timer() in Application.cpp
2013-06-28 16:20:05 -07:00
Andrzej Kapolka
884f14dca1
Merge branch 'master' of https://github.com/worklist/hifi into kinected
2013-06-28 16:06:58 -07:00
Mark Peng
53543c26fe
Added menu toggle for displaying ping
2013-06-28 16:02:49 -07:00
Stephen Birarda
02b37febad
Merge pull request #597 from LionTurtle/master
...
fix typo grabbing avatar mixer agent
2013-06-28 15:57:33 -07:00
Mark Peng
745dc03c72
Fixed AGENT_TYPE typo in Application::displayStats()
2013-06-28 15:42:27 -07:00
Stephen Birarda
eedaf5f76e
Merge pull request #593 from LionTurtle/master
...
ping reporter added to interface
2013-06-28 15:34:46 -07:00
Mark Peng
a5c6cee433
Renamed getPingTime() to getPingMs() in Agent.h, etc.
2013-06-28 15:33:08 -07:00
Mark Peng
0aa3227228
Merge remote-tracking branch 'upstream/master'
2013-06-28 15:26:34 -07:00
Eric Johnston
6c42922288
Minor bug fixes for networked Leap hands
2013-06-28 15:22:56 -07:00
Mark Peng
a5dc47eaab
ping reporter added to interface take 4
2013-06-28 15:10:45 -07:00
Mark Peng
293031de6f
ping reporter added to interface take 3
2013-06-28 13:03:30 -07:00
Philip Rosedale
a0e6c2869d
merge fix
2013-06-28 11:54:25 -07:00
Eric Johnston
0ff3554dd8
Networked Leap fingers
...
- Simplified finger updates and storage
- added pack and unpack for the fingers
- not yet tested between multiple machines, but *should* be harmless and backward-packet-compatible
2013-06-28 11:34:20 -07:00
Mark Peng
ee005f19d9
ping reporter added to interface take 2
2013-06-28 11:17:52 -07:00
Mark Peng
c5fe8b078e
ping reporter added to interface
2013-06-28 11:07:01 -07:00
Eric Johnston
1c797405da
Hand rework in preparation for adding send/receive hand data
...
- Added Hand.cpp, Hand.h, HandData.cpp, HandData.h, roughly matching the equivalent Head files
- Cleaned up Avatar by moving hand work into Hand files
- Added fixed-point data packing, for use in sending hand offsets
2013-06-28 07:57:02 -07:00
Philip Rosedale
27266ee3b2
Third person camera transition doesn't happen on movement.
2013-06-27 17:11:25 -07:00
Stephen Birarda
73a8882a9e
resolve conflicts on merge with upstream master
2013-06-27 15:22:21 -07:00
Stephen Birarda
392728fbe5
Merge remote-tracking branch 'upstream/master' into owning-agent
2013-06-27 15:19:47 -07:00
Eric Johnston
b4f5df17ab
(re-commit) Added support for Leap finger-sensing device.
...
Note that the actual Leap SDK can't be in the repo for IP reasons, so there's a stub-version of the header. When the actual SDK is put into the Leap folder, cake will find it automatically and switch over.
2013-06-27 10:54:36 -07:00
Stephen Birarda
6cf71fb49b
remove speex includes
2013-06-26 18:25:12 -07:00
Philip Rosedale
6cd25294b4
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-26 18:22:16 -07:00
Philip Rosedale
4a241d6220
turned off voxel grabbing
2013-06-26 18:21:40 -07:00
Stephen Birarda
14718980e5
tighten audio latency by clearing the network stack after starves
2013-06-26 18:17:50 -07:00
Stephen Birarda
1c0b256f92
remove echo cancellation from audio code
2013-06-26 16:22:54 -07:00
Stephen Birarda
fd30725222
add a missing set of parenthesis
2013-06-26 15:53:35 -07:00
Stephen Birarda
6c4dd03867
add a missing semicolon
2013-06-26 15:52:26 -07:00
Stephen Birarda
2c7d720e88
add a boolean helper for _owningAvatar NULL comparison
2013-06-26 15:52:01 -07:00
Andrzej Kapolka
5ef400b193
Got the depth information displaying.
2013-06-26 15:35:44 -07:00
Andrzej Kapolka
c0b5bc5922
Merge branch 'master' of https://github.com/worklist/hifi into kinected
2013-06-26 12:59:50 -07:00
Andrzej Kapolka
5e989b6ee5
More work on obtaining Kinect data.
2013-06-26 12:19:10 -07:00
Stephen Birarda
383b6ecec2
use correct future appcast URL
2013-06-26 11:27:55 -07:00
Stephen Birarda
949395348f
switch to silent update checking
2013-06-26 10:42:07 -07:00
Stephen Birarda
0b243ec881
add fervor updater and run during launch if OS X release
2013-06-26 10:36:32 -07:00
Stephen Birarda
800bfd097b
alphabetize some includes in Application header
2013-06-26 10:35:17 -07:00
Philip Rosedale
0b37ce5375
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-25 21:08:37 -07:00
Andrzej Kapolka
f2f29d2e60
Well, I guess OS X doesn't like || and && without parentheses.
2013-06-25 16:58:31 -07:00
Andrzej Kapolka
6eb421d564
Blink less when talking (and never when brows are raised); force a blink after
...
we stop talking.
2013-06-25 16:51:22 -07:00
Stephen Birarda
5cf89e90d7
fix redundancy in reference to Rect for OpenCV
2013-06-25 16:45:14 -07:00
Andrzej Kapolka
3d214c2655
More work on Kinect integration.
2013-06-25 15:26:07 -07:00
Andrzej Kapolka
1d578d5b0e
Lots of Kinect bits.
2013-06-25 14:27:13 -07:00
Andrzej Kapolka
7ab1055d47
Derp, need to bind the element array buffer.
2013-06-24 17:25:09 -07:00
Andrzej Kapolka
9356d1a27d
Turns out sincos is a GNU thing.
2013-06-24 17:16:06 -07:00
atlante45
ee15739e7e
few fixes on the job 19368
2013-06-25 01:28:31 +02:00
atlante45
52d62185ee
Merge branch 'master' of https://github.com/worklist/hifi into 19368
2013-06-25 00:24:54 +02:00
atlante45
d6c70ea6ca
#19368 - Improve editing/building workflow in Interface
2013-06-25 00:24:21 +02:00
Andrzej Kapolka
a0ecd167fc
Replace 0/1 with FULLY_OPEN/CLOSED.
2013-06-24 10:31:11 -07:00
Andrzej Kapolka
1e258aae99
Define blink speed as a constant.
2013-06-24 10:20:01 -07:00
ZappoMan
c627010d3a
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-06-24 10:12:59 -07:00
tosh
7690ace2c3
Merge branch 'master' of git://github.com/worklist/hifi into 19377
...
Conflicts:
interface/src/Audio.cpp
2013-06-22 05:35:31 +02:00
tosh
09962737dd
tightens bounding issues for bandwidth meter's scale indicators
2013-06-22 05:21:15 +02:00
tosh
4f692aeb56
improves bandwidth meter layout / simplifies & fixes rendering
2013-06-22 05:07:01 +02:00
tosh
290c20bfc7
introduces bandwidth meter / dialog
2013-06-22 04:22:10 +02:00
Andrzej Kapolka
ef7c6ebdc6
Basic blinking.
2013-06-21 18:11:31 -07:00
ZappoMan
4590bdc69d
added support for clipping polygons to screen bounds, not yet enabled since it doesn't help performance, will use in future
2013-06-21 16:42:55 -07:00
Andrzej Kapolka
5bbff6f63f
Merge branch 'master' of https://github.com/worklist/hifi into opencv
...
Conflicts:
interface/src/Balls.cpp
2013-06-21 14:40:47 -07:00
Philip Rosedale
7e12a0c1d7
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-21 14:33:52 -07:00
Philip Rosedale
74f6ee6fca
Fixed spacing at parenthesis
2013-06-21 14:33:37 -07:00
Andrzej Kapolka
650e659ee8
Fixed includes, pointer warning.
2013-06-21 14:33:01 -07:00
Stephen Birarda
258eed5890
fix casing of SharedUtil include in balls
2013-06-21 14:32:55 -07:00
Andrzej Kapolka
0c184b9912
Merge pull request #571 from ey6es/opencv
...
Quick fix for something I broke in mouse/touch took.
2013-06-21 14:30:59 -07:00
Andrzej Kapolka
94cbb50dfa
Merge branch 'master' of https://github.com/worklist/hifi into opencv
2013-06-21 14:30:03 -07:00
birarda
bd0d820fc7
Merge pull request #556 from PhilipRosedale/master
...
Dynamic jitter buffer for less stuttering, fixes to stereo
2013-06-21 14:29:45 -07:00
Andrzej Kapolka
686fc3607e
Fix for mouse/touch look: don't apply rotations if the gyros/webcam aren't
...
connected.
2013-06-21 14:25:25 -07:00
Philip Rosedale
12ef87e073
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-21 14:23:49 -07:00
Andrzej Kapolka
483407a3f2
Merge branch 'master' of https://github.com/worklist/hifi into opencv
2013-06-21 14:09:38 -07:00
Andrzej Kapolka
0000eac95f
Implementation parameter name should match interface parameter name.
2013-06-21 14:02:35 -07:00
Andrzej Kapolka
5194fb2ee6
Don't bother with testing the ignore orientations stuff.
2013-06-21 13:58:49 -07:00
Eric Johnston
6825274b65
Re-issue of change which adds two-finger touch look to avatar.
...
The option is un-checked by default because of an unsolved problem: We're getting the events into Qt very slowly, so input from several seconds ago is still active when the user has stopped the touch action. This needs to be fixed before this can be turned on full-time.
Corrections were made per feedback, and the change has been merged with the latest.
2013-06-21 13:43:23 -07:00
Philip Rosedale
6eafd6582e
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-21 11:42:29 -07:00
Philip Rosedale
1f6fd31b52
Merge pull request #568 from ey6es/opencv
...
Head roll, lean from webcam data.
2013-06-21 11:41:21 -07:00
Andrzej Kapolka
0e223b90d9
Merge branch 'master' of https://github.com/worklist/hifi into opencv
2013-06-21 11:35:23 -07:00
Andrzej Kapolka
00eba63e4e
Added various options to test for voxel avatars, manual third person mode
...
(also, cleaned up the camera switching a little).
2013-06-21 11:33:38 -07:00
Philip Rosedale
13b729d9b4
Fixed problems with ring buffer not handling stereo right, reset audio buffers on spacebar.
2013-06-20 18:49:05 -07:00
Andrzej Kapolka
3de76c9e15
Approach the webcam position rapidly.
2013-06-20 16:28:48 -07:00
Andrzej Kapolka
281aee1f12
Increased smoothing substantially to reduce effect of jittering face rect.
2013-06-20 16:22:46 -07:00
Andrzej Kapolka
8cffaf7cc0
Fixed includes.
2013-06-20 16:09:24 -07:00
Andrzej Kapolka
7e34bef01e
Attempt to fuse gyro readings with webcam data.
2013-06-20 16:07:33 -07:00
Stephen Birarda
8b7b0d542a
send the interface startup time to log stash
2013-06-20 15:34:17 -07:00
Andrzej Kapolka
02b881aa33
Increased the camera distance in mirror mode to avoid clipping.
2013-06-20 15:08:46 -07:00
Andrzej Kapolka
b0dd5223e1
Avatar head roll/lean based on webcam data.
2013-06-20 14:20:03 -07:00
Andrzej Kapolka
b14a0c1554
Reset webcam along with other sensors on spacebar, added settings config for
...
non-Apple.
2013-06-20 11:44:47 -07:00
Philip Rosedale
56b8a5880d
cleaned up stdout audio reporting
2013-06-20 10:59:50 -07:00
Philip Rosedale
c740400224
Merge fixes plus auto jitter buffer
2013-06-20 10:54:58 -07:00
Andrzej Kapolka
6493f3aa44
Merge branch 'master' of https://github.com/worklist/hifi into opencv
2013-06-20 10:08:58 -07:00
Philip Rosedale
2c8c34f9bd
set jitter buffer on application start to 1/2 of a packet
2013-06-20 09:08:37 -07:00
ZappoMan
517ff0f3cf
Merge pull request #565 from tschw/19371
...
Code Review for Job #19371
2013-06-19 21:08:55 -07:00
Philip Rosedale
5dae92d610
Merge pull request #560 from ZappoMan/occlusion_culling
...
Occlusion culling optimizations
2013-06-19 19:26:56 -07:00
tosh
72a29979d0
Merge branch 'master' of git://github.com/worklist/hifi into 19371
...
Conflicts:
interface/CMakeLists.txt
2013-06-20 03:46:25 +02:00
tosh
9c54ef18d3
adds 'Oscilloscope::setColor' and uses it when visualizing echo cancellation
2013-06-20 03:15:01 +02:00
Andrzej Kapolka
0dc0552f50
Basic Haar cascade/CamShift tracking.
2013-06-19 18:02:26 -07:00
ZappoMan
cadd596508
implement partitioned CoverageRegions in CoverageMap to further optimize polygon compares
2013-06-19 17:52:01 -07:00
tosh
7588b7f6bb
- separates audio system round trip time determination from echo cancellation
...
- changes speex parameters to more humble values
- resolves build issues by removing the speex dylibs - static ones are fine
- tightens build script
2013-06-20 02:00:12 +02:00
Philip Rosedale
3304f0eb2e
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-19 16:03:20 -07:00
Philip Rosedale
bc374d0183
More audio tweaks
2013-06-19 16:02:56 -07:00
tosh
651dc19427
separates echo cancellation from loopback test (intermediate commit)
2013-06-19 23:55:15 +02:00
Andrzej Kapolka
d4d662b3f5
Convert frame to grayscale and equalize.
2013-06-19 14:13:42 -07:00
ZappoMan
1284f9d09a
naming cleanup and some optimizations
2013-06-19 13:45:13 -07:00
Andrzej Kapolka
2e52925496
Bump this up to 60 again.
2013-06-19 11:22:41 -07:00
Andrzej Kapolka
46b3d829d5
Round FPS display.
2013-06-19 11:06:51 -07:00
Andrzej Kapolka
68371f8c3f
Merge branch 'master' of https://github.com/worklist/hifi into opencv
2013-06-19 11:04:12 -07:00
Andrzej Kapolka
1651044234
Disable auto exposure, set exposure rather high (which causes a lower exposure
...
time).
2013-06-19 11:02:48 -07:00
Andrzej Kapolka
963b033e41
Fixed warning on OS X, playing with settings.
2013-06-19 10:50:58 -07:00
Andrzej Kapolka
352f7ca3cf
Provide option to enable/disable webcam (disabled by default).
2013-06-19 10:46:54 -07:00
Andrzej Kapolka
dbde66cbd5
Use trigger to change the state of the menu actions; that way, we get the
...
callbacks.
2013-06-19 10:32:55 -07:00
tosh
755208aaf7
comments unused variable to avoid a compiler warning
2013-06-19 16:19:50 +02:00
tosh
7342b7a774
Merge branch 'master' of git://github.com/worklist/hifi into 19371
2013-06-19 16:15:38 +02:00
tosh
97fc38313b
implements audio echo cancellation based on speex
2013-06-19 16:12:25 +02:00
Andrzej Kapolka
cc9f8bc717
Adjustments to UVCCameraControl invocation.
2013-06-18 18:15:52 -07:00
Andrzej Kapolka
2e033631eb
Make our call to configureCamera on OS X.
2013-06-18 16:50:15 -07:00
Andrzej Kapolka
4519b43072
Initialization order fix.
2013-06-18 14:48:58 -07:00
Andrzej Kapolka
9cb671aa56
Slightly better fps computation.
2013-06-18 14:43:19 -07:00
Andrzej Kapolka
e1f76b2bdf
Limit the rate at which we acquire images, since OS X doesn't block like Linux
...
does.
2013-06-18 14:37:24 -07:00
Andrzej Kapolka
e98d1f9a92
Let's try getting the cam's fps.
2013-06-18 14:18:33 -07:00
Andrzej Kapolka
2ad8585f26
Show the acquisition fps.
2013-06-18 14:11:13 -07:00
Andrzej Kapolka
2a60414968
Set the desired webcam resolution and fps, report what we actually get.
2013-06-18 13:56:58 -07:00
Andrzej Kapolka
0fa710e518
Let's try using glPixelStore to specify the widthStep.
2013-06-18 13:39:54 -07:00
Andrzej Kapolka
2c2297b2bd
Let's try using widthStep rather than nChannels and computing the alpha
...
values.
2013-06-18 13:30:31 -07:00
tosh
682a7c9cdf
libspeexdsp-based echo cancellation (untested)
2013-06-18 22:18:27 +02:00
Andrzej Kapolka
a4324d71d5
If we don't get the image frame, try again later.
2013-06-18 13:08:16 -07:00
Philip Rosedale
216c5d054d
working on audio system, added metrics on in/out latency.
2013-06-18 12:16:39 -07:00
Andrzej Kapolka
9e92ea03da
Rather than copying to a QImage, just send the pointer. Also, put the render
...
code in Webcam itself.
2013-06-18 12:13:40 -07:00
ZappoMan
1fc3ad8011
CR feedback
2013-06-18 12:03:58 -07:00
ZappoMan
8b18ee6844
renamed VoxelProjectedShadow class
2013-06-18 12:01:01 -07:00
ZappoMan
46d7ada753
code cleanup
2013-06-18 10:21:47 -07:00
ZappoMan
8331fc1acb
removed some old debug code
2013-06-18 10:19:49 -07:00
ZappoMan
7fe6c0e3b3
added occlusion culling menu option
2013-06-18 09:34:12 -07:00
Philip Rosedale
002f8c736f
Added adjustable audio jitter buffer (in preferences), and simple lowPassFilter (for pert testing compared to LPF)
2013-06-17 18:30:02 -07:00
Andrzej Kapolka
341cde61f5
Allow four channel images, create a copy.
2013-06-17 18:21:35 -07:00
Andrzej Kapolka
a771f53df3
Read the webcam frames in a separate thread, since the call blocks.
2013-06-17 18:07:53 -07:00
Andrzej Kapolka
3c58f0c0a7
Must init webcam after OpenGL.
2013-06-17 16:24:47 -07:00
Andrzej Kapolka
c7ddc89803
Basic frame grab from camera; not currently working yet, but let's try on
...
OS X!
2013-06-17 15:06:40 -07:00
Andrzej Kapolka
ec495e14d3
Missed these guys.
2013-06-17 13:29:24 -07:00
Andrzej Kapolka
4421b21124
Working on reintegrating OpenCV (also, removed lodepng).
2013-06-17 13:24:01 -07:00
tosh
e3da925e46
Merge branch 'master' of git://github.com/worklist/hifi into 19371
2013-06-17 07:18:19 +02:00
tosh
66f350d846
echo cancellation: ui, calibration, visualization
2013-06-17 07:16:29 +02:00
ZappoMan
c9e1c898c2
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-06-14 19:50:38 -07:00
Andrzej Kapolka
c11ab45474
It seems gl_ModelViewMatrixInverse is problematic on OS X; let's try passing
...
in the camera's position as transformed into model space.
2013-06-14 17:21:35 -07:00
Andrzej Kapolka
790cdfb0bd
Added refraction to irises.
2013-06-14 16:46:34 -07:00
Andrzej Kapolka
ec0b1a99fb
Fix iris orientations: start with the head orientation, then rotate onto the
...
lookat vector. This way, the irises don't rotate around as we yaw.
2013-06-14 11:23:08 -07:00
ZappoMan
620a4a8ad6
latest occlusion culling with support for checking map without adding to coverage map for checking parent nodes
2013-06-13 16:37:14 -07:00
Philip Rosedale
dd1df47c71
fixes per review
2013-06-13 16:20:28 -07:00
Philip Rosedale
e6e147d86a
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-13 16:09:28 -07:00
Andrzej Kapolka
e401663459
Added per-pixel specular highlight to irises.
2013-06-13 15:58:49 -07:00
Philip Rosedale
04736fefb5
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-13 15:04:41 -07:00
Philip Rosedale
f6e6ceddfe
Head camera scaling always one if gyros off so that mouse look works.
2013-06-13 14:53:10 -07:00
Andrzej Kapolka
466c062bc1
Use a bound texture for the iris, load it with Qt rather than lodepng (we can
...
probably just remove the lodepng dependency).
2013-06-13 14:41:06 -07:00
Philip Rosedale
1556886a64
fixing reversed lookat, rendering for all avatars
2013-06-13 14:33:09 -07:00
Philip Rosedale
8af0da754f
we are always looking at something
2013-06-13 14:21:14 -07:00
Philip Rosedale
687966c486
Other people's avatar's look where they are mousing
2013-06-13 14:04:51 -07:00
Philip Rosedale
e32f9f387a
Basic random eye movements added, and fixation on camera in mirror mode.
2013-06-13 13:50:56 -07:00
ZappoMan
40c2cf2d44
removed some dead code
2013-06-13 13:31:26 -07:00
ZappoMan
8320925add
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-06-13 13:30:18 -07:00
Andrzej Kapolka
78072fbde0
Merge pull request #523 from PhilipRosedale/master
...
Better physics, first person to third person transition
2013-06-13 12:07:06 -07:00
Philip Rosedale
b85f91a7d4
fixes per code review
2013-06-13 12:05:06 -07:00
Philip Rosedale
d517487d1b
OK I wanted us to jump just a bit higher.
2013-06-13 11:35:36 -07:00
Philip Rosedale
61b1a2f995
First person to third person transition driven by velocity, changes to make moving and flying physics more fun.
2013-06-13 11:31:41 -07:00
Andrzej Kapolka
db729a04aa
Converted double timestamps to long long (64 bit integers), fixed bug with
...
updating agent timestamps.
2013-06-13 11:11:59 -07:00
ZappoMan
72b2845178
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-06-13 09:40:45 -07:00
Philip Rosedale
c0ba2aeebe
Added jumping, tuned friction model, tuned thrust
2013-06-12 23:45:59 -07:00
ZappoMan
b8e51943ab
make sure position is in voxel units NOT TREE_SCALE
2013-06-12 21:45:45 -07:00
ZappoMan
0f234d739e
remove Camera menu from frustum debugging, because its obsolete and only causes problems
2013-06-12 21:44:49 -07:00
Philip Rosedale
a5a0df09cb
removed grab voxel rendering
2013-06-12 16:36:55 -07:00
Philip Rosedale
3d1ddf047e
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-12 16:27:53 -07:00
Andrzej Kapolka
ccd61ee5a2
Found the problem we were having: the domain server was reporting back all
...
kinds of things as our ID.
2013-06-12 16:13:44 -07:00
Andrzej Kapolka
19180ad900
Put the debugging back in.
2013-06-12 15:56:28 -07:00
Andrzej Kapolka
e4ed9162b9
This should help, as well as fix another annoyance: bind to an ephemeral port,
...
rather than a fixed one.
2013-06-12 15:52:29 -07:00
Philip Rosedale
311b09eee0
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-12 14:30:48 -07:00
Andrzej Kapolka
f197b4cd62
Some debugging to use on the other machine.
2013-06-12 14:20:28 -07:00
Andrzej Kapolka
b28df17207
Slight tweak: we need to call trigger in order to get the full toggle
...
behavior.
2013-06-12 13:51:16 -07:00
Andrzej Kapolka
178996bb8b
Make sure first person mode and mirror mode are mutually exclusive.
2013-06-12 13:30:41 -07:00
Philip Rosedale
6cffb16279
merge fixes
2013-06-12 13:29:17 -07:00
Andrzej Kapolka
52c616b688
Added configurable lean scale, fixed loadSetting.
2013-06-12 13:06:28 -07:00
Philip Rosedale
26ca1a9a1d
Remove shortcut on ground plane 'G', was conflicting with turning gravity on/off
2013-06-12 12:58:45 -07:00
ZappoMan
627f61badb
some debug changes for testing occlusion culling
2013-06-12 12:36:28 -07:00
Philip Rosedale
6164e6cd7e
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-12 11:37:24 -07:00
Philip Rosedale
3546bcc101
Avatar can set velocity, velocity set to zero on reset
2013-06-12 11:36:28 -07:00
Andrzej Kapolka
59c8d9d26a
Function cleanup, fixed misspelling, tweaked transparency distances to
...
accomodate lean.
2013-06-12 10:25:28 -07:00
ZappoMan
636030b0bb
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-06-12 01:17:03 -07:00
ZappoMan
e2d22a8e21
latest cut at occlusion culling
2013-06-12 01:16:46 -07:00
Philip Rosedale
750d210f0a
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-11 21:20:39 -07:00
Philip Rosedale
ad58d0aa23
Adding voxel thrust on grabbing/dragging to move avatar
2013-06-11 21:19:58 -07:00
Andrzej Kapolka
c58eb0d584
Bump the maximum voxels up to 10000.
2013-06-11 18:11:42 -07:00
Andrzej Kapolka
7ef2a2c5d9
Set/get lean to/from network data.
2013-06-11 18:06:05 -07:00
Andrzej Kapolka
82f03ffd8e
Don't render the voxels when we're too close (i.e., in first person mode).
2013-06-11 17:53:49 -07:00
Andrzej Kapolka
648aacb53d
Let's use a fixed vector for the camera position so that the target doesn't
...
move with lean.
2013-06-11 17:26:41 -07:00
Andrzej Kapolka
70c5a941d7
Now let's try using the estimated position to calculate lean.
2013-06-11 17:01:06 -07:00
Andrzej Kapolka
c1c2439d2c
Let's try changing the torso rotation based on the gyros!
2013-06-11 16:44:21 -07:00
Andrzej Kapolka
35e18abcbd
Let's try using estimated velocity to control "lean."
2013-06-11 16:27:39 -07:00
Andrzej Kapolka
627fd49003
Merge branch 'master' of https://github.com/worklist/hifi into gyroquat
2013-06-11 16:01:52 -07:00
Andrzej Kapolka
090df81afe
Fixes to align better with previous code.
2013-06-11 15:58:50 -07:00
Andrzej Kapolka
e77aee3967
Show the average rotation rates, too.
2013-06-11 15:47:05 -07:00
Andrzej Kapolka
d913f8dec0
Actually, we want it sans gravity.
2013-06-11 14:25:05 -07:00
Andrzej Kapolka
4b890e2ccc
Let's see what the long-term average acceleration is.
2013-06-11 14:23:47 -07:00
Andrzej Kapolka
47bd3bcdd7
Don't estimate acceleration before we know the gravity and don't update our
...
matrices without acceleration.
2013-06-11 14:03:49 -07:00
Andrzej Kapolka
b88380db6f
New values, slower learning.
2013-06-11 13:43:29 -07:00
ZappoMan
ac7fbc6320
added occlusion tests to debug menu
2013-06-11 13:29:01 -07:00
Andrzej Kapolka
5ba1d3a28c
It ain't perfect, but I'm going with what I've got for now.
2013-06-11 13:18:13 -07:00
Andrzej Kapolka
517bbe80a7
Initial values, report error.
2013-06-11 13:02:20 -07:00
ZappoMan
ab365202c8
added some debugging routines to visualize occlusion
2013-06-11 12:36:15 -07:00
Andrzej Kapolka
ff9e6f831c
Revert to previous coordinates.
2013-06-11 11:31:01 -07:00
Andrzej Kapolka
bf389de774
Testing a different coordinate conversion.
2013-06-11 11:22:43 -07:00
Philip Rosedale
57fcaceec2
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-11 11:10:41 -07:00
Philip Rosedale
b1e3a0984b
Improved mouse look behavior to be smoother, removed transmitter debug.
2013-06-11 11:10:09 -07:00
Andrzej Kapolka
73ceea7795
Working on "learning" the acceleration matrices.
2013-06-11 10:55:28 -07:00
ZappoMan
74d63cdd1d
Merge pull request #522 from birarda/conditional-ds
...
allow agents to specify which agent types they want to hear about
2013-06-11 00:47:36 -07:00
Andrzej Kapolka
988c4f97b0
This should be the normalized offset.
2013-06-10 18:43:11 -07:00
Andrzej Kapolka
a34f9a0ef3
Need to include SharedUtil.
2013-06-10 18:41:49 -07:00
Andrzej Kapolka
90ef6a7cc0
Attempting to perform the transform between angular and linear acceleration.
2013-06-10 18:40:07 -07:00
Andrzej Kapolka
1b8683cbc5
Let's see if we can get an estimate of the distance to the sensor based on
...
the ratios between linear and angular velocity.
2013-06-10 15:22:53 -07:00
ZappoMan
27f8f5dcb8
fix CR feedback
2013-06-10 14:50:04 -07:00
Andrzej Kapolka
5820c3c7c3
Remove average measurements, compute estimated acceleration (without rotated
...
gravity).
2013-06-10 14:49:39 -07:00
Stephen Birarda
a8075e44ca
Merge remote-tracking branch 'upstream/master' into conditional-ds
2013-06-10 14:01:54 -07:00
Stephen Birarda
7fb42dcb8a
fix bug with sent and received agent interest packets
2013-06-10 13:48:34 -07:00
ZappoMan
fc3fb7d3f0
fixed bug with loading of corrupt settings file where NaN returned for avatar position details
2013-06-10 11:46:06 -07:00
Philip Rosedale
fb97d3e04b
Merge pull request #520 from tschw/19367
...
Code Review for Job #19367
2013-06-10 08:04:16 -07:00
atlante45
c96e01ef51
Fixed merge conflict
2013-06-09 23:15:49 +02:00
atlante45
b1aabc2c1f
Added shortcup for gravity use
2013-06-09 23:02:45 +02:00
Geenz
8dea00052d
Merge branch 'master' of https://github.com/worklist/hifi into 19361
2013-06-09 02:08:29 -04:00
ZappoMan
b60df9ce89
Merge pull request #512 from ey6es/gyroquat
...
Fixes for preferences: store avatar voxel URL along with other avatar settings, use QAction rather than separate boolean for autosave.
2013-06-08 21:36:07 -07:00
ZappoMan
6fa8c23cca
Merge branch 'master' of https://github.com/worklist/hifi into keyhole_frustum
2013-06-08 17:28:27 -07:00
ZappoMan
b69cfd4e06
fixed CR spacing issue
2013-06-08 17:27:48 -07:00
Philip Rosedale
55a5531eb7
Merge pull request #514 from ZappoMan/keyhole_frustum
...
Keyhole frustum
2013-06-08 14:22:06 -07:00
tosh
4736e95761
Merge branch 'master' of git://github.com/worklist/hifi into 19367
2013-06-08 02:37:16 +02:00
tosh
9ca0b5e7a7
removes blank lines that slipped in
2013-06-08 02:35:55 +02:00
tosh
d39b25a17b
adds menu option to set whether ground plane gets rendered
2013-06-08 02:31:23 +02:00
ZappoMan
46c66c39e5
implement keyhole frustum
2013-06-07 17:23:23 -07:00
atlante45
5c07638ce2
19369 - Added "Use Gravity" option
2013-06-08 02:05:54 +02:00
Andrzej Kapolka
ac2b7d7f48
Fix for initial camera transition.
2013-06-07 15:20:26 -07:00
Stephen Birarda
1e05936aea
unthread DS check in, allow agents to tell DS who they want to hear about
2013-06-07 15:19:12 -07:00
Andrzej Kapolka
096dcd089a
Merge branch 'master' of https://github.com/worklist/hifi into gyroquat
2013-06-07 14:28:22 -07:00
Stephen Birarda
fc27c2c7bb
more renaming for AGENT_TYPE_VOXEL_SERVER
2013-06-07 14:14:13 -07:00
Philip Rosedale
202c293a77
Merge pull request #513 from Atlante45/19366
...
19366 - Smaller log display
2013-06-07 14:13:49 -07:00
atlante45
b0d02ab7d8
19366 - Smaller log display
2013-06-07 23:02:00 +02:00
Andrzej Kapolka
5515fc02e4
Merge branch 'master' of https://github.com/worklist/hifi into gyroquat
2013-06-07 13:46:27 -07:00
Andrzej Kapolka
75c89f2c22
OK, I found the problem: duplication of state for the "autosave" option.
...
Let's just use the QAction, as does everything else.
2013-06-07 13:42:49 -07:00
Geenz
89ef026ce8
Remove seemingly unnecessary coordinate space conversion.
2013-06-07 16:42:22 -04:00
Geenz
65ec02044e
Add a distance check for selected voxels.
2013-06-07 16:34:10 -04:00
Geenz
1c8d4f7717
Get the average velocity of the avatar.
2013-06-07 16:20:51 -04:00
Andrzej Kapolka
9da10df9f2
We need to set these before initMenu, as that's where we create the QSettings.
2013-06-07 13:12:59 -07:00
Geenz
82db388552
Real max velocity stuff.
2013-06-07 16:08:27 -04:00
Geenz
c79bd71fe7
Merge branch 'master' of https://github.com/worklist/hifi into 19361
2013-06-07 16:00:33 -04:00
Geenz
86316bc674
Don't render the voxel selection when we're moving over a maximum velocity.
2013-06-07 16:00:13 -04:00
Andrzej Kapolka
953aec35e6
Use the default QSettings constructor and let it get the application info
...
from the QCoreApplication properties.
2013-06-07 11:48:29 -07:00
Andrzej Kapolka
a5c24b5333
OK, we don't need this sync. Clearly the problem I was seeing on OS X lies
...
elsewhere.
2013-06-07 11:32:26 -07:00
Andrzej Kapolka
dc8a6c2725
Store the avatar voxel URL along with the rest of the avatar settings.
2013-06-07 11:30:41 -07:00
Stephen Birarda
222a596754
remove unnecessary OctalCode include in main
2013-06-07 10:59:40 -07:00
ZappoMan
ba7863605c
fix several delete/delete[] mismatches
2013-06-07 10:49:43 -07:00
ZappoMan
479e8c7811
add shortcut key for Kill Local Voxels to help debugging of LOD
2013-06-07 10:29:05 -07:00
ZappoMan
887e3428c2
cleaned up menus slightly
2013-06-07 09:39:24 -07:00
Philip Rosedale
dd0fa021a0
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-07 09:19:54 -07:00
Philip Rosedale
f0c9bd45bb
Fixed merge
2013-06-07 09:19:49 -07:00
ZappoMan
ece117e0b0
Merge pull request #502 from ey6es/gyroquat
...
Increase YAW_DECAY, remove roll from head camera, provide option for pitch/yaw scale (zero by default).
2013-06-07 09:17:11 -07:00
ZappoMan
27c3627e02
Merge pull request #500 from birarda/master
...
indentation and NULL comparison repairs in Avatar
2013-06-07 09:15:09 -07:00
atlante45
2a1730af72
#19365 - Frustum menu moved inside the Debug menu
2013-06-07 16:35:43 +02:00
Andrzej Kapolka
26de3028fa
We need to sync in order to ensure that the settings are saved.
2013-06-06 18:25:16 -07:00
Andrzej Kapolka
acc8efa026
One more "one more try."
2013-06-06 18:10:21 -07:00
Andrzej Kapolka
1b698b24e2
OK, one more try.
2013-06-06 18:05:39 -07:00
Andrzej Kapolka
ce68c1a6a4
Think this needs to be a double.
2013-06-06 18:03:38 -07:00
Andrzej Kapolka
e0e94481c9
Add pitch/yaw scale preference to control degree of view rotation.
2013-06-06 17:53:00 -07:00
Philip Rosedale
b5e63fb446
Added debug->run timing tests option to speed test some common functions (please add some more, bottom of util.cpp
2013-06-06 17:52:19 -07:00
Andrzej Kapolka
ffc1c33455
Removed double negation for coordinates, world aligned orientation -> camera
...
orientation, removed roll.
2013-06-06 17:25:52 -07:00
Geenz
7cefa3fe7b
Check if our main window is our application window within Application's event handling functions.
2013-06-06 19:58:33 -04:00
Geenz
51340452df
Use _mouseX and _mouseY for mouse look instead of the global mouse position when idle (prevents mouse look from accidentally triggering when the window is inactive).
2013-06-06 19:47:01 -04:00
Geenz
151a6edfb4
Check if our canvas has focus. If not, then ignore events passed to it.
2013-06-06 19:31:55 -04:00
Stephen Birarda
bd553ef061
repair indentation and NULL comparisons in Avatar class
2013-06-06 16:01:36 -07:00
Andrzej Kapolka
a5abfbe1cd
Merge branch 'master' of https://github.com/worklist/hifi into gyroquat
2013-06-06 15:52:54 -07:00
Andrzej Kapolka
0dbb5375db
Approach the "down" direction more rapidly.
2013-06-06 15:50:14 -07:00
Andrzej Kapolka
a7c265d017
More compiley.
2013-06-06 15:44:38 -07:00
Andrzej Kapolka
ba6f2307ba
Coordinate fix.
2013-06-06 15:43:26 -07:00
Andrzej Kapolka
081f193db8
Add back yaw decay the quaternion way.
2013-06-06 14:34:28 -07:00
Andrzej Kapolka
d87e165b06
Acceleration is presumably relative to the current orientation.
2013-06-06 14:08:53 -07:00
Andrzej Kapolka
650981abfa
Remove the bounce term; it causes fluctuations in velocity.
2013-06-06 13:41:22 -07:00
Andrzej Kapolka
6ef7da5200
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-06 13:09:23 -07:00
Andrzej Kapolka
9afb1b3338
Enhanced workiness.
2013-06-06 13:09:00 -07:00
Andrzej Kapolka
f04e45b7c1
Use quaternions for rotation estimates.
2013-06-06 12:07:34 -07:00
Andrzej Kapolka
7f8b6fe0a6
Merge branch 'master' of https://github.com/worklist/hifi into gyroquat
2013-06-06 12:06:29 -07:00
Andrzej Kapolka
14f331b07d
Scratch that; need to do this in a branch.
2013-06-06 12:05:52 -07:00
Andrzej Kapolka
a851499684
Rework rotation estimation bits to use quaternions.
2013-06-06 12:03:50 -07:00
Stephen Birarda
ecd03d7b4b
replace magic number 1 with sizeof
2013-06-06 11:54:44 -07:00
Andrzej Kapolka
b13f22be26
Forgot to update the default pose position.
2013-06-06 11:14:57 -07:00
Andrzej Kapolka
56b4c04a18
Adjusted head base/top transforms.
2013-06-06 11:09:09 -07:00
Andrzej Kapolka
d9d6891cc8
Use the head rotation to adjust the position, too.
2013-06-06 10:54:28 -07:00
Andrzej Kapolka
27717bfcd4
Removed unused variables.
2013-06-06 10:48:35 -07:00
Andrzej Kapolka
2cc640b6f6
Set head bone rotation from head orientation.
2013-06-06 10:26:26 -07:00
Andrzej Kapolka
c1bccb04d1
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-06 10:21:10 -07:00
Philip Rosedale
0f4e6a447e
Merge pull request #493 from birarda/echo
...
add back audio echo option
2013-06-06 10:20:12 -07:00
Andrzej Kapolka
e0189c9834
Build fix, render body as balls if we don't have an avatar.
2013-06-06 10:17:57 -07:00
Andrzej Kapolka
80847b3884
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-06 10:10:07 -07:00
Andrzej Kapolka
7af42a1896
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
interface/src/Avatar.cpp
2013-06-06 10:09:48 -07:00
Andrzej Kapolka
4cac35293a
Refer to body balls parents, not joint parents.
2013-06-06 10:08:15 -07:00
Philip Rosedale
b08fe8f915
merge fixes
2013-06-06 10:07:50 -07:00
Philip Rosedale
61d4ac2675
Fixes per code review.
2013-06-06 09:52:39 -07:00
Stephen Birarda
719af3b9e6
Merge branch 'master' of github.com:worklist/hifi into echo
2013-06-06 09:52:33 -07:00
Stephen Birarda
dd7c1fab2e
more spacing fixes in Avatar.cpp
2013-06-06 09:51:32 -07:00
Stephen Birarda
6a7434651a
spacing fix in Avatar.cpp
2013-06-06 09:42:25 -07:00
Philip Rosedale
24dcd14371
Added sensor fusion for more stable gyro roll, pitch.
2013-06-05 23:53:01 -07:00
Philip Rosedale
1b20b016dd
Fixed acceleration checking bug that was limiting angular rotation, changed mouselook to work correctly/stable.
2013-06-05 20:04:30 -07:00
Stephen Birarda
2cb9b609f4
resolve conflicts on merge with upstream master
2013-06-05 18:28:02 -07:00
Stephen Birarda
30d6c7f68a
Merge remote-tracking branch 'upstream/master' into synthesis
2013-06-05 18:26:12 -07:00
Philip Rosedale
1f0e321980
removed Oculus Manager from camera object, using _tightness = 0.0 to shutoff camera movement smoothing
2013-06-05 17:54:14 -07:00
Stephen Birarda
5bbf96d946
allow avatar agents to ask for audio loopback
2013-06-05 17:31:52 -07:00
Philip Rosedale
97be04716e
Added render menu choice to switch between voxel and ball avatar rendering.
2013-06-05 17:24:53 -07:00
Stephen Birarda
e5a1fa4dec
Merge branch 'master' of github.com:worklist/hifi into synthesis
2013-06-05 17:03:53 -07:00
Philip Rosedale
07405ef280
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-05 16:55:12 -07:00
Andrzej Kapolka
6c3425a642
Fix for URL decoding.
2013-06-05 15:39:37 -07:00
Andrzej Kapolka
b9e2e26ab1
Don't restart the download when we're given the same URL.
2013-06-05 14:59:08 -07:00
Andrzej Kapolka
a4aa8e7bde
Basic sharing of the avatar voxel URLs.
2013-06-05 14:55:49 -07:00
Stephen Birarda
2db7b5de4e
fix the number of bytes for microphone audio
2013-06-05 14:41:10 -07:00
Andrzej Kapolka
69dd4ff59b
Improved rotation computation.
2013-06-05 13:08:17 -07:00
Stephen Birarda
beb415a851
correct buffer byte constants in AudioRingBuffer
2013-06-05 12:45:07 -07:00
Stephen Birarda
d64b46a6b2
add specialized parsing of audio data to ARB subclasses
2013-06-05 12:11:56 -07:00
Stephen Birarda
4cb00ad54b
clean up AudioRingBuffer by subclassing
2013-06-05 11:51:21 -07:00
Philip Rosedale
b38c68ab20
remove unused setHeadFromGyros() routine - confusing.
2013-06-05 10:46:55 -07:00
Andrzej Kapolka
391b62ed32
Make sure we don't hear back from replies after we've cleared them.
2013-06-05 10:34:41 -07:00
Philip Rosedale
5fbf9f8714
gyro look off by default
2013-06-05 10:23:52 -07:00
Philip Rosedale
29c4374dc0
Merge fixes for brad, reversed pitch direction to correct mouse look
2013-06-05 09:59:39 -07:00
Stephen Birarda
6353940bf7
some extra cleanup after merge with upstream master
2013-06-05 09:59:33 -07:00
Stephen Birarda
eee7d6f92f
resolve some conflicts on merge with upstream master
2013-06-05 09:56:26 -07:00
Stephen Birarda
6c2dcb86c8
Merge remote-tracking branch 'upstream/master' into synthesis
2013-06-05 09:55:16 -07:00
Philip Rosedale
626dcd0875
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-05 09:40:42 -07:00
ZappoMan
9310876531
Merge pull request #485 from birarda/cube-injector
...
spherical audio injector and quaternion rotations for audio
2013-06-05 09:37:38 -07:00
ZappoMan
3bce3f7a62
support file:// urls for avitar voxles
2013-06-05 00:53:27 -07:00
Philip Rosedale
8719b9f9d4
merge fix
2013-06-04 21:26:53 -07:00
Andrzej Kapolka
c953fc743d
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-04 18:00:01 -07:00
ZappoMan
b75bd80de7
fix build busters
2013-06-04 17:54:48 -07:00
Andrzej Kapolka
f708649546
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-04 17:44:53 -07:00
Andrzej Kapolka
b30b64c5b5
Use downloadProgress rather than isFinished (which worked on files, but didn't
...
on HTTP URLs).
2013-06-04 17:44:19 -07:00
ZappoMan
f66641f1b4
Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization
2013-06-04 17:41:41 -07:00
ZappoMan
26542d44c9
Merge pull request #478 from Atlante45/master
...
Settings handling with QSettings
2013-06-04 17:41:02 -07:00
ZappoMan
4f2af717f2
Fixed merge issue with new orientation vectors, migrated to common identity names
2013-06-04 17:27:40 -07:00
Andrzej Kapolka
ad377e6256
We can't initialize avatars from the network thread; they need access to the
...
OpenGL context.
2013-06-04 17:25:04 -07:00
Philip Rosedale
4db6e9074e
merge conflict fix
2013-06-04 17:11:33 -07:00
atlante45
d539ea283e
Merge 19358 with upstream Master
2013-06-05 01:43:47 +02:00
ZappoMan
6e70f3b187
Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization
2013-06-04 16:21:20 -07:00
Andrzej Kapolka
93b50f44f5
Add a reasonable minimum size for the URL field.
2013-06-04 15:59:07 -07:00
Andrzej Kapolka
b856af505a
Adjusted default bind radius, spring vector threshold.
2013-06-04 15:52:39 -07:00
Stephen Birarda
7d3d8f8b43
rewrite the AudioInjector to send an orientation quaternion instead of bearing
2013-06-04 15:31:11 -07:00
Stephen Birarda
0f70c9c06b
send full quaternion orientation instead of just bearing to audio-mixer
2013-06-04 12:52:09 -07:00
Andrzej Kapolka
d09700adde
Merge branch 'master' of https://github.com/worklist/hifi into voxeltars
...
Conflicts:
interface/src/Avatar.cpp
interface/src/Avatar.h
interface/src/Skeleton.h
interface/src/VoxelSystem.h
2013-06-04 11:00:59 -07:00
Andrzej Kapolka
90a53bc518
Only bind vertices within an adjustable radius.
2013-06-04 10:40:08 -07:00
Andrzej Kapolka
bc8eadd526
More work on voxeltars; separated default pose from bind pose.
2013-06-04 10:22:58 -07:00
atlante45
c199190666
Fixes asked by ZappoMan on QSettings' commit.
2013-06-04 19:00:38 +02:00
ZappoMan
edf6e767f0
removed unused variable
2013-06-04 09:35:38 -07:00
ZappoMan
026fb5b344
Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization
2013-06-04 09:34:37 -07:00
Philip Rosedale
60100fd473
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-04 09:09:39 -07:00
ZappoMan
ce499f925a
add cut voxels
2013-06-04 09:02:34 -07:00
ZappoMan
626874f9ec
add delete key support while in select mode
2013-06-04 08:47:57 -07:00
ZappoMan
743e1a433c
make import/export default to desktop
2013-06-04 01:24:35 -07:00
ZappoMan
4f3872c18f
CR feedback
2013-06-04 01:13:58 -07:00
ZappoMan
0a9b3bf5ce
changed file name and exention to Sparse Voxel Octree and svo
2013-06-04 01:07:18 -07:00
ZappoMan
435791f28c
CR feedback
2013-06-04 01:02:10 -07:00
ZappoMan
eef0636655
some cleanup
2013-06-03 21:53:06 -07:00
ZappoMan
510dfc7353
Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization
2013-06-03 21:43:38 -07:00
ZappoMan
05e8c8806c
Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels
2013-06-03 21:28:23 -07:00
ZappoMan
cf3ff53e2c
copy and paste working
2013-06-03 18:08:11 -07:00
Jeffrey Ventrella
cee2244364
fixed formatting things
2013-06-03 17:55:48 -07:00
Philip Rosedale
179e30fdfc
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-03 17:37:25 -07:00
Philip Rosedale
5e0a70c524
gyro look controls head offset on/off
2013-06-03 17:36:32 -07:00
Philip Rosedale
da343215ce
Rename serialPort to serialHeadSensor, added passing of lean to eyeOffset
2013-06-03 17:25:20 -07:00
Andrzej Kapolka
6552a64bb4
Merge branch 'master' of https://github.com/worklist/hifi into voxeltars
2013-06-03 17:17:24 -07:00
Jeffrey Ventrella
da09dd3259
test
2013-06-03 17:16:52 -07:00
ZappoMan
0b7f4b21f4
Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels
2013-06-03 16:42:27 -07:00
Jeffrey Ventrella
3ff11d0eb8
test
2013-06-03 16:42:27 -07:00
Jeffrey Ventrella
b73eb66492
temp test
2013-06-03 16:31:39 -07:00
Jeffrey Ventrella
26bbb9917b
more work on avatar touch
2013-06-03 16:23:55 -07:00
ZappoMan
0f2b736130
cleanup
2013-06-03 13:50:42 -07:00
ZappoMan
ea965f2290
fixed issue with sendVoxelsOperataion, some other cleanup
2013-06-03 13:46:21 -07:00
ZappoMan
c4b3b568e7
make import and export properly rebase
2013-06-03 13:13:52 -07:00
Andrzej Kapolka
73f8fca2af
More work on voxeltars; added rotations.
2013-06-03 13:00:54 -07:00
Jeffrey Ventrella
e96503de0d
Merge remote-tracking branch 'upstream/master'
2013-06-03 12:26:51 -07:00
Jeffrey Ventrella
6479a41206
more ball prep
2013-06-03 12:26:20 -07:00
ZappoMan
78fe89172a
eyedropper mode, and import work
2013-06-03 12:23:16 -07:00
Stephen Birarda
0fedf354e0
don't attempt to send microphone audio if AgentList is NULL
2013-06-03 12:10:18 -07:00
Jeffrey Ventrella
00dce6b59e
fix
2013-06-03 12:01:01 -07:00
Stephen Birarda
5a5b22db61
fix use of PI constant after merge with upstream master
2013-06-03 12:00:57 -07:00
Stephen Birarda
4348702dd2
Merge remote-tracking branch 'upstream/master' into synthesis
2013-06-03 11:53:13 -07:00
Jeffrey Ventrella
8d031b5c2d
preparation for extending the avatar ball array to accommodate more touch capabilities
2013-06-03 11:53:00 -07:00
ZappoMan
7dd217b318
more work on copy and paste
2013-06-03 10:57:18 -07:00
Andrzej Kapolka
a6daa296ff
Slight fix to capsule/box penetration test: we should use the smaller distance
...
to the diagonal, not the first one we find.
2013-06-03 10:08:42 -07:00
Jeffrey Ventrella
9e046b74e6
working on avatar touch
2013-06-03 08:09:27 -07:00
Andrzej Kapolka
8d757e148f
More work on voxeltars; basic skinning works.
2013-06-02 19:55:51 -07:00
atlante45
dccc44a6f5
Added settings management using QSettings
2013-06-02 14:58:51 +02:00
Andrzej Kapolka
35ae08def0
Merge branch 'master' of https://github.com/worklist/hifi into voxeltars
2013-06-01 15:07:00 -07:00
Andrzej Kapolka
6c975f9c6f
More work on avatar voxels.
2013-06-01 15:06:29 -07:00
Andrzej Kapolka
7425b39237
Working on avatar voxel system.
2013-05-31 17:55:30 -07:00
Jeffrey Ventrella
de49d7fc6c
more fixes
2013-05-31 17:32:30 -07:00
Jeffrey Ventrella
d92471860d
cleanup
2013-05-31 16:58:58 -07:00
Jeffrey Ventrella
4f49f1769e
separated springy balls from skeleton
2013-05-31 16:54:56 -07:00
Stephen Birarda
2d7c397138
create a FreeVerb object for each other agent per agent
2013-05-31 15:47:57 -07:00
Philip Rosedale
69ec109585
Refactor/Cleanup serial interface to use vectors, correct rotation axes. Added translation estimation for the head.
2013-05-31 15:28:15 -07:00
Jeffrey Ventrella
1061b3eb4d
cleanup
2013-05-31 15:05:05 -07:00
Jeffrey Ventrella
303643e921
cleanup
2013-05-31 15:01:08 -07:00
Jeffrey Ventrella
e33c11bb48
Merge remote-tracking branch 'upstream/master'
2013-05-31 14:52:46 -07:00
Andrzej Kapolka
929797516d
Merge branch 'master' of https://github.com/worklist/hifi into voxeltars
2013-05-31 14:52:39 -07:00
Andrzej Kapolka
e4bc7af6b4
Working on avatar voxels.
2013-05-31 14:52:29 -07:00
Jeffrey Ventrella
f1fc3fe704
merge
2013-05-31 14:52:24 -07:00
Andrzej Kapolka
8f377349ef
Merge pull request #474 from PhilipRosedale/master
...
Smooth gravity fields when flying
2013-05-31 14:52:00 -07:00
Philip Rosedale
088e9d0aef
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-31 14:21:38 -07:00
Jeffrey Ventrella
3ce051bff7
merge
2013-05-31 14:11:46 -07:00
Philip Rosedale
2a9a3139b2
Added smooth gravity field so we can fly to planets and land on them, static friction to stop drifting, thrust tweaks.
2013-05-31 14:02:20 -07:00
Jeffrey Ventrella
fdfc639c23
merge
2013-05-31 13:52:22 -07:00
ZappoMan
e5e200345b
more work on copy and paste
2013-05-31 11:52:18 -07:00
Jeffrey Ventrella
108ce62d1a
committing latest skeleton-separation changes (more to come as Andrzej and I work on it more)
2013-05-31 11:51:03 -07:00
ZappoMan
b0397e8eb9
Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels
2013-05-30 21:41:55 -07:00
Andrzej Kapolka
224e5d666d
Fix for segmentation fault when the settings file doesn't exist.
2013-05-30 17:12:18 -07:00
ZappoMan
bc5af6e399
Merge pull request #438 from Geenz/19308
...
#19308 - Store menu settings in the avatar data file
2013-05-30 16:51:02 -07:00
Geenz
ed904b58eb
Fixed spacing issues per the coding standard.
2013-05-30 19:50:01 -04:00
Geenz
fefa74135c
Moved to function overloads instead of unique function names.
2013-05-30 19:47:25 -04:00
Philip Rosedale
38e611eb7f
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-30 16:19:11 -07:00
Philip Rosedale
f009177aa7
Added check for lost transmitter
2013-05-30 16:19:07 -07:00
Andrzej Kapolka
9213cfd0c2
Revert to simply adding the Eulers.
2013-05-30 15:48:00 -07:00
Andrzej Kapolka
47bf5a2b77
Have the Head control how orientations are added.
2013-05-30 15:43:07 -07:00
Andrzej Kapolka
780b049f4b
I got these backwards.
2013-05-30 15:21:54 -07:00
Andrzej Kapolka
826ef33d4b
Reverse angles for mirror mode.
2013-05-30 15:20:20 -07:00
Andrzej Kapolka
3f6cf08b97
Removed remaining Orientation bits (and class itself), enforce limits on
...
head yaw/pitch/roll.
2013-05-30 15:15:12 -07:00
Andrzej Kapolka
e2ec8245b0
Rather than adding Euler angles, compose quaternions for gyros.
2013-05-30 14:56:12 -07:00
Andrzej Kapolka
f447230d26
Use body orientation, not head orientation, for mirror mode.
2013-05-30 14:14:01 -07:00
Geenz
0a3dbcd675
Removed unused readYaw variable.
2013-05-30 17:00:32 -04:00
Geenz
0dda2b88b5
Merge branch 'master' of https://github.com/worklist/hifi into 19308
...
Conflicts:
interface/src/Avatar.cpp - resolved; added avatarRotation setting that's interpreted as a vec3
2013-05-30 16:58:48 -04:00
Andrzej Kapolka
bcd3833898
Align chat with full camera rotation (not just yaw).
2013-05-30 13:46:53 -07:00
Andrzej Kapolka
28531fcae0
Added --local option to avatar-mixer for testing. Only update velocity,
...
acceleration, angular velocity, etc., for local avatar.
2013-05-30 12:33:05 -07:00
Andrzej Kapolka
342e19aa41
Save/restore the pitch and roll as well as the yaw.
2013-05-30 12:12:30 -07:00
Geenz
78c3891c92
Merge commit '6d57324d0b9fce9d6a030123689bb499ed54c8ad' into 19308
2013-05-30 14:48:40 -04:00
Andrzej Kapolka
100d10dc9e
Offset camera fix, cleaner frustum transformation.
2013-05-30 11:08:33 -07:00
Andrzej Kapolka
3330b20232
More reformatting.
2013-05-30 10:33:45 -07:00
Andrzej Kapolka
fff9d1c372
Formatting.
2013-05-30 10:23:19 -07:00
Andrzej Kapolka
b502321b57
Moved gravity influence multiplier into constant, reduced.
2013-05-30 10:00:52 -07:00
Andrzej Kapolka
021dce72be
Moved direction vectors to AvatarData, made them align with OpenGL view space
...
(to avoid the 180 degree rotations).
2013-05-30 09:55:34 -07:00
Andrzej Kapolka
9b301eb235
Merge branch 'master' of https://github.com/worklist/hifi into reorient
...
Conflicts:
interface/src/Avatar.cpp
2013-05-29 19:13:18 -07:00
Andrzej Kapolka
d6855b6430
Massive changes to orientations: use quaternions rather than Orientation
...
class.
2013-05-29 19:05:33 -07:00
Jeffrey Ventrella
d839312cd6
testing avatar touch
2013-05-29 17:28:44 -07:00
Jeffrey Ventrella
88ff0ea7aa
merge
2013-05-29 16:54:15 -07:00
Jeffrey Ventrella
4c7d75b39e
testing avatar touch
2013-05-29 16:52:48 -07:00
Geenz
f0d7b47c37
Merge branch 'master' of https://github.com/worklist/hifi into 19308
2013-05-29 19:47:54 -04:00
birarda
73168af4d1
Merge pull request #458 from birarda/master
...
move the mouth out farther in front of the face
2013-05-29 16:38:35 -07:00
Stephen Birarda
089dc3669d
push the mouth out in front of the face
2013-05-29 16:37:40 -07:00
Jeffrey Ventrella
f7a0e8018a
Merge remote-tracking branch 'upstream/master'
2013-05-29 16:15:16 -07:00
Jeffrey Ventrella
63434da23c
testing avatar touch
2013-05-29 16:14:55 -07:00
birarda
64d02f5f5f
Merge pull request #457 from birarda/master
...
make it harder to quit accidentally
2013-05-29 16:06:40 -07:00
Stephen Birarda
b0a8de818d
make quit CMD-Q instead of just Q
2013-05-29 16:05:03 -07:00
Jeffrey Ventrella
5750adf6fd
test
2013-05-29 15:53:47 -07:00
Stephen Birarda
02333644dc
one line fix in AvatarTouch
2013-05-29 15:31:18 -07:00
Jeffrey Ventrella
72688d86ca
Merge remote-tracking branch 'upstream/master'
2013-05-29 15:25:05 -07:00
Jeffrey Ventrella
66c7da6552
simplify avatar proximity check for 1p transition
2013-05-29 15:24:37 -07:00
ZappoMan
46c6f2f9b5
latest copy paste
2013-05-29 15:02:28 -07:00
Geenz
c33d2ee25e
Coding standard cleanup based upon ZappoMan's suggestions.
2013-05-29 16:46:47 -04:00
ZappoMan
c70ade0cc1
temporary hack fix to not discarding voxels
2013-05-29 12:14:45 -07:00
ZappoMan
377fb1e936
latest copy and paste
2013-05-29 12:06:58 -07:00
Jeffrey Ventrella
ab1c00dac6
Merge remote-tracking branch 'upstream/master'
2013-05-29 11:51:34 -07:00
Jeffrey Ventrella
e34193f1d7
increased hand motion sensitivity
2013-05-29 11:51:16 -07:00
ZappoMan
408fef0de8
Merge pull request #450 from birarda/master
...
make audio echo a menu option instead of forcing it with the mirror mode
2013-05-29 11:47:38 -07:00
Stephen Birarda
b6a0662c98
inline the shouldEchoAudio
2013-05-29 11:47:02 -07:00
Jeffrey Ventrella
ab3b0c8aa3
alpha
2013-05-29 11:43:42 -07:00
Stephen Birarda
a5a30efec9
CR fixes
2013-05-29 11:42:10 -07:00
Jeffrey Ventrella
350bd878fc
fix
2013-05-29 11:39:53 -07:00
Stephen Birarda
5d74a865e8
make audio echo a menu option instead of forcing with mirror
2013-05-29 11:35:32 -07:00
Jeffrey Ventrella
39805db040
Merge remote-tracking branch 'upstream/master'
2013-05-29 11:27:36 -07:00
Jeffrey Ventrella
39499e4a92
fix to head transparency
2013-05-29 11:26:06 -07:00
Philip Rosedale
c31c14c56e
Merge remote-tracking branch 'upstream/master' into one-liner
2013-05-29 10:46:55 -07:00
Philip Rosedale
ca8c78162d
one line fix for translucent head
2013-05-29 10:46:10 -07:00
Jeffrey Ventrella
31ff768363
fixed some glitches in avatar render alpha transition between 3p and 1p
2013-05-29 08:30:14 -07:00
ZappoMan
6b1d37599c
Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels
2013-05-29 08:12:07 -07:00
ZappoMan
d1d2e75143
first cut at export and import of voxels
2013-05-28 19:00:02 -07:00
Jeffrey Ventrella
0e329af03e
made inline
2013-05-28 18:55:21 -07:00
Jeffrey Ventrella
b98d03337d
fixed bug causing camera to not get updated position of other av
2013-05-28 18:49:16 -07:00
Jeffrey Ventrella
e4c0aeb9a0
added AVATAR_FACING_THRESHOLD to avatarTouch
2013-05-28 18:15:29 -07:00
Jeffrey Ventrella
5d9b8c08b3
Merge remote-tracking branch 'upstream/master'
2013-05-28 17:57:42 -07:00
Jeffrey Ventrella
923c39cdc0
fixed third person shift bug
2013-05-28 17:57:11 -07:00
Stephen Birarda
65f10cb99a
fix the enum in AABox, fix a warning in Head
2013-05-28 16:26:18 -07:00
Stephen Birarda
8118e3bf69
type squish in Audio.cpp
2013-05-28 16:23:54 -07:00
Stephen Birarda
55954899e6
fix silent audio on client
2013-05-28 16:20:23 -07:00
Stephen Birarda
badab39ef1
resolve conflict on merge with upstream master
2013-05-28 15:58:57 -07:00
Stephen Birarda
e040c927f5
Merge remote-tracking branch 'upstream/master' into mouth-render
2013-05-28 15:58:11 -07:00
birarda
17e3902d17
Merge pull request #435 from Ventrella/master
...
Integrated mohawk code, and did some cleanup and improvements on avatar
2013-05-28 15:50:48 -07:00
Stephen Birarda
9f2c0adec7
move audioLoudness to HeadData
2013-05-28 12:22:51 -07:00
Jeffrey Ventrella
5715860f6b
added Skeleton class (to be completed soon)
2013-05-27 18:55:23 -07:00
Jeffrey Ventrella
75b57d17a7
fixed some things based on recent code review
2013-05-27 18:54:44 -07:00
Geenz
8ac8335776
Check how many matches were found for the given data type we're checking for. 1 for bool and float, 3 for vec3. Return false and assign default values if this isn't true.
2013-05-27 19:18:36 -04:00
Geenz
5efda079c9
Store settings in an ordered map to allow for runtime getting and setting of settings. Read the setting file on startup, then write on shut down.
2013-05-27 18:48:05 -04:00
Andrzej Kapolka
278ff00926
Fixed Linux build error and a warning on call to Avatar.simulate, moved grid
...
size constant to world.h and made gravity bounds match.
2013-05-27 14:46:16 -07:00
Andrzej Kapolka
1df7806464
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-27 14:40:30 -07:00
Andrzej Kapolka
949befee09
Fix for NaN.
2013-05-27 14:37:07 -07:00
ZappoMan
04f4e499e1
Optimize wire-format for AvatarData
...
- moved HandState into semi-nibble in bitItems
- moved KeyState into semi-nibble in bitItems
- moved AudioLoudness into scaled float stored as byte
- overall savings - 5 bytes
2013-05-27 14:18:10 -07:00
ZappoMan
5d1ba857c5
Optimize View Frustum wire format.
...
- Changed View frstum orientaton to be a quaternion
- Implemented packing formats for Orientation Quats, Ratios, and Clipping values
- Changed wire format for View Frustum details to be more efficient 28 bytes vs 64 bytes
2013-05-27 14:17:34 -07:00
Andrzej Kapolka
cfb66bee95
Capsule/box collisions.
2013-05-27 14:05:44 -07:00
Geenz
94a07b92a7
Documentation for #19308 .
2013-05-27 15:54:32 -04:00
Jeffrey Ventrella
096e465d36
cleaned up some formatting and in-line functions in Avatar.cpp
2013-05-27 10:31:31 -07:00
Geenz
93eac0c0dc
Setup various debug options.
2013-05-27 12:56:41 -04:00
Geenz
17a5e6a700
First round of settings serialization. Setup an API to load and save different settings to the avatar data file.
...
Initial serialized settings:
Gyro look
Mouse look
Transmitter drives
Voxel rendering
Voxel textures
Star rendering
Atmosphere rendering
Avatar rendering
Oculus rift mode
Render stats
Frame stats
Look at vectors
Logging
Frustum debugging
View frustum offset
Camera frustum
2013-05-27 12:37:42 -04:00
Jeffrey Ventrella
d43c5ca52c
normalized body spring tightness
2013-05-26 21:56:21 -07:00
Jeffrey Ventrella
ad5d097ed4
improved neck rendering
2013-05-26 17:44:52 -07:00
Jeffrey Ventrella
4e4a672f32
fixed visual glitch where mouth penetrates head sphere
2013-05-26 17:17:15 -07:00
Jeffrey Ventrella
2b31e79a0b
cleanup
2013-05-26 15:23:44 -07:00
Jeffrey Ventrella
883d21a5e4
added facing other av requirement for camera shift to 1p; improved ease-in/out for camera mode shift; did some clean up on the camera code
2013-05-26 15:17:58 -07:00
Jeffrey Ventrella
622863dbf1
Merge remote-tracking branch 'upstream/master'
2013-05-26 10:19:02 -07:00
Jeffrey Ventrella
9f7e05d407
integrated Philip's mohawk colors into my hair code and added a switch to test each version
2013-05-26 10:18:35 -07:00
Philip Rosedale
7aebbe3047
Merge pull request #434 from ZappoMan/voxel_animation
...
Improve "Delta Sending" mode..
2013-05-26 09:45:54 -07:00
Andrzej Kapolka
70b25fd6c4
Sphere/box collisions for voxels, various utility functions.
2013-05-25 19:59:07 -07:00
ZappoMan
77e5fbb590
Merge pull request #427 from birarda/oculus
...
go into oculus mode when connected, fix the yaw pull
2013-05-25 15:38:20 -07:00
ZappoMan
1a2921e3e8
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation
2013-05-25 15:32:12 -07:00
ZappoMan
60f2b9a438
removed debug
2013-05-25 15:31:28 -07:00
ZappoMan
f6863081f9
Fix Delta Sending mode by not culling out of view voxels until we STOP moving
...
- added isViewChanging() which determines if the view is currently changing
- made hasViewChanged() report false UNTIL we've stopped moving
- changed setupNewVoxelsForDrawing() to only call removeOutOfView() if we're not moving
2013-05-25 15:29:23 -07:00
Jeffrey Ventrella
1e4771fe27
fix
2013-05-24 18:05:14 -07:00
Jeffrey Ventrella
8c24477a24
Merge remote-tracking branch 'upstream/master'
2013-05-24 18:01:47 -07:00
Jeffrey Ventrella
0c2c90b84d
cleanup
2013-05-24 18:01:25 -07:00
Freddy
6a4bcf32fa
Code review fixes
2013-05-24 17:58:31 -07:00
Freddy
30e951578e
procedural voxel create/delete noises
2013-05-24 17:27:56 -07:00
Jeffrey Ventrella
28f3af4ea5
Merge remote-tracking branch 'upstream/master'
2013-05-24 17:13:10 -07:00
Jeffrey Ventrella
56438435c1
made mouth conform to the head sphere
2013-05-24 17:12:14 -07:00
birarda
82f5e0a3b1
Merge pull request #426 from PhilipRosedale/master
...
big ground plane
2013-05-24 16:37:53 -07:00
Jeffrey Ventrella
6634ad2ed2
thingy
2013-05-24 16:31:17 -07:00
Stephen Birarda
a8b08647d0
require that crotch grabbing be explicit, not implicit
2013-05-24 16:18:36 -07:00
Stephen Birarda
65168e6aec
add a yaw offset to the oculus so it can pull body
2013-05-24 15:23:25 -07:00
Philip Rosedale
608a4f71bf
ground surface is 20 meters across. play on!
2013-05-24 14:51:06 -07:00
Philip Rosedale
995fbcf4f9
mohawk also follows body pitch when accelerating
2013-05-24 14:46:26 -07:00
Philip Rosedale
d796956a96
fix per review
2013-05-24 14:32:56 -07:00
Philip Rosedale
9baf087c9a
Avatar renders right arm in 1P mode
2013-05-24 14:29:26 -07:00
Philip Rosedale
31e41260c1
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-24 14:17:44 -07:00
Philip Rosedale
f5c0f84d27
Mohawk is different/stable for each person, and rotates correctly with head
2013-05-24 14:15:53 -07:00
Stephen Birarda
d12bc85376
go directly into oculus mode when the oculus is connected
2013-05-24 14:05:22 -07:00
Philip Rosedale
cb7381fcd1
incremental fix rotation
2013-05-24 12:33:05 -07:00
Philip Rosedale
360c9c8ab1
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-24 12:30:12 -07:00
Philip Rosedale
dc9b2e33b5
Fixing mohawk orientation
2013-05-24 12:30:05 -07:00
Stephen Birarda
81307939d4
Merge remote-tracking branch 'upstream/master' into owner-pointers
2013-05-24 12:23:12 -07:00
Stephen Birarda
59a6016f4b
use a NULL default for owningAvatar to simplify constructors
2013-05-24 12:18:38 -07:00
ZappoMan
0a1a86ca94
Merge pull request #418 from PhilipRosedale/master
...
More stable gyro averaging
2013-05-24 12:18:02 -07:00
Stephen Birarda
49b483ef53
maintain a pointer to owning avatar from HeadData
2013-05-24 12:17:48 -07:00
Stephen Birarda
36892da488
keep a pointer to owning agent in AgentData
2013-05-24 12:17:34 -07:00
ZappoMan
8560e42357
fix issue with duplicate VBO slots
2013-05-24 12:08:25 -07:00
Philip Rosedale
8b5901d904
simplified per stephens code review
2013-05-24 12:04:17 -07:00
Jeffrey Ventrella
51ddf40ffe
cleaned up hair code
2013-05-24 11:54:55 -07:00
Philip Rosedale
17c898c151
Long term averaging of the gyros for better stability
2013-05-24 11:33:00 -07:00
Philip Rosedale
59ac5ebd66
Head will always render when body does - no decapitation
2013-05-24 11:07:19 -07:00
Philip Rosedale
f961a40d1c
Chat message height doubled to clear mohawk
2013-05-24 10:55:26 -07:00
birarda
05ad7309a1
Merge pull request #411 from ey6es/master
...
Fix for starfield rendering on Oculus.
2013-05-24 10:14:31 -07:00
Philip Rosedale
bf94c88bcc
Fixes per review
2013-05-24 10:12:50 -07:00
Philip Rosedale
95e73afc78
Added the avatar mohawk
2013-05-24 00:16:52 -07:00
Jeffrey Ventrella
b74ceae61a
added avatar hair
2013-05-23 22:52:43 -07:00
Andrzej Kapolka
add84b2f39
Hide the cursor when in fullscreen Oculus mode.
2013-05-23 17:58:04 -07:00
Andrzej Kapolka
9be4f06e9a
Disable voxel textures by default.
2013-05-23 17:32:43 -07:00
Andrzej Kapolka
514c12c7fc
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
interface/src/Application.cpp
2013-05-23 15:39:04 -07:00
Andrzej Kapolka
9b433c974c
Fix for starfield rendering on Oculus: put inter-pupil translation in
...
modelview matrix where it belongs, don't reset perspective projection for
starfield.
2013-05-23 15:35:41 -07:00
Stephen Birarda
b673715aa2
remove the no longer in use AvatarRenderer
2013-05-23 15:18:32 -07:00
Philip Rosedale
37cb914891
You can reset start location with 'G'
2013-05-23 15:02:32 -07:00
Philip Rosedale
235cfc8ab2
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-23 12:33:39 -07:00
Philip Rosedale
32d2418b7a
Added display head mouse option (default off) and all camera modes follow head gyros the same way.
2013-05-23 12:33:26 -07:00
ZappoMan
089d8d525e
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation
2013-05-23 12:20:34 -07:00
ZappoMan
6ec61996c9
Merge pull request #405 from PhilipRosedale/master
...
Chat in right place above head, not body, tweaks to sensors, reset behavior, gyro pitch back.
2013-05-23 12:19:43 -07:00
Philip Rosedale
eb15aa602c
Added amplification of gyro rates when applying to head, for more sensitivity, and to allow easily looking to one side and another
2013-05-23 12:17:24 -07:00
ZappoMan
473665fb4a
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation
2013-05-23 12:16:29 -07:00
ZappoMan
6e5ed6435b
added shortcut key to log menu
2013-05-23 12:06:59 -07:00
Philip Rosedale
7a0ea8bd59
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-23 11:48:18 -07:00
Philip Rosedale
8fec96319c
Merge pull request #403 from Ventrella/master
...
added effect of avatars floating above the ground with knees bent slightly
2013-05-23 11:48:00 -07:00
Philip Rosedale
be1fae5958
Move head back to center when moving
2013-05-23 11:37:27 -07:00
Philip Rosedale
85ea48e43a
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-23 11:26:26 -07:00
Philip Rosedale
86e3e25663
removed commented line, formatting
2013-05-23 11:26:14 -07:00
Andrzej Kapolka
672f4de496
Avoid colliding with gravityless environments.
2013-05-23 10:36:28 -07:00
Andrzej Kapolka
34b526f15c
Restore the original floor behavior.
2013-05-23 10:32:12 -07:00
Jeffrey Ventrella
649fb72556
Merge remote-tracking branch 'upstream/master'
2013-05-23 10:15:18 -07:00
Jeffrey Ventrella
77324ebb46
made avatars appear to float above the ground
2013-05-23 10:14:46 -07:00
Philip Rosedale
c56509e5a2
Re-enabled pitch gyro look in first person, start location is now not reset on sensor reset
2013-05-23 09:30:36 -07:00
Philip Rosedale
6b3f35ef19
Merge pull request #393 from ey6es/master
...
Put all environment data in the same packet and only send it off about once a second.
2013-05-22 21:11:22 -07:00
Stephen Birarda
120c835004
fix head mouse
2013-05-22 19:46:33 -07:00
Philip Rosedale
5b3ac504c4
Updated merge conflicts
2013-05-22 19:43:11 -07:00
Philip Rosedale
f39fade4c7
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-22 19:40:13 -07:00
Philip Rosedale
22b534cd8e
Fixed headmouse
2013-05-22 19:39:37 -07:00
Stephen Birarda
d7a1cc6ea8
correct the sign for yaw and roll for invensense serial data
2013-05-22 19:38:17 -07:00
Stephen Birarda
3e192cda9b
correct rendering for first-person for oculus
2013-05-22 19:15:52 -07:00
birarda
3e16e6a36c
Merge pull request #398 from birarda/master
...
correct sign of yaw for oculus
2013-05-22 18:57:06 -07:00
Stephen Birarda
997a10c981
correct the sign of yaw for oculus
2013-05-22 18:56:38 -07:00
Jeffrey Ventrella
83c12ae9af
etc
2013-05-22 18:31:22 -07:00
Jeffrey Ventrella
b7613497eb
fixed pitch yaw (not roll)
2013-05-22 18:14:18 -07:00
Jeffrey Ventrella
2f943b697a
cleanup
2013-05-22 17:27:48 -07:00
Jeffrey Ventrella
549d3a3671
Merge remote-tracking branch 'upstream/master'
2013-05-22 17:25:06 -07:00
Jeffrey Ventrella
8b49cfbf93
added back transitions to first person
2013-05-22 17:24:46 -07:00
Andrzej Kapolka
a68c8c6389
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-22 17:11:03 -07:00
Andrzej Kapolka
629c7b0146
Send all environment data in the same packet and only send it about once a
...
second.
2013-05-22 17:09:35 -07:00
ZappoMan
da39f28211
Merge pull request #392 from birarda/oculus
...
fix broken head rotation set based on copy return
2013-05-22 16:51:13 -07:00
Stephen Birarda
9657265c24
remove a debug line from setHeadFromGyros
2013-05-22 16:50:17 -07:00
Stephen Birarda
a1b556d6a2
space out if
2013-05-22 16:49:26 -07:00
Stephen Birarda
4738fc888b
return Avatar Head by reference so setters actually do something
2013-05-22 16:43:41 -07:00
Andrzej Kapolka
b6e78064d8
Disable the righting for now, as well as the "floor" (whose presence makes us
...
slide, since the gravity vector isn't pointing straight down).
2013-05-22 16:29:13 -07:00
