You can subscribe to this list here.
2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(28) |
Nov
(193) |
Dec
(199) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2011 |
Jan
(214) |
Feb
(133) |
Mar
(81) |
Apr
(67) |
May
(101) |
Jun
(141) |
Jul
(134) |
Aug
(168) |
Sep
(153) |
Oct
(200) |
Nov
(137) |
Dec
(185) |
2012 |
Jan
(168) |
Feb
(153) |
Mar
(155) |
Apr
(183) |
May
(145) |
Jun
(166) |
Jul
(264) |
Aug
(285) |
Sep
(247) |
Oct
(108) |
Nov
(224) |
Dec
(193) |
2013 |
Jan
(173) |
Feb
(161) |
Mar
(205) |
Apr
(86) |
May
(81) |
Jun
(115) |
Jul
(115) |
Aug
(89) |
Sep
(83) |
Oct
(155) |
Nov
(123) |
Dec
(111) |
2014 |
Jan
(152) |
Feb
(180) |
Mar
(184) |
Apr
(106) |
May
(106) |
Jun
(144) |
Jul
(95) |
Aug
(109) |
Sep
(75) |
Oct
(75) |
Nov
(90) |
Dec
(64) |
2015 |
Jan
(59) |
Feb
(114) |
Mar
(64) |
Apr
(73) |
May
(113) |
Jun
(129) |
Jul
(127) |
Aug
(150) |
Sep
(127) |
Oct
(77) |
Nov
(178) |
Dec
(98) |
2016 |
Jan
(154) |
Feb
(151) |
Mar
(128) |
Apr
(62) |
May
(185) |
Jun
(120) |
Jul
(105) |
Aug
(91) |
Sep
(90) |
Oct
(165) |
Nov
(299) |
Dec
(203) |
2017 |
Jan
(184) |
Feb
(187) |
Mar
(209) |
Apr
(142) |
May
(189) |
Jun
(96) |
Jul
(54) |
Aug
(79) |
Sep
(151) |
Oct
(77) |
Nov
(142) |
Dec
(142) |
2018 |
Jan
(194) |
Feb
(175) |
Mar
(111) |
Apr
(85) |
May
(114) |
Jun
(205) |
Jul
(159) |
Aug
(102) |
Sep
(238) |
Oct
(179) |
Nov
(92) |
Dec
(76) |
2019 |
Jan
(199) |
Feb
(85) |
Mar
(100) |
Apr
(118) |
May
(80) |
Jun
(69) |
Jul
(91) |
Aug
(91) |
Sep
(137) |
Oct
(59) |
Nov
(82) |
Dec
(70) |
2020 |
Jan
(56) |
Feb
(70) |
Mar
(258) |
Apr
(385) |
May
(249) |
Jun
(344) |
Jul
(169) |
Aug
(362) |
Sep
(185) |
Oct
(416) |
Nov
(465) |
Dec
(267) |
2021 |
Jan
(279) |
Feb
(312) |
Mar
(378) |
Apr
(230) |
May
(150) |
Jun
(229) |
Jul
(358) |
Aug
(184) |
Sep
(155) |
Oct
(67) |
Nov
(98) |
Dec
(240) |
2022 |
Jan
(231) |
Feb
(215) |
Mar
(206) |
Apr
(144) |
May
(71) |
Jun
(18) |
Jul
(27) |
Aug
(66) |
Sep
(95) |
Oct
(65) |
Nov
(95) |
Dec
(76) |
2023 |
Jan
(149) |
Feb
(70) |
Mar
(84) |
Apr
(116) |
May
(218) |
Jun
(22) |
Jul
(15) |
Aug
(33) |
Sep
(93) |
Oct
(65) |
Nov
(43) |
Dec
(51) |
2024 |
Jan
(87) |
Feb
(84) |
Mar
(64) |
Apr
(33) |
May
(27) |
Jun
(107) |
Jul
(12) |
Aug
(16) |
Sep
(55) |
Oct
|
Nov
|
Dec
|
From: <fli...@li...> - 2024-09-24 00:42:48
|
fgarlin pushed a commit to branch release/2024.1 in repository fgdata. The following commit(s) were added to refs/heads/release/2024.1 by this push: new a4c74cbd6 Fix transparency issues related to model-transparent a4c74cbd6 is described below SF URL: http://sourceforge.net/p/flightgear/fgdata/ci/a4c74cbd68c255f1b09e620714d2c6d447d659ca/ Commit: a4c74cbd68c255f1b09e620714d2c6d447d659ca Author: Fernando García Liñán Committer: Fernando García Liñán AuthorDate: Tue Sep 24 02:42:06 2024 +0200 Fix transparency issues related to model-transparent Revert back to the version we had in 2020.3. --- Effects/model-transparent.eff | 62 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) diff --git a/Effects/model-transparent.eff b/Effects/model-transparent.eff index e6f2d61ed..20e8db30a 100644 --- a/Effects/model-transparent.eff +++ b/Effects/model-transparent.eff @@ -1,5 +1,65 @@ <?xml version="1.0" encoding="utf-8"?> <PropertyList> <name>Effects/model-transparent</name> - <inherits-from>Effects/model-default</inherits-from> + + <parameters> + <texture n="0"> + <type>white</type> + </texture> + <vertex-program-two-side type="bool">false</vertex-program-two-side> + <material> + <color-mode-uniform>1</color-mode-uniform> + <!-- DIFFUSE --> + </material> + <!-- BEGIN fog include --> + <visibility><use>/environment/ground-visibility-m</use></visibility> + <avisibility><use>/environment/visibility-m</use></avisibility> + <lthickness><use>/environment/ground-haze-thickness-m</use></lthickness> + <scattering><use>/rendering/scene/scattering</use></scattering> + <terminator><use>/environment/terminator-relative-position-m</use></terminator> + <fogtype><use>/sim/rendering/shaders/skydome</use></fogtype> + <!-- END fog include --> + </parameters> + + <technique n="11"> + <pass> + <lighting>true</lighting> + <depth> + <write-mask type="bool">false</write-mask> + </depth> + <material> + <active><use>material/active</use></active> + <ambient><use>material/ambient</use></ambient> + <diffuse><use>material/diffuse</use></diffuse> + <specular><use>material/specular</use></specular> + <emissive><use>material/emissive</use></emissive> + <shininess><use>material/shininess</use></shininess> + <color-mode><use>material/color-mode</use></color-mode> + </material> + <blend> + <active><use>blend/active</use></active> + <source><use>blend/source</use></source> + <destination><use>blend/destination</use></destination> + </blend> + <shade-model><use>shade-model</use></shade-model> + <cull-face><use>cull-face</use></cull-face> + <render-bin> + <bin-number>111</bin-number> + <bin-name>DepthSortedBin</bin-name> + </render-bin> + <texture-unit> + <unit>0</unit> + <active><use>texture[0]/active</use></active> + <type><use>texture[0]/type</use></type> + <image><use>texture[0]/image</use></image> + <filter><use>texture[0]/filter</use></filter> + <wrap-s><use>texture[0]/wrap-s</use></wrap-s> + <wrap-t><use>texture[0]/wrap-t</use></wrap-t> + <environment> + <mode>modulate</mode> + </environment> + </texture-unit> + </pass> + </technique> + </PropertyList> |
From: <fli...@li...> - 2024-09-23 23:11:50
|
fgarlin pushed a commit to branch release/2024.1 in repository fgdata. The following commit(s) were added to refs/heads/release/2024.1 by this push: new a08e1f630 Remove HDR a08e1f630 is described below SF URL: http://sourceforge.net/p/flightgear/fgdata/ci/a08e1f6304c3171802b8f63b875514023c2669e5/ Commit: a08e1f6304c3171802b8f63b875514023c2669e5 Author: Fernando García Liñán Committer: Fernando García Liñán AuthorDate: Tue Sep 24 01:00:48 2024 +0200 Remove HDR --- Compositor/HDR/ao-buffer.xml | 13 - Compositor/HDR/bloom-buffer.xml | 12 - Compositor/HDR/bloom-downsample-rest.xml | 6 - Compositor/HDR/bloom-upsample.xml | 6 - Compositor/HDR/csm-pass.xml | 14 - Compositor/HDR/debug-pass.xml | 9 - Compositor/HDR/env-capture-pass.xml | 27 - Compositor/HDR/env-prefilter-pass.xml | 12 - Compositor/HDR/hdr.xml | 1452 --------------------- Compositor/HDR/screen-buffer.xml | 9 - Compositor/HDR/smaa-pass.xml | 11 - Effects/HDR/atmos-aerial-perspective.eff | 123 -- Effects/HDR/atmos-sky-view.eff | 120 -- Effects/HDR/atmos-transmittance.eff | 115 -- Effects/HDR/bloom-downsample-first.eff | 8 - Effects/HDR/bloom-downsample-rest.eff | 8 - Effects/HDR/bloom-downsample.eff | 23 - Effects/HDR/bloom-upsample.eff | 30 - Effects/HDR/copy-prev-luminance.eff | 17 - Effects/HDR/debug-aerial-perspective.eff | 37 - Effects/HDR/debug-histogram.eff | 24 - Effects/HDR/envmap-brdf.eff | 14 - Effects/HDR/envmap-copy.eff | 17 - Effects/HDR/envmap-prefilter.eff | 39 - Effects/HDR/envmap-prefilter1.eff | 9 - Effects/HDR/envmap-prefilter2.eff | 9 - Effects/HDR/envmap-prefilter3.eff | 9 - Effects/HDR/envmap-prefilter4.eff | 9 - Effects/HDR/fxaa.eff | 17 - Effects/HDR/gbuffer-debug-clear.eff | 12 - Effects/HDR/gbuffer-debug-color.eff | 17 - Effects/HDR/gbuffer-debug-depth.eff | 17 - Effects/HDR/gbuffer-debug-matid.eff | 17 - Effects/HDR/gbuffer-debug-normal.eff | 17 - Effects/HDR/gbuffer-debug-orm.eff | 27 - Effects/HDR/gtao-denoiser.eff | 17 - Effects/HDR/gtao.eff | 40 - Effects/HDR/histogram-aggregate.eff | 29 - Effects/HDR/histogram-bin.eff | 38 - Effects/HDR/histogram-clear.eff | 26 - Effects/HDR/histogram-column.eff | 29 - Effects/HDR/histogram-compute.eff | 30 - Effects/HDR/histogram-luminance.eff | 23 - Effects/HDR/postprocess.eff | 70 - Effects/HDR/shading-opaque.eff | 181 --- Effects/HDR/smaa-blending-weight-calculation.eff | 71 - Effects/HDR/smaa-edge-detection.eff | 22 - Effects/HDR/smaa-neighborhood-blending.eff | 22 - Effects/HDR/trivial.eff | 17 - Effects/HDR/water-shading.eff | 74 -- Effects/building.eff | 30 - Effects/chrome.eff | 44 - Effects/cloud-impostor.eff | 212 --- Effects/cloud-noctilucent.eff | 211 --- Effects/cloud-static.eff | 212 --- Effects/cloud.eff | 248 ---- Effects/lfeat.eff | 40 - Effects/model-combined-transparent.eff | 168 --- Effects/model-combined.eff | 82 -- Effects/model-default.eff | 69 - Effects/model-pbr-transparent.eff | 236 ---- Effects/model-pbr.eff | 161 --- Effects/model-transparent.eff | 168 --- Effects/model-wingflex.eff | 82 -- Effects/moon.eff | 107 -- Effects/runway.eff | 63 - Effects/schemes.xml | 18 - Effects/skydome.eff | 96 -- Effects/stars.eff | 58 - Effects/terrain-default.eff | 195 --- Effects/text-default.eff | 131 -- Effects/tree.eff | 79 -- Effects/water.eff | 87 -- Effects/ws30.eff | 162 --- Environment/environment.xml | 9 - Nasal/hdr.nas | 289 ---- Shaders/Canvas/image.frag | 17 - Shaders/Canvas/image.vert | 19 - Shaders/Canvas/text.frag | 226 ---- Shaders/Canvas/text.vert | 19 - Shaders/HDR/3dcloud.frag | 24 - Shaders/HDR/3dcloud.vert | 24 - Shaders/HDR/3dcloud_common.frag | 65 - Shaders/HDR/3dcloud_common.vert | 109 -- Shaders/HDR/3dcloud_envmap.frag | 12 - Shaders/HDR/3dcloud_envmap.vert | 16 - Shaders/HDR/aces.glsl | 28 - Shaders/HDR/aerial_perspective.glsl | 52 - Shaders/HDR/aerial_perspective_envmap.glsl | 51 - Shaders/HDR/atmos.glsl | 343 ----- Shaders/HDR/atmos_aerial_perspective.frag | 75 -- Shaders/HDR/atmos_sky_view.frag | 58 - Shaders/HDR/atmos_spectral.glsl | 22 - Shaders/HDR/atmos_transmittance.frag | 58 - Shaders/HDR/bloom_downsample.frag | 87 -- Shaders/HDR/bloom_upsample.frag | 52 - Shaders/HDR/cloud_static.vert | 24 - Shaders/HDR/cloud_static_common.vert | 67 - Shaders/HDR/cloud_static_envmap.vert | 16 - Shaders/HDR/clustered.glsl | 163 --- Shaders/HDR/color.glsl | 51 - Shaders/HDR/copy_prev_luminance.frag | 10 - Shaders/HDR/debug_aerial_perspective.frag | 40 - Shaders/HDR/debug_gbuffer_clear.frag | 14 - Shaders/HDR/debug_gbuffer_color.frag | 12 - Shaders/HDR/debug_gbuffer_depth.frag | 14 - Shaders/HDR/debug_gbuffer_matid.frag | 12 - Shaders/HDR/debug_gbuffer_normal.frag | 12 - Shaders/HDR/debug_gbuffer_orm.frag | 17 - Shaders/HDR/debug_histogram.frag | 36 - Shaders/HDR/envmap.vert | 25 - Shaders/HDR/envmap_brdf.frag | 73 -- Shaders/HDR/envmap_copy.frag | 27 - Shaders/HDR/envmap_prefilter.frag | 99 -- Shaders/HDR/exposure.glsl | 37 - Shaders/HDR/fxaa.frag | 57 - Shaders/HDR/fxaa.vert | 20 - Shaders/HDR/gbuffer_pack.glsl | 27 - Shaders/HDR/gbuffer_unpack.glsl | 34 - Shaders/HDR/gtao.frag | 144 -- Shaders/HDR/gtao.glsl | 23 - Shaders/HDR/gtao_denoiser.frag | 35 - Shaders/HDR/hammersley.glsl | 16 - Shaders/HDR/histogram.comp | 75 -- Shaders/HDR/histogram.glsl | 24 - Shaders/HDR/histogram_aggregate.frag | 20 - Shaders/HDR/histogram_bin.frag | 22 - Shaders/HDR/histogram_clear.frag | 8 - Shaders/HDR/histogram_column.frag | 24 - Shaders/HDR/histogram_luminance.frag | 43 - Shaders/HDR/ibl.glsl | 75 -- Shaders/HDR/logarithmic_depth.glsl | 83 -- Shaders/HDR/math.glsl | 56 - Shaders/HDR/model_building.vert | 106 -- Shaders/HDR/model_chrome.frag | 22 - Shaders/HDR/model_chrome.vert | 22 - Shaders/HDR/model_combined.frag | 39 - Shaders/HDR/model_combined.vert | 31 - Shaders/HDR/model_default.frag | 32 - Shaders/HDR/model_default.vert | 43 - Shaders/HDR/model_pbr.frag | 45 - Shaders/HDR/model_pbr.vert | 34 - Shaders/HDR/model_pbr_transparent.frag | 65 - Shaders/HDR/model_pbr_transparent.vert | 40 - Shaders/HDR/model_shadow.frag | 8 - Shaders/HDR/model_shadow.vert | 10 - Shaders/HDR/model_transparent.frag | 48 - Shaders/HDR/model_transparent.vert | 58 - Shaders/HDR/moon.frag | 69 - Shaders/HDR/moon.vert | 24 - Shaders/HDR/night_vision.glsl | 33 - Shaders/HDR/noise.glsl | 264 ---- Shaders/HDR/normal_encoding.glsl | 30 - Shaders/HDR/normalmap.glsl | 44 - Shaders/HDR/pos_from_depth.glsl | 40 - Shaders/HDR/postprocess.frag | 80 -- Shaders/HDR/quad.frag | 12 - Shaders/HDR/quad.vert | 10 - Shaders/HDR/quad_cubemap.vert | 40 - Shaders/HDR/quad_matrix.vert | 14 - Shaders/HDR/quad_notexcoord.vert | 7 - Shaders/HDR/redout.glsl | 57 - Shaders/HDR/shading_opaque.frag | 41 - Shaders/HDR/shading_opaque.glsl | 75 -- Shaders/HDR/shading_transparent.glsl | 68 - Shaders/HDR/shadows.glsl | 275 ---- Shaders/HDR/skydome.frag | 103 -- Shaders/HDR/skydome.vert | 20 - Shaders/HDR/smaa_blending_weight_calculation.frag | 495 ------- Shaders/HDR/smaa_blending_weight_calculation.vert | 64 - Shaders/HDR/smaa_edge_detection.frag | 100 -- Shaders/HDR/smaa_edge_detection.vert | 55 - Shaders/HDR/smaa_neighborhood_blending.frag | 102 -- Shaders/HDR/smaa_neighborhood_blending.vert | 53 - Shaders/HDR/stars.frag | 52 - Shaders/HDR/stars.vert | 19 - Shaders/HDR/sun.glsl | 44 - Shaders/HDR/surface.glsl | 95 -- Shaders/HDR/terrain_default.frag | 42 - Shaders/HDR/terrain_default.vert | 28 - Shaders/HDR/terrain_envmap.frag | 51 - Shaders/HDR/terrain_envmap.vert | 28 - Shaders/HDR/terrain_lfeat.frag | 31 - Shaders/HDR/terrain_lfeat.vert | 28 - Shaders/HDR/terrain_runway.frag | 46 - Shaders/HDR/terrain_runway.vert | 30 - Shaders/HDR/text.frag | 48 - Shaders/HDR/text.vert | 35 - Shaders/HDR/tree.frag | 72 - Shaders/HDR/tree.vert | 86 -- Shaders/HDR/water.frag | 71 - Shaders/HDR/water.glsl | 240 ---- Shaders/HDR/water.vert | 85 -- Shaders/HDR/water_shading.frag | 82 -- Shaders/HDR/ws30.frag | 100 -- Shaders/HDR/ws30.vert | 25 - Shaders/ShaderVG/README | 6 - Shaders/ShaderVG/color_ramp.frag | 11 - Shaders/ShaderVG/color_ramp.vert | 13 - Shaders/ShaderVG/pipeline.frag | 105 -- Shaders/ShaderVG/pipeline.vert | 21 - defaults.xml | 48 - gui/dialogs/weather.xml | 3 - 203 files changed, 13467 deletions(-) diff --git a/Compositor/HDR/ao-buffer.xml b/Compositor/HDR/ao-buffer.xml deleted file mode 100644 index 007c8f44f..000000000 --- a/Compositor/HDR/ao-buffer.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<PropertyList> - <type>2d</type> - <width>screen</width> - <height>screen</height> - <format>r8</format> - <min-filter>linear</min-filter> - <mag-filter>linear</mag-filter> - <condition> - <property>/sim/rendering/hdr/ambient-occlusion/enabled</property> - </condition> -</PropertyList> diff --git a/Compositor/HDR/bloom-buffer.xml b/Compositor/HDR/bloom-buffer.xml deleted file mode 100644 index 7c02f2365..000000000 --- a/Compositor/HDR/bloom-buffer.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<PropertyList> - <type>2d</type> - <width>screen</width> - <height>screen</height> - <format>rgb16f</format> - <min-filter>linear</min-filter> - <mag-filter>linear</mag-filter> - <wrap-s>clamp-to-edge</wrap-s> - <wrap-t>clamp-to-edge</wrap-t> -</PropertyList> diff --git a/Compositor/HDR/bloom-downsample-rest.xml b/Compositor/HDR/bloom-downsample-rest.xml deleted file mode 100644 index c2c44cc7e..000000000 --- a/Compositor/HDR/bloom-downsample-rest.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<PropertyList> - <type>quad</type> - <effect>Effects/HDR/bloom-downsample-rest</effect> -</PropertyList> diff --git a/Compositor/HDR/bloom-upsample.xml b/Compositor/HDR/bloom-upsample.xml deleted file mode 100644 index b7bc73e13..000000000 --- a/Compositor/HDR/bloom-upsample.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<PropertyList> - <type>quad</type> - <effect>Effects/HDR/bloom-upsample</effect> -</PropertyList> diff --git a/Compositor/HDR/csm-pass.xml b/Compositor/HDR/csm-pass.xml deleted file mode 100644 index 1783e0a24..000000000 --- a/Compositor/HDR/csm-pass.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<PropertyList> - <type>csm</type> - <effect-scheme>hdr-shadow</effect-scheme> - <clear-mask>depth</clear-mask> - <!-- Only render objects with the CAST_SHADOW bit flag --> - <cull-mask>0x4</cull-mask> - <render-at-night>false</render-at-night> - <attachment> - <buffer>sun-shadowmap-atlas</buffer> - <component>depth</component> - </attachment> -</PropertyList> diff --git a/Compositor/HDR/debug-pass.xml b/Compositor/HDR/debug-pass.xml deleted file mode 100644 index 76dae1367..000000000 --- a/Compositor/HDR/debug-pass.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<PropertyList> - <type>quad</type> - <clear-mask>depth</clear-mask> - <condition> - <property>/sim/rendering/hdr/debug/show-gbuffer</property> - </condition> -</PropertyList> diff --git a/Compositor/HDR/env-capture-pass.xml b/Compositor/HDR/env-capture-pass.xml deleted file mode 100644 index b8fa9ac3c..000000000 --- a/Compositor/HDR/env-capture-pass.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<PropertyList> - <type>scene</type> - <implicit-attachment-mask>depth</implicit-attachment-mask> - <effect-scheme>hdr-envmap</effect-scheme> - <clear-mask>depth</clear-mask> - <!-- - Only render: - - Terrain (both WS 2.0 and 3.0) - - Clouds - - Skydome - --> - <cull-mask>0x1801</cull-mask> - <binding> - <unit>12</unit> - <buffer>transmittance</buffer> - </binding> - <binding> - <unit>13</unit> - <buffer>sky-view</buffer> - </binding> - <binding> - <unit>14</unit> - <buffer>prev-luminance</buffer> - </binding> -</PropertyList> diff --git a/Compositor/HDR/env-prefilter-pass.xml b/Compositor/HDR/env-prefilter-pass.xml deleted file mode 100644 index ddecddf18..000000000 --- a/Compositor/HDR/env-prefilter-pass.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<PropertyList> - <type>quad</type> - <binding> - <unit>0</unit> - <buffer>envmap</buffer> - </binding> - <render-condition> - <property>/sim/rendering/hdr/envmap/should-prefilter</property> - </render-condition> -</PropertyList> diff --git a/Compositor/HDR/hdr.xml b/Compositor/HDR/hdr.xml deleted file mode 100644 index eb0f724b8..000000000 --- a/Compositor/HDR/hdr.xml +++ /dev/null @@ -1,1452 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<PropertyList> - <name>HDR</name> - <!-- XXX: These won't be necessary once we go core profile only --> - <use-osg-uniforms>true</use-osg-uniforms> - <use-vertex-attribute-aliasing>true</use-vertex-attribute-aliasing> - - <!-- - G-Buffer layout - ........................................................................... - : : Red : Green : Blue : Alpha : - :........................:...........:.........:............:.............: - : G-Buffer 0 (RGB10_A2) : Normal : Roughness : Material ID : - : G-Buffer 1 (RGBA8) : Base Color : Metallic : - : G-Buffer 2 (RGBA8) : Material specific params : Occlusion : - : G-Buffer 3 (R11G11B10) : Emission : - : - : Depth/Stencil : DEPTH24_STENCIL8 (Logarithmic depth) : - :........................:............:.........:...........:.............: - - Notes: - - Two 10-bit channels is enough for normals, as long as we are using - octahedron normal encoding. - - Since the Material ID is stored in 2 bits, we can only have 4 different - material types. The maximum value (3 or 1.0) is reserved for the standard - PBR metallic-roughness material. - - In 'Material specific params' fancier materials can use up to 24 bits - to encode any information they might need (e.g. a clearcoat layer needs - to store the clearcoat amount and roughness). - - Materials that are very different from the standard should write - whatever they need in the G-Buffer without adhering to this layout and use - the stencil buffer and a separate render pass. - --> - <buffer include="screen-buffer.xml"> - <name>gbuffer0</name> - <format>rgb10-a2</format> - </buffer> - <buffer include="screen-buffer.xml"> - <name>gbuffer1</name> - <format>rgba8</format> - </buffer> - <buffer include="screen-buffer.xml"> - <name>gbuffer2</name> - <format>rgba8</format> - </buffer> - <buffer include="screen-buffer.xml"> - <name>gbuffer3</name> - <format>r11f-g11f-b10f</format> - </buffer> - <buffer include="screen-buffer.xml"> - <name>depth-stencil</name> - <format>depth24-stencil8</format> - </buffer> - - <!-- HDR shading result --> - <buffer include="screen-buffer.xml"> - <name>hdr-result</name> - <format>rgb16f</format> - </buffer> - - <!-- Final LDR buffer --> - <buffer include="screen-buffer.xml"> - <name>final</name> - <format>rgb8</format> - </buffer> - - <!-- Atmosphere LUTs --> - <buffer> - <name>transmittance</name> - <type>2d</type> - <width>256</width> - <height>64</height> - <format>rgba16f</format> - <min-filter>linear</min-filter> - <mag-filter>linear</mag-filter> - <wrap-s>clamp-to-edge</wrap-s> - <wrap-t>clamp-to-edge</wrap-t> - </buffer> - <buffer> - <name>sky-view</name> - <type>2d</type> - <width>256</width> - <height>256</height> - <format>rgba16f</format> - <min-filter>linear</min-filter> - <mag-filter>linear</mag-filter> - <wrap-s>repeat</wrap-s> - <wrap-t>clamp-to-edge</wrap-t> - </buffer> - <buffer> - <name>aerial-perspective</name> - <type>2d</type> - <width>1024</width> - <height>64</height> - <format>rgba16f</format> - <min-filter>linear</min-filter> - <mag-filter>linear</mag-filter> - <wrap-s>clamp-to-edge</wrap-s> - <wrap-t>clamp-to-edge</wrap-t> - </buffer> - - <!-- Environment BRDF LUT --> - <buffer> - <name>envmap-brdf-lut</name> - <type>2d</type> - <width>512</width> - <height>512</height> - <format>rg16f</format> - <min-filter>linear</min-filter> - <mag-filter>linear</mag-filter> - <wrap-s>clamp-to-edge</wrap-s> - <wrap-t>clamp-to-edge</wrap-t> - </buffer> - - <!-- Environment cubemap --> - <buffer> - <name>envmap</name> - <type>cubemap</type> - <width><property>/sim/rendering/hdr/envmap/cubemap-size</property></width> - <height><property>/sim/rendering/hdr/envmap/cubemap-size</property></height> - <format>r11f-g11f-b10f</format> - <min-filter>linear-mipmap-linear</min-filter> - <mag-filter>linear</mag-filter> - <wrap-s>clamp-to-edge</wrap-s> - <wrap-t>clamp-to-edge</wrap-t> - <mipmap-levels>5</mipmap-levels> - </buffer> - <buffer> - <name>prefiltered-envmap</name> - <type>cubemap</type> - <width><property>/sim/rendering/hdr/envmap/cubemap-size</property></width> - <height><property>/sim/rendering/hdr/envmap/cubemap-size</property></height> - <format>r11f-g11f-b10f</format> - <min-filter>linear-mipmap-linear</min-filter> - <mag-filter>linear</mag-filter> - <wrap-s>clamp-to-edge</wrap-s> - <wrap-t>clamp-to-edge</wrap-t> - <mipmap-levels>5</mipmap-levels> - </buffer> - - <!-- Shadow map atlas --> - <buffer> - <name>sun-shadowmap-atlas</name> - <type>2d</type> - <width><property>/sim/rendering/hdr/shadows/sun-atlas-size</property></width> - <height><property>/sim/rendering/hdr/shadows/sun-atlas-size</property></height> - <format>depth16</format> - <wrap-s>clamp-to-border</wrap-s> - <wrap-t>clamp-to-border</wrap-t> - <min-filter>linear</min-filter> - <mag-filter>linear</mag-filter> - <border-color type="vec4d">1.0 1.0 1.0 1.0</border-color> - <shadow-comparison>true</shadow-comparison> - </buffer> - - <!-- Histogram for automatic exposure --> - <buffer> - <name>histogram-bins</name> - <type>2d</type> - <width>screen</width> - <screen-width-scale><property>/sim/rendering/hdr/render-scale</property></screen-width-scale> - <height>screen</height> - <screen-height-scale><property>/sim/rendering/hdr/render-scale</property></screen-height-scale> - <format>r8ui</format> - <min-filter>nearest</min-filter> - <mag-filter>nearest</mag-filter> - </buffer> - <buffer> - <name>histogram-partial</name> - <type>2d</type> - <width>screen</width> - <screen-width-scale><property>/sim/rendering/hdr/render-scale</property></screen-width-scale> - <height>256</height> - <format>r32ui</format> - <min-filter>nearest</min-filter> - <mag-filter>nearest</mag-filter> - </buffer> - <buffer> - <name>histogram</name> - <type>2d</type> - <width>256</width> - <height>1</height> - <format>r32ui</format> - <min-filter>nearest</min-filter> - <mag-filter>nearest</mag-filter> - </buffer> - <buffer> - <name>histogram-luminance</name> - <type>2d</type> - <width>1</width> - <height>1</height> - <format>r32f</format> - <min-filter>nearest</min-filter> - <mag-filter>nearest</mag-filter> - </buffer> - <buffer> - <name>prev-luminance</name> - <type>2d</type> - <width>1</width> - <height>1</height> - <format>r32f</format> - <min-filter>nearest</min-filter> - <mag-filter>nearest</mag-filter> - </buffer> - - <!-- Ambient Occlusion buffers --> - <buffer include="ao-buffer.xml"> - <name>ao-noisy</name> - </buffer> - <buffer include="ao-buffer.xml"> - <name>ao-filtered</name> - </buffer> - - <!-- Bloom buffers --> - <buffer include="bloom-buffer.xml"> - <name>bloomA</name> - <screen-width-scale>0.5</screen-width-scale> - <screen-height-scale>0.5</screen-height-scale> - </buffer> - <buffer include="bloom-buffer.xml"> - <name>bloomB</name> - <screen-width-scale>0.25</screen-width-scale> - <screen-height-scale>0.25</screen-height-scale> - </buffer> - <buffer include="bloom-buffer.xml"> - <name>bloomC</name> - <screen-width-scale>0.125</screen-width-scale> - <screen-height-scale>0.125</screen-height-scale> - </buffer> - <buffer include="bloom-buffer.xml"> - <name>bloomD</name> - <screen-width-scale>0.0625</screen-width-scale> - <screen-height-scale>0.0625</screen-height-scale> - </buffer> - <buffer include="bloom-buffer.xml"> - <name>bloomE</name> - <screen-width-scale>0.03125</screen-width-scale> - <screen-height-scale>0.03125</screen-height-scale> - </buffer> - - <!-- SMAA buffers --> - <buffer include="screen-buffer.xml"> - <name>smaa-edges</name> - <format>rgba8</format> - <wrap-s>clamp</wrap-s> - <wrap-t>clamp</wrap-t> - <min-filter>linear-mipmap-linear</min-filter> - <mag-filter>linear</mag-filter> - </buffer> - <buffer include="screen-buffer.xml"> - <name>smaa-blend</name> - <format>rgba8</format> - <wrap-s>clamp</wrap-s> - <wrap-t>clamp</wrap-t> - <min-filter>linear-mipmap-linear</min-filter> - <mag-filter>linear</mag-filter> - </buffer> - - <!--=======================================================================--> - - <!-- - Clear the G-Buffer if we are debugging it to avoid the dreaded - 'Solitaire Effect' :) - --> - <pass> - <name>debug-clear-gbuffer</name> - <type>quad</type> - <effect>Effects/HDR/gbuffer-debug-clear</effect> - <condition> - <property>/sim/rendering/hdr/debug/show-gbuffer</property> - </condition> - <attachment> - <component>color0</component> - <buffer>gbuffer0</buffer> - </attachment> - <attachment> - <component>color1</component> - <buffer>gbuffer1</buffer> - </attachment> - <attachment> - <component>color2</component> - <buffer>gbuffer2</buffer> - </attachment> - <attachment> - <component>color3</component> - <buffer>gbuffer3</buffer> - </attachment> - </pass> - - <!-- - BRDF convolution for the IBL split sum integral approximation. - --> - <pass> - <name>envmap-brdf</name> - <type>quad</type> - <render-once>true</render-once> - <effect>Effects/HDR/envmap-brdf</effect> - <attachment> - <component>color0</component> - <buffer>envmap-brdf-lut</buffer> - </attachment> - </pass> - - <!-- - Atmospheric scattering. - --> - <pass> - <name>atmos-transmittance</name> - <type>quad</type> - <effect>Effects/HDR/atmos-transmittance</effect> - <attachment> - <component>color0</component> - <buffer>transmittance</buffer> - </attachment> - </pass> - <pass> - <name>atmos-sky-view</name> - <type>quad</type> - <effect>Effects/HDR/atmos-sky-view</effect> - <binding> - <unit>0</unit> - <buffer>transmittance</buffer> - </binding> - <attachment> - <component>color0</component> - <buffer>sky-view</buffer> - </attachment> - </pass> - <pass> - <name>atmos-aerial-perspective</name> - <type>quad</type> - <effect>Effects/HDR/atmos-aerial-perspective</effect> - <binding> - <unit>0</unit> - <buffer>transmittance</buffer> - </binding> - <attachment> - <component>color0</component> - <buffer>aerial-perspective</buffer> - </attachment> - </pass> - - <!-- - Environment capture passes - Render to a cubemap using forward rendering. Only render the skydome and - very bare terrain since we want to make as little draw calls as possible. - We also want to avoid doing an OSG cull traversal on many nodes as our - scene graph structure isn't too well optimized. - --> - <pass include="env-capture-pass.xml"> - <name>env-capture0</name> - <cubemap-face>0</cubemap-face> - <attachment> - <component>color0</component> - <buffer>envmap</buffer> - <face>0</face> - </attachment> - <render-condition> - <property>/sim/rendering/hdr/envmap/should-render-face-0</property> - </render-condition> - </pass> - <pass include="env-capture-pass.xml"> - <name>env-capture1</name> - <cubemap-face>1</cubemap-face> - <attachment> - <component>color0</component> - <buffer>envmap</buffer> - <face>1</face> - </attachment> - <render-condition> - <property>/sim/rendering/hdr/envmap/should-render-face-1</property> - </render-condition> - </pass> - <pass include="env-capture-pass.xml"> - <name>env-capture2</name> - <cubemap-face>2</cubemap-face> - <attachment> - <component>color0</component> - <buffer>envmap</buffer> - <face>2</face> - </attachment> - <render-condition> - <property>/sim/rendering/hdr/envmap/should-render-face-2</property> - </render-condition> - </pass> - <pass include="env-capture-pass.xml"> - <name>env-capture3</name> - <cubemap-face>3</cubemap-face> - <attachment> - <component>color0</component> - <buffer>envmap</buffer> - <face>3</face> - </attachment> - <render-condition> - <property>/sim/rendering/hdr/envmap/should-render-face-3</property> - </render-condition> - </pass> - <pass include="env-capture-pass.xml"> - <name>env-capture4</name> - <cubemap-face>4</cubemap-face> - <attachment> - <component>color0</component> - <buffer>envmap</buffer> - <face>4</face> - </attachment> - <render-condition> - <property>/sim/rendering/hdr/envmap/should-render-face-4</property> - </render-condition> - </pass> - <pass include="env-capture-pass.xml"> - <name>env-capture5</name> - <cubemap-face>5</cubemap-face> - <attachment> - <component>color0</component> - <buffer>envmap</buffer> - <face>5</face> - <!-- Generate the mips after writing to the last face --> - <mipmap-generation>true</mipmap-generation> - </attachment> - <render-condition> - <property>/sim/rendering/hdr/envmap/should-render-face-5</property> - </render-condition> - </pass> - - <!-- - Pre-filter the environment map - We convolve the cubemap for five roughness values and store the results - on the mipmap levels of the cubemap. Later passes will choose which mipmap - level to use for reflections based on the roughness of the surface that's - being lighted/rendered. The first mipmap level can just be copied from the - original envmap as we'd like it to contain perfect mirror reflections. - Diffuse lighting is approximated by using the highest mipmap level - (roughness=1). - --> - <pass include="env-prefilter-pass.xml"> - <name>env-prefilter0</name> - <effect>Effects/HDR/envmap-copy</effect> - <attachment> - <component>color0</component> - <buffer>prefiltered-envmap</buffer> - <face>0</face> - <level>0</level> - </attachment> - <attachment> - <component>color1</component> - <buffer>prefiltered-envmap</buffer> - <face>1</face> - <level>0</level> - </attachment> - <attachment> - <component>color2</component> - <buffer>prefiltered-envmap</buffer> - <face>2</face> - <level>0</level> - </attachment> - <attachment> - <component>color3</component> - <buffer>prefiltered-envmap</buffer> - <face>3</face> - <level>0</level> - </attachment> - <attachment> - <component>color4</component> - <buffer>prefiltered-envmap</buffer> - <face>4</face> - <level>0</level> - </attachment> - <attachment> - <component>color5</component> - <buffer>prefiltered-envmap</buffer> - <face>5</face> - <level>0</level> - </attachment> - </pass> - <pass include="env-prefilter-pass.xml"> - <name>env-prefilter1</name> - <effect>Effects/HDR/envmap-prefilter1</effect> - <attachment> - <component>color0</component> - <buffer>prefiltered-envmap</buffer> - <face>0</face> - <level>1</level> - </attachment> - <attachment> - <component>color1</component> - <buffer>prefiltered-envmap</buffer> - <face>1</face> - <level>1</level> - </attachment> - <attachment> - <component>color2</component> - <buffer>prefiltered-envmap</buffer> - <face>2</face> - <level>1</level> - </attachment> - <attachment> - <component>color3</component> - <buffer>prefiltered-envmap</buffer> - <face>3</face> - <level>1</level> - </attachment> - <attachment> - <component>color4</component> - <buffer>prefiltered-envmap</buffer> - <face>4</face> - <level>1</level> - </attachment> - <attachment> - <component>color5</component> - <buffer>prefiltered-envmap</buffer> - <face>5</face> - <level>1</level> - </attachment> - </pass> - <pass include="env-prefilter-pass.xml"> - <name>env-prefilter2</name> - <effect>Effects/HDR/envmap-prefilter2</effect> - <attachment> - <component>color0</component> - <buffer>prefiltered-envmap</buffer> - <face>0</face> - <level>2</level> - </attachment> - <attachment> - <component>color1</component> - <buffer>prefiltered-envmap</buffer> - <face>1</face> - <level>2</level> - </attachment> - <attachment> - <component>color2</component> - <buffer>prefiltered-envmap</buffer> - <face>2</face> - <level>2</level> - </attachment> - <attachment> - <component>color3</component> - <buffer>prefiltered-envmap</buffer> - <face>3</face> - <level>2</level> - </attachment> - <attachment> - <component>color4</component> - <buffer>prefiltered-envmap</buffer> - <face>4</face> - <level>2</level> - </attachment> - <attachment> - <component>color5</component> - <buffer>prefiltered-envmap</buffer> - <face>5</face> - <level>2</level> - </attachment> - </pass> - <pass include="env-prefilter-pass.xml"> - <name>env-prefilter3</name> - <effect>Effects/HDR/envmap-prefilter3</effect> - <attachment> - <component>color0</component> - <buffer>prefiltered-envmap</buffer> - <face>0</face> - <level>3</level> - </attachment> - <attachment> - <component>color1</component> - <buffer>prefiltered-envmap</buffer> - <face>1</face> - <level>3</level> - </attachment> - <attachment> - <component>color2</component> - <buffer>prefiltered-envmap</buffer> - <face>2</face> - <level>3</level> - </attachment> - <attachment> - <component>color3</component> - <buffer>prefiltered-envmap</buffer> - <face>3</face> - <level>3</level> - </attachment> - <attachment> - <component>color4</component> - <buffer>prefiltered-envmap</buffer> - <face>4</face> - <level>3</level> - </attachment> - <attachment> - <component>color5</component> - <buffer>prefiltered-envmap</buffer> - <face>5</face> - <level>3</level> - </attachment> - </pass> - <pass include="env-prefilter-pass.xml"> - <name>env-prefilter4</name> - <effect>Effects/HDR/envmap-prefilter4</effect> - <attachment> - <component>color0</component> - <buffer>prefiltered-envmap</buffer> - <face>0</face> - <level>4</level> - </attachment> - <attachment> - <component>color1</component> - <buffer>prefiltered-envmap</buffer> - <face>1</face> - <level>4</level> - </attachment> - <attachment> - <component>color2</component> - <buffer>prefiltered-envmap</buffer> - <face>2</face> - <level>4</level> - </attachment> - <attachment> - <component>color3</component> - <buffer>prefiltered-envmap</buffer> - <face>3</face> - <level>4</level> - </attachment> - <attachment> - <component>color4</component> - <buffer>prefiltered-envmap</buffer> - <face>4</face> - <level>4</level> - </attachment> - <attachment> - <component>color5</component> - <buffer>prefiltered-envmap</buffer> - <face>5</face> - <level>4</level> - </attachment> - </pass> - - <!-- - G-Buffer pass - This is the main forward pass. Here we skip the rendering of transparent - objects and other geometry that should be forward rendered later (like the - skydome, clouds, etc.) - --> - <pass> - <name>geometry</name> - <type>scene</type> - <effect-scheme>hdr-geometry</effect-scheme> - <clear-mask>depth stencil</clear-mask> - <clear-depth>1.0</clear-depth> - <cull-mask>0xfffff7ff</cull-mask> - <clustered-shading> - <tile-size>128</tile-size> - <depth-slices>1</depth-slices> - <num-threads>1</num-threads> - <max-pointlights>1024</max-pointlights> - <max-spotlights>1024</max-spotlights> - <pbr-lights>true</pbr-lights> - <expose-uniforms>false</expose-uniforms> - </clustered-shading> - <attachment> - <component>color0</component> - <buffer>gbuffer0</buffer> - </attachment> - <attachment> - <component>color1</component> - <buffer>gbuffer1</buffer> - </attachment> - <attachment> - <component>color2</component> - <buffer>gbuffer2</buffer> - </attachment> - <attachment> - <component>color3</component> - <buffer>gbuffer3</buffer> - </attachment> - <attachment> - <component>depth</component> - <buffer>depth-stencil</buffer> - </attachment> - <attachment> - <component>stencil</component> - <buffer>depth-stencil</buffer> - </attachment> - </pass> - - <!-- GTAO (Ground Truth Ambient Occlusion) --> - <pass> - <name>gtao</name> - <type>quad</type> - <effect>Effects/HDR/gtao</effect> - <clear-mask>color</clear-mask> - <clear-color type="vec4d">1.0 1.0 1.0 1.0</clear-color> - <condition> - <property>/sim/rendering/hdr/ambient-occlusion/enabled</property> - </condition> - <binding> - <unit>0</unit> - <buffer>gbuffer0</buffer> - </binding> - <binding> - <unit>1</unit> - <buffer>depth-stencil</buffer> - </binding> - <attachment> - <component>color0</component> - <buffer>ao-noisy</buffer> - </attachment> - </pass> - <pass> - <name>gtao-denoiser</name> - <type>quad</type> - <effect>Effects/HDR/gtao-denoiser</effect> - <condition> - <property>/sim/rendering/hdr/ambient-occlusion/enabled</property> - </condition> - <binding> - <unit>0</unit> - <buffer>ao-noisy</buffer> - </binding> - <attachment> - <component>color0</component> - <buffer>ao-filtered</buffer> - </attachment> - </pass> - - <!-- Shadow mapping pre-passes --> - <pass include="csm-pass.xml"> - <name>csm0</name> - <near-m>0.1</near-m> - <far-m>2.0</far-m> - <viewport> - <x>0.0</x> - <y>0.0</y> - <width>0.5</width> - <height>0.5</height> - </viewport> - </pass> - <pass include="csm-pass.xml"> - <name>csm1</name> - <near-m>2.0</near-m> - <far-m>40.0</far-m> - <viewport> - <x>0.5</x> - <y>0.0</y> - <width>0.5</width> - <height>0.5</height> - </viewport> - </pass> - <pass include="csm-pass.xml"> - <name>csm2</name> - <near-m>40.0</near-m> - <far-m>150.0</far-m> - <viewport> - <x>0.0</x> - <y>0.5</y> - <width>0.5</width> - <height>0.5</height> - </viewport> - </pass> - <pass include="csm-pass.xml"> - <name>csm3</name> - <near-m>150.0</near-m> - <far-m>500.0</far-m> - <viewport> - <x>0.5</x> - <y>0.5</y> - <width>0.5</width> - <height>0.5</height> - </viewport> - </pass> - - <!-- - Main shading pass (for opaque objects) - Combine the G-Buffer and other buffers to compute the final shading value - of the pixel in HDR. - --> - <pass> - <name>shading-opaque</name> - <type>quad</type> - <effect>Effects/HDR/shading-opaque</effect> - <use-shadow-pass>csm0</use-shadow-pass> - <use-shadow-pass>csm1</use-shadow-pass> - <use-shadow-pass>csm2</use-shadow-pass> - <use-shadow-pass>csm3</use-shadow-pass> - <use-clustered-uniforms> - <pass>geometry</pass> - <clusters-bind-unit>5</clusters-bind-unit> - <indices-bind-unit>6</indices-bind-unit> - <pointlights-bind-unit>13</pointlights-bind-unit> - <spotlights-bind-unit>15</spotlights-bind-unit> - </use-clustered-uniforms> - <binding> - <unit>0</unit> - <buffer>gbuffer0</buffer> - </binding> - <binding> - <unit>1</unit> - <buffer>gbuffer1</buffer> - </binding> - <binding> - <unit>2</unit> - <buffer>gbuffer2</buffer> - </binding> - <binding> - <unit>3</unit> - <buffer>gbuffer3</buffer> - </binding> - <binding> - <unit>4</unit> - <buffer>depth-stencil</buffer> - </binding> - <binding> - <unit>7</unit> - <buffer>ao-filtered</buffer> - <condition> - <property>/sim/rendering/hdr/ambient-occlusion/enabled</property> - </condition> - </binding> - <binding> - <unit>8</unit> - <buffer>envmap-brdf-lut</buffer> - </binding> - <binding> - <unit>9</unit> - <buffer>prefiltered-envmap</buffer> - </binding> - <binding> - <unit>10</unit> - <buffer>sun-shadowmap-atlas</buffer> - </binding> - <binding> - <unit>11</unit> - <buffer>aerial-perspective</buffer> - </binding> - <binding> - <unit>12</unit> - <buffer>transmittance</buffer> - </binding> - <binding> - <unit>14</unit> - <buffer>prev-luminance</buffer> - </binding> - <attachment> - <component>color0</component> - <buffer>hdr-result</buffer> - </attachment> - <attachment> - <component>stencil</component> - <buffer>depth-stencil</buffer> - </attachment> - </pass> - - <pass> - <name>water</name> - <type>quad</type> - <effect>Effects/HDR/water-shading</effect> - <binding> - <unit>0</unit> - <buffer>gbuffer0</buffer> - </binding> - <binding> - <unit>1</unit> - <buffer>gbuffer1</buffer> - </binding> - <binding> - <unit>3</unit> - <buffer>depth-stencil</buffer> - </binding> - <binding> - <unit>9</unit> - <buffer>prefiltered-envmap</buffer> - </binding> - <binding> - <unit>11</unit> - <buffer>aerial-perspective</buffer> - </binding> - <binding> - <unit>12</unit> - <buffer>transmittance</buffer> - </binding> - <binding> - <unit>14</unit> - <buffer>prev-luminance</buffer> - </binding> - <attachment> - <component>color0</component> - <buffer>hdr-result</buffer> - </attachment> - <attachment> - <component>stencil</component> - <buffer>depth-stencil</buffer> - </attachment> - </pass> - - <!-- - Main forward pass - Render all objects that couldn't be rendered on the G-Buffer, mainly - transparent objects. This is also done in HDR. - We reuse the depth buffer from the G-Buffer stage so we can take advantage - of early depth testing. - --> - <pass> - <name>forward</name> - <type>scene</type> - <effect-scheme>hdr-forward</effect-scheme> - <use-shadow-pass>csm0</use-shadow-pass> - <use-shadow-pass>csm1</use-shadow-pass> - <use-shadow-pass>csm2</use-shadow-pass> - <use-shadow-pass>csm3</use-shadow-pass> - <use-clustered-uniforms> - <pass>geometry</pass> - <clusters-bind-unit>5</clusters-bind-unit> - <indices-bind-unit>6</indices-bind-unit> - <pointlights-bind-unit>16</pointlights-bind-unit> - <spotlights-bind-unit>15</spotlights-bind-unit> - </use-clustered-uniforms> - <!-- - We should not be binding and attaching the depth buffer as that usually - implies reading and writing to it at the same time, which will result in - undefined behaviour. However, in the forward pass we don't write to the - depth buffer (all Effects that use hdr-forward have write-mask=false). - --> - <binding> - <unit>7</unit> - <buffer>depth-stencil</buffer> - </binding> - <binding> - <unit>8</unit> - <buffer>envmap-brdf-lut</buffer> - </binding> - <binding> - <unit>9</unit> - <buffer>prefiltered-envmap</buffer> - </binding> - <binding> - <unit>10</unit> - <buffer>sun-shadowmap-atlas</buffer> - </binding> - <binding> - <unit>11</unit> - <buffer>aerial-perspective</buffer> - </binding> - <binding> - <unit>12</unit> - <buffer>transmittance</buffer> - </binding> - <binding> - <unit>13</unit> - <buffer>sky-view</buffer> - </binding> - <binding> - <unit>14</unit> - <buffer>prev-luminance</buffer> - </binding> - <attachment> - <component>color0</component> - <buffer>hdr-result</buffer> - </attachment> - <attachment> - <component>depth</component> - <buffer>depth-stencil</buffer> - </attachment> - <attachment> - <component>stencil</component> - <buffer>depth-stencil</buffer> - </attachment> - </pass> - - <!-- - Auto exposure using a luminance histogram - Based on the article by Alex Tardif: - https://www.alextardif.com/HistogramLuminance.html - - The first step calculates the bin numbers of every pixel of the input HDR - texture. - - If compute shaders aren't supported, we run two fragment shaders. The - first calculate a partial histogram of the rows of the bin numbers - texture, and the second aggregates them together to obtain a single - histogram. - - If compute shaders are supported, a fragment shader resets the histogram - buffer, followed by a compute shader to calculate the histogram of the bin - numbers. - - The last step, which calculates the average scene luminance from the - histogram, is identical even though it is implemented as a fragment shader. - - This technique will find the average luminance after multiplication by the - albedo. This is not correct, but the alternative (keeping a luminance - texture) is too expensive and not worth the trouble. - --> - <pass> - <name>histogram-bin</name> - <type>quad</type> - <effect>Effects/HDR/histogram-bin</effect> - <binding> - <unit>0</unit> - <buffer>hdr-result</buffer> - </binding> - <binding> - <unit>14</unit> - <buffer>prev-luminance</buffer> - </binding> - <attachment> - <component>color0</component> - <buffer>histogram-bins</buffer> - </attachment> - </pass> - <!-- Slower version without compute shaders --> - <pass> - <name>histogram-column</name> - <type>quad</type> - <effect>Effects/HDR/histogram-column</effect> - <binding> - <unit>0</unit> - <buffer>histogram-bins</buffer> - </binding> - <attachment> - <component>color0</component> - <buffer>histogram-partial</buffer> - </attachment> - </pass> - <pass> - <name>histogram-aggregate</name> - <type>quad</type> - <effect>Effects/HDR/histogram-aggregate</effect> - <binding> - <unit>0</unit> - <buffer>histogram-partial</buffer> - </binding> - <attachment> - <component>color0</component> - <buffer>histogram</buffer> - </attachment> - </pass> - <!-- Faster version with compute shaders --> - <pass> - <name>histogram-clear</name> - <type>quad</type> - <effect>Effects/HDR/histogram-clear</effect> - <attachment> - <component>color0</component> - <buffer>histogram</buffer> - </attachment> - </pass> - <pass> - <name>histogram-compute</name> - <type>compute</type> - <workgroup-size> - <x>256</x> - <y>2</y> - </workgroup-size> - <global-size> - <x>screen</x> - <y>screen</y> - <z>screen</z> - <y-screen-scale>0.0625</y-screen-scale> - </global-size> - <effect>Effects/HDR/histogram-compute</effect> - <binding> - <unit>0</unit> - <buffer>histogram-bins</buffer> - </binding> - <image-binding> - <unit>0</unit> - <buffer>histogram</buffer> - <access>read-write</access> - <format>r32ui</format> - </image-binding> - </pass> - <!-- End of faster version with compute shaders --> - <pass> - <name>histogram-luminance</name> - <type>quad</type> - <effect>Effects/HDR/histogram-luminance</effect> - <binding> - <unit>0</unit> - <buffer>histogram</buffer> - </binding> - <binding> - <unit>1</unit> - <buffer>prev-luminance</buffer> - </binding> - <attachment> - <component>color0</component> - <buffer>histogram-luminance</buffer> - </attachment> - </pass> - <pass> - <name>copy-prev-luminance</name> - <type>quad</type> - <effect>Effects/HDR/copy-prev-luminance</effect> - <binding> - <unit>0</unit> - <buffer>histogram-luminance</buffer> - </binding> - <attachment> - <component>color0</component> - <buffer>prev-luminance</buffer> - </attachment> - </pass> - - <!-- - Bloom effect from: - "Next Generation Post Processing in Call of Duty Advanced Warfare", - ACM Siggraph (2014). - --> - <pass> - <name>bloom-downsample1</name> - <type>quad</type> - <effect>Effects/HDR/bloom-downsample-first</effect> - <binding> - <unit>0</unit> - <buffer>hdr-result</buffer> - </binding> - <attachment> - <component>color0</component> - <buffer>bloomA</buffer> - </attachment> - </pass> - <pass include="bloom-downsample-rest.xml"> - <name>bloom-downsample2</name> - <binding> - <unit>0</unit> - <buffer>bloomA</buffer> - </binding> - <attachment> - <component>color0</component> - <buffer>bloomB</buffer> - </attachment> - </pass> - <pass include="bloom-downsample-rest.xml"> - <name>bloom-downsample3</name> - <binding> - <unit>0</unit> - <buffer>bloomB</buffer> - </binding> - <attachment> - <component>color0</component> - <buffer>bloomC</buffer> - </attachment> - </pass> - <pass include="bloom-downsample-rest.xml"> - <name>bloom-downsample4</name> - <binding> - <unit>0</unit> - <buffer>bloomC</buffer> - </binding> - <attachment> - <component>color0</component> - <buffer>bloomD</buffer> - </attachment> - </pass> - <pass include="bloom-downsample-rest.xml"> - <name>bloom-downsample5</name> - <binding> - <unit>0</unit> - <buffer>bloomD</buffer> - </binding> - <attachment> - <component>color0</component> - <buffer>bloomE</buffer> - </attachment> - </pass> - - <pass include="bloom-upsample.xml"> - <name>bloom-upsample1</name> - <binding> - <unit>0</unit> - <buffer>bloomE</buffer> - </binding> - <attachment> - <component>color0</component> - <buffer>bloomD</buffer> - </attachment> - </pass> - <pass include="bloom-upsample.xml"> - <name>bloom-upsample2</name> - <binding> - <unit>0</unit> - <buffer>bloomD</buffer> - </binding> - <attachment> - <component>color0</component> - <buffer>bloomC</buffer> - </attachment> - </pass> - <pass include="bloom-upsample.xml"> - <name>bloom-upsample3</name> - <binding> - <unit>0</unit> - <buffer>bloomC</buffer> - </binding> - <attachment> - <component>color0</component> - <buffer>bloomB</buffer> - </attachment> - </pass> - <pass include="bloom-upsample.xml"> - <name>bloom-upsample4</name> - <binding> - <unit>0</unit> - <buffer>bloomB</buffer> - </binding> - <attachment> - <component>color0</component> - <buffer>bloomA</buffer> - </attachment> - </pass> - - <!-- - Post-processing - Perform miscellaneous post-processing operations, namely tonemapping - and exposure compensation. This process converts the HDR buffer into an - LDR texture ready to be displayed on a screen. - --> - <pass> - <name>post</name> - <type>quad</type> - <effect>Effects/HDR/postprocess</effect> - <binding> - <unit>0</unit> - <buffer>hdr-result</buffer> - </binding> - <binding> - <unit>1</unit> - <buffer>bloomA</buffer> - </binding> - <attachment> - <component>color0</component> - <buffer>final</buffer> - </attachment> - </pass> - - <!-- - Final LDR post-processing passes that render to the screen - For now they just do antialiasing. - --> - <!-- No AA --> - <pass> - <name>no-aa-display</name> - <type>quad</type> - <effect>Effects/HDR/trivial</effect> - <condition> - <equals> - <property>/sim/rendering/hdr/antialiasing-technique</property> - <value type="int">0</value> - </equals> - </condition> - <binding> - <unit>0</unit> - <buffer>final</buffer> - </binding> - </pass> - - <!-- FXAA --> - <pass> - <name>fxaa</name> - <type>quad</type> - <effect>Effects/HDR/fxaa</effect> - <condition> - <equals> - <property>/sim/rendering/hdr/antialiasing-technique</property> - <value type="int">1</value> - </equals> - </condition> - <binding> - <unit>0</unit> - <buffer>final</buffer> - </binding> - </pass> - - <!-- - SMAA (Enhanced Subpixel Morphological Antialiasing) - http://www.iryoku.com/smaa/ - --> - <pass include="smaa-pass.xml"> - <name>smaa-edge-detection</name> - <effect>Effects/HDR/smaa-edge-detection</effect> - <clear-mask>color stencil</clear-mask> - <clear-color type="vec4d">0.0 0.0 0.0 0.0</clear-color> - <binding> - <unit>0</unit> - <buffer>final</buffer> - </binding> - <attachment> - <component>color0</component> - <buffer>smaa-edges</buffer> - </attachment> - <attachment> - <component>stencil</component> - <buffer>depth-stencil</buffer> - </attachment> - </pass> - <pass include="smaa-pass.xml"> - <name>smaa-blending-weight-calculation</name> - <effect>Effects/HDR/smaa-blending-weight-calculation</effect> - <clear-mask>color</clear-mask> - <clear-color type="vec4d">0.0 0.0 0.0 0.0</clear-color> - <binding> - <unit>0</unit> - <buffer>smaa-edges</buffer> - </binding> - <attachment> - <component>color0</component> - <buffer>smaa-blend</buffer> - </attachment> - <attachment> - <component>stencil</component> - <buffer>depth-stencil</buffer> - </attachment> - </pass> - <pass include="smaa-pass.xml"> - <name>smaa-neighborhood-blending</name> - <effect>Effects/HDR/smaa-neighborhood-blending</effect> - <binding> - <unit>0</unit> - <buffer>final</buffer> - </binding> - <binding> - <unit>1</unit> - <buffer>smaa-blend</buffer> - </binding> - </pass> - - <!-- Debug passes --> - <pass include="debug-pass.xml"> - <name>debug-color</name> - <effect>Effects/HDR/gbuffer-debug-color</effect> - <geometry> - <left>0.0</left> - <bottom>0.0</bottom> - <width>0.2</width> - <height>0.2</height> - </geometry> - <binding> - <unit>0</unit> - <buffer>gbuffer1</buffer> - </binding> - </pass> - <pass include="debug-pass.xml"> - <name>debug-normals</name> - <effect>Effects/HDR/gbuffer-debug-normal</effect> - <geometry> - <left>0.8</left> - <bottom>0.0</bottom> - <width>0.2</width> - <height>0.2</height> - </geometry> - <binding> - <unit>0</unit> - <buffer>gbuffer0</buffer> - </binding> - </pass> - <pass include="debug-pass.xml"> - <name>debug-orm</name> - <effect>Effects/HDR/gbuffer-debug-orm</effect> - <geometry> - <left>0.0</left> - <bottom>0.8</bottom> - <width>0.2</width> - <height>0.2</height> - </geometry> - <binding> - <unit>0</unit> - <buffer>gbuffer0</buffer> - </binding> - <binding> - <unit>1</unit> - <buffer>gbuffer1</buffer> - </binding> - <binding> - <unit>2</unit> - <buffer>gbuffer2</buffer> - </binding> - </pass> - <pass include="debug-pass.xml"> - <name>debug-matid</name> - <effect>Effects/HDR/gbuffer-debug-matid</effect> - <geometry> - <left>0.0</left> - <bottom>0.57</bottom> - <width>0.2</width> - <height>0.2</height> - </geometry> - <binding> - <unit>0</unit> - <buffer>gbuffer0</buffer> - </binding> - </pass> - <pass include="debug-pass.xml"> - <name>debug-depth</name> - <effect>Effects/HDR/gbuffer-debug-depth</effect> - <geometry> - <left>0.8</left> - <bottom>0.8</bottom> - <width>0.2</width> - <height>0.2</height> - </geometry> - <binding> - <unit>0</unit> - <buffer>depth-stencil</buffer> - </binding> - </pass> - - <pass> - <name>debug-histogram</name> - <type>quad</type> - <clear-mask>depth</clear-mask> - <effect>Effects/HDR/debug-histogram</effect> - <condition> - <property>/sim/rendering/hdr/debug/show-histogram</property> - </condition> - <geometry> - <left>0.8</left> - <bottom>0.57</bottom> - <width>0.2</width> - <height>0.2</height> - </geometry> - <binding> - <unit>0</unit> - <buffer>histogram</buffer> - </binding> - <binding> - <unit>1</unit> - <buffer>histogram-luminance</buffer> - </binding> - </pass> - - <pass> - <name>debug-aerial-perspective</name> - <type>quad</type> - <clear-mask>depth</clear-mask> - <effect>Effects/HDR/debug-aerial-perspective</effect> - <condition> - <property>/sim/rendering/hdr/debug/show-aerial-perspective</property> - </condition> - <geometry> - <left>0.0</left> - <bottom>0.23</bottom> - <width>0.2</width> - <height>0.2</height> - </geometry> - <binding> - <unit>1</unit> - <buffer>histogram-luminance</buffer> - </binding> - <binding> - <unit>11</unit> - <buffer>aerial-perspective</buffer> - </binding> - </pass> -</PropertyList> diff --git a/Compositor/HDR/screen-buffer.xml b/Compositor/HDR/screen-buffer.xml deleted file mode 100644 index b95a02297..000000000 --- a/Compositor/HDR/screen-buffer.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<PropertyList> - <type>2d</type> - <width>screen</width> - <height>screen</height> - <screen-width-scale><property>/sim/rendering/hdr/render-scale</property></screen-width-scale> - <screen-height-scale><property>/sim/rendering/hdr/render-scale</property></screen-height-scale> -</PropertyList> diff --git a/Compositor/HDR/smaa-pass.xml b/Compositor/HDR/smaa-pass.xml deleted file mode 100644 index 1193d8d17..000000000 --- a/Compositor/HDR/smaa-pass.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<PropertyList> - <type>quad</type> - <condition> - <equals> - <property>/sim/rendering/hdr/antialiasing-technique</property> - <value type="int">2</value> - </equals> - </condition> -</PropertyList> diff --git a/Effects/HDR/atmos-aerial-perspective.eff b/Effects/HDR/atmos-aerial-perspective.eff deleted file mode 100644 index 4e784c42a..000000000 --- a/Effects/HDR/atmos-aerial-perspective.eff +++ /dev/null @@ -1,123 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<PropertyList> - <name>Effects/HDR/atmos-aerial-perspective</name> - <parameters> - <!-- atmos.glsl --> - <aerosol-absorption-cross-section type="vec4d"> - <use>/sim/rendering/hdr/atmos/aerosol-absorption-cross-section[0]</use> - <use>/sim/rendering/hdr/atmos/aerosol-absorption-cross-section[1]</use> - <use>/sim/rendering/hdr/atmos/aerosol-absorption-cross-section[2]</use> - <use>/sim/rendering/hdr/atmos/aerosol-absorption-cross-section[3]</use> - </aerosol-absorption-cross-section> - <aerosol-scattering-cross-section type="vec4d"> - <use>/sim/rendering/hdr/atmos/aerosol-scattering-cross-section[0... [truncated message content] |
From: <fli...@li...> - 2024-09-23 19:52:29
|
stuartbuchanan pushed a commit to branch release/2024.1 in repository fgdata. The following commit(s) were added to refs/heads/release/2024.1 by this push: new ec87b6c17 Update version to 2024.1.1 ec87b6c17 is described below SF URL: http://sourceforge.net/p/flightgear/fgdata/ci/ec87b6c1725d15990c2f72bf0c6854e22138b546/ Commit: ec87b6c1725d15990c2f72bf0c6854e22138b546 Author: Stuart Buchanan Committer: Stuart Buchanan AuthorDate: Mon Sep 23 20:52:09 2024 +0100 Update version to 2024.1.1 --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 3bc46161d..b8af7d7d7 100644 --- a/version +++ b/version @@ -1 +1 @@ -2020.4.0 +2024.1.1 |
From: <fli...@li...> - 2024-09-23 19:50:04
|
stuartbuchanan pushed a commit to branch release/2024.1 in repository simgear. The following commit(s) were added to refs/heads/release/2024.1 by this push: new 58535a02 Update simgear-version to 2024.1.1 58535a02 is described below SF URL: http://sourceforge.net/p/flightgear/simgear/ci/58535a0290f1b24fde898dee85152c8887c804f2/ Commit: 58535a0290f1b24fde898dee85152c8887c804f2 Author: Stuart Buchanan Committer: Stuart Buchanan AuthorDate: Mon Sep 23 20:49:39 2024 +0100 Update simgear-version to 2024.1.1 --- simgear-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simgear-version b/simgear-version index 3bc46161..b8af7d7d 100644 --- a/simgear-version +++ b/simgear-version @@ -1 +1 @@ -2020.4.0 +2024.1.1 |
From: <fli...@li...> - 2024-09-23 19:45:30
|
stuartbuchanan pushed a commit to branch next in repository fgdata. The following commit(s) were added to refs/heads/next by this push: new a5e360a7b Update fgdata version to 2024.2.0 a5e360a7b is described below SF URL: http://sourceforge.net/p/flightgear/fgdata/ci/a5e360a7b6c043e31320878507529e6f3032bf2a/ Commit: a5e360a7b6c043e31320878507529e6f3032bf2a Author: Stuart Buchanan Committer: Stuart Buchanan AuthorDate: Mon Sep 23 20:45:00 2024 +0100 Update fgdata version to 2024.2.0 --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 3bc46161d..7e08acf8e 100644 --- a/version +++ b/version @@ -1 +1 @@ -2020.4.0 +2024.2.0 |
From: <fli...@li...> - 2024-09-23 19:43:45
|
stuartbuchanan pushed a commit to branch next in repository simgear. The following commit(s) were added to refs/heads/next by this push: new 1ff779bd Upate simgear version to 2024.2.0 1ff779bd is described below SF URL: http://sourceforge.net/p/flightgear/simgear/ci/1ff779bd90cc17c101036fbd3e1a644703042f5d/ Commit: 1ff779bd90cc17c101036fbd3e1a644703042f5d Author: Stuart Buchanan Committer: Stuart Buchanan AuthorDate: Mon Sep 23 20:43:19 2024 +0100 Upate simgear version to 2024.2.0 --- simgear-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simgear-version b/simgear-version index 3bc46161..7e08acf8 100644 --- a/simgear-version +++ b/simgear-version @@ -1 +1 @@ -2020.4.0 +2024.2.0 |
From: <fli...@li...> - 2024-09-23 19:28:51
|
stuartbuchanan pushed a commit to branch next in repository fgmeta. SF URL: http://sourceforge.net/p/flightgear/fgmeta/ci/29b4769cbf2b7a87822942e4e89aab5255a8d804/ Commit: 29b4769cbf2b7a87822942e4e89aab5255a8d804 Author: Stuart Buchanan Committer: Stuart Buchanan AuthorDate: Mon Sep 23 20:26:35 2024 +0100 track submodule changes for release --- fgdata | 2 +- flightgear | 2 +- getstart | 2 +- simgear | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fgdata b/fgdata index 5981eb1..99c8a8f 160000 --- a/fgdata +++ b/fgdata @@ -1 +1 @@ -Subproject commit 5981eb11fcdfb528456a4fed2e4c2881080b2649 +Subproject commit 99c8a8fd4dd636b5eb08ad121441fee87be4b746 diff --git a/flightgear b/flightgear index cbf1f34..6a46a6a 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit cbf1f3494ab047fcf9158267e9356f27aabc8f4e +Subproject commit 6a46a6a93ad61ce1bc87e5afb715b0794a5e62c6 diff --git a/getstart b/getstart index 4204eb3..9617f69 160000 --- a/getstart +++ b/getstart @@ -1 +1 @@ -Subproject commit 4204eb38e72b286d292cfd41d2d036b086bdec46 +Subproject commit 9617f693b7d11b3f0771e35de74e50aee213c382 diff --git a/simgear b/simgear index 3075b8b..fde967e 160000 --- a/simgear +++ b/simgear @@ -1 +1 @@ -Subproject commit 3075b8bcc4b1513fce346212128547c8de2f7d62 +Subproject commit fde967ed59bf8fd56e1617415f9a1c2592d37fb3 |
From: <fli...@li...> - 2024-09-23 19:28:49
|
stuartbuchanan pushed a commit to branch next in repository fgmeta. SF URL: http://sourceforge.net/p/flightgear/fgmeta/ci/d93aba4a0634516a85025a0a51e5c2860876487d/ Commit: d93aba4a0634516a85025a0a51e5c2860876487d Author: Stuart Buchanan Committer: Stuart Buchanan AuthorDate: Mon Sep 23 20:26:35 2024 +0100 new version: 2024.2.0 --- flightgear-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear-version b/flightgear-version index b8af7d7..7e08acf 100644 --- a/flightgear-version +++ b/flightgear-version @@ -1 +1 @@ -2024.1.1 +2024.2.0 |
From: <fli...@li...> - 2024-09-23 19:28:48
|
stuartbuchanan pushed a change to branch next in repository fgmeta. from 654924b WS30 - Explanatory diagram of ws30 scripts add 4b0e38b new version: 2024.1.1 new d93aba4 new version: 2024.2.0 new 29b4769 track submodule changes for release The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: fgdata | 2 +- flightgear | 2 +- flightgear-version | 1 + getstart | 2 +- simgear | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 flightgear-version |
From: <fli...@li...> - 2024-09-23 19:28:41
|
stuartbuchanan pushed a commit to branch release/2024.1 in repository fgmeta. SF URL: http://sourceforge.net/p/flightgear/fgmeta/ci/a7b79868339b941287946582f8b3cce1c9ce1a8b/ Commit: a7b79868339b941287946582f8b3cce1c9ce1a8b Author: Stuart Buchanan Committer: Stuart Buchanan AuthorDate: Mon Sep 23 20:26:35 2024 +0100 set correct release-branch for submodules --- .gitmodules | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 50e2eeb..3a2a9b1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,11 +1,11 @@ [submodule "simgear"] path = simgear url = ../simgear - branch = next + branch = release/2024.1 [submodule "flightgear"] path = flightgear url = ../flightgear - branch = next + branch = release/2024.1 [submodule "fgrun"] path = fgrun url = ../fgrun @@ -13,7 +13,7 @@ [submodule "fgdata"] path = fgdata url = ../fgdata - branch = next + branch = release/2024.1 [submodule "windows-3rd-party"] path = windows-3rd-party url = ../windows-3rd-party @@ -21,4 +21,4 @@ [submodule "getstart"] path = getstart url = ../getstart - branch = next + branch = release/2024.1 |
From: <fli...@li...> - 2024-09-23 19:28:39
|
stuartbuchanan pushed a commit to branch release/2024.1 in repository fgmeta. SF URL: http://sourceforge.net/p/flightgear/fgmeta/ci/4b0e38b347a98e870bebaf7ca7ad3439982ce34f/ Commit: 4b0e38b347a98e870bebaf7ca7ad3439982ce34f Author: Stuart Buchanan Committer: Stuart Buchanan AuthorDate: Mon Sep 23 20:26:34 2024 +0100 new version: 2024.1.1 --- flightgear-version | 1 + 1 file changed, 1 insertion(+) diff --git a/flightgear-version b/flightgear-version new file mode 100644 index 0000000..b8af7d7 --- /dev/null +++ b/flightgear-version @@ -0,0 +1 @@ +2024.1.1 |
From: <fli...@li...> - 2024-09-23 19:28:38
|
stuartbuchanan pushed a change to branch release/2024.1 in repository fgmeta. at a7b7986 set correct release-branch for submodules This branch includes the following new commits: new 4b0e38b new version: 2024.1.1 new a7b7986 set correct release-branch for submodules The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. |
From: <fli...@li...> - 2024-09-23 19:28:32
|
stuartbuchanan pushed a commit to branch next in repository getstart. SF URL: http://sourceforge.net/p/flightgear/getstart/ci/9617f693b7d11b3f0771e35de74e50aee213c382/ Commit: 9617f693b7d11b3f0771e35de74e50aee213c382 Author: Stuart Buchanan Committer: Stuart Buchanan AuthorDate: Mon Sep 23 20:26:31 2024 +0100 new version: 2024.2.0 --- flightgear-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear-version b/flightgear-version index b8af7d7..7e08acf 100644 --- a/flightgear-version +++ b/flightgear-version @@ -1 +1 @@ -2024.1.1 +2024.2.0 |
From: <fli...@li...> - 2024-09-23 19:28:31
|
stuartbuchanan pushed a change to branch next in repository getstart. from 44b451e Update Polish translation add 3de8b67 new version: 2024.1.1 new 9617f69 new version: 2024.2.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: flightgear-version | 1 + 1 file changed, 1 insertion(+) create mode 100644 flightgear-version |
From: <fli...@li...> - 2024-09-23 19:28:26
|
stuartbuchanan pushed a commit to branch release/2024.1 in repository getstart. SF URL: http://sourceforge.net/p/flightgear/getstart/ci/3de8b677df95479451f251357c3c3d6ac5de0b40/ Commit: 3de8b677df95479451f251357c3c3d6ac5de0b40 Author: Stuart Buchanan Committer: Stuart Buchanan AuthorDate: Mon Sep 23 20:26:31 2024 +0100 new version: 2024.1.1 --- flightgear-version | 1 + 1 file changed, 1 insertion(+) diff --git a/flightgear-version b/flightgear-version new file mode 100644 index 0000000..b8af7d7 --- /dev/null +++ b/flightgear-version @@ -0,0 +1 @@ +2024.1.1 |
From: <fli...@li...> - 2024-09-23 19:28:24
|
stuartbuchanan pushed a change to branch release/2024.1 in repository getstart. at 3de8b67 new version: 2024.1.1 This branch includes the following new commits: new 3de8b67 new version: 2024.1.1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. |
From: <fli...@li...> - 2024-09-23 19:28:19
|
stuartbuchanan pushed a commit to branch next in repository fgdata. SF URL: http://sourceforge.net/p/flightgear/fgdata/ci/99c8a8fd4dd636b5eb08ad121441fee87be4b746/ Commit: 99c8a8fd4dd636b5eb08ad121441fee87be4b746 Author: Stuart Buchanan Committer: Stuart Buchanan AuthorDate: Mon Sep 23 20:26:29 2024 +0100 new version: 2024.2.0 --- flightgear-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear-version b/flightgear-version index b8af7d7d7..7e08acf8e 100644 --- a/flightgear-version +++ b/flightgear-version @@ -1 +1 @@ -2024.1.1 +2024.2.0 |
From: <fli...@li...> - 2024-09-23 19:28:18
|
stuartbuchanan pushed a change to branch next in repository fgdata. from e5c8d6927 WS30 - mark Unknown landclasses as sea add 509e5b9b0 new version: 2024.1.1 new 99c8a8fd4 new version: 2024.2.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: flightgear-version | 1 + 1 file changed, 1 insertion(+) create mode 100644 flightgear-version |
From: <fli...@li...> - 2024-09-23 19:28:04
|
stuartbuchanan pushed a commit to branch release/2024.1 in repository fgdata. SF URL: http://sourceforge.net/p/flightgear/fgdata/ci/509e5b9b069de342f69ed82292d12c5c96186b24/ Commit: 509e5b9b069de342f69ed82292d12c5c96186b24 Author: Stuart Buchanan Committer: Stuart Buchanan AuthorDate: Mon Sep 23 20:26:28 2024 +0100 new version: 2024.1.1 --- flightgear-version | 1 + 1 file changed, 1 insertion(+) diff --git a/flightgear-version b/flightgear-version new file mode 100644 index 000000000..b8af7d7d7 --- /dev/null +++ b/flightgear-version @@ -0,0 +1 @@ +2024.1.1 |
From: <fli...@li...> - 2024-09-23 19:28:03
|
stuartbuchanan pushed a change to branch release/2024.1 in repository fgdata. at 509e5b9b0 new version: 2024.1.1 This branch includes the following new commits: new 509e5b9b0 new version: 2024.1.1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. |
From: <fli...@li...> - 2024-09-23 19:27:47
|
stuartbuchanan pushed a commit to branch next in repository flightgear. SF URL: http://sourceforge.net/p/flightgear/flightgear/ci/6a46a6a93ad61ce1bc87e5afb715b0794a5e62c6/ Commit: 6a46a6a93ad61ce1bc87e5afb715b0794a5e62c6 Author: Stuart Buchanan Committer: Stuart Buchanan AuthorDate: Mon Sep 23 20:26:23 2024 +0100 new version: 2024.2.0 --- flightgear-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear-version b/flightgear-version index b8af7d7d7..7e08acf8e 100644 --- a/flightgear-version +++ b/flightgear-version @@ -1 +1 @@ -2024.1.1 +2024.2.0 |
From: <fli...@li...> - 2024-09-23 19:27:45
|
stuartbuchanan pushed a change to branch next in repository flightgear. from 3a869de51 Magnetic compass: add damping to roll/pitch of disc to simulate fluid add 2bcea3753 new version: 2024.1.1 new 6a46a6a93 new version: 2024.2.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: flightgear-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) |
From: <fli...@li...> - 2024-09-23 19:27:40
|
stuartbuchanan pushed a commit to branch release/2024.1 in repository flightgear. SF URL: http://sourceforge.net/p/flightgear/flightgear/ci/2bcea37533ccfe14c9f8ffd41d99bc8c244bb40e/ Commit: 2bcea37533ccfe14c9f8ffd41d99bc8c244bb40e Author: Stuart Buchanan Committer: Stuart Buchanan AuthorDate: Mon Sep 23 20:26:23 2024 +0100 new version: 2024.1.1 --- flightgear-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear-version b/flightgear-version index 3bc46161d..b8af7d7d7 100644 --- a/flightgear-version +++ b/flightgear-version @@ -1 +1 @@ -2020.4.0 +2024.1.1 |
From: <fli...@li...> - 2024-09-23 19:27:38
|
stuartbuchanan pushed a change to branch release/2024.1 in repository flightgear. at 2bcea3753 new version: 2024.1.1 This branch includes the following new commits: new 2bcea3753 new version: 2024.1.1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. |
From: <fli...@li...> - 2024-09-23 19:27:33
|
stuartbuchanan pushed a commit to branch next in repository simgear. SF URL: http://sourceforge.net/p/flightgear/simgear/ci/fde967ed59bf8fd56e1617415f9a1c2592d37fb3/ Commit: fde967ed59bf8fd56e1617415f9a1c2592d37fb3 Author: Stuart Buchanan Committer: Stuart Buchanan AuthorDate: Mon Sep 23 20:26:20 2024 +0100 new version: 2024.2.0 --- flightgear-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear-version b/flightgear-version index b8af7d7d..7e08acf8 100644 --- a/flightgear-version +++ b/flightgear-version @@ -1 +1 @@ -2024.1.1 +2024.2.0 |