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

1561 commits

Author SHA1 Message Date
ZappoMan
5830f1134e add particle collisions with voxels 2013-12-12 17:52:22 -08:00
ZappoMan
08591481a6 added shadows to particles 2013-12-12 15:44:06 -08:00
Andrzej Kapolka
4a7efa5ef9 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-12 15:36:48 -08:00
Andrzej Kapolka
652be27910 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
 2013-12-12 15:36:37 -08:00
ZappoMan
d3197ef8f9 fix crash, and remove gravity while in hand 2013-12-12 13:54:36 -08:00
ZappoMan
50b93d1e2b added easy access to creating a ParticleEditHandle for a know particle ID 2013-12-12 12:40:38 -08:00
ZappoMan
28c5d5b7bf removed unused variable 2013-12-12 11:01:37 -08:00
ZappoMan
5ec8de1bf3 have ParticleEditHandle update local tree as well 2013-12-12 10:41:55 -08:00
ZappoMan
5d9b7c7f75 change toy ball to use ParicleEditHandle class 2013-12-12 10:26:55 -08:00
ZappoMan
82b5c53551 Merge branch 'master' of https://github.com/worklist/hifi into edit_particles 2013-12-11 18:01:45 -08:00
Andrzej Kapolka
5ec9017d3b More metavoxel bits. 2013-12-11 18:00:17 -08:00
ZappoMan
4acadabaa5 adding better support for ParticleEditHandle to allow access to particles after being created 2013-12-11 17:46:18 -08:00
Philip Rosedale
2d72bea27a cleanup test toy ball throwing code 2013-12-11 17:35:02 -08:00
ZappoMan
03c72134cb first cut at creatorTokenIDs for creating particles 2013-12-11 15:38:52 -08:00
Philip Rosedale
bad5d82ceb Merge branch 'master' of https://github.com/worklist/hifi into XBOX_controller 2013-12-11 12:40:06 -08:00
ZappoMan
dd85f145d2 Merge branch 'master' of https://github.com/worklist/hifi into particle_details 2013-12-11 10:43:33 -08:00
Andrzej Kapolka
8ba2cf9a8b Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-11 10:30:30 -08:00
ZappoMan
03e892d4fd make shootParticle() work better 2013-12-10 17:42:55 -08:00
ZappoMan
ae1576b9f5 CR cleanup and add shootParticle() to application 2013-12-10 17:07:11 -08:00
Philip Rosedale
132b313c9c remove voxel glow on local add 2013-12-10 17:00:53 -08:00
Philip Rosedale
c9f96d1adf Basic joystick thrust/view drive behavior 2013-12-10 16:52:08 -08:00
ZappoMan
8bbdae0e64 fix extra debugging 2013-12-10 15:50:39 -08:00
Andrzej Kapolka
6ba750a963 More progress on generic attributes, metavoxel node management. 2013-12-10 15:44:48 -08:00
ZappoMan
cde7eb1f30 removed some dead code 2013-12-10 15:36:49 -08:00
ZappoMan
a8fff62832 removed some dead code 2013-12-10 15:36:07 -08:00
Philip Rosedale
0f0ee07f8c Merge branch 'master' of https://github.com/worklist/hifi 2013-12-10 14:06:11 -08:00
Andrzej Kapolka
f268797bde Merge branch 'master' of https://github.com/worklist/hifi 2013-12-09 16:00:00 -08:00
Andrzej Kapolka
569425df88 Merge pull request #1348 from PhilipRosedale/narcissus 
Improved full screen mirror view to allow leaning
 2013-12-09 15:42:06 -08:00
ZappoMan
68a51f5205 added update to particle 2013-12-09 15:34:52 -08:00
Philip Rosedale
83a1654d9c making toy ball 2013-12-09 15:12:28 -08:00
ZappoMan
d0944b0278 make particles spheres for now 2013-12-09 14:06:45 -08:00
Andrzej Kapolka
8f633f87e9 Fix for seg fault on Linux exit. 2013-12-09 13:32:02 -08:00
ZappoMan
2783770e2b got particles sending from server to client and rendering 2013-12-09 13:29:44 -08:00
Philip Rosedale
9616268da7 Improved full screen mirror view to allow leaning 2013-12-09 13:02:18 -08:00
ZappoMan
2ca628fdf1 first cut at particle renderer cleanup particle jurisdiction listener fix storage of particles 2013-12-09 11:45:32 -08:00
Andrzej Kapolka
85f7995700 Don't apply ambient occlusion to avatars (just voxels). 2013-12-09 11:00:35 -08:00
Philip Rosedale
3bd8c53115 Fix to get other avatar’s model data 2013-12-07 11:36:51 -08:00
ZappoMan
91d6ef633d Merge pull request #1340 from PhilipRosedale/remove_avatar_balls 
Remove avatar balls
 2013-12-06 17:11:53 -08:00
