Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-27 19:15:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
17650 commits 71 branches 56 tags 1.2 GiB
Commit graph

150 commits

Author SHA1 Message Date
Andrzej Kapolka
c9fb73ecf8 Playing around with using points to represent distant voxel surfaces. 2014-10-06 18:52:10 -07:00
Andrzej Kapolka
0d5f81c062 Merge pull request #3540 from samcake/temp0 
replacing glutSolidSPhere by a cached Geometry
 2014-10-06 12:23:44 -07:00
Sam Gateau
bd5c6517a5 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 
Conflicts:
	interface/src/ui/MetavoxelEditor.cpp
	interface/src/ui/overlays/Sphere3DOverlay.cpp
 2014-10-03 17:31:05 -07:00
Andrzej Kapolka
91942e6188 Reduce the size of the smoothing step. 2014-10-03 17:17:22 -07:00
Andrzej Kapolka
3d88463569 Blend between cube face textures. 2014-10-03 17:05:14 -07:00
Sam Gateau
738369e21f Replacing glutSolidSphere by a cached Geometry 
Instead of calling glutSolidSphere, just call Application::getInstance()->getGeometryCache()->renderSphere(...)

- replaced all the instances of "glutSolidSphere"
- Changed the atmosphere shaders so instead of drawing a sphere of the size of the atmosphere, we draw a unit sphere, the vertices get scaled at the right radius in th vertex shader using  fOuterRadius
 2014-10-03 16:55:58 -07:00
Andrzej Kapolka
bf1c7b17fe Fix for texture coordinate generation. 2014-10-02 18:09:47 -07:00
Andrzej Kapolka
16cfaa6ea5 Use cubic texture coordinate generation for the dual contour surfaces. 2014-09-23 13:28:00 -07:00
Andrzej Kapolka
646c0dc48f Working on translucent model bits. 2014-09-19 15:31:46 -07:00
Andrzej Kapolka
446c2193ff Limit what we render for deferred point/spot lights based on the light's 
radius.
 2014-09-19 12:18:00 -07:00
Andrzej Kapolka
b9ae005e53 Working on the actual deferred lights. 2014-09-18 16:12:46 -07:00
Andrzej Kapolka
7580a1da89 Glow fix for simple shader. 2014-09-15 17:33:07 -07:00
Andrzej Kapolka
580d591dc4 Working on getting glow to work with deferred lighting. 2014-09-15 17:11:36 -07:00
Andrzej Kapolka
0f3a020b5d Working on getting particles/entities to work with deferred lighting; 
normalize normals from buffer.
 2014-09-15 16:07:48 -07:00
Andrzej Kapolka
e3a1341be1 Don't include the color on the skin. 2014-09-15 12:52:35 -07:00
Andrzej Kapolka
b3b82ba56c I think we need to include the color. 2014-09-15 12:49:51 -07:00
Andrzej Kapolka
70c8c146bc Fix for specular issue on Nvidia, try passing along material colors. 2014-09-15 12:44:25 -07:00
Andrzej Kapolka
4475759461 Revert the normal-based ambient occlusion; I wasn't crazy about the look of 
it.  Will perhaps revisit later.
 2014-09-15 11:52:44 -07:00
