From 48768ee9d2d79957de25fb1ad458dc409f826635 Mon Sep 17 00:00:00 2001 From: Thorsten Renk Date: Wed, 5 Apr 2017 16:50:31 +0300 Subject: [PATCH] Earthview 2.1 - parallax mapping for cloud layer, lightning at night, Rayleigh scattering in atmosphere and minor bugfixes --- Effects/planet-aurora.eff | 28 +- Effects/planet-cloudlayer.eff | 49 +- Effects/planet.eff | 31 +- Models/Astro/Effects/aurora_inner.eff | 9 + Models/Astro/aurora.xml | 60 +- Models/Astro/aurora_inner.xml | 43 + Models/Astro/aurora_outer.xml | 49 + Models/Astro/aurora_projection.ac | 3670 ++++++++++++------------- Nasal/earthview.nas | 104 +- Shaders/planet-aurora.frag | 6 +- Shaders/planet-aurora.vert | 15 +- Shaders/planet-cloudlayer.frag | 75 +- Shaders/planet-high.frag | 27 +- Shaders/planet.frag | 15 +- defaults.xml | 3 + gui/dialogs/earthview.xml | 36 + 16 files changed, 2257 insertions(+), 1963 deletions(-) create mode 100755 Models/Astro/Effects/aurora_inner.eff create mode 100755 Models/Astro/aurora_inner.xml create mode 100755 Models/Astro/aurora_outer.xml diff --git a/Effects/planet-aurora.eff b/Effects/planet-aurora.eff index fd740e277..c404de5a6 100644 --- a/Effects/planet-aurora.eff +++ b/Effects/planet-aurora.eff @@ -17,15 +17,16 @@ /environment/aurora/patchiness /environment/aurora/afterglow /sim/rendering/als-filters/use-filtering - /sim/rendering/als-filters/gamma - /sim/rendering/als-filters/brightness - /environment/surface/delta-T-cloud + /sim/rendering/als-filters/gamma + /sim/rendering/als-filters/brightness + /environment/surface/delta-T-cloud /sim/rendering/als-filters/grey-factor - /sim/rendering/als-filters/black-factor - /sim/rendering/als-filters/use-night-vision - /sim/rendering/als-filters/use-IR-vision - /sim/startup/xsize - /sim/startup/ysize + /sim/rendering/als-filters/black-factor + /sim/rendering/als-filters/use-night-vision + /sim/rendering/als-filters/use-IR-vision + /sim/startup/xsize + /sim/startup/ysize + 0.0 @@ -77,9 +78,9 @@ shade-model - + rendering-hint @@ -87,7 +88,7 @@ false - 10 + 111 DepthSortedBin @@ -164,6 +165,11 @@ float brightness + + arc_id + float + arc_id + use_filtering bool diff --git a/Effects/planet-cloudlayer.eff b/Effects/planet-cloudlayer.eff index 91debda5c..ae2b354f4 100644 --- a/Effects/planet-cloudlayer.eff +++ b/Effects/planet-cloudlayer.eff @@ -23,17 +23,21 @@ /earthview/cloud-normal-flag /earthview/shade-effect /sim/time/sun-angle-rad - /environment/air-pollution-norm + /environment/air-pollution-norm + /earthview/roi-x1 + /earthview/roi-y1 + /earthview/lightning /sim/rendering/als-filters/use-filtering - /sim/rendering/als-filters/gamma - /sim/rendering/als-filters/brightness - /environment/surface/delta-T-cloud + /sim/rendering/als-filters/gamma + /sim/rendering/als-filters/brightness + /environment/surface/delta-T-cloud /sim/rendering/als-filters/grey-factor - /sim/rendering/als-filters/black-factor - /sim/rendering/als-filters/use-night-vision - /sim/rendering/als-filters/use-IR-vision - /sim/startup/xsize - /sim/startup/ysize + /sim/rendering/als-filters/black-factor + /sim/rendering/als-filters/use-night-vision + /sim/rendering/als-filters/use-IR-vision + /sim/startup/xsize + /sim/startup/ysize + 15 @@ -161,7 +165,7 @@ use-cloud-normals - + colorMode int @@ -183,11 +187,11 @@ shade-effect - + air_pollution float air_pollution - + sun_angle float @@ -195,6 +199,27 @@ sun-angle + + lightning + float + + lightning + + + + roi_x1 + float + + roi_x1 + + + + roi_y1 + float + + roi_y1 + + gamma float diff --git a/Effects/planet.eff b/Effects/planet.eff index 28c65a9c4..5ee7549aa 100644 --- a/Effects/planet.eff +++ b/Effects/planet.eff @@ -35,20 +35,21 @@ /environment/visibility-m + /environment/air-pollution-norm /earthview/cloudsphere-flag /earthview/cloud-shadow-flag /earthview/overlay-texture-flag /sim/time/sun-angle-rad /sim/rendering/als-filters/use-filtering - /sim/rendering/als-filters/gamma - /sim/rendering/als-filters/brightness - /environment/surface/delta-T-cloud + /sim/rendering/als-filters/gamma + /sim/rendering/als-filters/brightness + /environment/surface/delta-T-cloud /sim/rendering/als-filters/grey-factor - /sim/rendering/als-filters/black-factor - /sim/rendering/als-filters/use-night-vision - /sim/rendering/als-filters/use-IR-vision - /sim/startup/xsize - /sim/startup/ysize + /sim/rendering/als-filters/black-factor + /sim/rendering/als-filters/use-night-vision + /sim/rendering/als-filters/use-IR-vision + /sim/startup/xsize + /sim/startup/ysize 15 @@ -196,6 +197,13 @@ visibility + + air_pollution + float + + air_pollution + + sun_angle float @@ -412,6 +420,13 @@ visibility + + air_pollution + float + + air_pollution + + sun_angle float diff --git a/Models/Astro/Effects/aurora_inner.eff b/Models/Astro/Effects/aurora_inner.eff new file mode 100755 index 000000000..63bad8f54 --- /dev/null +++ b/Models/Astro/Effects/aurora_inner.eff @@ -0,0 +1,9 @@ + + + + aurora_inner + Effects/planet-aurora + + 1.0 + + \ No newline at end of file diff --git a/Models/Astro/aurora.xml b/Models/Astro/aurora.xml index c5ed33c62..87fc58b43 100644 --- a/Models/Astro/aurora.xml +++ b/Models/Astro/aurora.xml @@ -1,49 +1,11 @@ - - - - aurora_projection.ac - - - - scale - 58030 - 58030 - 58030 - - - - - false - - - - - - rotate - /earthview/yaw-deg - 1 - 0 -
- 0 - 0 - 0 -
- - 0 - 0 - 1 - -
- - - Effects/planet-aurora - aurora - - - - - - - - -
+ + + + + aurora_inner.xml + + + aurora_outer.xml + + + diff --git a/Models/Astro/aurora_inner.xml b/Models/Astro/aurora_inner.xml new file mode 100755 index 000000000..200df0326 --- /dev/null +++ b/Models/Astro/aurora_inner.xml @@ -0,0 +1,43 @@ + + + + aurora_projection.ac + + + + scale + 51030 + 51030 + 58030 + + + + + false + + + + + + rotate + /earthview/yaw-deg + 1 + 0 +
+ 0 + 0 + 0 +
+ + 0 + 0 + 1 + +
+ + + Models/Astro/Effects/aurora_inner + aurora + + +
\ No newline at end of file diff --git a/Models/Astro/aurora_outer.xml b/Models/Astro/aurora_outer.xml new file mode 100755 index 000000000..313cd3550 --- /dev/null +++ b/Models/Astro/aurora_outer.xml @@ -0,0 +1,49 @@ + + + + aurora_projection.ac + + + + scale + 58030 + 58030 + 58030 + + + + + false + + + + + + rotate + /earthview/yaw-deg + 1 + 0 +
+ 0 + 0 + 0 +
+ + 0 + 0 + 1 + +
+ + + Effects/planet-aurora + aurora + + + + + + + + +
diff --git a/Models/Astro/aurora_projection.ac b/Models/Astro/aurora_projection.ac index 3bff43fca..f484aa134 100644 --- a/Models/Astro/aurora_projection.ac +++ b/Models/Astro/aurora_projection.ac @@ -1,1835 +1,1835 @@ -AC3Db -MATERIAL "DefaultWhite" rgb 1.0000 1.0000 1.0000 amb 0.2000 0.2000 0.2000 emis 0.0000 0.0000 0.0000 spec 0.5000 0.5000 0.5000 shi 10 trans 0.0000 -MATERIAL "AuroraBase" rgb 0.8000 0.8000 0.8000 amb 1.0000 1.0000 1.0000 emis 0.0000 0.0000 0.0000 spec 0.5000 0.5000 0.5000 shi 50 trans 1.0000 -OBJECT world -name "Blender_export__aurora_projection.ac" -kids 1 -OBJECT poly -name "aurora" -numvert 256 --0.2828431 -1.0999999 0.2828431 --0.2828431 -0.7857139 0.2828431 --0.2828431 -0.4714283 0.2828431 --0.2828431 -0.1571425 0.2828431 --0.2828431 0.1571433 0.2828431 --0.2828431 0.4714291 0.2828431 --0.2828431 0.7857149 0.2828431 --0.2828431 1.0999998 0.2828431 --0.3533359 -1.0999998 0.1896514 --0.3533359 -0.7857143 0.1896514 --0.3533359 -0.4714283 0.1896514 --0.3533358 -0.1571425 0.1896514 --0.3533358 0.1571433 0.1896514 --0.3533358 0.4714290 0.1896514 --0.3533359 0.7857149 0.1896514 --0.3533358 1.0999998 0.1896514 --0.3876873 -1.0999999 0.1080882 --0.3876873 -0.7857141 0.1080882 --0.3876873 -0.4714283 0.1080882 --0.3876873 -0.1571425 0.1080882 --0.3876873 0.1571433 0.1080882 --0.3876873 0.4714291 0.1080882 --0.3876873 0.7857150 0.1080882 --0.3876873 1.0999998 0.1080882 --0.3986132 -1.0999998 0.0474936 --0.3986133 -0.7857141 0.0474936 --0.3986133 -0.4714284 0.0474936 --0.3986133 -0.1571425 0.0474936 --0.3986132 0.1571433 0.0474936 --0.3986133 0.4714290 0.0474936 --0.3986133 0.7857149 0.0474936 --0.3986133 1.0999999 0.0474936 --0.4000006 -1.0999999 0.0000000 --0.4000005 -0.7857140 0.0000000 --0.4000006 -0.4714283 0.0000000 --0.4000006 -0.1571425 0.0000000 --0.4000006 0.1571433 0.0000000 --0.4000006 0.4714291 0.0000000 --0.4000006 0.7857149 0.0000000 --0.4000005 1.0999998 0.0000000 --0.3986132 -1.0999998 -0.0474936 --0.3986133 -0.7857140 -0.0474936 --0.3986132 -0.4714282 -0.0474936 --0.3986133 -0.1571424 -0.0474936 --0.3986133 0.1571433 -0.0474936 --0.3986133 0.4714291 -0.0474936 --0.3986133 0.7857149 -0.0474936 --0.3986133 1.0999999 -0.0474936 --0.3876873 -1.0999999 -0.1080882 --0.3876873 -0.7857141 -0.1080882 --0.3876873 -0.4714283 -0.1080882 --0.3876873 -0.1571425 -0.1080882 --0.3876873 0.1571433 -0.1080882 --0.3876873 0.4714291 -0.1080882 --0.3876873 0.7857150 -0.1080882 --0.3876873 1.0999999 -0.1080882 --0.3533358 -1.0999998 -0.1896514 --0.3533358 -0.7857141 -0.1896514 --0.3533359 -0.4714283 -0.1896514 --0.3533359 -0.1571425 -0.1896514 --0.3533358 0.1571433 -0.1896514 --0.3533358 0.4714290 -0.1896514 --0.3533359 0.7857150 -0.1896514 --0.3533359 1.0999999 -0.1896514 --0.2828431 -1.0999999 -0.2828431 --0.2828431 -0.7857139 -0.2828431 --0.2828431 -0.4714283 -0.2828431 --0.2828431 -0.1571425 -0.2828431 --0.2828431 0.1571433 -0.2828431 --0.2828431 0.4714291 -0.2828431 --0.2828431 0.7857149 -0.2828431 --0.2828431 1.0999998 -0.2828431 --0.1896514 -1.0999998 -0.3533359 --0.1896514 -0.7857143 -0.3533359 --0.1896514 -0.4714283 -0.3533359 --0.1896514 -0.1571425 -0.3533358 --0.1896514 0.1571433 -0.3533358 --0.1896514 0.4714290 -0.3533358 --0.1896514 0.7857149 -0.3533359 --0.1896514 1.0999998 -0.3533358 --0.1080882 -1.0999999 -0.3876873 --0.1080882 -0.7857141 -0.3876873 --0.1080882 -0.4714283 -0.3876873 --0.1080882 -0.1571425 -0.3876873 --0.1080882 0.1571433 -0.3876873 --0.1080882 0.4714291 -0.3876873 --0.1080882 0.7857150 -0.3876873 --0.1080882 1.0999998 -0.3876873 --0.0474936 -1.0999998 -0.3986132 --0.0474936 -0.7857141 -0.3986133 --0.0474936 -0.4714284 -0.3986133 --0.0474936 -0.1571425 -0.3986133 --0.0474936 0.1571433 -0.3986132 --0.0474936 0.4714290 -0.3986133 --0.0474936 0.7857149 -0.3986133 --0.0474936 1.0999999 -0.3986133 -0.0000000 -1.0999999 -0.4000006 -0.0000000 -0.7857140 -0.4000005 -0.0000000 -0.4714283 -0.4000006 -0.0000000 -0.1571425 -0.4000006 -0.0000000 0.1571433 -0.4000006 -0.0000000 0.4714291 -0.4000006 -0.0000000 0.7857149 -0.4000006 -0.0000000 1.0999998 -0.4000005 -0.0474936 -1.0999998 -0.3986132 -0.0474936 -0.7857140 -0.3986133 -0.0474936 -0.4714282 -0.3986132 -0.0474936 -0.1571424 -0.3986133 -0.0474936 0.1571433 -0.3986133 -0.0474936 0.4714291 -0.3986133 -0.0474936 0.7857149 -0.3986133 -0.0474936 1.0999999 -0.3986133 -0.1080882 -1.0999999 -0.3876873 -0.1080882 -0.7857141 -0.3876873 -0.1080882 -0.4714283 -0.3876873 -0.1080882 -0.1571425 -0.3876873 -0.1080882 0.1571433 -0.3876873 -0.1080882 0.4714291 -0.3876873 -0.1080882 0.7857150 -0.3876873 -0.1080882 1.0999999 -0.3876873 -0.1896514 -1.0999998 -0.3533358 -0.1896514 -0.7857141 -0.3533358 -0.1896514 -0.4714283 -0.3533359 -0.1896514 -0.1571425 -0.3533359 -0.1896514 0.1571433 -0.3533358 -0.1896514 0.4714290 -0.3533358 -0.1896514 0.7857150 -0.3533359 -0.1896514 1.0999999 -0.3533359 -0.2828431 -1.0999999 -0.2828431 -0.2828431 -0.7857139 -0.2828431 -0.2828431 -0.4714283 -0.2828431 -0.2828431 -0.1571425 -0.2828431 -0.2828431 0.1571433 -0.2828431 -0.2828431 0.4714291 -0.2828431 -0.2828431 0.7857149 -0.2828431 -0.2828431 1.0999998 -0.2828431 -0.3533359 -1.0999998 -0.1896514 -0.3533359 -0.7857143 -0.1896514 -0.3533359 -0.4714283 -0.1896514 -0.3533358 -0.1571425 -0.1896514 -0.3533358 0.1571433 -0.1896514 -0.3533358 0.4714290 -0.1896514 -0.3533359 0.7857149 -0.1896514 -0.3533358 1.0999998 -0.1896514 -0.3876873 -1.0999999 -0.1080882 -0.3876873 -0.7857141 -0.1080882 -0.3876873 -0.4714283 -0.1080882 -0.3876873 -0.1571425 -0.1080882 -0.3876873 0.1571433 -0.1080882 -0.3876873 0.4714291 -0.1080882 -0.3876873 0.7857150 -0.1080882 -0.3876873 1.0999998 -0.1080882 -0.3986132 -1.0999998 -0.0474936 -0.3986133 -0.7857141 -0.0474936 -0.3986133 -0.4714284 -0.0474936 -0.3986133 -0.1571425 -0.0474936 -0.3986132 0.1571433 -0.0474936 -0.3986133 0.4714290 -0.0474936 -0.3986133 0.7857149 -0.0474936 -0.3986133 1.0999999 -0.0474936 -0.4000006 -1.0999999 0.0000000 -0.4000005 -0.7857140 0.0000000 -0.4000006 -0.4714283 0.0000000 -0.4000006 -0.1571425 0.0000000 -0.4000006 0.1571433 0.0000000 -0.4000006 0.4714291 0.0000000 -0.4000006 0.7857149 0.0000000 -0.4000005 1.0999998 0.0000000 -0.3986132 -1.0999998 0.0474936 -0.3986133 -0.7857140 0.0474936 -0.3986132 -0.4714282 0.0474936 -0.3986133 -0.1571424 0.0474936 -0.3986133 0.1571433 0.0474936 -0.3986133 0.4714291 0.0474936 -0.3986133 0.7857149 0.0474936 -0.3986133 1.0999999 0.0474936 -0.3876873 -1.0999999 0.1080882 -0.3876873 -0.7857141 0.1080882 -0.3876873 -0.4714283 0.1080882 -0.3876873 -0.1571425 0.1080882 -0.3876873 0.1571433 0.1080882 -0.3876873 0.4714291 0.1080882 -0.3876873 0.7857150 0.1080882 -0.3876873 1.0999999 0.1080882 -0.3533358 -1.0999998 0.1896514 -0.3533358 -0.7857141 0.1896514 -0.3533359 -0.4714283 0.1896514 -0.3533359 -0.1571425 0.1896514 -0.3533358 0.1571433 0.1896514 -0.3533358 0.4714290 0.1896514 -0.3533359 0.7857150 0.1896514 -0.3533359 1.0999999 0.1896514 -0.2828431 -1.0999999 0.2828431 -0.2828431 -0.7857139 0.2828431 -0.2828431 -0.4714283 0.2828431 -0.2828431 -0.1571425 0.2828431 -0.2828431 0.1571433 0.2828431 -0.2828431 0.4714291 0.2828431 -0.2828431 0.7857149 0.2828431 -0.2828431 1.0999998 0.2828431 -0.1896514 -1.0999998 0.3533359 -0.1896514 -0.7857143 0.3533359 -0.1896514 -0.4714283 0.3533359 -0.1896514 -0.1571425 0.3533358 -0.1896514 0.1571433 0.3533358 -0.1896514 0.4714290 0.3533358 -0.1896514 0.7857149 0.3533359 -0.1896514 1.0999998 0.3533358 -0.1080882 -1.0999999 0.3876873 -0.1080882 -0.7857141 0.3876873 -0.1080882 -0.4714283 0.3876873 -0.1080882 -0.1571425 0.3876873 -0.1080882 0.1571433 0.3876873 -0.1080882 0.4714291 0.3876873 -0.1080882 0.7857150 0.3876873 -0.1080882 1.0999998 0.3876873 -0.0474936 -1.0999998 0.3986132 -0.0474936 -0.7857141 0.3986133 -0.0474936 -0.4714284 0.3986133 -0.0474936 -0.1571425 0.3986133 -0.0474936 0.1571433 0.3986132 -0.0474936 0.4714290 0.3986133 -0.0474936 0.7857149 0.3986133 -0.0474936 1.0999999 0.3986133 -0.0000000 -1.0999999 0.4000006 -0.0000000 -0.7857140 0.4000005 -0.0000000 -0.4714283 0.4000006 -0.0000000 -0.1571425 0.4000006 -0.0000000 0.1571433 0.4000006 -0.0000000 0.4714291 0.4000006 -0.0000000 0.7857149 0.4000006 -0.0000000 1.0999998 0.4000005 --0.0474936 -1.0999998 0.3986132 --0.0474936 -0.7857140 0.3986133 --0.0474936 -0.4714282 0.3986132 --0.0474936 -0.1571424 0.3986133 --0.0474936 0.1571433 0.3986133 --0.0474936 0.4714291 0.3986133 --0.0474936 0.7857149 0.3986133 --0.0474936 1.0999999 0.3986133 --0.1080882 -1.0999999 0.3876873 --0.1080882 -0.7857141 0.3876873 --0.1080882 -0.4714283 0.3876873 --0.1080882 -0.1571425 0.3876873 --0.1080882 0.1571433 0.3876873 --0.1080882 0.4714291 0.3876873 --0.1080882 0.7857150 0.3876873 --0.1080882 1.0999999 0.3876873 --0.1896514 -1.0999998 0.3533358 --0.1896514 -0.7857141 0.3533358 --0.1896514 -0.4714283 0.3533359 --0.1896514 -0.1571425 0.3533359 --0.1896514 0.1571433 0.3533358 --0.1896514 0.4714290 0.3533358 --0.1896514 0.7857150 0.3533359 --0.1896514 1.0999999 0.3533359 -numsurf 224 -SURF 0X30 -mat 1 -refs 4 -8 0 0 -0 0 0 -1 0 0 -9 0 0 -SURF 0X30 -mat 1 -refs 4 -2 0 0 -10 0 0 -9 0 0 -1 0 0 -SURF 0X30 -mat 1 -refs 4 -3 0 0 -11 0 0 -10 0 0 -2 0 0 -SURF 0X30 -mat 1 -refs 4 -4 0 0 -12 0 0 -11 0 0 -3 0 0 -SURF 0X30 -mat 1 -refs 4 -5 0 0 -13 0 0 -12 0 0 -4 0 0 -SURF 0X30 -mat 1 -refs 4 -6 0 0 -14 0 0 -13 0 0 -5 0 0 -SURF 0X30 -mat 1 -refs 4 -7 0 0 -15 0 0 -14 0 0 -6 0 0 -SURF 0X30 -mat 1 -refs 4 -9 0 0 -17 0 0 -16 0 0 -8 0 0 -SURF 0X30 -mat 1 -refs 4 -10 0 0 -18 0 0 -17 0 0 -9 0 0 -SURF 0X30 -mat 1 -refs 4 -11 0 0 -19 0 0 -18 0 0 -10 0 0 -SURF 0X30 -mat 1 -refs 4 -12 0 0 -20 0 0 -19 0 0 -11 0 0 -SURF 0X30 -mat 1 -refs 4 -13 0 0 -21 0 0 -20 0 0 -12 0 0 -SURF 0X30 -mat 1 -refs 4 -14 0 0 -22 0 0 -21 0 0 -13 0 0 -SURF 0X30 -mat 1 -refs 4 -15 0 0 -23 0 0 -22 0 0 -14 0 0 -SURF 0X30 -mat 1 -refs 4 -17 0 0 -25 0 0 -24 0 0 -16 0 0 -SURF 0X30 -mat 1 -refs 4 -18 0 0 -26 0 0 -25 0 0 -17 0 0 -SURF 0X30 -mat 1 -refs 4 -19 0 0 -27 0 0 -26 0 0 -18 0 0 -SURF 0X30 -mat 1 -refs 4 -20 0 0 -28 0 0 -27 0 0 -19 0 0 -SURF 0X30 -mat 1 -refs 4 -21 0 0 -29 0 0 -28 0 0 -20 0 0 -SURF 0X30 -mat 1 -refs 4 -22 0 0 -30 0 0 -29 0 0 -21 0 0 -SURF 0X30 -mat 1 -refs 4 -23 0 0 -31 0 0 -30 0 0 -22 0 0 -SURF 0X30 -mat 1 -refs 4 -25 0 0 -33 0 0 -32 0 0 -24 0 0 -SURF 0X30 -mat 1 -refs 4 -26 0 0 -34 0 0 -33 0 0 -25 0 0 -SURF 0X30 -mat 1 -refs 4 -27 0 0 -35 0 0 -34 0 0 -26 0 0 -SURF 0X30 -mat 1 -refs 4 -28 0 0 -36 0 0 -35 0 0 -27 0 0 -SURF 0X30 -mat 1 -refs 4 -29 0 0 -37 0 0 -36 0 0 -28 0 0 -SURF 0X30 -mat 1 -refs 4 -30 0 0 -38 0 0 -37 0 0 -29 0 0 -SURF 0X30 -mat 1 -refs 4 -31 0 0 -39 0 0 -38 0 0 -30 0 0 -SURF 0X30 -mat 1 -refs 4 -33 0 0 -41 0 0 -40 0 0 -32 0 0 -SURF 0X30 -mat 1 -refs 4 -34 0 0 -42 0 0 -41 0 0 -33 0 0 -SURF 0X30 -mat 1 -refs 4 -35 0 0 -43 0 0 -42 0 0 -34 0 0 -SURF 0X30 -mat 1 -refs 4 -36 0 0 -44 0 0 -43 0 0 -35 0 0 -SURF 0X30 -mat 1 -refs 4 -37 0 0 -45 0 0 -44 0 0 -36 0 0 -SURF 0X30 -mat 1 -refs 4 -38 0 0 -46 0 0 -45 0 0 -37 0 0 -SURF 0X30 -mat 1 -refs 4 -39 0 0 -47 0 0 -46 0 0 -38 0 0 -SURF 0X30 -mat 1 -refs 4 -41 0 0 -49 0 0 -48 0 0 -40 0 0 -SURF 0X30 -mat 1 -refs 4 -42 0 0 -50 0 0 -49 0 0 -41 0 0 -SURF 0X30 -mat 1 -refs 4 -43 0 0 -51 0 0 -50 0 0 -42 0 0 -SURF 0X30 -mat 1 -refs 4 -44 0 0 -52 0 0 -51 0 0 -43 0 0 -SURF 0X30 -mat 1 -refs 4 -45 0 0 -53 0 0 -52 0 0 -44 0 0 -SURF 0X30 -mat 1 -refs 4 -46 0 0 -54 0 0 -53 0 0 -45 0 0 -SURF 0X30 -mat 1 -refs 4 -47 0 0 -55 0 0 -54 0 0 -46 0 0 -SURF 0X30 -mat 1 -refs 4 -49 0 0 -57 0 0 -56 0 0 -48 0 0 -SURF 0X30 -mat 1 -refs 4 -50 0 0 -58 0 0 -57 0 0 -49 0 0 -SURF 0X30 -mat 1 -refs 4 -51 0 0 -59 0 0 -58 0 0 -50 0 0 -SURF 0X30 -mat 1 -refs 4 -52 0 0 -60 0 0 -59 0 0 -51 0 0 -SURF 0X30 -mat 1 -refs 4 -53 0 0 -61 0 0 -60 0 0 -52 0 0 -SURF 0X30 -mat 1 -refs 4 -54 0 0 -62 0 0 -61 0 0 -53 0 0 -SURF 0X30 -mat 1 -refs 4 -55 0 0 -63 0 0 -62 0 0 -54 0 0 -SURF 0X30 -mat 1 -refs 4 -57 0 0 -65 0 0 -64 0 0 -56 0 0 -SURF 0X30 -mat 1 -refs 4 -58 0 0 -66 0 0 -65 0 0 -57 0 0 -SURF 0X30 -mat 1 -refs 4 -59 0 0 -67 0 0 -66 0 0 -58 0 0 -SURF 0X30 -mat 1 -refs 4 -60 0 0 -68 0 0 -67 0 0 -59 0 0 -SURF 0X30 -mat 1 -refs 4 -61 0 0 -69 0 0 -68 0 0 -60 0 0 -SURF 0X30 -mat 1 -refs 4 -62 0 0 -70 0 0 -69 0 0 -61 0 0 -SURF 0X30 -mat 1 -refs 4 -63 0 0 -71 0 0 -70 0 0 -62 0 0 -SURF 0X30 -mat 1 -refs 4 -65 0 0 -73 0 0 -72 0 0 -64 0 0 -SURF 0X30 -mat 1 -refs 4 -66 0 0 -74 0 0 -73 0 0 -65 0 0 -SURF 0X30 -mat 1 -refs 4 -67 0 0 -75 0 0 -74 0 0 -66 0 0 -SURF 0X30 -mat 1 -refs 4 -68 0 0 -76 0 0 -75 0 0 -67 0 0 -SURF 0X30 -mat 1 -refs 4 -69 0 0 -77 0 0 -76 0 0 -68 0 0 -SURF 0X30 -mat 1 -refs 4 -70 0 0 -78 0 0 -77 0 0 -69 0 0 -SURF 0X30 -mat 1 -refs 4 -71 0 0 -79 0 0 -78 0 0 -70 0 0 -SURF 0X30 -mat 1 -refs 4 -73 0 0 -81 0 0 -80 0 0 -72 0 0 -SURF 0X30 -mat 1 -refs 4 -74 0 0 -82 0 0 -81 0 0 -73 0 0 -SURF 0X30 -mat 1 -refs 4 -75 0 0 -83 0 0 -82 0 0 -74 0 0 -SURF 0X30 -mat 1 -refs 4 -76 0 0 -84 0 0 -83 0 0 -75 0 0 -SURF 0X30 -mat 1 -refs 4 -77 0 0 -85 0 0 -84 0 0 -76 0 0 -SURF 0X30 -mat 1 -refs 4 -78 0 0 -86 0 0 -85 0 0 -77 0 0 -SURF 0X30 -mat 1 -refs 4 -79 0 0 -87 0 0 -86 0 0 -78 0 0 -SURF 0X30 -mat 1 -refs 4 -81 0 0 -89 0 0 -88 0 0 -80 0 0 -SURF 0X30 -mat 1 -refs 4 -82 0 0 -90 0 0 -89 0 0 -81 0 0 -SURF 0X30 -mat 1 -refs 4 -83 0 0 -91 0 0 -90 0 0 -82 0 0 -SURF 0X30 -mat 1 -refs 4 -84 0 0 -92 0 0 -91 0 0 -83 0 0 -SURF 0X30 -mat 1 -refs 4 -85 0 0 -93 0 0 -92 0 0 -84 0 0 -SURF 0X30 -mat 1 -refs 4 -86 0 0 -94 0 0 -93 0 0 -85 0 0 -SURF 0X30 -mat 1 -refs 4 -87 0 0 -95 0 0 -94 0 0 -86 0 0 -SURF 0X30 -mat 1 -refs 4 -89 0 0 -97 0 0 -96 0 0 -88 0 0 -SURF 0X30 -mat 1 -refs 4 -90 0 0 -98 0 0 -97 0 0 -89 0 0 -SURF 0X30 -mat 1 -refs 4 -91 0 0 -99 0 0 -98 0 0 -90 0 0 -SURF 0X30 -mat 1 -refs 4 -92 0 0 -100 0 0 -99 0 0 -91 0 0 -SURF 0X30 -mat 1 -refs 4 -93 0 0 -101 0 0 -100 0 0 -92 0 0 -SURF 0X30 -mat 1 -refs 4 -94 0 0 -102 0 0 -101 0 0 -93 0 0 -SURF 0X30 -mat 1 -refs 4 -95 0 0 -103 0 0 -102 0 0 -94 0 0 -SURF 0X30 -mat 1 -refs 4 -97 0 0 -105 0 0 -104 0 0 -96 0 0 -SURF 0X30 -mat 1 -refs 4 -98 0 0 -106 0 0 -105 0 0 -97 0 0 -SURF 0X30 -mat 1 -refs 4 -99 0 0 -107 0 0 -106 0 0 -98 0 0 -SURF 0X30 -mat 1 -refs 4 -100 0 0 -108 0 0 -107 0 0 -99 0 0 -SURF 0X30 -mat 1 -refs 4 -101 0 0 -109 0 0 -108 0 0 -100 0 0 -SURF 0X30 -mat 1 -refs 4 -102 0 0 -110 0 0 -109 0 0 -101 0 0 -SURF 0X30 -mat 1 -refs 4 -103 0 0 -111 0 0 -110 0 0 -102 0 0 -SURF 0X30 -mat 1 -refs 4 -105 0 0 -113 0 0 -112 0 0 -104 0 0 -SURF 0X30 -mat 1 -refs 4 -106 0 0 -114 0 0 -113 0 0 -105 0 0 -SURF 0X30 -mat 1 -refs 4 -107 0 0 -115 0 0 -114 0 0 -106 0 0 -SURF 0X30 -mat 1 -refs 4 -108 0 0 -116 0 0 -115 0 0 -107 0 0 -SURF 0X30 -mat 1 -refs 4 -109 0 0 -117 0 0 -116 0 0 -108 0 0 -SURF 0X30 -mat 1 -refs 4 -110 0 0 -118 0 0 -117 0 0 -109 0 0 -SURF 0X30 -mat 1 -refs 4 -111 0 0 -119 0 0 -118 0 0 -110 0 0 -SURF 0X30 -mat 1 -refs 4 -113 0 0 -121 0 0 -120 0 0 -112 0 0 -SURF 0X30 -mat 1 -refs 4 -114 0 0 -122 0 0 -121 0 0 -113 0 0 -SURF 0X30 -mat 1 -refs 4 -115 0 0 -123 0 0 -122 0 0 -114 0 0 -SURF 0X30 -mat 1 -refs 4 -116 0 0 -124 0 0 -123 0 0 -115 0 0 -SURF 0X30 -mat 1 -refs 4 -117 0 0 -125 0 0 -124 0 0 -116 0 0 -SURF 0X30 -mat 1 -refs 4 -118 0 0 -126 0 0 -125 0 0 -117 0 0 -SURF 0X30 -mat 1 -refs 4 -119 0 0 -127 0 0 -126 0 0 -118 0 0 -SURF 0X30 -mat 1 -refs 4 -121 0 0 -129 0 0 -128 0 0 -120 0 0 -SURF 0X30 -mat 1 -refs 4 -122 0 0 -130 0 0 -129 0 0 -121 0 0 -SURF 0X30 -mat 1 -refs 4 -123 0 0 -131 0 0 -130 0 0 -122 0 0 -SURF 0X30 -mat 1 -refs 4 -124 0 0 -132 0 0 -131 0 0 -123 0 0 -SURF 0X30 -mat 1 -refs 4 -125 0 0 -133 0 0 -132 0 0 -124 0 0 -SURF 0X30 -mat 1 -refs 4 -126 0 0 -134 0 0 -133 0 0 -125 0 0 -SURF 0X30 -mat 1 -refs 4 -127 0 0 -135 0 0 -134 0 0 -126 0 0 -SURF 0X30 -mat 1 -refs 4 -129 0 0 -137 0 0 -136 0 0 -128 0 0 -SURF 0X30 -mat 1 -refs 4 -130 0 0 -138 0 0 -137 0 0 -129 0 0 -SURF 0X30 -mat 1 -refs 4 -131 0 0 -139 0 0 -138 0 0 -130 0 0 -SURF 0X30 -mat 1 -refs 4 -132 0 0 -140 0 0 -139 0 0 -131 0 0 -SURF 0X30 -mat 1 -refs 4 -133 0 0 -141 0 0 -140 0 0 -132 0 0 -SURF 0X30 -mat 1 -refs 4 -134 0 0 -142 0 0 -141 0 0 -133 0 0 -SURF 0X30 -mat 1 -refs 4 -135 0 0 -143 0 0 -142 0 0 -134 0 0 -SURF 0X30 -mat 1 -refs 4 -137 0 0 -145 0 0 -144 0 0 -136 0 0 -SURF 0X30 -mat 1 -refs 4 -138 0 0 -146 0 0 -145 0 0 -137 0 0 -SURF 0X30 -mat 1 -refs 4 -139 0 0 -147 0 0 -146 0 0 -138 0 0 -SURF 0X30 -mat 1 -refs 4 -140 0 0 -148 0 0 -147 0 0 -139 0 0 -SURF 0X30 -mat 1 -refs 4 -141 0 0 -149 0 0 -148 0 0 -140 0 0 -SURF 0X30 -mat 1 -refs 4 -142 0 0 -150 0 0 -149 0 0 -141 0 0 -SURF 0X30 -mat 1 -refs 4 -143 0 0 -151 0 0 -150 0 0 -142 0 0 -SURF 0X30 -mat 1 -refs 4 -145 0 0 -153 0 0 -152 0 0 -144 0 0 -SURF 0X30 -mat 1 -refs 4 -146 0 0 -154 0 0 -153 0 0 -145 0 0 -SURF 0X30 -mat 1 -refs 4 -147 0 0 -155 0 0 -154 0 0 -146 0 0 -SURF 0X30 -mat 1 -refs 4 -148 0 0 -156 0 0 -155 0 0 -147 0 0 -SURF 0X30 -mat 1 -refs 4 -149 0 0 -157 0 0 -156 0 0 -148 0 0 -SURF 0X30 -mat 1 -refs 4 -150 0 0 -158 0 0 -157 0 0 -149 0 0 -SURF 0X30 -mat 1 -refs 4 -151 0 0 -159 0 0 -158 0 0 -150 0 0 -SURF 0X30 -mat 1 -refs 4 -153 0 0 -161 0 0 -160 0 0 -152 0 0 -SURF 0X30 -mat 1 -refs 4 -154 0 0 -162 0 0 -161 0 0 -153 0 0 -SURF 0X30 -mat 1 -refs 4 -155 0 0 -163 0 0 -162 0 0 -154 0 0 -SURF 0X30 -mat 1 -refs 4 -156 0 0 -164 0 0 -163 0 0 -155 0 0 -SURF 0X30 -mat 1 -refs 4 -157 0 0 -165 0 0 -164 0 0 -156 0 0 -SURF 0X30 -mat 1 -refs 4 -158 0 0 -166 0 0 -165 0 0 -157 0 0 -SURF 0X30 -mat 1 -refs 4 -159 0 0 -167 0 0 -166 0 0 -158 0 0 -SURF 0X30 -mat 1 -refs 4 -161 0 0 -169 0 0 -168 0 0 -160 0 0 -SURF 0X30 -mat 1 -refs 4 -162 0 0 -170 0 0 -169 0 0 -161 0 0 -SURF 0X30 -mat 1 -refs 4 -163 0 0 -171 0 0 -170 0 0 -162 0 0 -SURF 0X30 -mat 1 -refs 4 -164 0 0 -172 0 0 -171 0 0 -163 0 0 -SURF 0X30 -mat 1 -refs 4 -165 0 0 -173 0 0 -172 0 0 -164 0 0 -SURF 0X30 -mat 1 -refs 4 -166 0 0 -174 0 0 -173 0 0 -165 0 0 -SURF 0X30 -mat 1 -refs 4 -167 0 0 -175 0 0 -174 0 0 -166 0 0 -SURF 0X30 -mat 1 -refs 4 -169 0 0 -177 0 0 -176 0 0 -168 0 0 -SURF 0X30 -mat 1 -refs 4 -170 0 0 -178 0 0 -177 0 0 -169 0 0 -SURF 0X30 -mat 1 -refs 4 -171 0 0 -179 0 0 -178 0 0 -170 0 0 -SURF 0X30 -mat 1 -refs 4 -172 0 0 -180 0 0 -179 0 0 -171 0 0 -SURF 0X30 -mat 1 -refs 4 -173 0 0 -181 0 0 -180 0 0 -172 0 0 -SURF 0X30 -mat 1 -refs 4 -174 0 0 -182 0 0 -181 0 0 -173 0 0 -SURF 0X30 -mat 1 -refs 4 -175 0 0 -183 0 0 -182 0 0 -174 0 0 -SURF 0X30 -mat 1 -refs 4 -177 0 0 -185 0 0 -184 0 0 -176 0 0 -SURF 0X30 -mat 1 -refs 4 -178 0 0 -186 0 0 -185 0 0 -177 0 0 -SURF 0X30 -mat 1 -refs 4 -179 0 0 -187 0 0 -186 0 0 -178 0 0 -SURF 0X30 -mat 1 -refs 4 -180 0 0 -188 0 0 -187 0 0 -179 0 0 -SURF 0X30 -mat 1 -refs 4 -181 0 0 -189 0 0 -188 0 0 -180 0 0 -SURF 0X30 -mat 1 -refs 4 -182 0 0 -190 0 0 -189 0 0 -181 0 0 -SURF 0X30 -mat 1 -refs 4 -183 0 0 -191 0 0 -190 0 0 -182 0 0 -SURF 0X30 -mat 1 -refs 4 -185 0 0 -193 0 0 -192 0 0 -184 0 0 -SURF 0X30 -mat 1 -refs 4 -186 0 0 -194 0 0 -193 0 0 -185 0 0 -SURF 0X30 -mat 1 -refs 4 -187 0 0 -195 0 0 -194 0 0 -186 0 0 -SURF 0X30 -mat 1 -refs 4 -188 0 0 -196 0 0 -195 0 0 -187 0 0 -SURF 0X30 -mat 1 -refs 4 -189 0 0 -197 0 0 -196 0 0 -188 0 0 -SURF 0X30 -mat 1 -refs 4 -190 0 0 -198 0 0 -197 0 0 -189 0 0 -SURF 0X30 -mat 1 -refs 4 -191 0 0 -199 0 0 -198 0 0 -190 0 0 -SURF 0X30 -mat 1 -refs 4 -193 0 0 -201 0 0 -200 0 0 -192 0 0 -SURF 0X30 -mat 1 -refs 4 -194 0 0 -202 0 0 -201 0 0 -193 0 0 -SURF 0X30 -mat 1 -refs 4 -195 0 0 -203 0 0 -202 0 0 -194 0 0 -SURF 0X30 -mat 1 -refs 4 -196 0 0 -204 0 0 -203 0 0 -195 0 0 -SURF 0X30 -mat 1 -refs 4 -197 0 0 -205 0 0 -204 0 0 -196 0 0 -SURF 0X30 -mat 1 -refs 4 -198 0 0 -206 0 0 -205 0 0 -197 0 0 -SURF 0X30 -mat 1 -refs 4 -199 0 0 -207 0 0 -206 0 0 -198 0 0 -SURF 0X30 -mat 1 -refs 4 -201 0 0 -209 0 0 -208 0 0 -200 0 0 -SURF 0X30 -mat 1 -refs 4 -202 0 0 -210 0 0 -209 0 0 -201 0 0 -SURF 0X30 -mat 1 -refs 4 -203 0 0 -211 0 0 -210 0 0 -202 0 0 -SURF 0X30 -mat 1 -refs 4 -204 0 0 -212 0 0 -211 0 0 -203 0 0 -SURF 0X30 -mat 1 -refs 4 -205 0 0 -213 0 0 -212 0 0 -204 0 0 -SURF 0X30 -mat 1 -refs 4 -206 0 0 -214 0 0 -213 0 0 -205 0 0 -SURF 0X30 -mat 1 -refs 4 -207 0 0 -215 0 0 -214 0 0 -206 0 0 -SURF 0X30 -mat 1 -refs 4 -209 0 0 -217 0 0 -216 0 0 -208 0 0 -SURF 0X30 -mat 1 -refs 4 -210 0 0 -218 0 0 -217 0 0 -209 0 0 -SURF 0X30 -mat 1 -refs 4 -211 0 0 -219 0 0 -218 0 0 -210 0 0 -SURF 0X30 -mat 1 -refs 4 -212 0 0 -220 0 0 -219 0 0 -211 0 0 -SURF 0X30 -mat 1 -refs 4 -213 0 0 -221 0 0 -220 0 0 -212 0 0 -SURF 0X30 -mat 1 -refs 4 -214 0 0 -222 0 0 -221 0 0 -213 0 0 -SURF 0X30 -mat 1 -refs 4 -215 0 0 -223 0 0 -222 0 0 -214 0 0 -SURF 0X30 -mat 1 -refs 4 -217 0 0 -225 0 0 -224 0 0 -216 0 0 -SURF 0X30 -mat 1 -refs 4 -218 0 0 -226 0 0 -225 0 0 -217 0 0 -SURF 0X30 -mat 1 -refs 4 -219 0 0 -227 0 0 -226 0 0 -218 0 0 -SURF 0X30 -mat 1 -refs 4 -220 0 0 -228 0 0 -227 0 0 -219 0 0 -SURF 0X30 -mat 1 -refs 4 -221 0 0 -229 0 0 -228 0 0 -220 0 0 -SURF 0X30 -mat 1 -refs 4 -222 0 0 -230 0 0 -229 0 0 -221 0 0 -SURF 0X30 -mat 1 -refs 4 -223 0 0 -231 0 0 -230 0 0 -222 0 0 -SURF 0X30 -mat 1 -refs 4 -225 0 0 -233 0 0 -232 0 0 -224 0 0 -SURF 0X30 -mat 1 -refs 4 -226 0 0 -234 0 0 -233 0 0 -225 0 0 -SURF 0X30 -mat 1 -refs 4 -227 0 0 -235 0 0 -234 0 0 -226 0 0 -SURF 0X30 -mat 1 -refs 4 -228 0 0 -236 0 0 -235 0 0 -227 0 0 -SURF 0X30 -mat 1 -refs 4 -229 0 0 -237 0 0 -236 0 0 -228 0 0 -SURF 0X30 -mat 1 -refs 4 -230 0 0 -238 0 0 -237 0 0 -229 0 0 -SURF 0X30 -mat 1 -refs 4 -231 0 0 -239 0 0 -238 0 0 -230 0 0 -SURF 0X30 -mat 1 -refs 4 -233 0 0 -241 0 0 -240 0 0 -232 0 0 -SURF 0X30 -mat 1 -refs 4 -234 0 0 -242 0 0 -241 0 0 -233 0 0 -SURF 0X30 -mat 1 -refs 4 -235 0 0 -243 0 0 -242 0 0 -234 0 0 -SURF 0X30 -mat 1 -refs 4 -236 0 0 -244 0 0 -243 0 0 -235 0 0 -SURF 0X30 -mat 1 -refs 4 -237 0 0 -245 0 0 -244 0 0 -236 0 0 -SURF 0X30 -mat 1 -refs 4 -238 0 0 -246 0 0 -245 0 0 -237 0 0 -SURF 0X30 -mat 1 -refs 4 -239 0 0 -247 0 0 -246 0 0 -238 0 0 -SURF 0X30 -mat 1 -refs 4 -241 0 0 -249 0 0 -248 0 0 -240 0 0 -SURF 0X30 -mat 1 -refs 4 -242 0 0 -250 0 0 -249 0 0 -241 0 0 -SURF 0X30 -mat 1 -refs 4 -243 0 0 -251 0 0 -250 0 0 -242 0 0 -SURF 0X30 -mat 1 -refs 4 -244 0 0 -252 0 0 -251 0 0 -243 0 0 -SURF 0X30 -mat 1 -refs 4 -245 0 0 -253 0 0 -252 0 0 -244 0 0 -SURF 0X30 -mat 1 -refs 4 -246 0 0 -254 0 0 -253 0 0 -245 0 0 -SURF 0X30 -mat 1 -refs 4 -247 0 0 -255 0 0 -254 0 0 -246 0 0 -SURF 0X30 -mat 1 -refs 4 -0 0 0 -248 0 0 -249 0 0 -1 0 0 -SURF 0X30 -mat 1 -refs 4 -250 0 0 -2 0 0 -1 0 0 -249 0 0 -SURF 0X30 -mat 1 -refs 4 -251 0 0 -3 0 0 -2 0 0 -250 0 0 -SURF 0X30 -mat 1 -refs 4 -252 0 0 -4 0 0 -3 0 0 -251 0 0 -SURF 0X30 -mat 1 -refs 4 -253 0 0 -5 0 0 -4 0 0 -252 0 0 -SURF 0X30 -mat 1 -refs 4 -254 0 0 -6 0 0 -5 0 0 -253 0 0 -SURF 0X30 -mat 1 -refs 4 -255 0 0 -7 0 0 -6 0 0 -254 0 0 -kids 0 +AC3Db +MATERIAL "DefaultWhite" rgb 1.0000 1.0000 1.0000 amb 0.2000 0.2000 0.2000 emis 0.0000 0.0000 0.0000 spec 0.5000 0.5000 0.5000 shi 10 trans 0.0000 +MATERIAL "AuroraBase" rgb 0.8000 0.8000 0.8000 amb 1.0000 1.0000 1.0000 emis 0.0000 0.0000 0.0000 spec 0.5000 0.5000 0.5000 shi 50 trans 1.0000 +OBJECT world +name "Blender_export__aurora_projection.ac" +kids 1 +OBJECT poly +name "aurora" +numvert 256 +-0.2828431 -1.0999999 0.2828431 +-0.2828431 -0.7857139 0.2828431 +-0.2828431 -0.4714283 0.2828431 +-0.2828431 -0.1571425 0.2828431 +-0.2828431 0.1571433 0.2828431 +-0.2828431 0.4714291 0.2828431 +-0.2828431 0.7857149 0.2828431 +-0.2828431 1.0999998 0.2828431 +-0.3533359 -1.0999998 0.1896514 +-0.3533359 -0.7857143 0.1896514 +-0.3533359 -0.4714283 0.1896514 +-0.3533358 -0.1571425 0.1896514 +-0.3533358 0.1571433 0.1896514 +-0.3533358 0.4714290 0.1896514 +-0.3533359 0.7857149 0.1896514 +-0.3533358 1.0999998 0.1896514 +-0.3876873 -1.0999999 0.1080882 +-0.3876873 -0.7857141 0.1080882 +-0.3876873 -0.4714283 0.1080882 +-0.3876873 -0.1571425 0.1080882 +-0.3876873 0.1571433 0.1080882 +-0.3876873 0.4714291 0.1080882 +-0.3876873 0.7857150 0.1080882 +-0.3876873 1.0999998 0.1080882 +-0.3986132 -1.0999998 0.0474936 +-0.3986133 -0.7857141 0.0474936 +-0.3986133 -0.4714284 0.0474936 +-0.3986133 -0.1571425 0.0474936 +-0.3986132 0.1571433 0.0474936 +-0.3986133 0.4714290 0.0474936 +-0.3986133 0.7857149 0.0474936 +-0.3986133 1.0999999 0.0474936 +-0.4000006 -1.0999999 0.0000000 +-0.4000005 -0.7857140 0.0000000 +-0.4000006 -0.4714283 0.0000000 +-0.4000006 -0.1571425 0.0000000 +-0.4000006 0.1571433 0.0000000 +-0.4000006 0.4714291 0.0000000 +-0.4000006 0.7857149 0.0000000 +-0.4000005 1.0999998 0.0000000 +-0.3986132 -1.0999998 -0.0474936 +-0.3986133 -0.7857140 -0.0474936 +-0.3986132 -0.4714282 -0.0474936 +-0.3986133 -0.1571424 -0.0474936 +-0.3986133 0.1571433 -0.0474936 +-0.3986133 0.4714291 -0.0474936 +-0.3986133 0.7857149 -0.0474936 +-0.3986133 1.0999999 -0.0474936 +-0.3876873 -1.0999999 -0.1080882 +-0.3876873 -0.7857141 -0.1080882 +-0.3876873 -0.4714283 -0.1080882 +-0.3876873 -0.1571425 -0.1080882 +-0.3876873 0.1571433 -0.1080882 +-0.3876873 0.4714291 -0.1080882 +-0.3876873 0.7857150 -0.1080882 +-0.3876873 1.0999999 -0.1080882 +-0.3533358 -1.0999998 -0.1896514 +-0.3533358 -0.7857141 -0.1896514 +-0.3533359 -0.4714283 -0.1896514 +-0.3533359 -0.1571425 -0.1896514 +-0.3533358 0.1571433 -0.1896514 +-0.3533358 0.4714290 -0.1896514 +-0.3533359 0.7857150 -0.1896514 +-0.3533359 1.0999999 -0.1896514 +-0.2828431 -1.0999999 -0.2828431 +-0.2828431 -0.7857139 -0.2828431 +-0.2828431 -0.4714283 -0.2828431 +-0.2828431 -0.1571425 -0.2828431 +-0.2828431 0.1571433 -0.2828431 +-0.2828431 0.4714291 -0.2828431 +-0.2828431 0.7857149 -0.2828431 +-0.2828431 1.0999998 -0.2828431 +-0.1896514 -1.0999998 -0.3533359 +-0.1896514 -0.7857143 -0.3533359 +-0.1896514 -0.4714283 -0.3533359 +-0.1896514 -0.1571425 -0.3533358 +-0.1896514 0.1571433 -0.3533358 +-0.1896514 0.4714290 -0.3533358 +-0.1896514 0.7857149 -0.3533359 +-0.1896514 1.0999998 -0.3533358 +-0.1080882 -1.0999999 -0.3876873 +-0.1080882 -0.7857141 -0.3876873 +-0.1080882 -0.4714283 -0.3876873 +-0.1080882 -0.1571425 -0.3876873 +-0.1080882 0.1571433 -0.3876873 +-0.1080882 0.4714291 -0.3876873 +-0.1080882 0.7857150 -0.3876873 +-0.1080882 1.0999998 -0.3876873 +-0.0474936 -1.0999998 -0.3986132 +-0.0474936 -0.7857141 -0.3986133 +-0.0474936 -0.4714284 -0.3986133 +-0.0474936 -0.1571425 -0.3986133 +-0.0474936 0.1571433 -0.3986132 +-0.0474936 0.4714290 -0.3986133 +-0.0474936 0.7857149 -0.3986133 +-0.0474936 1.0999999 -0.3986133 +0.0000000 -1.0999999 -0.4000006 +0.0000000 -0.7857140 -0.4000005 +0.0000000 -0.4714283 -0.4000006 +0.0000000 -0.1571425 -0.4000006 +0.0000000 0.1571433 -0.4000006 +0.0000000 0.4714291 -0.4000006 +0.0000000 0.7857149 -0.4000006 +0.0000000 1.0999998 -0.4000005 +0.0474936 -1.0999998 -0.3986132 +0.0474936 -0.7857140 -0.3986133 +0.0474936 -0.4714282 -0.3986132 +0.0474936 -0.1571424 -0.3986133 +0.0474936 0.1571433 -0.3986133 +0.0474936 0.4714291 -0.3986133 +0.0474936 0.7857149 -0.3986133 +0.0474936 1.0999999 -0.3986133 +0.1080882 -1.0999999 -0.3876873 +0.1080882 -0.7857141 -0.3876873 +0.1080882 -0.4714283 -0.3876873 +0.1080882 -0.1571425 -0.3876873 +0.1080882 0.1571433 -0.3876873 +0.1080882 0.4714291 -0.3876873 +0.1080882 0.7857150 -0.3876873 +0.1080882 1.0999999 -0.3876873 +0.1896514 -1.0999998 -0.3533358 +0.1896514 -0.7857141 -0.3533358 +0.1896514 -0.4714283 -0.3533359 +0.1896514 -0.1571425 -0.3533359 +0.1896514 0.1571433 -0.3533358 +0.1896514 0.4714290 -0.3533358 +0.1896514 0.7857150 -0.3533359 +0.1896514 1.0999999 -0.3533359 +0.2828431 -1.0999999 -0.2828431 +0.2828431 -0.7857139 -0.2828431 +0.2828431 -0.4714283 -0.2828431 +0.2828431 -0.1571425 -0.2828431 +0.2828431 0.1571433 -0.2828431 +0.2828431 0.4714291 -0.2828431 +0.2828431 0.7857149 -0.2828431 +0.2828431 1.0999998 -0.2828431 +0.3533359 -1.0999998 -0.1896514 +0.3533359 -0.7857143 -0.1896514 +0.3533359 -0.4714283 -0.1896514 +0.3533358 -0.1571425 -0.1896514 +0.3533358 0.1571433 -0.1896514 +0.3533358 0.4714290 -0.1896514 +0.3533359 0.7857149 -0.1896514 +0.3533358 1.0999998 -0.1896514 +0.3876873 -1.0999999 -0.1080882 +0.3876873 -0.7857141 -0.1080882 +0.3876873 -0.4714283 -0.1080882 +0.3876873 -0.1571425 -0.1080882 +0.3876873 0.1571433 -0.1080882 +0.3876873 0.4714291 -0.1080882 +0.3876873 0.7857150 -0.1080882 +0.3876873 1.0999998 -0.1080882 +0.3986132 -1.0999998 -0.0474936 +0.3986133 -0.7857141 -0.0474936 +0.3986133 -0.4714284 -0.0474936 +0.3986133 -0.1571425 -0.0474936 +0.3986132 0.1571433 -0.0474936 +0.3986133 0.4714290 -0.0474936 +0.3986133 0.7857149 -0.0474936 +0.3986133 1.0999999 -0.0474936 +0.4000006 -1.0999999 0.0000000 +0.4000005 -0.7857140 0.0000000 +0.4000006 -0.4714283 0.0000000 +0.4000006 -0.1571425 0.0000000 +0.4000006 0.1571433 0.0000000 +0.4000006 0.4714291 0.0000000 +0.4000006 0.7857149 0.0000000 +0.4000005 1.0999998 0.0000000 +0.3986132 -1.0999998 0.0474936 +0.3986133 -0.7857140 0.0474936 +0.3986132 -0.4714282 0.0474936 +0.3986133 -0.1571424 0.0474936 +0.3986133 0.1571433 0.0474936 +0.3986133 0.4714291 0.0474936 +0.3986133 0.7857149 0.0474936 +0.3986133 1.0999999 0.0474936 +0.3876873 -1.0999999 0.1080882 +0.3876873 -0.7857141 0.1080882 +0.3876873 -0.4714283 0.1080882 +0.3876873 -0.1571425 0.1080882 +0.3876873 0.1571433 0.1080882 +0.3876873 0.4714291 0.1080882 +0.3876873 0.7857150 0.1080882 +0.3876873 1.0999999 0.1080882 +0.3533358 -1.0999998 0.1896514 +0.3533358 -0.7857141 0.1896514 +0.3533359 -0.4714283 0.1896514 +0.3533359 -0.1571425 0.1896514 +0.3533358 0.1571433 0.1896514 +0.3533358 0.4714290 0.1896514 +0.3533359 0.7857150 0.1896514 +0.3533359 1.0999999 0.1896514 +0.2828431 -1.0999999 0.2828431 +0.2828431 -0.7857139 0.2828431 +0.2828431 -0.4714283 0.2828431 +0.2828431 -0.1571425 0.2828431 +0.2828431 0.1571433 0.2828431 +0.2828431 0.4714291 0.2828431 +0.2828431 0.7857149 0.2828431 +0.2828431 1.0999998 0.2828431 +0.1896514 -1.0999998 0.3533359 +0.1896514 -0.7857143 0.3533359 +0.1896514 -0.4714283 0.3533359 +0.1896514 -0.1571425 0.3533358 +0.1896514 0.1571433 0.3533358 +0.1896514 0.4714290 0.3533358 +0.1896514 0.7857149 0.3533359 +0.1896514 1.0999998 0.3533358 +0.1080882 -1.0999999 0.3876873 +0.1080882 -0.7857141 0.3876873 +0.1080882 -0.4714283 0.3876873 +0.1080882 -0.1571425 0.3876873 +0.1080882 0.1571433 0.3876873 +0.1080882 0.4714291 0.3876873 +0.1080882 0.7857150 0.3876873 +0.1080882 1.0999998 0.3876873 +0.0474936 -1.0999998 0.3986132 +0.0474936 -0.7857141 0.3986133 +0.0474936 -0.4714284 0.3986133 +0.0474936 -0.1571425 0.3986133 +0.0474936 0.1571433 0.3986132 +0.0474936 0.4714290 0.3986133 +0.0474936 0.7857149 0.3986133 +0.0474936 1.0999999 0.3986133 +0.0000000 -1.0999999 0.4000006 +0.0000000 -0.7857140 0.4000005 +0.0000000 -0.4714283 0.4000006 +0.0000000 -0.1571425 0.4000006 +0.0000000 0.1571433 0.4000006 +0.0000000 0.4714291 0.4000006 +0.0000000 0.7857149 0.4000006 +0.0000000 1.0999998 0.4000005 +-0.0474936 -1.0999998 0.3986132 +-0.0474936 -0.7857140 0.3986133 +-0.0474936 -0.4714282 0.3986132 +-0.0474936 -0.1571424 0.3986133 +-0.0474936 0.1571433 0.3986133 +-0.0474936 0.4714291 0.3986133 +-0.0474936 0.7857149 0.3986133 +-0.0474936 1.0999999 0.3986133 +-0.1080882 -1.0999999 0.3876873 +-0.1080882 -0.7857141 0.3876873 +-0.1080882 -0.4714283 0.3876873 +-0.1080882 -0.1571425 0.3876873 +-0.1080882 0.1571433 0.3876873 +-0.1080882 0.4714291 0.3876873 +-0.1080882 0.7857150 0.3876873 +-0.1080882 1.0999999 0.3876873 +-0.1896514 -1.0999998 0.3533358 +-0.1896514 -0.7857141 0.3533358 +-0.1896514 -0.4714283 0.3533359 +-0.1896514 -0.1571425 0.3533359 +-0.1896514 0.1571433 0.3533358 +-0.1896514 0.4714290 0.3533358 +-0.1896514 0.7857150 0.3533359 +-0.1896514 1.0999999 0.3533359 +numsurf 224 +SURF 0X30 +mat 1 +refs 4 +8 0 0 +0 0 0 +1 0 0 +9 0 0 +SURF 0X30 +mat 1 +refs 4 +2 0 0 +10 0 0 +9 0 0 +1 0 0 +SURF 0X30 +mat 1 +refs 4 +3 0 0 +11 0 0 +10 0 0 +2 0 0 +SURF 0X30 +mat 1 +refs 4 +4 0 0 +12 0 0 +11 0 0 +3 0 0 +SURF 0X30 +mat 1 +refs 4 +5 0 0 +13 0 0 +12 0 0 +4 0 0 +SURF 0X30 +mat 1 +refs 4 +6 0 0 +14 0 0 +13 0 0 +5 0 0 +SURF 0X30 +mat 1 +refs 4 +7 0 0 +15 0 0 +14 0 0 +6 0 0 +SURF 0X30 +mat 1 +refs 4 +9 0 0 +17 0 0 +16 0 0 +8 0 0 +SURF 0X30 +mat 1 +refs 4 +10 0 0 +18 0 0 +17 0 0 +9 0 0 +SURF 0X30 +mat 1 +refs 4 +11 0 0 +19 0 0 +18 0 0 +10 0 0 +SURF 0X30 +mat 1 +refs 4 +12 0 0 +20 0 0 +19 0 0 +11 0 0 +SURF 0X30 +mat 1 +refs 4 +13 0 0 +21 0 0 +20 0 0 +12 0 0 +SURF 0X30 +mat 1 +refs 4 +14 0 0 +22 0 0 +21 0 0 +13 0 0 +SURF 0X30 +mat 1 +refs 4 +15 0 0 +23 0 0 +22 0 0 +14 0 0 +SURF 0X30 +mat 1 +refs 4 +17 0 0 +25 0 0 +24 0 0 +16 0 0 +SURF 0X30 +mat 1 +refs 4 +18 0 0 +26 0 0 +25 0 0 +17 0 0 +SURF 0X30 +mat 1 +refs 4 +19 0 0 +27 0 0 +26 0 0 +18 0 0 +SURF 0X30 +mat 1 +refs 4 +20 0 0 +28 0 0 +27 0 0 +19 0 0 +SURF 0X30 +mat 1 +refs 4 +21 0 0 +29 0 0 +28 0 0 +20 0 0 +SURF 0X30 +mat 1 +refs 4 +22 0 0 +30 0 0 +29 0 0 +21 0 0 +SURF 0X30 +mat 1 +refs 4 +23 0 0 +31 0 0 +30 0 0 +22 0 0 +SURF 0X30 +mat 1 +refs 4 +25 0 0 +33 0 0 +32 0 0 +24 0 0 +SURF 0X30 +mat 1 +refs 4 +26 0 0 +34 0 0 +33 0 0 +25 0 0 +SURF 0X30 +mat 1 +refs 4 +27 0 0 +35 0 0 +34 0 0 +26 0 0 +SURF 0X30 +mat 1 +refs 4 +28 0 0 +36 0 0 +35 0 0 +27 0 0 +SURF 0X30 +mat 1 +refs 4 +29 0 0 +37 0 0 +36 0 0 +28 0 0 +SURF 0X30 +mat 1 +refs 4 +30 0 0 +38 0 0 +37 0 0 +29 0 0 +SURF 0X30 +mat 1 +refs 4 +31 0 0 +39 0 0 +38 0 0 +30 0 0 +SURF 0X30 +mat 1 +refs 4 +33 0 0 +41 0 0 +40 0 0 +32 0 0 +SURF 0X30 +mat 1 +refs 4 +34 0 0 +42 0 0 +41 0 0 +33 0 0 +SURF 0X30 +mat 1 +refs 4 +35 0 0 +43 0 0 +42 0 0 +34 0 0 +SURF 0X30 +mat 1 +refs 4 +36 0 0 +44 0 0 +43 0 0 +35 0 0 +SURF 0X30 +mat 1 +refs 4 +37 0 0 +45 0 0 +44 0 0 +36 0 0 +SURF 0X30 +mat 1 +refs 4 +38 0 0 +46 0 0 +45 0 0 +37 0 0 +SURF 0X30 +mat 1 +refs 4 +39 0 0 +47 0 0 +46 0 0 +38 0 0 +SURF 0X30 +mat 1 +refs 4 +41 0 0 +49 0 0 +48 0 0 +40 0 0 +SURF 0X30 +mat 1 +refs 4 +42 0 0 +50 0 0 +49 0 0 +41 0 0 +SURF 0X30 +mat 1 +refs 4 +43 0 0 +51 0 0 +50 0 0 +42 0 0 +SURF 0X30 +mat 1 +refs 4 +44 0 0 +52 0 0 +51 0 0 +43 0 0 +SURF 0X30 +mat 1 +refs 4 +45 0 0 +53 0 0 +52 0 0 +44 0 0 +SURF 0X30 +mat 1 +refs 4 +46 0 0 +54 0 0 +53 0 0 +45 0 0 +SURF 0X30 +mat 1 +refs 4 +47 0 0 +55 0 0 +54 0 0 +46 0 0 +SURF 0X30 +mat 1 +refs 4 +49 0 0 +57 0 0 +56 0 0 +48 0 0 +SURF 0X30 +mat 1 +refs 4 +50 0 0 +58 0 0 +57 0 0 +49 0 0 +SURF 0X30 +mat 1 +refs 4 +51 0 0 +59 0 0 +58 0 0 +50 0 0 +SURF 0X30 +mat 1 +refs 4 +52 0 0 +60 0 0 +59 0 0 +51 0 0 +SURF 0X30 +mat 1 +refs 4 +53 0 0 +61 0 0 +60 0 0 +52 0 0 +SURF 0X30 +mat 1 +refs 4 +54 0 0 +62 0 0 +61 0 0 +53 0 0 +SURF 0X30 +mat 1 +refs 4 +55 0 0 +63 0 0 +62 0 0 +54 0 0 +SURF 0X30 +mat 1 +refs 4 +57 0 0 +65 0 0 +64 0 0 +56 0 0 +SURF 0X30 +mat 1 +refs 4 +58 0 0 +66 0 0 +65 0 0 +57 0 0 +SURF 0X30 +mat 1 +refs 4 +59 0 0 +67 0 0 +66 0 0 +58 0 0 +SURF 0X30 +mat 1 +refs 4 +60 0 0 +68 0 0 +67 0 0 +59 0 0 +SURF 0X30 +mat 1 +refs 4 +61 0 0 +69 0 0 +68 0 0 +60 0 0 +SURF 0X30 +mat 1 +refs 4 +62 0 0 +70 0 0 +69 0 0 +61 0 0 +SURF 0X30 +mat 1 +refs 4 +63 0 0 +71 0 0 +70 0 0 +62 0 0 +SURF 0X30 +mat 1 +refs 4 +65 0 0 +73 0 0 +72 0 0 +64 0 0 +SURF 0X30 +mat 1 +refs 4 +66 0 0 +74 0 0 +73 0 0 +65 0 0 +SURF 0X30 +mat 1 +refs 4 +67 0 0 +75 0 0 +74 0 0 +66 0 0 +SURF 0X30 +mat 1 +refs 4 +68 0 0 +76 0 0 +75 0 0 +67 0 0 +SURF 0X30 +mat 1 +refs 4 +69 0 0 +77 0 0 +76 0 0 +68 0 0 +SURF 0X30 +mat 1 +refs 4 +70 0 0 +78 0 0 +77 0 0 +69 0 0 +SURF 0X30 +mat 1 +refs 4 +71 0 0 +79 0 0 +78 0 0 +70 0 0 +SURF 0X30 +mat 1 +refs 4 +73 0 0 +81 0 0 +80 0 0 +72 0 0 +SURF 0X30 +mat 1 +refs 4 +74 0 0 +82 0 0 +81 0 0 +73 0 0 +SURF 0X30 +mat 1 +refs 4 +75 0 0 +83 0 0 +82 0 0 +74 0 0 +SURF 0X30 +mat 1 +refs 4 +76 0 0 +84 0 0 +83 0 0 +75 0 0 +SURF 0X30 +mat 1 +refs 4 +77 0 0 +85 0 0 +84 0 0 +76 0 0 +SURF 0X30 +mat 1 +refs 4 +78 0 0 +86 0 0 +85 0 0 +77 0 0 +SURF 0X30 +mat 1 +refs 4 +79 0 0 +87 0 0 +86 0 0 +78 0 0 +SURF 0X30 +mat 1 +refs 4 +81 0 0 +89 0 0 +88 0 0 +80 0 0 +SURF 0X30 +mat 1 +refs 4 +82 0 0 +90 0 0 +89 0 0 +81 0 0 +SURF 0X30 +mat 1 +refs 4 +83 0 0 +91 0 0 +90 0 0 +82 0 0 +SURF 0X30 +mat 1 +refs 4 +84 0 0 +92 0 0 +91 0 0 +83 0 0 +SURF 0X30 +mat 1 +refs 4 +85 0 0 +93 0 0 +92 0 0 +84 0 0 +SURF 0X30 +mat 1 +refs 4 +86 0 0 +94 0 0 +93 0 0 +85 0 0 +SURF 0X30 +mat 1 +refs 4 +87 0 0 +95 0 0 +94 0 0 +86 0 0 +SURF 0X30 +mat 1 +refs 4 +89 0 0 +97 0 0 +96 0 0 +88 0 0 +SURF 0X30 +mat 1 +refs 4 +90 0 0 +98 0 0 +97 0 0 +89 0 0 +SURF 0X30 +mat 1 +refs 4 +91 0 0 +99 0 0 +98 0 0 +90 0 0 +SURF 0X30 +mat 1 +refs 4 +92 0 0 +100 0 0 +99 0 0 +91 0 0 +SURF 0X30 +mat 1 +refs 4 +93 0 0 +101 0 0 +100 0 0 +92 0 0 +SURF 0X30 +mat 1 +refs 4 +94 0 0 +102 0 0 +101 0 0 +93 0 0 +SURF 0X30 +mat 1 +refs 4 +95 0 0 +103 0 0 +102 0 0 +94 0 0 +SURF 0X30 +mat 1 +refs 4 +97 0 0 +105 0 0 +104 0 0 +96 0 0 +SURF 0X30 +mat 1 +refs 4 +98 0 0 +106 0 0 +105 0 0 +97 0 0 +SURF 0X30 +mat 1 +refs 4 +99 0 0 +107 0 0 +106 0 0 +98 0 0 +SURF 0X30 +mat 1 +refs 4 +100 0 0 +108 0 0 +107 0 0 +99 0 0 +SURF 0X30 +mat 1 +refs 4 +101 0 0 +109 0 0 +108 0 0 +100 0 0 +SURF 0X30 +mat 1 +refs 4 +102 0 0 +110 0 0 +109 0 0 +101 0 0 +SURF 0X30 +mat 1 +refs 4 +103 0 0 +111 0 0 +110 0 0 +102 0 0 +SURF 0X30 +mat 1 +refs 4 +105 0 0 +113 0 0 +112 0 0 +104 0 0 +SURF 0X30 +mat 1 +refs 4 +106 0 0 +114 0 0 +113 0 0 +105 0 0 +SURF 0X30 +mat 1 +refs 4 +107 0 0 +115 0 0 +114 0 0 +106 0 0 +SURF 0X30 +mat 1 +refs 4 +108 0 0 +116 0 0 +115 0 0 +107 0 0 +SURF 0X30 +mat 1 +refs 4 +109 0 0 +117 0 0 +116 0 0 +108 0 0 +SURF 0X30 +mat 1 +refs 4 +110 0 0 +118 0 0 +117 0 0 +109 0 0 +SURF 0X30 +mat 1 +refs 4 +111 0 0 +119 0 0 +118 0 0 +110 0 0 +SURF 0X30 +mat 1 +refs 4 +113 0 0 +121 0 0 +120 0 0 +112 0 0 +SURF 0X30 +mat 1 +refs 4 +114 0 0 +122 0 0 +121 0 0 +113 0 0 +SURF 0X30 +mat 1 +refs 4 +115 0 0 +123 0 0 +122 0 0 +114 0 0 +SURF 0X30 +mat 1 +refs 4 +116 0 0 +124 0 0 +123 0 0 +115 0 0 +SURF 0X30 +mat 1 +refs 4 +117 0 0 +125 0 0 +124 0 0 +116 0 0 +SURF 0X30 +mat 1 +refs 4 +118 0 0 +126 0 0 +125 0 0 +117 0 0 +SURF 0X30 +mat 1 +refs 4 +119 0 0 +127 0 0 +126 0 0 +118 0 0 +SURF 0X30 +mat 1 +refs 4 +121 0 0 +129 0 0 +128 0 0 +120 0 0 +SURF 0X30 +mat 1 +refs 4 +122 0 0 +130 0 0 +129 0 0 +121 0 0 +SURF 0X30 +mat 1 +refs 4 +123 0 0 +131 0 0 +130 0 0 +122 0 0 +SURF 0X30 +mat 1 +refs 4 +124 0 0 +132 0 0 +131 0 0 +123 0 0 +SURF 0X30 +mat 1 +refs 4 +125 0 0 +133 0 0 +132 0 0 +124 0 0 +SURF 0X30 +mat 1 +refs 4 +126 0 0 +134 0 0 +133 0 0 +125 0 0 +SURF 0X30 +mat 1 +refs 4 +127 0 0 +135 0 0 +134 0 0 +126 0 0 +SURF 0X30 +mat 1 +refs 4 +129 0 0 +137 0 0 +136 0 0 +128 0 0 +SURF 0X30 +mat 1 +refs 4 +130 0 0 +138 0 0 +137 0 0 +129 0 0 +SURF 0X30 +mat 1 +refs 4 +131 0 0 +139 0 0 +138 0 0 +130 0 0 +SURF 0X30 +mat 1 +refs 4 +132 0 0 +140 0 0 +139 0 0 +131 0 0 +SURF 0X30 +mat 1 +refs 4 +133 0 0 +141 0 0 +140 0 0 +132 0 0 +SURF 0X30 +mat 1 +refs 4 +134 0 0 +142 0 0 +141 0 0 +133 0 0 +SURF 0X30 +mat 1 +refs 4 +135 0 0 +143 0 0 +142 0 0 +134 0 0 +SURF 0X30 +mat 1 +refs 4 +137 0 0 +145 0 0 +144 0 0 +136 0 0 +SURF 0X30 +mat 1 +refs 4 +138 0 0 +146 0 0 +145 0 0 +137 0 0 +SURF 0X30 +mat 1 +refs 4 +139 0 0 +147 0 0 +146 0 0 +138 0 0 +SURF 0X30 +mat 1 +refs 4 +140 0 0 +148 0 0 +147 0 0 +139 0 0 +SURF 0X30 +mat 1 +refs 4 +141 0 0 +149 0 0 +148 0 0 +140 0 0 +SURF 0X30 +mat 1 +refs 4 +142 0 0 +150 0 0 +149 0 0 +141 0 0 +SURF 0X30 +mat 1 +refs 4 +143 0 0 +151 0 0 +150 0 0 +142 0 0 +SURF 0X30 +mat 1 +refs 4 +145 0 0 +153 0 0 +152 0 0 +144 0 0 +SURF 0X30 +mat 1 +refs 4 +146 0 0 +154 0 0 +153 0 0 +145 0 0 +SURF 0X30 +mat 1 +refs 4 +147 0 0 +155 0 0 +154 0 0 +146 0 0 +SURF 0X30 +mat 1 +refs 4 +148 0 0 +156 0 0 +155 0 0 +147 0 0 +SURF 0X30 +mat 1 +refs 4 +149 0 0 +157 0 0 +156 0 0 +148 0 0 +SURF 0X30 +mat 1 +refs 4 +150 0 0 +158 0 0 +157 0 0 +149 0 0 +SURF 0X30 +mat 1 +refs 4 +151 0 0 +159 0 0 +158 0 0 +150 0 0 +SURF 0X30 +mat 1 +refs 4 +153 0 0 +161 0 0 +160 0 0 +152 0 0 +SURF 0X30 +mat 1 +refs 4 +154 0 0 +162 0 0 +161 0 0 +153 0 0 +SURF 0X30 +mat 1 +refs 4 +155 0 0 +163 0 0 +162 0 0 +154 0 0 +SURF 0X30 +mat 1 +refs 4 +156 0 0 +164 0 0 +163 0 0 +155 0 0 +SURF 0X30 +mat 1 +refs 4 +157 0 0 +165 0 0 +164 0 0 +156 0 0 +SURF 0X30 +mat 1 +refs 4 +158 0 0 +166 0 0 +165 0 0 +157 0 0 +SURF 0X30 +mat 1 +refs 4 +159 0 0 +167 0 0 +166 0 0 +158 0 0 +SURF 0X30 +mat 1 +refs 4 +161 0 0 +169 0 0 +168 0 0 +160 0 0 +SURF 0X30 +mat 1 +refs 4 +162 0 0 +170 0 0 +169 0 0 +161 0 0 +SURF 0X30 +mat 1 +refs 4 +163 0 0 +171 0 0 +170 0 0 +162 0 0 +SURF 0X30 +mat 1 +refs 4 +164 0 0 +172 0 0 +171 0 0 +163 0 0 +SURF 0X30 +mat 1 +refs 4 +165 0 0 +173 0 0 +172 0 0 +164 0 0 +SURF 0X30 +mat 1 +refs 4 +166 0 0 +174 0 0 +173 0 0 +165 0 0 +SURF 0X30 +mat 1 +refs 4 +167 0 0 +175 0 0 +174 0 0 +166 0 0 +SURF 0X30 +mat 1 +refs 4 +169 0 0 +177 0 0 +176 0 0 +168 0 0 +SURF 0X30 +mat 1 +refs 4 +170 0 0 +178 0 0 +177 0 0 +169 0 0 +SURF 0X30 +mat 1 +refs 4 +171 0 0 +179 0 0 +178 0 0 +170 0 0 +SURF 0X30 +mat 1 +refs 4 +172 0 0 +180 0 0 +179 0 0 +171 0 0 +SURF 0X30 +mat 1 +refs 4 +173 0 0 +181 0 0 +180 0 0 +172 0 0 +SURF 0X30 +mat 1 +refs 4 +174 0 0 +182 0 0 +181 0 0 +173 0 0 +SURF 0X30 +mat 1 +refs 4 +175 0 0 +183 0 0 +182 0 0 +174 0 0 +SURF 0X30 +mat 1 +refs 4 +177 0 0 +185 0 0 +184 0 0 +176 0 0 +SURF 0X30 +mat 1 +refs 4 +178 0 0 +186 0 0 +185 0 0 +177 0 0 +SURF 0X30 +mat 1 +refs 4 +179 0 0 +187 0 0 +186 0 0 +178 0 0 +SURF 0X30 +mat 1 +refs 4 +180 0 0 +188 0 0 +187 0 0 +179 0 0 +SURF 0X30 +mat 1 +refs 4 +181 0 0 +189 0 0 +188 0 0 +180 0 0 +SURF 0X30 +mat 1 +refs 4 +182 0 0 +190 0 0 +189 0 0 +181 0 0 +SURF 0X30 +mat 1 +refs 4 +183 0 0 +191 0 0 +190 0 0 +182 0 0 +SURF 0X30 +mat 1 +refs 4 +185 0 0 +193 0 0 +192 0 0 +184 0 0 +SURF 0X30 +mat 1 +refs 4 +186 0 0 +194 0 0 +193 0 0 +185 0 0 +SURF 0X30 +mat 1 +refs 4 +187 0 0 +195 0 0 +194 0 0 +186 0 0 +SURF 0X30 +mat 1 +refs 4 +188 0 0 +196 0 0 +195 0 0 +187 0 0 +SURF 0X30 +mat 1 +refs 4 +189 0 0 +197 0 0 +196 0 0 +188 0 0 +SURF 0X30 +mat 1 +refs 4 +190 0 0 +198 0 0 +197 0 0 +189 0 0 +SURF 0X30 +mat 1 +refs 4 +191 0 0 +199 0 0 +198 0 0 +190 0 0 +SURF 0X30 +mat 1 +refs 4 +193 0 0 +201 0 0 +200 0 0 +192 0 0 +SURF 0X30 +mat 1 +refs 4 +194 0 0 +202 0 0 +201 0 0 +193 0 0 +SURF 0X30 +mat 1 +refs 4 +195 0 0 +203 0 0 +202 0 0 +194 0 0 +SURF 0X30 +mat 1 +refs 4 +196 0 0 +204 0 0 +203 0 0 +195 0 0 +SURF 0X30 +mat 1 +refs 4 +197 0 0 +205 0 0 +204 0 0 +196 0 0 +SURF 0X30 +mat 1 +refs 4 +198 0 0 +206 0 0 +205 0 0 +197 0 0 +SURF 0X30 +mat 1 +refs 4 +199 0 0 +207 0 0 +206 0 0 +198 0 0 +SURF 0X30 +mat 1 +refs 4 +201 0 0 +209 0 0 +208 0 0 +200 0 0 +SURF 0X30 +mat 1 +refs 4 +202 0 0 +210 0 0 +209 0 0 +201 0 0 +SURF 0X30 +mat 1 +refs 4 +203 0 0 +211 0 0 +210 0 0 +202 0 0 +SURF 0X30 +mat 1 +refs 4 +204 0 0 +212 0 0 +211 0 0 +203 0 0 +SURF 0X30 +mat 1 +refs 4 +205 0 0 +213 0 0 +212 0 0 +204 0 0 +SURF 0X30 +mat 1 +refs 4 +206 0 0 +214 0 0 +213 0 0 +205 0 0 +SURF 0X30 +mat 1 +refs 4 +207 0 0 +215 0 0 +214 0 0 +206 0 0 +SURF 0X30 +mat 1 +refs 4 +209 0 0 +217 0 0 +216 0 0 +208 0 0 +SURF 0X30 +mat 1 +refs 4 +210 0 0 +218 0 0 +217 0 0 +209 0 0 +SURF 0X30 +mat 1 +refs 4 +211 0 0 +219 0 0 +218 0 0 +210 0 0 +SURF 0X30 +mat 1 +refs 4 +212 0 0 +220 0 0 +219 0 0 +211 0 0 +SURF 0X30 +mat 1 +refs 4 +213 0 0 +221 0 0 +220 0 0 +212 0 0 +SURF 0X30 +mat 1 +refs 4 +214 0 0 +222 0 0 +221 0 0 +213 0 0 +SURF 0X30 +mat 1 +refs 4 +215 0 0 +223 0 0 +222 0 0 +214 0 0 +SURF 0X30 +mat 1 +refs 4 +217 0 0 +225 0 0 +224 0 0 +216 0 0 +SURF 0X30 +mat 1 +refs 4 +218 0 0 +226 0 0 +225 0 0 +217 0 0 +SURF 0X30 +mat 1 +refs 4 +219 0 0 +227 0 0 +226 0 0 +218 0 0 +SURF 0X30 +mat 1 +refs 4 +220 0 0 +228 0 0 +227 0 0 +219 0 0 +SURF 0X30 +mat 1 +refs 4 +221 0 0 +229 0 0 +228 0 0 +220 0 0 +SURF 0X30 +mat 1 +refs 4 +222 0 0 +230 0 0 +229 0 0 +221 0 0 +SURF 0X30 +mat 1 +refs 4 +223 0 0 +231 0 0 +230 0 0 +222 0 0 +SURF 0X30 +mat 1 +refs 4 +225 0 0 +233 0 0 +232 0 0 +224 0 0 +SURF 0X30 +mat 1 +refs 4 +226 0 0 +234 0 0 +233 0 0 +225 0 0 +SURF 0X30 +mat 1 +refs 4 +227 0 0 +235 0 0 +234 0 0 +226 0 0 +SURF 0X30 +mat 1 +refs 4 +228 0 0 +236 0 0 +235 0 0 +227 0 0 +SURF 0X30 +mat 1 +refs 4 +229 0 0 +237 0 0 +236 0 0 +228 0 0 +SURF 0X30 +mat 1 +refs 4 +230 0 0 +238 0 0 +237 0 0 +229 0 0 +SURF 0X30 +mat 1 +refs 4 +231 0 0 +239 0 0 +238 0 0 +230 0 0 +SURF 0X30 +mat 1 +refs 4 +233 0 0 +241 0 0 +240 0 0 +232 0 0 +SURF 0X30 +mat 1 +refs 4 +234 0 0 +242 0 0 +241 0 0 +233 0 0 +SURF 0X30 +mat 1 +refs 4 +235 0 0 +243 0 0 +242 0 0 +234 0 0 +SURF 0X30 +mat 1 +refs 4 +236 0 0 +244 0 0 +243 0 0 +235 0 0 +SURF 0X30 +mat 1 +refs 4 +237 0 0 +245 0 0 +244 0 0 +236 0 0 +SURF 0X30 +mat 1 +refs 4 +238 0 0 +246 0 0 +245 0 0 +237 0 0 +SURF 0X30 +mat 1 +refs 4 +239 0 0 +247 0 0 +246 0 0 +238 0 0 +SURF 0X30 +mat 1 +refs 4 +241 0 0 +249 0 0 +248 0 0 +240 0 0 +SURF 0X30 +mat 1 +refs 4 +242 0 0 +250 0 0 +249 0 0 +241 0 0 +SURF 0X30 +mat 1 +refs 4 +243 0 0 +251 0 0 +250 0 0 +242 0 0 +SURF 0X30 +mat 1 +refs 4 +244 0 0 +252 0 0 +251 0 0 +243 0 0 +SURF 0X30 +mat 1 +refs 4 +245 0 0 +253 0 0 +252 0 0 +244 0 0 +SURF 0X30 +mat 1 +refs 4 +246 0 0 +254 0 0 +253 0 0 +245 0 0 +SURF 0X30 +mat 1 +refs 4 +247 0 0 +255 0 0 +254 0 0 +246 0 0 +SURF 0X30 +mat 1 +refs 4 +0 0 0 +248 0 0 +249 0 0 +1 0 0 +SURF 0X30 +mat 1 +refs 4 +250 0 0 +2 0 0 +1 0 0 +249 0 0 +SURF 0X30 +mat 1 +refs 4 +251 0 0 +3 0 0 +2 0 0 +250 0 0 +SURF 0X30 +mat 1 +refs 4 +252 0 0 +4 0 0 +3 0 0 +251 0 0 +SURF 0X30 +mat 1 +refs 4 +253 0 0 +5 0 0 +4 0 0 +252 0 0 +SURF 0X30 +mat 1 +refs 4 +254 0 0 +6 0 0 +5 0 0 +253 0 0 +SURF 0X30 +mat 1 +refs 4 +255 0 0 +7 0 0 +6 0 0 +254 0 0 +kids 0 diff --git a/Nasal/earthview.nas b/Nasal/earthview.nas index 6f74d42d6..0d5860997 100644 --- a/Nasal/earthview.nas +++ b/Nasal/earthview.nas @@ -2,6 +2,39 @@ # Earthview orbital rendering ########################################################### + +var lightning_table = []; + +var entry = [2.85, 30.28, 0.35, 0.045]; +append(lightning_table, entry); + +entry = [9.3,8.0,0.1, 0.105]; +append(lightning_table, entry); + +entry = [6.0, -72.0, 0.2, 0.09]; +append(lightning_table, entry); + +entry = [30.89, -112.0, 0.72, 0.34]; +append(lightning_table, entry); + + +var check_lightning_table = func (lat, lon) { + +for (var i=0; i< size(lightning_table); i=i+1) + { + if (math.abs(lat - lightning_table[i][0]) < 15.0) + { + if (math.abs(lon - lightning_table[i][1]) < 15.0) + { + return i; + } + } + } +return -1; + +} + + var start = func() { if (earthview_running_flag ==1) {return;} @@ -75,7 +108,7 @@ setprop("/environment/visibility-m", 80000.0); setprop("/sim/rendering/mie", 0.0); setprop("/sim/rendering/rayleigh", 0.00002); setprop("/sim/rendering/dome-density", 1.0); -setprop("/earthview/shade-effect", 1.5); +setprop("/earthview/shade-effect", 0.5); earth_model.l1 = setlistener("/earthview/show-n1", func(n) {load_sector (1, n);},0,0); earth_model.l2 = setlistener("/earthview/show-n2", func(n) {load_sector (2, n);},0,0); @@ -89,6 +122,8 @@ earth_model.l8 = setlistener("/earthview/show-s4", func(n) {load_sector (8, n);} control_loop(); +slow_loop(); + } var stop = func () { @@ -289,6 +324,71 @@ if (getprop("/earthview/control_loop_flag") ==1) {settimer( func {control_loop() } +var slow_loop = func { + +if (earthview_running_flag == 0) {return;} + +# thunderstorms + +var lat = getprop("/position/latitude-deg"); +var lon = getprop("/position/longitude-deg") + getprop("/earthview/cloudsphere-angle"); + + +var index = check_lightning_table(lat, lon); + +if (index > -1) + { + + + rn = rand(); + + if (rn < 0.3) + { + var roi_x_base = lightning_table[index][2]; + var roi_y_base = lightning_table[index][3]; + + var rn = 0.005 * (2.0 * rand() - 0.5); + setprop("/earthview/roi-x1", roi_x_base + rn); + + rn = 0.005 * (2.0 * rand() - 0.5); + setprop("/earthview/roi-y1", roi_y_base + rn); + + + lightning_strike(); + + } + } + +if (getprop("/earthview/control_loop_flag") ==1) {settimer( func {slow_loop(); },1.0);} +} + + + +var lightning_strike = func { + +var rn = rand(); + +var repeat = 1; + +if (rn > 0.5) {repeat = 2;} + +var duration = 0.1 + 0.1 * rand(); +var strength = 0.5 + 1.0 * rand(); + +setprop("/earthview/lightning", strength); +settimer( func{ setprop("/earthview/lightning", 0.0);}, duration); + +var duration1 = 0.1 + 0.1 * rand(); + +if (repeat == 2) + { + settimer( func{ setprop("/earthview/lightning", strength);}, duration + 0.1); + settimer( func{ setprop("/earthview/lightning", 0.0);}, duration + 0.1 + duration1); + } + +} + + # rotate position of cloud tiles var adjust_cloud_tiles = func { @@ -370,7 +470,7 @@ if (action) { var lat = getprop("/position/latitude-deg"); var lon = getprop("/position/longitude-deg"); - + if (i==1) { earth_model.node1 = place_earth_model("Models/Astro/earth_N1.xml",lat, lon, 0.0, 0.0, 0.0, 0.0); diff --git a/Shaders/planet-aurora.frag b/Shaders/planet-aurora.frag index a72a5f195..b05804701 100644 --- a/Shaders/planet-aurora.frag +++ b/Shaders/planet-aurora.frag @@ -14,6 +14,7 @@ uniform float upper_alt_factor; uniform float penetration_factor; uniform float patchiness; uniform float afterglow; +uniform float arc_id; uniform float osg_SimulationTime; float Noise2D(in vec2 coord, in float wavelength); @@ -23,11 +24,12 @@ void main() { -float vCoord = abs(vertex.z); + +float vCoord = abs(vertex.z) - 0.02 * arc_id; -float aurora_time = 0.001 * osg_SimulationTime; +float aurora_time = 0.001 * osg_SimulationTime + arc_id; float noise_01 = Noise2D( vec2(vertex.x +aurora_time, vertex.y), 0.05); float blend_factor = smoothstep(0.935, 0.955, vCoord - 0.001 * noise_01 - 0.02 * (1.0-upper_alt_factor)); diff --git a/Shaders/planet-aurora.vert b/Shaders/planet-aurora.vert index 3b18c3339..d976311fd 100644 --- a/Shaders/planet-aurora.vert +++ b/Shaders/planet-aurora.vert @@ -4,6 +4,10 @@ varying vec3 vertex; varying vec3 normal; varying vec3 relVec; +uniform float osg_SimulationTime; +uniform float arc_id; + + void main() { @@ -11,5 +15,14 @@ void main() vertex = gl_Vertex.xyz; vec3 ep = (gl_ModelViewMatrixInverse * vec4 (0.0, 0.0, 0.0, 1.0)).xyz; relVec = vertex - ep; - gl_Position = ftransform(); + + vec4 vert_out = gl_Vertex; + + float ang = dot(vert_out.xy, vec2 (0.0, 1.0)); + + vert_out.x *= (1.0 + 0.05 * sin(ang + 0.1 * osg_SimulationTime + arc_id)); + vert_out.y *= (1.0 + 0.05 * sin(ang + 0.12 * osg_SimulationTime + arc_id)); + + + gl_Position = gl_ModelViewProjectionMatrix * vert_out; } diff --git a/Shaders/planet-cloudlayer.frag b/Shaders/planet-cloudlayer.frag index 5663eb575..451586fbe 100644 --- a/Shaders/planet-cloudlayer.frag +++ b/Shaders/planet-cloudlayer.frag @@ -12,6 +12,10 @@ uniform float shade_effect; uniform float sun_angle; uniform float air_pollution; +uniform float roi_x1; +uniform float roi_y1; +uniform float lightning; + uniform bool use_overlay; uniform bool use_cloud_normals; @@ -32,6 +36,17 @@ return cos1 * cos2 + sign * sin1 * sin2; } +vec3 lightning_color (in vec2 coord) +{ + +vec2 roi1 = vec2 (roi_x1, roi_y1); + +float strength = 1.0 - smoothstep(0.0, 0.005, length(roi1 - coord)); + +return strength * vec3 (0.43, 0.57, 1.0); + +} + void main() { @@ -71,27 +86,46 @@ void main() vec3 binormal = cross(n, tangent); float NdotL2 = 0.0; + texel = texture2D(texture, gl_TexCoord[0].st); + ref_texel = texel; + if (use_cloud_normals) { - vec2 sun2d = vec2 (0.0, 1.0); + vec2 sun2d = vec2 (0.0, 1.0); - float xOffset = -1.0 * dot(normalize(lightDir), tangent); - float yOffset = -1.0 * dot(normalize(lightDir), binormal); + float xOffset = -1.0 * dot(normalize(lightDir), tangent); + float yOffset = -1.0 * dot(normalize(lightDir), binormal); + + grad_dir = normalize (vec2 (xOffset, yOffset)); + + vec4 comp_texel = texture2D(texture, gl_TexCoord[0].st - 0.0005 * grad_dir); + + // parallax mapping + + xOffset = -1.0 * dot(ecViewDir, tangent); + yOffset = -1.0 * dot(ecViewDir, binormal); + + grad_dir = normalize (vec2 (xOffset, yOffset)); + + texel = texture2D(texture, gl_TexCoord[0].st - 0.0005 * grad_dir * ref_texel.a * 0.7); + + // relief shading based on gradient and parallax lookup + + float slope = shade_effect * (comp_texel.a - ref_texel.a) * texel.a; + float sign = -1.0; + if (slope < 0.0) {sign = 1.0;} + + vec2 snormal = normalize(vec2 (slope, 1.0)); + + NdotL2 = dot (snormal, sun2d); + NdotL = add_cosines(NdotL, NdotL2, sign ); + - grad_dir = normalize (vec2 (xOffset, yOffset)); - vec4 comp_texel = texture2D(texture, gl_TexCoord[0].st - 0.0005 * grad_dir); - - float slope = shade_effect * (comp_texel.a - ref_texel.a); - float sign = -1.0; - if (slope < 0.0) {sign = 1.0;} - - vec2 snormal = normalize(vec2 (slope, 1.0)); - - NdotL2 = dot (snormal, sun2d); - NdotL = add_cosines(NdotL, NdotL2, sign ); + } + color += diff_term * max(NdotL, 0.15) ; @@ -101,15 +135,13 @@ void main() color.rgb *= smoothstep(-0.2, -0.1, NdotLraw); // + float darkness_fact = 1.0 - smoothstep(0.0,0.2, length(color.rgb)); + color.rgb += lightning_color(gl_TexCoord[0].st) * (1.0 - texel.a) * lightning * darkness_fact; - color.a = diffuse_term.a; + color.a = 1.0;//diffuse_term.a; color = clamp(color, 0.0, 1.0); - texel = texture2D(texture, gl_TexCoord[0].st); - - - - ref_texel = texel; + structureTexel = texture2D(structure_texture, 20.0 * gl_TexCoord[0].st); float noise = Noise2D( gl_TexCoord[0].st, 0.01); @@ -127,6 +159,9 @@ void main() { texel = vec4(structureTexel.rgb, smoothstep(0.0, 0.5,texel.a) * structureTexel.a); } + + + texel.a = clamp((1.0 + darkness_fact) * texel.a, 0.0, 1.0); fragColor = color * texel; diff --git a/Shaders/planet-high.frag b/Shaders/planet-high.frag index 3e206aaf0..5a423a8bd 100644 --- a/Shaders/planet-high.frag +++ b/Shaders/planet-high.frag @@ -9,6 +9,7 @@ varying vec3 ecViewDir; varying vec3 VTangent; uniform float visibility; +uniform float air_pollution; uniform float sun_angle; uniform bool use_clouds; uniform bool use_cloud_shadows; @@ -75,9 +76,9 @@ void main() NdotL = dot(N, lightDir); float NdotLraw = NdotL; // due to atmosphere scattering, we should make this harder - NdotL = smoothstep(-0.2,0.2,NdotL); + NdotL = smoothstep(-0.2 ,0.2,NdotL); // fog does not feel normal map - float NdotLfog = smoothstep(-0.2, 0.2, dot(n, lightDir)); + float NdotLfog = smoothstep(-0.2 , 0.2, dot(n, lightDir)); float intensity = length(diffuse_term); vec4 dawn = intensity * normalize (vec4 (1.0,0.5,0.3,1.0)); @@ -116,7 +117,6 @@ void main() color.a = diffuse_term.a; - // This shouldn't be necessary, but our lighting becomes very // saturated. Clamping the color before modulating by the texture // is closer to what the OpenGL fixed function pipeline does. @@ -140,19 +140,16 @@ void main() float angle = dot(normalize(ecViewDir), normalize(normal)); float distance_through_atmosphere = min(10.0 / (abs(angle)+0.001),500.0); - - float correction = smoothstep(-0.4, 0.0, dot(n, lightDir) - 0.45 ) ; - //correction = correction + (1.0 - correction) * (1.0 - smoothstep(1.40, 1.57, sun_angle)); - float correction1 = 1.0 - smoothstep(1.4, 1.45, sun_angle); - correction1 = 1.0; - - //vec4 fogColor = vec4 (0.83,0.9,1.0,1.0) * clamp(length(diffuse_term.rgb/1.73 * correction * clamp(NdotL + correction1,0.01, 0.99) ),0.0,1.0); - - vec4 fogColor = vec4 (0.83,0.9,1.0,1.0) * clamp(smoothstep(0.4, 1.0,NdotLfog),0.0,1.0) * length(diff_term.rgb/1.73); - + + float fogLighting = clamp(NdotLfog,0.0,1.0) * length(diff_term.rgb/1.73); + + vec4 fogColor = vec4 (0.83,0.9,1.0,1.0) * fogLighting; + vec3 rayleighColor = vec3 (0.17, 0.52, 0.87) * fogLighting; + float fogFactor = exp(-distance_through_atmosphere/(visibility/1000.0)); - - + float rayleighFactor = exp(-distance_through_atmosphere/(300.0 / (1.0 + 4.0 * air_pollution)) ); + + fragColor.rgb = mix(rayleighColor, fragColor.rgb, rayleighFactor); fragColor = mix(fogColor, fragColor, fogFactor); fragColor.rgb = filter_combined(fragColor.rgb); diff --git a/Shaders/planet.frag b/Shaders/planet.frag index 707625959..6c42d5421 100644 --- a/Shaders/planet.frag +++ b/Shaders/planet.frag @@ -9,6 +9,7 @@ varying vec3 ecViewDir; varying vec3 VTangent; uniform float visibility; +uniform float air_pollution; uniform float sun_angle; uniform bool use_clouds; uniform bool use_cloud_shadows; @@ -130,19 +131,17 @@ void main() float angle = dot(normalize(ecViewDir), normalize(normal)); float distance_through_atmosphere = min(10.0 / (abs(angle)+0.001),500.0); + float fogLighting = clamp(NdotL,0.0,1.0) * length(diff_term.rgb/1.73); - float correction = smoothstep(-0.4, 0.0, dot(n, lightDir) - 0.45 ) ; - //correction = correction + (1.0 - correction) * (1.0 - smoothstep(1.40, 1.57, sun_angle)); - float correction1 = 1.0 - smoothstep(1.4, 1.45, sun_angle); - correction1 = 1.0; - //vec4 fogColor = vec4 (0.83,0.9,1.0,1.0) * clamp(length(diffuse_term.rgb/1.73 * correction * clamp(NdotL + correction1,0.01, 0.99) ),0.0,1.0); - - vec4 fogColor = vec4 (0.83,0.9,1.0,1.0) * clamp(smoothstep(0.4, 1.0,NdotL),0.0,1.0) * length(diff_term.rgb/1.73); + vec4 fogColor = vec4 (0.83,0.9,1.0,1.0) * fogLighting; + vec3 rayleighColor = vec3 (0.17, 0.52, 0.87) * fogLighting; + float fogFactor = exp(-distance_through_atmosphere/(visibility/1000.0)); + float rayleighFactor = exp(-distance_through_atmosphere/(300.0 / (1.0 + 4.0 * air_pollution)) ); - + fragColor.rgb = mix(rayleighColor, fragColor.rgb, rayleighFactor); fragColor = mix(fogColor, fragColor, fogFactor); fragColor.rgb = filter_combined(fragColor.rgb); diff --git a/defaults.xml b/defaults.xml index d38d98cd6..113f4aa52 100644 --- a/defaults.xml +++ b/defaults.xml @@ -1369,6 +1369,9 @@ Started September 2000 by David Megginson, david@megginson.com false false false + 0.0 + 0.0 + 0.0 diff --git a/gui/dialogs/earthview.xml b/gui/dialogs/earthview.xml index 4d9671684..63ee65042 100644 --- a/gui/dialogs/earthview.xml +++ b/gui/dialogs/earthview.xml @@ -395,6 +395,42 @@ true /environment/visibility-m + + + + + + + + + hbox + right + + + + + + + + + + + air_pollution + 0.0 + 1.0 + /environment/air-pollution-norm + + dialog-apply + air_pollution + + true + + + + %.1f + true + /environment/air-pollution-norm +