Andrzej Kapolka
65c21105ae Merge pull request #1339 from PhilipRosedale/remove_avatar_touch 
Removed _avatarTouch class
 2013-12-06 17:11:41 -08:00
Philip Rosedale
4707733563 Removed avatar balls 2013-12-06 16:26:02 -08:00
ZappoMan
ba83fa462d Merge pull request #1336 from birarda/master 
some NodeList cleanup
 2013-12-06 15:59:33 -08:00
Philip Rosedale
0fcc2d8634 Removed _avatarTouch class 2013-12-06 15:11:01 -08:00
Stephen Birarda
8f4e641ade remove NodeList threads that are deprecated 2013-12-05 17:11:58 -08:00
Philip Rosedale
3f957bbf5d Rave out! 2013-12-05 16:46:11 -08:00
Stephen Birarda
3f9e00d977 fix a boneheaded mistake in AvatarMixer broadcastAvatarData 2013-12-05 15:10:01 -08:00
Stephen Birarda
21076af739 hook audio loudness back to QAudioInput 2013-12-05 14:29:55 -08:00
Stephen Birarda
d1054b3cfc add received audio to buffer via queued connection 2013-12-05 13:17:16 -08:00
Stephen Birarda
d2f7dd2371 resolve conflicts on merge with upstream master 2013-12-05 12:13:11 -08:00
Stephen Birarda
71aca69410 fix rendered scope for new Qt Audio 2013-12-05 11:36:45 -08:00
Stephen Birarda
6bbd944b6a wait for audio thread to quit on application exit 2013-12-05 10:21:30 -08:00
ZappoMan
821b490ff1 added basic particle server renamed voxel packet names to fit standard 2013-12-04 21:00:17 -08:00
Stephen Birarda
0e3cb11863 use invokeMethod for Audio reset 2013-12-04 16:58:21 -08:00
Stephen Birarda
277aa9dd89 handle conflicts on merge with upstream master 2013-12-04 14:21:00 -08:00
Stephen Birarda
7df6210ba0 Merge remote-tracking branch 'upstream/master' into qt-for-portaudio 2013-12-04 14:20:44 -08:00
Stephen Birarda
560844c138 re-enable rendering and fix sampling algorithim 2013-12-04 13:55:27 -08:00
Stephen Birarda
e339155328 replace missing PortAudio with Qt audio 2013-12-04 12:54:33 -08:00
ZappoMan
2b27c91550 Merge branch 'master' of https://github.com/worklist/hifi into particle_server 
Conflicts:
	interface/src/VoxelSystem.cpp
	interface/src/VoxelSystem.h
 2013-12-04 11:40:54 -08:00
ZappoMan
bc715085a9 Merge pull request #1304 from PhilipRosedale/master 
Voxel drumming, search function to find leaf voxel containing a point
 2013-12-04 11:28:39 -08:00
Stephen Birarda
eb316a450a Merge pull request #1298 from ZappoMan/move_hideshow_to_thread 
Move Hide/Show local voxels to a dedicated thread
 2013-12-04 11:27:14 -08:00
ZappoMan
9faef65ccc first cut at splitting out octree base classes 2013-12-03 17:32:02 -08:00
Philip Rosedale
423b2e8e0f Highlight voxel being touched 2013-12-03 16:52:38 -08:00
Stephen Birarda
8fbd1e4cfb repairs after merge with upstream master 2013-12-03 12:28:44 -08:00
Stephen Birarda
3277cb49a6 Merge remote-tracking branch 'upstream/master' into cleanup 2013-12-03 12:21:03 -08:00
Philip Rosedale
a84e97c54a Removed obsolete HandControl class, files 2013-12-03 08:29:17 -08:00
Stephen Birarda
49191826af add check for pending datagrams before read 2013-12-02 14:08:49 -08:00
Stephen Birarda
141394a664 replace UDPSocket with QUDPSocket 2013-12-02 13:34:29 -08:00
ZappoMan
44f92fb47c Merge pull request #1297 from PhilipRosedale/master 
Voxel editing with hands, flying by pointing hands
 2013-12-02 12:46:04 -08:00