Andrzej Kapolka
48adbdfbd2 Shadow fix. 2014-09-12 19:05:49 -07:00
Andrzej Kapolka
24b193b5dc Alpha testing bits. 2014-09-12 18:11:46 -07:00
Andrzej Kapolka
42c8701b26 Don't use gl_Color for skin. 2014-09-12 17:36:58 -07:00
Andrzej Kapolka
72f38900bb Fix for blending on models. 2014-09-12 17:31:03 -07:00
Andrzej Kapolka
53933fc9c6 Working on deferred lighting for models. 2014-09-12 17:09:07 -07:00
Andrzej Kapolka
7074d96c04 Working on support for specular components in deferred lights. 2014-09-12 14:11:56 -07:00
Andrzej Kapolka
f954e4d7ea Fix for deferred lighting on voxels. 2014-09-11 19:06:29 -07:00
Andrzej Kapolka
e6f37544fd Use deferred lighting for voxels as well as metavoxels. 2014-09-11 18:06:56 -07:00
Andrzej Kapolka
21f3f2b90e Switch to deferred lighting for metavoxels. 2014-09-04 17:17:44 -07:00
Andrzej Kapolka
2dfabdfe64 Support for scaling splat textures in S and T, use mipmaps for them. 2014-08-22 16:43:09 -07:00
Andrzej Kapolka
72500630b0 Basic splatting. 2014-08-20 19:26:06 -07:00
Andrzej Kapolka
416d9bac2e Working on texture rendering. 2014-08-20 14:48:02 -07:00
Andrzej Kapolka
668f6d3cfd Support for shadows on heightmaps. 2014-08-15 16:13:47 -07:00
Andrzej Kapolka
2c0f8ff57e Working on rejiggering the heightfield tiles. 2014-08-12 10:56:15 -07:00
Andrzej Kapolka
b7b1b018ee No need to use a texture for the cursor; we can just use a fragment shader. 2014-08-08 11:24:57 -07:00
Andrzej Kapolka
0fc34a47aa Show heightfield cursor. 2014-08-07 18:19:58 -07:00
Andrzej Kapolka
4696832ec6 Compute heightfield normals from adjacent values in vertex shader. 2014-08-05 15:13:50 -07:00
Andrzej Kapolka
c3c2265ddd Hide the unset (black) bits. 2014-07-30 18:14:11 -07:00
Andrzej Kapolka
6824479762 Progress on rendering heightfield buffers. 2014-07-29 16:06:35 -07:00
Andrzej Kapolka
aeee369286 Working on heightfield implementation. 2014-07-28 19:10:59 -07:00
Andrzej Kapolka
bbd977777a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-22 19:24:02 -07:00
Andrzej Kapolka
4f87524821 Switched back to using uniforms for light parameters, as using the fixed 
function state killed my frame rate.  Also cleaned up some of the location
tracking.
 2014-07-22 18:03:13 -07:00
Andrzej Kapolka
be028c2b01 Fixes for local lights. 2014-07-22 14:13:51 -07:00
Andrzej Kapolka
0ddd3e650c More point bits (trying a different tack). 2014-07-21 19:00:13 -07:00
TonyPeng
ef4b95c6e0 Merged from master. Get rid of redundant GL fog states. Moved local light parameters to shader uniform arrays. 2014-07-09 13:27:42 -07:00
TonyPeng
56eadcb0dc Get rid of redundant GL calls for fog. Enable and disable fog during rendering stage of voxels. Moved the local light parameters to shader uniform arrays. 2014-07-09 12:05:34 -07:00
TonyPeng
94e81da557 Added local lights to avatar. Added haze to voxel. 2014-07-08 09:44:28 -07:00
Chris Oates
2d9a42c07a Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-02 13:12:37 -07:00
Chris Oates
e903b1659a Implemented Improved Perlin Noise in existing "textured voxels" option. 
TextureCache.cpp: modified so that permutation texture contains known permutation of 0..255 rather than random set of values. Does not noticeably affect visuals.
perlin_modulate.frag: implementation of improved noise, per 2002 SIGGRAPH paper, including "turbulence" summation.
 2014-07-02 13:09:16 -07:00
barnold1953
1af2996cf2 Properly use body orientation for Oculus camera 2014-06-27 09:53:31 -07:00
barnold1953
67c5281205 Fixed CMake for oculus. Gave Oculus its own camera for minimum latency. 2014-06-26 17:10:53 -07:00
barnold1953
61b20b2be0 Working 3.2 Oculus SDK 2014-06-26 09:56:19 -07:00