From 164112a8c0abdaab6261f37af39c371a05926149 Mon Sep 17 00:00:00 2001
From: Stuart Buchanan <stuart_d_buchanan@yahoo.co.uk>
Date: Sat, 21 Aug 2021 17:16:28 +0100
Subject: [PATCH] WS30: Properties for lit roads

---
 Docs/README.materials             |  8 ++++++++
 Docs/README.scenery               |  6 +++---
 Materials/base/materials-base.xml | 11 +++++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/Docs/README.materials b/Docs/README.materials
index 207ea6ce8..ab830d03d 100644
--- a/Docs/README.materials
+++ b/Docs/README.materials
@@ -73,6 +73,14 @@ light-coverage : The coverage of a single point of light in m^2. 0 indicates no
         of an object-mask. Lights are all generated 3m above the surface, and
         have random colour (50% yellow, 35% white, 10% orange, 5% red)
 
+light-edge-spacing-m    : Spacing of lighting in m on the edge of line features in WS30.
+light-edge-height-m     : Height of lighting in m above the line feature surface.
+light-edge-size-cm      : Size of edge lighting in cm. Default 50cm
+light-edge-intensity-cd : Intensity of edge lighting in candela. Default 100.
+light-edge-angle-horizontal-deg : Horizontal extent of light. Default 360.
+light-edge-angle-vertical-deg : Vertical extent of light. Default 360.
+light-edge-color/r ... : Light colour, with r,g,b,a properties.  Default 1.0, resulting in white light
+
 ambient : The ambient light colour for the material, specified as separate
         r, g, b, a components (default: all color components 0.2, alpha 1.0).
 
diff --git a/Docs/README.scenery b/Docs/README.scenery
index a1a514657..ccbda2e00 100644
--- a/Docs/README.scenery
+++ b/Docs/README.scenery
@@ -380,11 +380,11 @@ defines building meshes, typically based on OSM data.
 
 Example:
 
-  BUILDING_ROUGH buildings.ac -122.501090 37.514830 15.5 0.00 0.00 0.00
+  BUILDING_ROUGH buildings.ac -122.501090 37.514830 15.5 0.00 0.00 0.00 4000.0
 
 Syntax:
 
-  BUILDING_ROUGH <object-path> <lon> <lat> <elev-m> <hdg-deg> <pitch-deg> <roll-deg>
+  BUILDING_ROUGH <object-path> <lon> <lat> <elev-m> <hdg-deg> <pitch-deg> <roll-deg> <radius-m>
 
 Note that only bare .ac files should be referenced. The material definition for
 "OSM_Building" will be used to determine the texture and Effects.
@@ -526,7 +526,7 @@ W ATTR A B C D lon0 lat0 lon1 lat1 lon2 lat2 lon3 lat4
 Where:
 
 - W is the feature width in meters.
-- ATTR is an integer value used to store packed attributes (e.g. lighting, currenty unused)
+- ATTR is an integer value used to store packed attributes (e.g. bitwise.  Bit 1 is for lit)
 - A,B,C,D are float values used to store attributes (currently unused)
 - lonN, latN are lon/lat pairs on the center of the line feature.  There must be at least two pairs
 
diff --git a/Materials/base/materials-base.xml b/Materials/base/materials-base.xml
index d0555d295..805860569 100644
--- a/Materials/base/materials-base.xml
+++ b/Materials/base/materials-base.xml
@@ -538,6 +538,17 @@
   <rolling-friction>0.02</rolling-friction>
   <bumpiness>0.01</bumpiness>
   <load-resistance>1e10</load-resistance>
+  <light-edge-spacing-m>20</light-edge-spacing-m>
+  <light-edge-height-m>5.0</light-edge-height-m>
+  <light-edge-intensity-cd>50</light-edge-intensity-cd>
+  <light-edge-angle-horizontal-deg>360</light-edge-angle-horizontal-deg>
+  <light-edge-angle-vertical-deg>360</light-edge-angle-vertical-deg>
+  <light-edge-color>
+    <r>1.0</r>
+    <g>0.82</g>
+    <b>0.7</b>
+    <a>1.0</a>
+  </light-edge-color>
 </material>
 
 <material n="2010">