ZappoMan
76b3bd4e6e Move Hide/Show local voxels to a dedicated thread so that it doesn't slow performance of voxel packet processing 2013-12-02 12:08:45 -08:00
Andrzej Kapolka
635eb7c52d Merge branch 'master' of https://github.com/worklist/hifi into noculus 2013-12-02 09:55:27 -08:00
Philip Rosedale
7ab9cc9c14 Voxel editing with hands, flying and rotation with hands 2013-12-02 00:17:06 -08:00
Philip Rosedale
2456c26207 changed function name so less confusing 2013-12-01 20:46:42 -08:00
Philip Rosedale
ea850368de First working voxel insertion at fingertip 2013-12-01 20:16:14 -08:00
Philip Rosedale
9680941500 Add palm velocity 2013-11-29 14:50:18 -08:00
Philip Rosedale
14129cd86d Merge pull request #1295 from ZappoMan/compressed_packets 
Major improvements to Voxel Packet "packing" and compression
 2013-11-29 10:06:36 -08:00
Andrzej Kapolka
e84f5a59aa Merge branch 'master' of https://github.com/worklist/hifi into noculus 2013-11-27 16:17:30 -08:00
ZappoMan
7f9d0849bd added more client side voxel stats including lost packets, out of order packets, and average flight time 2013-11-27 13:37:47 -08:00
Andrzej Kapolka
b294b328dd Only render ball avatars when "avatars as balls" is checked. 2013-11-27 12:56:31 -08:00
ZappoMan
3a16a4935d added additional flight time debugging 2013-11-26 22:43:49 -08:00
ZappoMan
2ce9937126 major pass on cleaning up voxel packets to have flags, sequence numbers, and flight time, add compression menu item 2013-11-26 17:27:08 -08:00
Andrzej Kapolka
fa5f8b093c Screw it; just use the standard mouse hiding. 2013-11-26 15:07:40 -08:00
Andrzej Kapolka
bdba05785e Mouse pointer fix fix. 2013-11-26 15:00:49 -08:00
Andrzej Kapolka
600b05fcc9 Oculus mouse pointer fix. 2013-11-26 14:50:43 -08:00
Andrzej Kapolka
c5406c47a6 Moved Oculus code out of Application, started on using StereoConfig to get 
actual values to replace the magic numbers.
 2013-11-26 11:59:06 -08:00
Andrzej Kapolka
0e0685af04 New Oculus software with Linux support. 2013-11-25 17:30:51 -08:00
ZappoMan
a60cf0f34e fix issue with copy 2013-11-25 15:52:30 -08:00
ZappoMan
63a82af449 allow client to set voxels MaxPPS in Preferences 2013-11-25 15:13:31 -08:00
ZappoMan
d13ebf6095 more menu cleanup removing developer options that are now defunct 2013-11-25 14:44:34 -08:00
ZappoMan
de26b950f8 cleanup menu defaults 2013-11-25 14:25:09 -08:00
Andrzej Kapolka
083800dc59 Glow/shrink avatars when killed, send kill message when we move between 
domains, locations, etc.
 2013-11-22 16:23:40 -08:00
Andrzej Kapolka
092515e199 Send an explicit kill request to the avatar mixer (which will pass it along to 
the other clients) when we exit.
 2013-11-22 15:19:59 -08:00
Andrzej Kapolka
91b38313be Treat pitchFromTouch more like yawFromTouch, persist mouse pitch. 2013-11-22 11:28:33 -08:00
Andrzej Kapolka
b04a249079 Make this a constant. 2013-11-21 14:24:30 -08:00
Andrzej Kapolka
88a84c733e Stretch out shadow volume to encompass all avatars. 2013-11-21 14:14:09 -08:00
Andrzej Kapolka
3137e9a3e6 Don't leave out the head when we draw our shadow. 2013-11-21 13:57:55 -08:00
Andrzej Kapolka
f0e5872b89 Lighten the shadows, remove some debug code. 2013-11-21 12:29:22 -08:00
Andrzej Kapolka
f38e74c51c Merge branch 'master' of https://github.com/worklist/hifi into shadowplay 2013-11-21 11:18:56 -08:00
Andrzej Kapolka
3cf47f8d5c Merge branch 'master' of https://github.com/worklist/hifi into shadowplay 2013-11-21 11:08:45 -08:00
Andrzej Kapolka
7bc65136c7 Merge branch 'master' of https://github.com/worklist/hifi into sicksense 2013-11-21 11:00:09 -08:00
Andrzej Kapolka
dcc926a0db Working on the "real" shadow volume. 2013-11-20 20:36:54 -08:00
Andrzej Kapolka
758246309a Use compare mode. 2013-11-20 20:06:22 -08:00
Andrzej Kapolka
4bcc6fdc0d More progress on shadows. 2013-11-20 18:27:59 -08:00
Andrzej Kapolka
5cc5d9bba8 Progress towards shadow maps. 2013-11-20 16:23:54 -08:00
ZappoMan
6881d9fb36 fix to crash in client side VoxelSceneStats crash 2013-11-19 22:57:42 -08:00
Andrzej Kapolka
4e952b0f99 Clamp pitch from touch when adjusting it. 2013-11-19 16:40:29 -08:00
Andrzej Kapolka
38c2abd6d8 First stab at Leap driving. 2013-11-19 15:10:02 -08:00
Andrzej Kapolka
1f2fe5ddee Rudimentary Sixense (Razer Hydra) support. 2013-11-15 18:06:32 -08:00
Andrzej Kapolka
7249e5293c Added a slider in the preferences to control the amount of Faceshift eye 
deflection.
 2013-11-15 10:17:52 -08:00
