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

1065 commits

Author SHA1 Message Date
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