46481b25cd
line endings fix
2018-09-24 17:44:32 +03:00
741d283c0e
SL-9696
...
Remove squashfarclip hackery to make horizon lines in deferred match non-ALM rendering to avoid seam when rendering deferred.
2018-09-19 18:47:39 +01:00
862b8f72dc
SL-9685
...
Make sure legacy opaque water texture ID is assigned so it can be bound for lowest graphics use.
2018-09-18 20:31:26 +01:00
d452fd77ef
MAINT-9007
...
fix management of water plane and fog Ks shader uniforms
2018-08-30 21:37:10 +01:00
b86e899e7e
MAINT-9006
...
Make perspective projection consistent between ALM and non-ALM when drawing water (horizon matches).
Make perspective projection consistent between ALM and non-ALM when drawing heavenly bodies (sun disc position matches).
Make gamma correction of sun disc tex consistent between ALM and non-ALM rendering.
2018-08-23 00:53:11 +01:00
26514a0c80
Remove MSVC optimize pragma.
2018-08-14 21:13:11 +01:00
8e9d27fdcd
MAINT-8884 Re-arrange water norm/reflection tex binding to be less incorrect.
2018-08-14 21:10:54 +01:00
bc82509ccd
fix init on array
2018-07-27 12:20:05 -07:00
ed8082a94b
Pausing the clouds will now also stop the waves.
2018-07-27 10:46:32 -07:00
71a0d3e959
Fix OSX bug from OLD_SELECT GLSL work-around define not being used with automatically linked feature shaders.
...
Add LL_RELEASE_FOR_DOWNLOAD ifdef around launcher nag.
Fix OSX 10.14 SDK compile issue from unused var in scroll list.
2018-06-26 23:31:03 +01:00
34865c4bb5
Mods to hook up water settings to water normals for rendering with support for current to next blending.
...
Modify LLSettingsFoo::buildDefaultFoo to use a static and avoid re-validation of default sky/water/daycycle settings.
Remove all references to gSun/MoonTextureId globals (they should come from sky settings now).
2018-06-13 00:51:39 +01:00
a0598b1265
Fix water fog consolidation in underwater shaders.
...
Add plumbing facilities to allow current and next moon textures to be passed to moon shader.
Modify moon shader to blend between current and next moon textures by blend factor.
2018-06-11 17:46:16 +01:00
64302d3000
Modify use of sky settings, reduce complexity, and name funcs to indicate coord systems in use.
...
Fix class2 softenLightF shader.
2018-06-01 00:18:36 +01:00
ae5f24eb4d
Make rendering of sun / moon work with both in the sky (test visibility independently).
2018-05-21 19:10:32 +01:00
8082cb8668
Make nighttime elev constant _SIN, since it uses a sin value.
...
Put that constant in sky settings and eliminate dups.
Fix up logic around when to use heavenly bodies (fix broken moon in basic sky).
Remove unnecessary clip to horizon.
Put in temp code to ena/dis sun/moon based on LLEnvironment::getIsDaytime().
2018-05-18 23:14:56 +01:00
3116416fcb
Le Merge
2018-05-01 00:10:11 +01:00
087e210825
Add LLVoSky wrapper for current env sky light direction.
...
Make LLVo classes use LLVoSky wrappers instead of direct access.
Isolate more legacy haze param usage w/in settings.
2018-03-08 16:09:29 +00:00
096ea05a93
Rename getFogColor from water and sky settings to getWaterFogColor and getSkyFogColor.
2018-03-08 00:04:03 +00:00
cc22ffc6d7
Watter settings active and start of new joystick button type.
2017-10-13 17:17:49 -07:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
59628d6f85
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-10-01 14:28:39 -07:00
2a03e8f9fb
MAINT-3172 fix rendering regressions from release mergedown
2013-09-20 16:44:39 -07:00
95e34d86b9
The unbearable lightness of being norspec
2013-09-18 18:24:16 -07:00
cbe397ad13
changed fast timer over to using macro
...
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
5efee00a83
NORSPEC-291 WIP added underwater deferred program and more reflection pass work
2013-07-12 13:01:31 -07:00
326e20b0e5
NORSPEC-291 WIP materials underwater w and wo alpha, water fog color broken, no refl, no water dis
2013-07-10 09:47:46 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
b42b789723
Merge in downstream code (chui fixes, materials)
2013-04-11 16:18:34 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
5a436e46f6
SH-3959 WIP - pass information about type of fetched image - server bake, host bake, map tile, etc - down the chain so LLTextureFetchWorker can adjust behavior as needed
2013-03-08 17:07:17 -05:00
609ed855e1
MAINT-2371 More optimizations.
...
Reviewed by Graham
2013-03-04 18:01:42 -06:00
0bb0bd514b
SH-3499 WIP Ensure asset stats output is correct
...
Finished making LLUnit implicitly convertible to/from scalar integer values
cleaned up test code
2012-11-08 23:42:18 -08:00
1f6e20c5bb
Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTexture
2012-09-04 17:43:08 +00:00
2322c57b4d
SH-2545 Fix for transparent water option doing nothing when shaders are enabled.
2011-10-11 14:55:33 -05:00
54ba56dbe9
SH-2244 changes to run in a core context on AMD hardware without generating deprecation or performance warnings
2011-09-26 18:31:55 -05:00
f49e7014ca
SH-2244 Fix for crash when transparent water disabled (silently ignore setting when basic shaders enabled)
2011-09-24 23:29:38 -05:00
7c95af74f1
SH-2243 work in progress -- application side matrix stack management
2011-09-14 16:30:45 -05:00
14f6bbadef
SH-2242 Work in progress migrating to glVertexAttrib everywhere
2011-08-08 15:29:23 -05:00
5a0547cdc3
STORM-1126 merge
2011-03-31 18:46:56 +03:00
61daa3133a
automated merge from viewer-development-shining
2010-11-18 13:23:01 -05:00
ab42f31608
SH-410 Opaque Water Project version 2.0
...
First implementation with UI changes.
2010-11-05 14:30:09 -04:00
179e9e37ec
merge from viewer-development.
2010-10-27 11:03:39 +01:00
393c819477
VWR-21967 There's lots of ::renderForSelect() code that we don't need any more.
...
VWR-22088 Remove underlying ::renderForSelect() code (render-pipeline)
2010-10-10 15:25:11 +01:00
c7b6ebaf76
Port of SNOW-643 : Water flicker at high altitude. This doesn't fix the low altitude flicker though (STORM-306)
2010-09-30 22:57:05 -07:00
2fb337bc12
STORM-1126 WIP Windlight Estate Settings port from 1.23: second pass at getting windlight ported to V2.
...
Lots of cleanup in the floater classes. Not sure every decision was correct
but it compiles now. Doesn't link yet.
(resubmitted by Vadim ProductEngine)
2010-09-30 23:21:23 -04:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
AndreyL ProductEngine