fly/fgdata
1
0
Fork 0
Code Activity

Daily variation of road traffic with commuter rush hours based on actual traffic studies for ALS road shader

Browse source
This commit is contained in:
Thorsten Renk 2017-06-09 12:07:51 +03:00
parent d3b4d03b80
commit 32ff0056ef
3 changed files with 112 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Effects/road.eff
View file

@ -23,6 +23,7 @@
<road-traffic-enabled><use>/sim/rendering/osm/road-traffic-enabled</use></road-traffic-enabled> <road-traffic-enabled><use>/sim/rendering/osm/road-traffic-enabled</use></road-traffic-enabled>
<road-traffic-density><use>/sim/rendering/osm/road-traffic-density</use></road-traffic-density> <road-traffic-density><use>/sim/rendering/osm/road-traffic-density</use></road-traffic-density>
<road-traffic-direction><use>/sim/rendering/osm/road-traffic-direction</use></road-traffic-direction> <road-traffic-direction><use>/sim/rendering/osm/road-traffic-direction</use></road-traffic-direction>
<road-traffic-variation><use>/sim/rendering/osm/road-traffic-daily-variation</use></road-traffic-variation>
<road-light-factor><use>/environment/lightmap-factor</use></road-light-factor> <road-light-factor><use>/environment/lightmap-factor</use></road-light-factor>
</parameters> </parameters>
@ -488,6 +489,14 @@
</value> </value>
</uniform> </uniform>
<uniform>
<name>road_traffic_variation</name>
<type>float</type>
<value>
<use>road-traffic-variation</use>
</value>
</uniform>
<uniform> <uniform>
<name>road_traffic_direction</name> <name>road_traffic_direction</name>
<type>int</type> <type>int</type>

101
Environment/local-weather-rules.xml
View file

@ -839,7 +839,108 @@
<output>/environment/lightmap-factor</output> <output>/environment/lightmap-factor</output>
</filter> </filter>
<!-- Daily variation of road traffic for the road shader -->
<filter>
<name>EnvironmentInterpolator:OSM:LocalTime</name>
<input>
<expression>
<sum>
<property>/sim/time/utc/day-seconds</property>
<property>/sim/time/local-offset</property>
</sum>
</expression>
</input>
<output>/sim/time/local-day-seconds</output>
<type>gain</type>
<gain>1.0</gain>
</filter>
<filter>
<name>EnvironmentInterpolator:OSM:LocalTimeOverrun</name>
<enable>
<condition>
<greater-than>
<property>/sim/time/local-day-seconds</property>
<value>86400.0</value>
</greater-than>
</condition>
</enable>
<input>
<expression>
<difference>
<property>/sim/time/local-day-seconds</property>
<value>86400</value>
</difference>
</expression>
</input>
<output>/sim/time/local-day-seconds</output>
<type>gain</type>
<gain>1.0</gain>
</filter>
<filter>
<name>EnvironmentInterpolator:OSM:LocalTimeUnderrun</name>
<enable>
<condition>
<less-than>
<property>/sim/time/local-day-seconds</property>
<value>0.0</value>
</less-than>
</condition>
</enable>
<input>
<expression>
<sum>
<property>/sim/time/local-day-seconds</property>
<value>86400</value>
</sum>
</expression>
</input>
<output>/sim/time/local-day-seconds</output>
<type>gain</type>
<gain>1.0</gain>
</filter>
<filter>
<name>EnvironmentInterpolator:OSM:TrafficDensity</name>
<type>gain</type>
<input>
<expression>
<table>
<property>/sim/time/local-day-seconds</property>
<entry><ind>0.0</ind><dep>0.32</dep></entry>
<entry><ind>3600.0</ind><dep>0.21</dep></entry>
<entry><ind>7200.0</ind><dep>0.18</dep></entry>
<entry><ind>10800.0</ind><dep>0.16</dep></entry>
<entry><ind>14400.0</ind><dep>0.19</dep></entry>
<entry><ind>18000.0</ind><dep>0.21</dep></entry>
<entry><ind>21600.0</ind><dep>0.45</dep></entry>
<entry><ind>25200.0</ind><dep>0.77</dep></entry>
<entry><ind>28800.0</ind><dep>1.30</dep></entry>
<entry><ind>32400.0</ind><dep>1.44</dep></entry>
<entry><ind>36000.0</ind><dep>1.04</dep></entry>
<entry><ind>39600.0</ind><dep>0.95</dep></entry>
<entry><ind>43200.0</ind><dep>1.03</dep></entry>
<entry><ind>46800.0</ind><dep>1.04</dep></entry>
<entry><ind>50400.0</ind><dep>1.10</dep></entry>
<entry><ind>54000.0</ind><dep>1.30</dep></entry>
<entry><ind>57600.0</ind><dep>1.50</dep></entry>
<entry><ind>61200.0</ind><dep>1.26</dep></entry>
<entry><ind>64800.0</ind><dep>0.92</dep></entry>
<entry><ind>68400.0</ind><dep>0.72</dep></entry>
<entry><ind>72000.0</ind><dep>0.56</dep></entry>
<entry><ind>75600.0</ind><dep>0.52</dep></entry>
<entry><ind>79200.0</ind><dep>0.45</dep></entry>
<entry><ind>82800.0</ind><dep>0.36</dep></entry>
</table>
</expression>
</input>
<output>/sim/rendering/osm/road-traffic-daily-variation</output>
</filter>
<!-- illumination setting for precipitation particles -->
<filter> <filter>
<name>EnvironmentInterpolator:Precipitation:Illumination</name> <name>EnvironmentInterpolator:Precipitation:Illumination</name>

3
Shaders/road-ALS-ultra.frag
View file

@ -57,6 +57,7 @@ uniform float grain_magnification;
uniform float wetness; uniform float wetness;
uniform float rain_norm; uniform float rain_norm;
uniform float road_traffic_density; uniform float road_traffic_density;
uniform float road_traffic_variation;
uniform float streetlight_factor; uniform float streetlight_factor;
uniform float avisibility; uniform float avisibility;
@ -353,7 +354,7 @@ void main (void)
cSign *= road_traffic_direction; cSign *= road_traffic_direction;
float total_traffic_density = road_traffic_density * rtype_traffic_density; float total_traffic_density = road_traffic_density * rtype_traffic_density * road_traffic_variation;
float cCoord = roadCoords.t + cOffset; float cCoord = roadCoords.t + cOffset;
cCoord += 0.3 * osg_SimulationTime * cSign * rtype_traffic_speed * (1.0 - (0.9 * smoothstep(1.0, 2.5, total_traffic_density))); cCoord += 0.3 * osg_SimulationTime * cSign * rtype_traffic_speed * (1.0 - (0.9 * smoothstep(1.0, 2.5, total_traffic_density)));