Andrzej Kapolka
c358b9f0fd Don't track the mouse in mirror mode. 2013-11-14 10:19:35 -08:00
ZappoMan
34668e8716 add Paste To Voxel 2013-11-13 23:04:51 -08:00
ZappoMan
b6bc3cb166 handle changes in server list properly 2013-11-13 15:56:03 -08:00
Andrzej Kapolka
df30e3c851 As a hack, when we have an FBX face/body, position the camera to point at the 
origin and reposition the models based on the relative eye positions.  Fixes
the jitteriness in rear mirror mode.
 2013-11-12 12:28:07 -08:00
Philip Rosedale
2991c8af61 screen does not flash when voxels are clicked 2013-11-08 14:34:22 -08:00
Philip Rosedale
f3b6e21a6d Voxel click to fly is now an option in the Tools Menu 2013-11-08 14:34:15 -08:00
ZappoMan
1587cf0bbe some comment cleanup 2013-11-07 17:17:34 -08:00
ZappoMan
2c4ab63d2b tweaks to placement and wording of voxel stats 2013-11-07 17:11:35 -08:00
ZappoMan
19515c80fd Merge branch 'master' of https://github.com/worklist/hifi into new_voxel_scene_stats 
Conflicts:
	interface/src/Application.cpp
 2013-11-07 16:44:34 -08:00
ZappoMan
64d5ccf91e add menu option for voxel server fade in/out and dont remove local voxels when server shuts down 2013-11-07 14:10:09 -08:00
Andrzej Kapolka
add8ccc877 Lower the deflection amount. 2013-11-05 14:31:41 -08:00
Andrzej Kapolka
0c8799bb3d Tweaks to voxel editing: edit from farther away, expand cubes to make sure 
they show up over voxels, initialize voxel scale with moused-over scale.
 2013-11-05 12:12:54 -08:00
ZappoMan
843e9da873 merge conflict fix 2013-11-05 10:47:05 -08:00
ZappoMan
581e0adecf Merge branch 'master' of https://github.com/worklist/hifi into new_voxel_scene_stats 
Conflicts:
	interface/src/Application.cpp
 2013-11-05 10:45:30 -08:00
ZappoMan
09dab892d3 first cut at new voxel scene stats 2013-11-05 10:29:56 -08:00
Andrzej Kapolka
b2ed29dbff Work around precision issues with multiplying matrices with high translation 
magnitudes (by using relative translation).
 2013-11-04 16:49:12 -08:00
Andrzej Kapolka
361f1f6adf Don't override the lookat positions we receive for others. 2013-11-04 14:07:05 -08:00
Andrzej Kapolka
490194c747 Rescale eye positions to compensate for growing heads. 2013-11-04 13:53:39 -08:00
Andrzej Kapolka
33c61937ab Remove unused parameters. 2013-11-04 11:31:05 -08:00
Andrzej Kapolka
65907a75a3 Merge branch 'master' of https://github.com/worklist/hifi into 321contact 
Conflicts:
	interface/src/Application.cpp
 2013-11-04 10:40:02 -08:00
