Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 06:32:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
11711 commits 75 branches 59 tags 1.2 GiB
Commit graph

218 commits

Author SHA1 Message Date
stojce
0c2e55a53b Merging with master 
- resolve conflicts on GeometryCache
 2014-01-24 07:31:22 +01:00
Andrzej Kapolka
ff4795d9a5 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-22 15:59:02 -08:00
stojce
becbd4cb1c Merge branch 'master' of https://github.com/worklist/hifi into 19483 2014-01-23 00:54:05 +01:00
Stephen Birarda
d2e02c15d8 repair the UpdateDialog so it is a QDialog with no child QWidget 2014-01-22 14:17:56 -08:00
Andrzej Kapolka
aabff3f141 Adjust the fog density; getting different results on Linux vs. OS X. 2014-01-22 14:17:02 -08:00
Andrzej Kapolka
0a3d6ae5e0 More work on metavoxel editing (grid, etc.) 2014-01-21 19:31:56 -08:00
stojce
19c4b2b2ec Merge branch 'master' of https://github.com/worklist/hifi into 19483 2014-01-21 22:51:32 +01:00
Andrzej Kapolka
5e908134ea Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-21 11:05:00 -08:00
Andrzej Kapolka
bf9fc65de4 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-20 17:40:16 -08:00
Leonardo Murillo
82ecc9cc36 Merge branch 'master' of github.com:/worklist/hifi 2014-01-17 13:06:59 -06:00
stojce
36d21e812d Merge branch 'master' of https://github.com/worklist/hifi into 19483 2014-01-17 19:46:02 +01:00
Andrzej Kapolka
e7a3beed78 Removed a couple more resources. 2014-01-16 15:17:38 -08:00
Andrzej Kapolka
1b891cb326 Removed unused resources. 2014-01-16 15:16:19 -08:00
stojce
50ad5a4ec8 alternate css background settings for selected items in QTreeView 2014-01-15 23:38:34 +01:00
stojce
8e2879e5ff Layout fixes 2014-01-15 23:14:45 +01:00
Leonardo Murillo
40492a1713 Removing text from .ui 2014-01-14 22:16:06 -06:00
Leonardo Murillo
b20334de1d Dont need qss 2014-01-14 22:13:49 -06:00
Leonardo Murillo
f9bb98680d Using Qt Designer .ui file instead of manually coding dialog 2014-01-14 21:57:28 -06:00
Andrzej Kapolka
c163b513d2 Working on allowing visitors to modify, as well as read, data. 2014-01-13 18:09:28 -08:00
stojce
06ecf03180 Layout fix (notes from Grayson) 2014-01-13 23:04:19 +01:00
stojce
577ff766ee fix size of grid items 2014-01-12 00:53:49 +01:00
stojce
048359e3a4 more layout fixes 2014-01-12 00:44:50 +01:00
stojce
3afacfce4f Info label layout 2014-01-12 00:40:29 +01:00
stojce
0c4bee8d12 save and restore dialog settings 2014-01-12 00:33:46 +01:00
stojce
623def0964 File filter 
Display extensions
 2014-01-11 21:03:49 +01:00
stojce
227326e3b7 Import button opacity 2014-01-11 14:40:22 +01:00
stojce
80561b6861 removed size hint from sag icons 2014-01-10 23:47:18 +01:00
stojce
d5e07a5c75 Add import configuration 
remove unused icons
remove redundant QLabels
 2014-01-10 23:26:58 +01:00
