From 400e6284175afc6eb00b597b6b548b8350b5474c Mon Sep 17 00:00:00 2001
From: Thorsten Renk <thorsten@science-and-fiction.org>
Date: Thu, 11 May 2017 13:52:27 +0300
Subject: [PATCH] Tentative fixes for OSM structure lightmaps

---
 Effects/cityLM.eff |  2 +-
 Effects/road.eff   |  1 +
 Effects/roads.eff  | 25 -------------------------
 3 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 Effects/roads.eff

diff --git a/Effects/cityLM.eff b/Effects/cityLM.eff
index 182137e3a..e88dbe18b 100644
--- a/Effects/cityLM.eff
+++ b/Effects/cityLM.eff
@@ -11,7 +11,7 @@
                   <wrap-s>repeat</wrap-s>
                   <wrap-t>repeat</wrap-t>
                 </texture>
-                <lightmap-factor type="float" n="0"><use>/scenery/osm2city/lightmap-factor</use></lightmap-factor>
+                <lightmap-factor type="float" n="0"><use>/environment/lightmap-factor</use></lightmap-factor>
                 <lightmap-color type="vec3d" n="0"> 1. 0.88 0.6 </lightmap-color>
                 <lightmap-factor type="float" n="1"><use>/scenery/osm2city/lightmap-factor</use></lightmap-factor>
                 <!--
diff --git a/Effects/road.eff b/Effects/road.eff
index 8f46d2a4c..d0f099f94 100644
--- a/Effects/road.eff
+++ b/Effects/road.eff
@@ -16,6 +16,7 @@
     	</texture>
 	<grain-texture-enabled type="int">0</grain-texture-enabled>
 	<grain-magnification type="float">50</grain-magnification>
+        <lightmap-enabled type="int">1</lightmap-enabled>
 	<lightmap-color type="vec3d" n="0"> 0.8 0.8 1.0 </lightmap-color>
     	<snow_level><use>/environment/snow-level-m</use></snow_level>
     	<snow_thickness_factor><use>/environment/surface/snow-thickness-factor</use></snow_thickness_factor>
diff --git a/Effects/roads.eff b/Effects/roads.eff
deleted file mode 100644
index c55fb4815..000000000
--- a/Effects/roads.eff
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PropertyList>
-        <name>Effects/roadsLM</name>
-        <inherits-from>/Effects/model-combined-deferred</inherits-from>
-        <parameters>
-                <!-- Light Map -->
-                <lightmap-enabled type="int">1</lightmap-enabled>
-                <lightmap-multi type="int">0</lightmap-multi>
-                <lightmap-color type="vec3d" n="0"> 0.941 0.682 0.086 </lightmap-color>
-                <texture n="3">
-                    <image>tex/roads_LM.png</image>
-                    <wrap-s>repeat</wrap-s>
-                    <wrap-t>repeat</wrap-t>
-                </texture>
-<!--
-240 174 22
-                <lightmap-factor type="float" n="1">0</lightmap-factor>
-                <lightmap-color type="vec3d" n="1"> 0 0 0.5 </lightmap-color>
-                <lightmap-factor type="float" n="2">0</lightmap-factor>
-                <lightmap-color type="vec3d" n="2"> 0 0 0.5 </lightmap-color>
-                <lightmap-factor type="float" n="3">1</lightmap-factor>
-                <lightmap-color type="vec3d" n="3"> 1 1 1 </lightmap-color>
-		-->
-        </parameters>
-</PropertyList>