ZappoMan
9bd27e2b2a fix stutter on rotating 2013-11-03 21:11:08 -08:00
ZappoMan
c18de72dd4 work on debugging stutter behavior, mostly debugging and cleanup 2013-11-03 19:06:06 -08:00
Andrzej Kapolka
def3707041 I don't think Faceshift's gaze data is actually head-relative. 2013-11-01 18:28:35 -07:00
Andrzej Kapolka
a7683fa07f More tweaks to eye offsets. 2013-11-01 18:15:43 -07:00
Andrzej Kapolka
e4bf5358eb Attempt to use Faceshift eye data to deflect the default eye behavior. 2013-11-01 17:58:41 -07:00
ZappoMan
b3aac56d29 first cut a variable point size point rendering 2013-11-01 14:33:06 -07:00
ZappoMan
848e78aded CR feedback 2013-10-31 13:58:12 -07:00
ZappoMan
a04cd8e95c added menu item to enable extra debugging to help debug hq VS issue 2013-10-31 13:54:10 -07:00
ZappoMan
db08b20405 added more logging 2013-10-31 12:36:48 -07:00
ZappoMan
42b44064d3 CR feedback 2013-10-31 12:19:18 -07:00
ZappoMan
af1047f5e0 fix to how voxel servers are queried when they have no known jurisdiction 2013-10-31 12:06:18 -07:00
ZappoMan
256428c6ae CR feedback 2013-10-30 16:55:39 -07:00
ZappoMan
054f49808f Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 
Conflicts:
	libraries/voxel-server-library/src/VoxelSendThread.cpp
 2013-10-30 16:48:50 -07:00
ZappoMan
606a6349c7 added abandoned voxels to stats, improved sizing behavior of voxel stats dialog 2013-10-30 15:28:44 -07:00
ZappoMan
0bbbd7efce fix Voxel Server Protocol menu options to work again 2013-10-30 14:00:56 -07:00
ZappoMan
d1fbe242ab Merge branch 'master' of https://github.com/worklist/hifi into lod_slider 2013-10-30 12:27:50 -07:00
Andrzej Kapolka
719a014118 Merge pull request #1149 from ey6es/master 
This should fix Stephen's crash on init.
 2013-10-30 12:27:17 -07:00
Andrzej Kapolka
d820611618 Looks like setCentralWidget is ending up calling the init functions in newer 
versions of Qt.  Initialize the network access manager before that happens.
 2013-10-30 12:25:43 -07:00
ZappoMan
375ef34bd5 Merge pull request #1141 from stojce/19447 
Code Review for Job #19447
 2013-10-30 12:23:32 -07:00
ZappoMan
3a6f8ea66b Merge branch 'master' of https://github.com/worklist/hifi into lod_slider 2013-10-30 12:04:52 -07:00
ZappoMan
580102bb38 more work on LOD slider 2013-10-30 11:01:37 -07:00
ZappoMan
fbc3a4d2c1 first cut at user adjustable LOD 2013-10-29 16:16:58 -07:00
Stephen Birarda
f6c265dcf3 remove the ground plane 2013-10-29 15:22:04 -07:00
stojce
a14242632a Rear view zoom level 
new zoom icons
save and restore state from settings
display zoomed out rear view when selected
 2013-10-29 20:51:14 +01:00
Andrzej Kapolka
4771982c30 Merge pull request #1131 from stojce/19443 
Code Review for Job #19443
 2013-10-28 17:04:36 -07:00