Leonardo Murillo
ede32cfadc Checkpoint 2014-01-10 14:08:10 -06:00
Leonardo Murillo
eb52ded4ad Styling + others 2014-01-09 20:34:02 -06:00
stojce
5b678cb24d Layout fix 2014-01-09 18:15:39 +01:00
Leonardo Murillo
efb173e1d4 Preliminary update dialog work 2014-01-08 21:20:43 -06:00
stojce
cc543f4313 Added custom icons (QFileIconProvider) 2014-01-07 00:41:11 +01:00
Leonardo Murillo
ba79b1b329 Using BUILD_VERSION to setApplicationVersion 2014-01-06 09:18:10 -06:00
stojce
8855a32526 removed unused widgets 2014-01-06 11:15:15 +01:00
Stojce Slavkovski
2b92194d35 sytle changes on log dialog 2013-12-29 23:45:24 +01:00
Stojce Slavkovski
ee1eb25dfa replace LogDisplay with File logger 
- added abstract logger interface
 2013-12-22 18:56:53 +01:00
Stojce Slavkovski
3d44ab9939 Dialog layout 2013-12-22 15:06:40 +01:00
Stojce Slavkovski
4c1226ffd9 Merge branch 'master' of https://github.com/worklist/hifi into 19461 2013-12-18 08:00:55 +01:00
Andrzej Kapolka
ff2b77d311 Back to a more modest depth. 2013-12-17 17:16:09 -08:00
Andrzej Kapolka
e6a41b2003 Proof of concept sphere thing for metavoxels. 2013-12-17 16:56:52 -08:00
Stojce Slavkovski
57b4148867 Dialog position / toggle 2013-12-17 22:12:24 +01:00
Stojce Slavkovski
18295809ce log dialog style changes 2013-12-17 21:44:44 +01:00
Stojce Slavkovski
e788d746d4 added dialog for log data 
- importing Inconsolata.otf on application level
- style sheet for dialog
- changed menu behaviour for log data
 2013-12-16 22:43:17 +01:00
Andrzej Kapolka
c003a55c37 Diffuse lighting. 2013-12-12 16:19:05 -08:00
Andrzej Kapolka
c1aec11b32 More work on rendering voxels. 2013-12-12 15:14:19 -08:00
Andrzej Kapolka
f6b3a6ceca The other part of the Oculus ambient occlusion fix. 2013-11-26 17:53:31 -08:00
Andrzej Kapolka
e406988ed3 Partial fix for ambient occlusion with Oculus. 2013-11-26 17:18:03 -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
f0e5872b89 Lighten the shadows, remove some debug code. 2013-11-21 12:29:22 -08:00
ZappoMan
c4a2b3c49b fix thinning in voxels as points by using correct points to calculate width of voxel based on camera position relative to voxel 2013-11-03 11:10:00 -08:00
ZappoMan
508b8f4678 change in comment to kick off build 2013-11-01 16:29:49 -07:00
ZappoMan
b103f9dacf clean up 2013-11-01 15:32:17 -07:00
ZappoMan
e62322b805 clean up comment 2013-11-01 15:28:54 -07:00
ZappoMan
61b6d6a4a4 added comment about fixing point selection 2013-11-01 15:27:57 -07:00
ZappoMan
cab87c3a97 added comment about fixing point selection 2013-11-01 15:27:25 -07:00
ZappoMan
b3aac56d29 first cut a variable point size point rendering 2013-11-01 14:33:06 -07:00
Andrzej Kapolka
12374c2cc4 Allow more clusters per mesh. 2013-10-31 17:01:00 -07:00
ZappoMan
e9d366fb80 Merge pull request #1147 from ey6es/ick 
Support for normap maps on loaded models.
 2013-10-30 12:26:56 -07:00
Andrzej Kapolka
06e050f1c1 Normal map support almost there. 2013-10-29 22:13:00 -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
stojce
4fe9964e5a reset view 
- reset icon
- resetView signal
 2013-10-28 18:19:31 +01:00
Andrzej Kapolka
62b2388592 Temporary fix for Mavericks: the skin shader isn't getting the color, so just 
use white.  We're not using vertex colors on anything skinned yet, anyway.
 2013-10-25 14:40:00 -07:00
