diff --git a/Effects/cityLM.eff b/Effects/cityLM.eff new file mode 100644 index 000000000..182137e3a --- /dev/null +++ b/Effects/cityLM.eff @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<PropertyList> + <name>Effects/cityLM</name> + <inherits-from>/Effects/model-combined-deferred</inherits-from> + <parameters> + <!-- Light Map --> + <lightmap-enabled type="int">1</lightmap-enabled> + <lightmap-multi type="int">1</lightmap-multi> + <texture n="3"> + <image>/Textures/osm2city/atlas_facades_LM.png</image> + <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-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> + <!-- + <lightmap-color type="vec3d" n="1"> 0.941 0.682 0.086 </lightmap-color> + <lightmap-color type="vec3d" n="1"> 0.941 0.682 0.286 </lightmap-color> + --> + <lightmap-color type="vec3d" n="1"> 0.564 0.409 0.172 </lightmap-color> + <lightmap-factor type="float" n="2">0</lightmap-factor> + <lightmap-factor type="float" n="3">0</lightmap-factor> + + <!-- + <lightmap-factor type="float" n="3">1</lightmap-factor> + <lightmap-color type="vec3d" n="3"> 1 1 1 </lightmap-color> + --> + </parameters> +</PropertyList> diff --git a/Effects/road-high.eff b/Effects/road-high.eff new file mode 100644 index 000000000..88d08b22c --- /dev/null +++ b/Effects/road-high.eff @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<PropertyList> + <name>Effects/road-high</name> + <inherits-from>Effects/road</inherits-from> + <parameters> + <speed-factor>1.2</speed-factor> + <base-density>3.0</base-density> + </parameters> +</PropertyList> diff --git a/Effects/road-low.eff b/Effects/road-low.eff new file mode 100644 index 000000000..f1f71271b --- /dev/null +++ b/Effects/road-low.eff @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<PropertyList> + <name>Effects/road-low</name> + <inherits-from>Effects/road</inherits-from> + <parameters> + <speed-factor>0.3</speed-factor> + <base-density>0.2</base-density> + </parameters> +</PropertyList> diff --git a/Effects/road-mid.eff b/Effects/road-mid.eff new file mode 100644 index 000000000..3e9d030b6 --- /dev/null +++ b/Effects/road-mid.eff @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<PropertyList> + <name>Effects/road-mid</name> + <inherits-from>Effects/road</inherits-from> + <parameters> + <speed-factor>0.8</speed-factor> + <base-density>0.25</base-density> + </parameters> +</PropertyList> diff --git a/Effects/roads.eff b/Effects/roads.eff new file mode 100644 index 000000000..c55fb4815 --- /dev/null +++ b/Effects/roads.eff @@ -0,0 +1,25 @@ +<?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> diff --git a/Materials/base/materials-base.xml b/Materials/base/materials-base.xml index 4998460af..a2fbebff0 100644 --- a/Materials/base/materials-base.xml +++ b/Materials/base/materials-base.xml @@ -470,4 +470,19 @@ </glyph> </material> +<material n="2101"> + <name>OSM_Building</name> + <effect>Effects/cityLM</effect> +</material> + +<material n="2102"> + <name>OSM_Road</name> + <effect>Effects/road-high</effect> +</material> + +<material n="2103"> + <name>OSM_Railway</name> + <effect>Effects/road-high</effect> +</material> + </PropertyList> diff --git a/Textures/osm2city/atlas_facades.png b/Textures/osm2city/atlas_facades.png new file mode 100644 index 000000000..68fee53e0 Binary files /dev/null and b/Textures/osm2city/atlas_facades.png differ diff --git a/Textures/osm2city/atlas_facades_LM.png b/Textures/osm2city/atlas_facades_LM.png new file mode 100644 index 000000000..74cbc033a Binary files /dev/null and b/Textures/osm2city/atlas_facades_LM.png differ diff --git a/Textures/osm2city/roads.png b/Textures/osm2city/roads.png new file mode 100644 index 000000000..4bc81c046 Binary files /dev/null and b/Textures/osm2city/roads.png differ diff --git a/Textures/osm2city/roads_LM.png b/Textures/osm2city/roads_LM.png new file mode 100644 index 000000000..f6e6ae297 Binary files /dev/null and b/Textures/osm2city/roads_LM.png differ