Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 14:42:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
11443 commits 71 branches 56 tags 1.2 GiB
Commit graph

195 commits

Author SHA1 Message Date
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
Andrzej Kapolka
cceeb1c6ff Merge branch 'master' of https://github.com/worklist/hifi into ssao 2013-08-15 13:11:12 -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
Andrzej Kapolka
a9ccca3f72 Diffuse/add glow mode. 2013-08-14 16:13:30 -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
Andrzej Kapolka
d24e340c91 To keep the frame rate up, let's only sample eight points for the blur. 2013-08-13 14:52:35 -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
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
Andrzej Kapolka
1828a105d4 Basic glow effect. 2013-08-08 16:55:45 -07:00
Andrzej Kapolka
bd3c235fe4 Switching between textured and untextured modes. 2013-08-06 16:23:58 -07:00
Andrzej Kapolka
720ae561df Working on support for a textured face mode that doesn't rely on the video 
stream.
 2013-08-06 13:27:54 -07:00
atlante45
f441295eb1 Merge branch 'pie_menu' of https://github.com/Atlante45/hifi into stalking_option 2013-08-02 14:15:07 -07:00
atlante45
fdd01a6551 merge 2013-08-01 15:48:57 -07:00
Andrzej Kapolka
ba9b5888d2 More work on full frame sending. 2013-08-01 13:00:01 -07:00
Andrzej Kapolka
ff0d63173c Pass the aspect ratio into the shader, since it no longer necessarily 
corresponds to the texture rectangle's aspect ratio.
 2013-07-18 21:25:11 -07:00
Andrzej Kapolka
b15724665b Removed unused variable, fixed shader comments. 2013-07-18 18:16:45 -07:00
Andrzej Kapolka
fdeb63c121 More work on face points. 2013-07-15 16:09:49 -07:00
Andrzej Kapolka
5c590638f3 Working on mesh rendering for faces. 2013-07-15 13:12:22 -07:00
Andrzej Kapolka
84bb2aa265 Started on C++ side of SSAO effect. 2013-07-14 18:21:18 -07:00
Andrzej Kapolka
5eac599243 Merge branch 'master' of https://github.com/worklist/hifi into ssao 2013-07-14 15:56:41 -07:00
Andrzej Kapolka
411cb92300 Working on face rendering as point cloud. 2013-07-14 15:54:29 -07:00
Andrzej Kapolka
b294b33ac7 Started on ambient occlusion shader. 2013-07-05 18:21:59 -07:00
atlante45
78aa3ac9f9 Added UI responsivness 2013-07-02 16:17:25 +02:00
atlante45
05a77bf373 Forgot to add .svg file 2013-07-02 09:29:11 +02:00
Stephen Birarda
0b243ec881 add fervor updater and run during launch if OS X release 2013-06-26 10:36:32 -07:00
Andrzej Kapolka
0dc0552f50 Basic Haar cascade/CamShift tracking. 2013-06-19 18:02:26 -07:00
Andrzej Kapolka
c11ab45474 It seems gl_ModelViewMatrixInverse is problematic on OS X; let's try passing 
in the camera's position as transformed into model space.
 2013-06-14 17:21:35 -07:00
Andrzej Kapolka
790cdfb0bd Added refraction to irises. 2013-06-14 16:46:34 -07:00
Andrzej Kapolka
7d1679dab7 Ryan's new iris texture. 2013-06-14 14:35:56 -07:00
Andrzej Kapolka
5241c41ddd Shed some light on what these shaders are doing, so to speak. 2013-06-14 11:29:32 -07:00
Andrzej Kapolka
4f9f2fa4ca Better iris texture. 2013-06-14 10:28:45 -07:00
Andrzej Kapolka
0f897340ee New iris texture from Ryan. 2013-06-13 16:42:31 -07:00
Andrzej Kapolka
e401663459 Added per-pixel specular highlight to irises. 2013-06-13 15:58:49 -07:00
Geenz
d512b414ee Correct after blending. 2013-06-09 22:48:14 -04:00
Andrzej Kapolka
d09700adde Merge branch 'master' of https://github.com/worklist/hifi into voxeltars 
Conflicts:
	interface/src/Avatar.cpp
	interface/src/Avatar.h
	interface/src/Skeleton.h
	interface/src/VoxelSystem.h
 2013-06-04 11:00:59 -07:00
