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

1413 commits

Author SHA1 Message Date
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
ZappoMan
18dbfd5cc7 Merge pull request #877 from Atlante45/separate_import_with_preview 
New paste behaviour
 2013-08-21 13:44:17 -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
9003a7d40b PR comments 2013-08-21 12:06:47 -07:00
atlante45
867303e673 Code cleanup 2013-08-21 11:33:10 -07:00
atlante45
3eb5ace715 merge + few efficiency ameliorations to importDialog 2013-08-20 18:04:25 -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
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
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
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
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
atlante45
6b58e1bfec merge 2013-08-16 20:24:18 -07:00
Stephen Birarda
98b144d675 Merge remote-tracking branch 'upstream/master' into menu 2013-08-16 15:59:09 -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
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
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
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
c930d058b1 fix monochrome option menu hook 2013-08-15 15:23:26 -07:00
Stephen Birarda
e77aae157b fix in view and occluded false colorization 2013-08-15 15:15:19 -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
cd000cb7c1 remove the particle system from ground plane 2013-08-15 14:37:27 -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
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
3a42bda0f2 repairs after merge with upstream master 2013-08-15 11:42:30 -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
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
ZappoMan
8e07bd42ea removed app from SendVoxelsOperationArgs since its available as singleton 2013-08-15 10:51:56 -07:00
Stephen Birarda
46b064b7d6 initial decoupling of menu from Application 2013-08-15 10:46:51 -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
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
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
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
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
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
b1e975e96b Don't show pie menu when on voxel 2013-08-08 15:48:33 -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
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
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
f4820143d7 cleanup resizeGL, and Display Frustum menus 2013-08-07 16:12:03 -07:00
Philip Rosedale
a4d1bc5b6e Merge branch 'master' of https://github.com/worklist/hifi 2013-08-07 14:43:49 -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
e9b3cca3de OpenGL fields of view are vertical, not horizontal. 2013-08-07 14:26:22 -07:00
Andrzej Kapolka
597842eba2 Starting on glow effect. 2013-08-07 14:17:52 -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
19b9be3361 - Now P switch between first and third person view 2013-08-07 12:24:13 -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
377adb30ae Merge branch 'master' of https://github.com/worklist/hifi 2013-08-07 11:14:48 -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
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
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
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
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
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
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
ZappoMan
88e2e3dd3f added visulization for voxel add/kill 2013-08-06 12:05:43 -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
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
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
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
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
f1a0edb471 Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 2013-08-05 14:57:10 -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
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
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
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
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
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
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
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
Stephen Birarda
8704964a0f resolve conflicts on merge with upstream master 2013-08-02 17:56:19 -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
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
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
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
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
ZappoMan
db55160f9a Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 2013-08-02 14:40:39 -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
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
28dd38c013 Merge remote-tracking branch 'upstream/master' into particles 2013-08-02 13:36:01 -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
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
ZappoMan
983db5f70d Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 2013-08-01 20:50:24 -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
Mark Peng
9ba0e3bb0c Add reference lines to mouse voxel when adding/deleting voxels. 2013-08-01 13:03:17 -07:00
Philip Rosedale
bc1ac6b455 turn down collision sounds 2013-08-01 12:49:10 -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
Jeffrey Ventrella
6c1cc911d5 Merge remote-tracking branch 'upstream/master' into particles 2013-07-31 15:12:54 -07:00
Jeffrey Ventrella
89f36a7eb7 cleanup 2013-07-31 12:38:40 -07:00
Stephen Birarda
9e63b78a69 Merge branch 'master' of github.com:worklist/hifi into qt5 2013-07-31 11:35:24 -07:00
Philip Rosedale
98ec2efc01 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-30 14:55:33 -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
ZappoMan
620fe12358 support for multiple voxel servers in ping stats 2013-07-29 16:31:14 -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
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
ZappoMan
86bf268eef first cut at multiple voxel servers 2013-07-29 14:56:33 -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
Andrzej Kapolka
20360ad3e9 Make particle system update/render toggleable, fix GCC compile warnings. 2013-07-29 10:41:45 -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
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
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
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
atlante45
d165891fe6 New design for pie menus 2013-07-24 12:38:35 -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
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
a162643e1e more removing of SourceID from classes 2013-07-23 19:21:43 -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
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
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
0cdad1a313 Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-19 19:48:52 -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
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
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
Mark Peng
cfcb31172c Merge remote-tracking branch 'upstream/master' 2013-07-18 21:08:08 -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
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
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
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
Jeffrey Ventrella
1f1259cec5 added particle life stages 2013-07-17 16:03:10 -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
Jeffrey Ventrella
98dd83dde8 ahibfasubhdf 2013-07-17 10:02:23 -07:00
Jeffrey Ventrella
0be15231b9 ahibfasubhdf 2013-07-17 10:01:23 -07:00
Eric Johnston
39130aef58 Rave Glove demo: activation mode and stage (dark backdrop) drawing. 2013-07-16 18:10:54 -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
atlante45
13762da7d8 Changed shortcuts to ALT+ +/- 2013-07-16 12:03:07 -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
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
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