Andrzej Kapolka
bae4a17605 Voxel attachments. 2013-10-24 13:59:04 -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
stojce
2fcb246923 close button on rear mirror view 2013-10-22 20:42:31 +02:00
Andrzej Kapolka
7ddac20c62 Allow more bones. The model I'm testing with has about 60. 2013-10-18 19:18:48 -07: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
a79c0a9244 Removed unused shader. 2013-10-15 17:14:20 -07:00
Andrzej Kapolka
d06acdd169 Per-pixel shading, material tweaks. 2013-10-15 11:50:29 -07:00
Andrzej Kapolka
e97cfb8cf8 Per-pixel specular for blend faces. 2013-10-14 19:59:13 -07:00
Andrzej Kapolka
124966d2e4 More progress on skinning. 2013-10-14 18:39:19 -07:00
stojce
7ce483b658 remove unused resource 2013-10-05 13:21:34 +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
Andrzej Kapolka
c98dec8a65 Dilate our network-downloaded textures. 2013-10-02 11:59:14 -07:00
ZappoMan
dbfc0956c1 added normals to voxel shader 2013-09-27 13:26:58 -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
3ab92a592a fix comments in shaders 2013-09-26 17:05:04 -07:00
ZappoMan
07515d1c5f fix projection between shaders 2013-09-26 17:03:50 -07:00
ZappoMan
c0bfdfbc4f fix comment 2013-09-26 16:54:20 -07:00
ZappoMan
57b30c13d8 style cleanup 2013-09-26 16:45:09 -07:00
ZappoMan
864c00c6e0 removed some dead code 2013-09-26 16:38:29 -07:00
ZappoMan
552d9fadd8 rearranged menus, some hacking on voxel shader 2013-09-26 14:51:57 -07:00
Andrzej Kapolka
736dae0c81 Use shaders for eyes (like the ones for the iris). 2013-09-25 15:26:29 -07:00
Andrzej Kapolka
9a16d44a47 Render the eye textures. 2013-09-25 13:47:03 -07:00
ZappoMan
3d4341cee4 hacking on voxel geometry shader 2013-09-23 15:18:45 -07:00
stojce
114cc065bd Merge branch 'master' of https://github.com/worklist/hifi into 19418 2013-09-10 21:05:44 +02:00
stojce
a081f081f8 popup layot 
- center position
- resizable
 2013-09-09 23:27:03 +02:00
Andrzej Kapolka
ddf92b39c7 Fix for off-axis ambient occlusion. 2013-09-08 17:52:35 -07:00
stojce
8779e000fe #19418 Load a local HTML file in a web view within Interface 2013-09-08 21:29:35 +02:00
stojce
fef70098a3 #19418 Load a local HTML file in a web view within Interface 2013-09-08 21:28:30 +02:00
Andrzej Kapolka
d63bb3afaa Fixed glow/ambient occlusion with Oculus. 2013-08-21 15:44:57 -07:00
Andrzej Kapolka
f3a32a7934 Might as well convert the divide to a multiply. 2013-08-20 17:04:29 -07:00
Andrzej Kapolka
590672d035 Fewer texture lookups when diffusing. 2013-08-20 17:02:35 -07:00
Andrzej Kapolka
5b923bc6f2 More cleanup. 2013-08-20 13:46:13 -07:00
Andrzej Kapolka
22598ceb4f Optimizations for occlusion blur (the main one being that we only need to 
sample the texture four, not sixteen, times if we turn on linear filtering
and sample between the texels).
 2013-08-20 11:52:43 -07:00
Stephen Birarda
d0ab8317c4 Merge pull request #865 from ey6es/ssao 
Basic screen space ambient occlusion effect.  Defaults to off, because at the moment it slows things down substantially.
 2013-08-20 10:37:01 -07:00
Stephen Birarda
13f5b7f68d change application name to Interface 2013-08-20 10:02:06 -07:00
Andrzej Kapolka
b41fa1e03c Basic ambient occlusion effect up and running; needs tweaking and 
optimization.
 2013-08-16 17:26:47 -07:00
Andrzej Kapolka
3ddab484e0 Beginnings of ambient occlusion. Looks like an architectural drawing. 2013-08-15 17:52:31 -07:00