1e5830f55f
Merge viewer-eep
2019-08-26 21:51:36 +02:00
1f656735d3
SL-11705, SL-11706: New flags in llsettings base for tracking by simulator.
2019-08-26 11:43:45 -07:00
69efafe064
Merge viewer-eep
2019-08-04 16:20:35 +02:00
b507d63566
SL-11621
...
Remove all references to unused shader var global_gamma.
Remove many unused decls for gamma from shaders.
Make post-deferred gamma correction use display_gamma.
Make setting display_gamma use the correct RenderDeferredDisplayGamma setting.
2019-07-23 11:36:22 -07:00
02c3d2fe9b
Merge viewer-eep
2019-07-12 21:08:13 +02:00
8ba159fed9
SL-11151, SL-11504
...
Remove update threshold logic causing hiccups and rework sky updates.
Make deferred water do double transport again to match non-ALM rendering more closely.
2019-06-27 09:10:38 -07:00
ccea567c08
Merge viewer-eep
2019-06-19 20:20:14 +02:00
ee229e0f0b
Merged in maxim_productengine/viewer-eep (pull request #406 )
...
SL-11279 and SL-11273 fixes
2019-05-28 16:23:56 +00:00
fdf0d49614
SL-11279 [EEP] Automatically toggle the beacon checkboxes
2019-05-28 18:06:08 +03:00
6aa393f7f5
SL-11287 [EEP] Importing certain legacy windlights give upload error
2019-05-24 21:17:41 +03:00
82c68aca0d
Merge viewer-eep
2019-04-17 21:12:55 +02:00
a39bc2d28c
Quickprefs: Improved day cycle slider
...
Added sliders for sun, but highly buggy
2019-04-05 03:24:24 -07:00
e24237b6af
SL-10189, SL-10880: Mark the day instance so that it does not try to reanimate a day cycle when setting a fixed sky. Add new floater for setting the shared environment to local and allowing modifications.
2019-04-03 14:52:59 -07:00
44fe6e7c5f
More changing doubles to floats to make VS happy.
2019-03-31 17:41:12 -07:00
58582fb621
SL-10672 Fixed Sun transitioned to image from previous keyframe
2019-03-15 14:44:52 +02:00
d8eff424a5
SL-10664
2019-03-02 07:17:46 -08:00
2401712d10
SL-9660: Next pass cleanup. Removed and downgraded a number of logs. Removed refs to LAPAS. Better sync with legacy regions.
2019-02-20 15:20:30 -08:00
2108d5ee38
SL-10464: A couple last fixes dealing with region crossings. Environment Experiences are still stripped when changing regions. Even if destination region participates in the experience.
2019-02-14 16:19:39 -08:00
98d6d1969b
SL-10464: Request experience status on parcel change, strip if no longer allowed.
2019-02-13 17:01:17 -08:00
5d9915243b
SL-10406, SL-10464: Remove experience injections and destroy push environment when finished.
2019-02-12 14:44:37 -08:00
d5aba39882
Merge
2019-02-11 16:51:06 -08:00
2a740309d0
SL-10406, SL-10464: Experience injections now have their own sub class of day instance (DayInjection) Montitors underlying environments and switches the sources as needed.
2019-02-11 16:50:15 -08:00
a9dd57c351
SL-10456 FIXED [EEP] Viewer continues to show last EEP environment after teleporting from EEP to non-EEP region
2019-02-07 13:06:16 +02:00
ce40f88ecb
Better calculation of time remaining in span for track animator (from SL-10465)
2019-02-05 15:09:32 -08:00
fcf25b690f
SL-10364 FIXED Parcel Sky Altitudes not set correct when opening About Land -> Environment for the first time upon region arrival
2019-02-01 18:33:55 +02:00
c7e02b0835
SL-9925: Viewer now shows an error message if import from legacy windlight fails.
2019-01-30 14:36:46 -08:00
211ad31dc2
I hope this is the last one.
2019-01-23 14:44:44 -08:00
a7570ae344
More specifics OSX compile.
2019-01-23 14:12:29 -08:00
618af868db
More OSX template
2019-01-23 11:45:07 -08:00
f6b27a4a0c
More OSX pickyness.
2019-01-23 10:54:46 -08:00
a5392bb8e8
Found the issue.
2019-01-23 10:10:19 -08:00
5ac7441250
Mac is a bit picky
2019-01-23 09:13:06 -08:00
b465a5bf6f
SL-10387: Inject individual settings. Still freezes parcel/region settings.
2019-01-22 16:53:14 -08:00
f42ac5b94e
SL-10387: Move settings intjection to a setting object (and out of llEnvironment)
2019-01-22 09:24:11 -08:00
00d8caa359
SL-10279 Finalize drag and drop support
2019-01-10 22:11:11 +02:00
1871f03d12
SL-10067, SL-9917: Updated UUIDs for sun and moon textures and to corrected known skies.
2019-01-07 17:00:01 -08:00
8227a0b270
SL-10279: Rework the environment pannel. Still in progress.
2018-12-21 15:30:57 -08:00
634910f685
SL-10241: Group roll for changing environment.
2018-12-14 14:33:42 -08:00
9475a593a1
Merge
2018-12-12 14:07:56 -08:00
70ac8d9fa7
SL-10238: Viewer spport for push notifications from the simulator contaiting partial groups of settings. Blend these settings into the current environment.
2018-12-12 14:07:23 -08:00
d4fe87cca4
SL-10091 Prevent info floater from re-requesting data when not open
2018-12-07 16:24:47 +02:00
76071d4fe8
SL-10091 EEP Filter out dupplicate refreshes and callbacks
2018-12-05 22:13:49 +02:00
d66012f85e
SL-9716 [EEP] "Use Shared Environment" does not enable when applying an environment to a parcel or region
2018-11-30 17:48:08 +02:00
29130c5483
SL-10093: Client code to support experiences changing an environment. Handle generic messages with "commands" to be executed.
2018-11-20 10:59:38 -08:00
bda785e8b1
SL-10033 [EEP] Use fast environment transition for teleports
2018-11-12 20:11:00 +02:00
8d333a0176
OSX Pedantics
2018-11-02 14:32:42 -07:00
51772e6083
SL-9886: Viewer send and receive new day_name(s) information in the environment protocol for viewer specified names on individual tracks.
2018-11-02 09:17:19 -07:00
659d14504f
SL-1476 EEP Better shader resets and transitions
2018-10-29 18:18:20 +02:00
8740368b0b
SL-9922 FIXED [EEP] The Day environment settings are changed when open the Water setting in ‘Fixed Environment’ editor
2018-10-23 17:52:00 +03:00
44cdf00bff
SL-1476 EEP parcel transition inconsistencies
2018-10-17 21:17:00 +03:00
6cdcc7fe2e
SL-9889: New reconverted default assets
2018-10-17 12:16:24 -07:00
fdfb60ecb1
Merge
2018-10-01 16:12:48 -07:00
6e7d794b01
MAINT-9738: Wire the altitude slider to the protocol and send new altitudes to simulator.
2018-10-01 16:10:19 -07:00
50ec228b02
SL-9660 EEP Remove residual code (LLFloaterEditDayCycle and LLEnvironment::UserPrefs)
2018-10-01 16:45:19 +03:00
70c18ba14b
SL-9736: 0.0 is no motion for cloud scroll.
2018-09-24 14:55:21 -07:00
1bd1a10109
SL-1061 EEP prevent invalid settings from getting into environment
2018-09-21 18:33:07 +03:00
cae08e0096
SL-9661: Trigger an event when the settings on a parcel or region are changed. Environment panel montiors this event and updates itself when it occurs.
2018-09-19 15:31:23 -07:00
e53d35f4e8
SL-1258 FIXED [EEP] Custom cloud, sun & moon textures don't update when you apply a Windlight sky locally.
2018-09-18 17:38:06 +03:00
7c6ac0740d
SL-1556: Correctly identify when the selected parcel is in another region and display a message about cross region environments.
2018-09-14 09:52:28 -07:00
3988bc8d85
SL-9653 EEP Blender abruptly jumps from correct value to initial
2018-09-14 18:27:31 +03:00
4bd2b8b98b
Fix createDensityProfileLayer dropping passed in values.
...
Enable sky density panel to update advanced atmo precomputed textures.
Take wild stab at appropriate ranges for density parameters in edit panel UI.
Clean up debug-only code that isn't necessary anymore.
Point autobuild at latest version of libatmosphere package.
2018-09-07 17:24:29 +01:00
451ab80ca6
Fix tex format mismatch between what libatmosphere was generating and what we were claiming to use in rendering.
...
First pass at sky shader using libatmosphere sky radiance lookup.
Add atmo density controls to ext daycycle floater tabs.
2018-09-06 22:50:26 +01:00
3b10414c63
Adding optional flags to settings objects.
2018-08-31 11:47:18 -07:00
100a58778b
MAINT-8944 Fix missed mNextFooTextureId updates when jumping between keyframes by forcing mReplaced when sky is replaced.
2018-08-30 00:16:44 +01:00
477c66c890
Lest couple nullptr checks and disable the controls on legacy regions.
2018-08-21 11:37:59 -07:00
b2b3c36bda
Didn't get a fix from last week, and divide by zeros are bad.
2018-08-20 16:26:54 -07:00
8fc3956a5e
Use the EnvironmentInfo structure to pass information back from legacy environment requests.
2018-08-20 14:59:02 -07:00
1e3ee272ae
Add an apparent time of day. More OSX complaints.
2018-08-17 15:37:10 -07:00
1716129fd2
MAINT-8826, MAINT-8990, MAINT-9002, MAINT-7703: Rework for environment pannels in Region/Estate and Parcel. Enable/disable by permission. Edit the correct environment. Dirty flags for changes. Estate owner disallow switch.
2018-08-17 12:35:42 -07:00
7f25bef9c4
MAINT-7703: Estate level switch turns of parcel environments.
2018-08-16 16:27:53 -07:00
68158f0340
Pass call backs into parcel and region change methods.
2018-08-16 09:43:54 -07:00
eadf0b9101
MAINT-8990, MAINT-9002: First pass rework on environment panels, region/parcel
2018-08-15 13:35:53 -07:00
881ee670d9
Fix for mac build
...
MAINT-8870, MAINT-8871: When legacy windlight fails load the default day cycle asset and use that.
2018-08-08 15:41:28 -07:00
76206db45e
remove some pragmas that snuck in
2018-08-03 22:21:43 -07:00
7e8c849a15
Fix name change from clearTrack to clealCycleTrack
2018-08-03 16:57:04 -07:00
b50d546d5f
MAINT-7699: More robust cap protocol, better support for delete and support for individual tracks, support for setting environment by asset id in the cap
...
MAINT-7703: Initial flags sent in message protocol for parcels
2018-08-03 16:13:22 -07:00
9391744164
Add default and wellknown asset ids.
2018-07-16 16:49:49 -07:00
294793b9a9
MAINT-8821: Tighten up floater. Allow apply from gear menu.
2018-07-10 15:15:47 -07:00
438d977147
Adding pause clouds to menu, and throttling expensive visual update on change.
2018-06-25 16:02:51 -07:00
d25f801814
Fix cloud scroll adjustment in the editor, pause clouds method, set sun disk UUID to null.
2018-06-25 14:44:09 -07:00
1f9b8f59af
Don't recalculate lighting every frame. Fix altitude transitions. On track switch ignore time threshold on blender.
2018-06-19 16:46:12 -07:00
e2adba65de
Merge
2018-06-12 12:56:53 -07:00
2add1e7abd
Time threshold on timer based updates. Editor can replace frame with one from inventory. Extra check on adding a frame type.
2018-06-12 12:39:59 -07:00
67ab0084f8
Fix env panel forward action.
...
Make env panel update environment when jumping frame to frame.
Add separate funcs for sun/moon vectors in various coord systems.
Make haze glow only pay attention to sun (i.e. fix sun glow when moon is near horizon in daytime).
2018-06-12 18:42:07 +01:00
97da85de0b
remove legacy environmental edit floater and some lingering transition functions. Change floater environment switch behavior.
2018-06-11 11:43:50 -07:00
8365945f8a
Settings inventory picker.
2018-06-08 16:40:01 -07:00
caa5bd3cb9
Fix legacy haze validation returning warnings as errors.
...
Add assert that calculated spans are > 0 to avoid div by 0 NaNs.
Make span calc return 1.0 for case where begin == end.
Fix order of ops in LLTrackBlenderLoopingTime ctor causing skies to be init'd with water instances.
2018-06-06 19:48:12 +01:00
610a793aa8
EOL in llsetingssky.cpp and llrender.cpp. const on ptr_t & in llenvironment
2018-06-05 11:19:22 -07:00
11a7c22b72
Merge
2018-06-05 16:39:11 +01:00
b06803225b
Reconnect apply to region and parcel reconnected to interface.
2018-06-04 16:50:13 -07:00
cd8f0da2d1
Fix use of new typedefs in inventory settings code in llenvironment.
2018-06-04 23:12:21 +01:00
7136956b90
Use more typedefs to simplify sync between viewer and sim env settings code.
2018-06-02 23:28:48 +01:00
7d6743f42d
Merge
2018-06-02 00:31:25 +01:00
2a613d7363
Rework preset loading and context menu from inventory.
2018-06-01 16:24:36 -07:00
8cfdc07e79
Code cleanup and move to using typedefs of S64Seconds/F64Seconds for ease in sync w/ sim side which has not llunits types.
2018-06-01 23:32:30 +01:00
8dd8501386
Fix mis-merge of LLSettingsBase and remove optimize pragmas.
2018-06-01 15:50:25 +01:00
37e8fd20c3
Merge to 5.1.6
2018-06-01 15:34:21 +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
460d944b08
More with min
2018-05-31 11:15:17 -07:00
9831087fb6
Use llmin rather than std::min
2018-05-31 10:36:10 -07:00
acaf57100e
switch track based on altitudes sent from region.
2018-05-24 17:09:01 -07:00
fa4ac065cb
Enable sky changes with altitude.
2018-05-24 13:11:33 -07:00
439273c9c1
Merge
2018-05-23 01:16:12 +01:00
b29aa01056
Enable save/load/import for day edit.
2018-05-22 16:54:04 -07:00
13536bb273
Remove some obsolete sky funcs.
...
Remove Matrix3/4 funcs using LLQuat 4-float init incorrectly
(they are redundant to angle/axis versions anyway).
Fix up tests referring to removed funcs above.
2018-05-22 21:42:54 +01:00
044b80e4e1
Manual blender for use in day editing dialog.
2018-05-22 10:49:55 -07: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
242fe06109
Merge
2018-05-18 00:27:39 +01:00
430c5cd235
Self contained looping track blender. Will blend over time across an entire track in a day cycle.
2018-05-17 16:16:33 -07:00
4d4a7dfb9f
Merge and disable new sky render.
2018-05-16 23:45:56 +01:00
4975bd03c1
Splitting the blender up to support manual positioning as well as time. Phase1
2018-05-16 13:42:48 -07:00
c238fa3ac5
Add save/update functionality hooks to fixed editor.
2018-05-08 16:57:14 -07:00
3e33fc9130
Inventory context menus and increment attrib for settings panels.
2018-05-03 14:59:29 -07:00
438609699b
New water settings dialog.
2018-04-30 16:37:08 -07:00
cf0e4f79f5
Adding fixed water edit dialog.
2018-04-27 17:12:13 -07:00
79e4a8c28a
Fix up atmospheric helpers and transport shader for adv atmo path.
...
Basic hook-up of sky settings to llatmosphere model.
Moved mie aniso to be a top-level setting instead of a per-mie-layer setting.
2018-03-14 00:11:19 +01:00
057dda6afe
Fix storing legacy haze parameters in inner map by fixing
...
parameter update to not expect them at top level of LLSD for sky settings.
2018-03-13 17:21:10 +01: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
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
e9edd37cdb
Update a couple constructs
2018-02-09 10:10:13 -08:00
7838189843
boost->std & same level interp
2018-02-06 17:27:56 -08:00
f07e5ee2a4
Transitions between skys. 1
2018-02-05 15:12:23 -08:00
0bf50e2f8c
Cleanup on daycyle selection and stack. Move blenders into environment.
...
(Transition bronken, instant only. Shaddows moved based on region, not parcel)
2018-01-30 16:42:34 -08:00
fbd8a98300
Selects correct day cycle. Fix an error validating legacy daycycles.
2018-01-25 17:21:25 -08:00
b4af7fe9d0
Settins failure fix.
2018-01-24 17:30:56 -08:00
1b8c2b5ebb
MAINT-8052: Initial support for new EEP cap
2018-01-23 08:54:34 -08:00
a0c228d842
MAINT-8052: Report if the returned environment is the default.
2018-01-16 11:03:26 -08:00
8211f57205
MAINT-7699: Deliver new settings to viewer via cap
2018-01-08 15:10:25 -08:00
d7dd10b88b
Split for viewer/simhost sync LLSD with simhost.
2017-11-30 11:32:22 -08:00
b37eb2642f
Remove delete preset dialog, Initial settings for selection level (Region/Parcel/Local)
2017-11-10 16:17:25 -08:00
fe846ec994
Day cycles and animated sky/water blending.
2017-11-08 16:02:20 -08:00
61e6632a71
Initial day cycle impl.
2017-11-03 11:28:08 -07:00
2161788711
Day cycles start
2017-10-20 16:37:03 -07:00
cc22ffc6d7
Watter settings active and start of new joystick button type.
2017-10-13 17:17:49 -07:00
23916be3da
Moon is showing, sun still not working.
2017-09-29 16:46:39 -07:00
52b0d4173c
No longer 'goth windlight only', sky parameters passed from settings object.
2017-09-27 09:36:26 -07:00
0d414c1fb5
Clouds still funky but better.
2017-09-26 09:19:20 -07:00
150fba7c5c
Still not working. Black Sky.
2017-09-21 15:58:13 -07:00
Ansariel