afa7c1861e
Remove optimize pragma.
2018-03-12 17:52:49 +01:00
98b2fed85f
De-duplicate shader code for encoding and decoding normals to/from gbuffer format.
2018-03-12 17:52:04 +01:00
cf460b13be
De-duplicate sRGB conversion funcs from many shaders
...
and unify on using the version that works on OSX.
Add more logging to shader loading about fallbacks and loading succcess.
Add frag shaders for sharing sRGB and normal encode/decode via GL shader linkage.
2018-03-12 16:24:16 +01:00
b6b2392634
De-duplicate water fog code and modify programs to include the shared object as necessary.
2018-03-09 21:40:46 +00:00
b2d8d63890
Fix warnings from shaders and include EXTRA_CODE_HERE sentinel in places using DEFINE_GL_FRAGCOLOR for consistency.
2018-03-09 20:59:18 +00:00
e7203d9a78
Update windows autobuild to fix ABI mismatch.
2018-03-08 23:45:05 +00:00
84e47f45f6
Get libatmosphere shader into link chain for Adv WL shaders.
...
Point autobuild at fixed libatmosphere.
2018-03-08 22:26:31 +00:00
54ee5bfc05
Remove MSVC-only debug pragma.
2018-03-08 17:46:42 +00:00
89d71617f0
Prepare for validation and storage of legacy haze settings (still pass-through for now).
...
Isolate more use of legacy haze params behind wrapper funcs.
2018-03-08 17:45:43 +00: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
2eb03ae3ef
Merge
2018-03-08 00:05:09 +00:00
096ea05a93
Rename getFogColor from water and sky settings to getWaterFogColor and getSkyFogColor.
2018-03-08 00:04:03 +00:00
6d77503542
Isolate more legacy atmo param use in sky (convert to getLightAttenuation and getLightTransmittance).
...
Optimize sky texture creation.
2018-03-07 23:49:37 +00:00
7b56db31f9
Merge
2018-03-07 11:27:43 -08:00
4235231b5a
Fix for calculating azimuth and angle
2018-03-07 11:24:48 -08:00
0f33f0a6f3
Don't add old atmo params to new settings defaults.
2018-03-07 18:46:40 +00:00
62a0d579b5
Move legacy atmospherics code outside of llvosky (begin teasing apart).
2018-03-07 18:37:09 +00:00
c11c17ed7b
Remove override keyword not working with LL_SINGLETON pattern.
2018-03-06 23:44:09 +00:00
15ce532ccf
Merge
2018-03-06 23:17:02 +00:00
1687719a25
Undo changes to default Sky settings XML.
...
Undo forced validation of objects built from legacy sky settings.
2018-03-06 23:11:53 +00:00
cbe4cac78c
Settings type inventory objects and upload the assests.
2018-03-06 14:58:39 -08:00
82c84027b2
Remove new atmospheric LLSD entries from old settings XML files.
2018-03-06 22:02:18 +00:00
098d1c8ed6
Updated autobuild.xml to use update 3p-libatmosphere package w/ fixes for Release builds.
2018-03-06 20:59:29 +00:00
6e51714419
Isolate atmospherics LLSD conversion code.
...
Fix translateLegacySettings to add an array where an array is expected.
2018-03-06 20:16:49 +00:00
1d522aca8a
Reference updated libatmosphere package.
2018-03-06 19:20:52 +00:00
7ba03ede49
Modify use of linkable shader from libatmosphere.
...
Update to use latest 3p-libatmo build packages.
2018-03-06 17:42:54 +00:00
5517eb3f6f
Remove MSVC pragmas breaking OSX build.
2018-03-03 01:08:58 +00:00
98862a53a7
Fix 16F enum for compat w/ SL gl headers on Mac.
...
Make density profile/layer parsing handle when
LLSD heard you liked arrays so it put an array
in your array.
2018-03-03 00:53:39 +00:00
acdead96cd
Replace ifdefs with comments marking legacy atmo params.
2018-03-02 23:29:28 +00:00
7951001081
Rework density profile validation, eliminate custom LLSettingsSky::settingsValidation
...
in favor of custom validator functor for each profile type (rayleigh, mie, absorption).
2018-03-02 00:58:04 +00:00
f8c76535a3
increment viewer version to 5.1.3
2018-03-01 16:51:48 -05:00
c31263798c
Added tag 5.1.2-release for changeset 2eb917875efd
2018-03-01 16:51:48 -05:00
73caf6f52d
Fix accidental dups/deletes from merge and remove optimize pragmas.
2018-02-28 22:34:43 +00:00
ccdf55f4ab
Merge
2018-02-28 21:57:19 +00:00
aba5777d74
Merge
2018-02-28 21:53:34 +00:00
72270213f5
Add 3p package for adv atmospherics to autobuild.
...
Mark legacy atmospherics code with ifdefs.
Fix up legacy uplift to include new atmospherics settings.
2018-02-28 21:46:30 +00:00
5621fa4853
Fix the return type.
2018-02-27 15:17:18 -08:00
65cffb24e9
More missing 'override's
2018-02-27 13:01:45 -08:00
09a8b0e501
Need to bring the mac in...
2018-02-27 12:27:21 -08:00
edc12edaae
Missed two overrides.
2018-02-27 11:02:37 -08:00
87f5675455
XCode now gets cranky about override (or lack there of)
2018-02-27 10:46:21 -08:00
9f2f2a2874
Replace variadic template with more specific expansion.
2018-02-27 09:38:06 -08:00
e2e63598d4
Merge
2018-02-26 09:29:38 -08:00
b766466b30
Added settings inventory object with subtype
2018-02-26 09:27:14 -08:00
3101793458
Add distinct versions of sky, cloud, and transport shaders so they can be different with adv atmo shaders.
2018-02-26 16:41:39 +00:00
6303ef5763
Redo advanced atmo shader integration with SL.
2018-02-26 16:38:50 +00:00
8ee09ed28b
MAINT-8200 Updated viewer-manager to codeticket version 512801.
...
Built from lindenlab/viewer-manager-maint
2018-02-22 22:19:01 +02:00
6cc4a091b3
Add settings/validations for new advanced atmo settings.
2018-02-22 00:35:24 +00:00
99b82d9449
Atmospherics WIP
...
libatmosphere integrated in indra/llrender/llatmosphere.cpp
Still working on runtime shaders to use libatmosphere precomputed atmospherics textures
2018-02-18 15:52:23 +00:00
5510b589b1
increment viewer version to 5.1.2
2018-02-12 13:33:08 -05:00
Graham Linden graham@lindenlab.com