Andrzej Kapolka
6d8f8dc8ed Merge branch 'master' of https://github.com/worklist/hifi into ick 2013-10-28 15:59:42 -07:00
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
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
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
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
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
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
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
71b4b8fe46 Use lowercase h to toggle full screen mirror, capital H for inset. 2013-10-23 10:54:39 -07:00
Andrzej Kapolka
adc79be81c Add back the full screen mode as a menu option, temporarily. 2013-10-23 10:30:42 -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
306b23d489 make Fast Voxel Pipeline the default behavior 2013-10-23 05:58:47 -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
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
stojce
2fcb246923 close button on rear mirror view 2013-10-22 20:42:31 +02:00
ZappoMan
1b302f60f8 Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 2013-10-21 16:03:53 -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
023a521948 some debug timing and voxel stats display 2013-10-21 14:39:05 -07:00
stojce
b45525ae21 Mirror View initial setup 2013-10-21 08:28:38 +02:00
Andrzej Kapolka
7e174093e4 Factoring the FBX model code out to a shared base class. 2013-10-18 17:26:03 -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
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
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
Stephen Birarda
73d3ecccf3 resolve conflicts on merge with upstream master 2013-10-17 14:37:58 -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
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
9643c1262c Fix mute button, visualize gaze direction when showing headMouse 2013-10-17 11:03:12 -07:00
Stephen Birarda
012fccc72e send ping to AvM and VS for socket activation 2013-10-16 18:01:15 -07:00
ZappoMan
6fff53a2dc next round of voxelnode size improvements 2013-10-15 14:43:51 -07:00
Philip Rosedale
746bce8626 All onscreen text, overlay OFF when stats are off 2013-10-15 11:01:22 -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
6f9fdfba2f make mouse cursor hiding more aware of focused window and bounds 2013-10-14 11:39:48 -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
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
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
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
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
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
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
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
27a892fa55 Removed old head rotation code, menu items, added ability to turn off faceshift head rotation 2013-10-09 22:46:34 -07:00
Stephen Birarda
f7a0dd514e load NodeList and Profile settings with menu settings load 2013-10-09 15:23:07 -07:00
Philip Rosedale
4afa82d626 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-09 15:10:16 -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
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
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
f09888dd1b Merge branch 'master' of github.com:worklist/hifi into nameserver 2013-10-09 10:21:25 -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
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
Stephen Birarda
85edb93710 add a Profile class to hold user data from data-server 2013-10-08 12:13:45 -07:00
Stephen Birarda
892614470e Merge branch 'master' of github.com:worklist/hifi into nameserver 2013-10-08 11:19:32 -07:00
ZappoMan
f6981feacf added various render mode options, including voxels as points 2013-10-07 17:46:22 -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
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
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
Philip Rosedale
e9a21e284a Merge pull request #1011 from ZappoMan/voxeleditsender_improvements 
VoxelEditPacketSender class improvements
 2013-10-02 21:25:10 -07:00
ZappoMan
aac6d409d2 delete voxels locally on edit to match add behavior 2013-10-02 17:00:19 -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
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
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
Philip Rosedale
cebd8e5f4b Merge pull request #997 from birarda/assignment 
file of static assignments for DS
 2013-10-01 13:47:10 -07:00
ZappoMan
793a14e25a first cut at new faster voxel pipeline 2013-10-01 10:37:14 -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
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
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
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
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
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
Philip Rosedale
0fbabe9891 Merge pull request #984 from ZappoMan/voxel_geo_shader 
Voxel Geometry Shader Experiment
 2013-09-26 17:22:55 -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
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
63efeccb13 Renaming for clarity. 2013-09-25 17:38:37 -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
ZappoMan
3d4341cee4 hacking on voxel geometry shader 2013-09-23 15:18:45 -07:00
Andrzej Kapolka
133ba3a00a Set normals based on indices, cache face models. 2013-09-20 17:40: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
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
Stephen Birarda
bbbdc4f88c fixes for InfoView ownership and display 2013-09-18 16:42:51 -07:00
Stephen Birarda
8a901382a3 get rid of local and domain options in interface 2013-09-18 14:01:32 -07:00
Stephen Birarda
ab85c4109d use QHostInfo and QHostAddress for DS changes in NodeList 2013-09-18 13:29:53 -07:00
ZappoMan
2d545c8adb Merge pull request #924 from stojce/19418 
Code Review for Job #19418
 2013-09-14 14:00:09 -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
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
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
stojce
921e88ea5d Merge branch 'master' of https://github.com/worklist/hifi into 19418 
Merge branch 'master'
 2013-09-12 21:11:30 +02:00
LionTurtle
cef4837654 Fix voxel erase bug in nudge code. Fix rendering of nudge guide. 2013-09-11 16:43:50 -07:00
stojce
a362fdc2ed name the current domain server 2013-09-10 21:51:50 +02:00
stojce
114cc065bd Merge branch 'master' of https://github.com/worklist/hifi into 19418 2013-09-10 21:05:44 +02:00
ZappoMan
befbc1b93a Merge pull request #916 from LionTurtle/master 
Nudge
 2013-09-10 11:16:12 -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
Stephen Birarda
613334074f leverage qDebug and custom message handler for verbose logging 2013-09-09 15:11:11 -07:00
Andrzej Kapolka
f8aee88a5b Let's try subtracting the long-term average from the eye directions. 2013-09-09 14:30:26 -07:00
Andrzej Kapolka
ddf92b39c7 Fix for off-axis ambient occlusion. 2013-09-08 17:52:35 -07: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
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
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
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
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
atlante45
f21a2798ff Fixed _sharedVoxelSystemTree deleted twice 2013-08-30 10:37:55 -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
Stephen Birarda
818355dc1a implementing @problem's proposed changes to menus 2013-08-23 15:18:06 -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
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