Andrzej Kapolka
26b7976489 Merge branch 'master' of https://github.com/worklist/hifi into voxeltars 2013-06-03 09:49:50 -07:00
Jeffrey Ventrella
cf67f28b57 merge 2013-06-03 08:10:41 -07:00
Andrzej Kapolka
6c975f9c6f More work on avatar voxels. 2013-06-01 15:06:29 -07:00
Geenz
de76851207 Remove unnecessary normalize. 2013-05-31 20:35:26 -04:00
Geenz
d98b28d4ab So apparently, this was a scale problem the entire time. 2013-05-31 20:30:42 -04:00
Geenz
1eac57dd0c #19351 - Atmosphere shaders should be handled per-pixel instead of per-vertex. 2013-05-30 15:02:11 -04:00
Stephen Birarda
0fdbfe8ea8 move gen_stars to the tools folder 2013-05-22 12:39:27 -07:00
Stephen Birarda
b2518e0595 change the iris texture 2013-05-17 10:51:29 -07:00
Andrzej Kapolka
86ddcea87f Better names for the shaders. 2013-05-16 13:08:21 -07:00
Andrzej Kapolka
0a6b4702c6 Experimenting with simple Perlin noise shader for voxels. 2013-05-15 22:18:56 -07:00
Andrzej Kapolka
f0055bd419 Fixes for OS X: GLSL version must be first line in source, don't init glut 
(Qt apparently uses it?)
 2013-05-15 16:19:42 -07:00
Stephen Birarda
82ed4a4ae8 remove old style walking sounds 2013-05-10 17:21:58 -07:00
Philip Rosedale
527b65f6a4 Log cleanup. removed star field meridians. 2013-05-09 22:06:32 -07:00
tosh
395e4a7852 removes equator, achieves uniform distribution of stars implementing rejection sampling, adds UNIX script header 2013-05-09 12:08:19 +02:00
Andrzej Kapolka
5138f62aef Use the "proper" alpha value (i.e., the one from the original shader). This 
makes the sky somewhat darker, but that probably just means we need more
scattering or a brighter sun.
 2013-05-08 11:50:59 -07:00
Andrzej Kapolka
82f16e7f34 Include the "sky from space" shaders, too, and use them when the camera is 
outside the atmosphere's outer radius.
 2013-05-08 11:42:31 -07:00
Andrzej Kapolka
4567c31a26 Added licensing information from the GPU Gems site, fixed spacing. 2013-05-08 09:55:46 -07:00
Andrzej Kapolka
c7e31ec414 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	libraries/shared/src/PacketHeaders.h
 2013-05-07 14:44:17 -07:00
Andrzej Kapolka
7faa9e4318 More work on atmosphere rendering; rendering now working. 2013-05-07 12:40:15 -07:00
Stephen Birarda
d4ca60a668 remove image files that are no longer in use 2013-05-06 18:11:57 -07:00
Stephen Birarda
66a2b1a86f move stars.txt to S3 bucket 2013-04-03 15:24:26 -07:00
tosh
2341af271b Merge branch 'master' of git://github.com/worklist/hifi into 19188 
Conflicts:
	interface/CMakeLists.txt
	interface/src/main.cpp
	shared/src/SharedUtil.cpp
	shared/src/SharedUtil.h
	shared/src/VoxelTree.cpp
 2013-04-03 22:44:22 +02:00
tosh
06fc3ce00c adjusts the north-south meridian 2013-03-27 17:12:33 +01:00
tosh
56d802cd57 updates to a whole sphere of stars with meridians and equator 2013-03-27 17:06:36 +01:00
tosh
891194ed2e adds meridians with color gradient and an equator 2013-03-27 17:05:23 +01:00
tosh
eac8c99ee1 changes default to generate a full sphere 2013-03-27 15:46:54 +01:00
tosh
24d0f3a0a0 adds stars file in the right location so everything runs out of the box 2013-03-27 13:49:52 +01:00
tosh
8a1fd43437 implements a more uniform distribution of star positions and a progress bar 2013-03-27 03:28:48 +01:00
tosh
5de3ec035b leftover changes / minor corrections 2013-03-24 06:30:33 +01:00
tosh
4444bcf26e starfield and numerous utility components, initial checkin 2013-03-24 05:50:07 +01:00
Stephen Birarda
61f23a2d0f add a new walk sound 2013-03-22 14:06:20 -07:00
Stephen Birarda
4552140f61 add a sound when moving so we aren't ninjas 2013-03-21 16:11:17 -07:00
stojce
4d6bbba93d added eye texture 2013-03-06 07:20:11 +01:00
Stephen Birarda
1111e4837e intial restructuring for CMake setup 2013-02-06 18:07:36 -08:00