diff --git a/AI/foch_demo.xml b/AI/foch_demo.xml index c17885d1d..4de056dbd 100644 --- a/AI/foch_demo.xml +++ b/AI/foch_demo.xml @@ -15,7 +15,7 @@ Foch R99 026X - Models/Geometry/Foch/Foch.xml + Models/Geometry/Clemenceau/Clemenceau.xml 42.830 6.325 diff --git a/Effects/road.eff b/Effects/road.eff index d0f099f94..1ddf88dff 100644 --- a/Effects/road.eff +++ b/Effects/road.eff @@ -17,7 +17,7 @@ 0 50 1 - 0.8 0.8 1.0 + 0.941 0.682 0.086 /environment/snow-level-m /environment/surface/snow-thickness-factor /sim/rendering/osm/road-traffic-enabled diff --git a/Models/Geometry/Clemenceau/Clemenceau.xml b/Models/Geometry/Clemenceau/Clemenceau.xml index fca66b961..fd0f6255b 100644 --- a/Models/Geometry/Clemenceau/Clemenceau.xml +++ b/Models/Geometry/Clemenceau/Clemenceau.xml @@ -94,7 +94,7 @@ 8 - + diff --git a/Models/Geometry/Clemenceau/Pont.xml b/Models/Geometry/Clemenceau/Pont.xml index 0fb0a5f80..d5edef07f 100644 --- a/Models/Geometry/Clemenceau/Pont.xml +++ b/Models/Geometry/Clemenceau/Pont.xml @@ -11,9 +11,16 @@ pont-v2.ac - Textures - + Textures + + Models/Geometry/Nimitz/Effects/flightdeck + Pont1 + Pont2 + Pont3 + Pont4 + Pont5 + diff --git a/Shaders/model-ALS-ultra.frag b/Shaders/model-ALS-ultra.frag index 22c550f5f..d9cb45461 100644 --- a/Shaders/model-ALS-ultra.frag +++ b/Shaders/model-ALS-ultra.frag @@ -187,7 +187,9 @@ void main (void) float fog_lightArg = (terminator-fog_yprime_alt)/100000.0; float fog_earthShade = 0.9 * smoothstep(terminator_width+ terminator, -terminator_width + terminator, fog_yprime_alt) + 0.1; + float delta_z = hazeLayerAltitude - eye_alt; + float ct = dot(normalize(up), normalize(vertVec)); /// END geometry for light @@ -296,7 +298,9 @@ void main (void) vec3 relPos = (gl_ModelViewMatrixInverse * vec4 (vertVec,0.0)).xyz; if (cloud_shadow_flag == 1) { - light_diffuse = light_diffuse * shadow_func(relPos.x, relPos.y, 1.0, dist); + float cloud_shadow_factor = shadow_func(relPos.x, relPos.y, 1.0, dist); + cloud_shadow_factor = 1.0 - ((1.0 - cloud_shadow_factor) * (1.0 - smoothstep (-100.0, 100.0, vertex_alt - hazeLayerAltitude))); + light_diffuse = light_diffuse * cloud_shadow_factor; } vec3 secondary_light = vec3 (0.0,0.0,0.0); @@ -477,7 +481,6 @@ void main (void) float transmission_arg; float eqColorFactor; - float delta_z = hazeLayerAltitude - eye_alt; float mvisibility = min(visibility, avisibility); if (dist > 0.04 * mvisibility) diff --git a/Shaders/road-ALS-ultra.frag b/Shaders/road-ALS-ultra.frag index bc36bd6c6..ab06a9fc6 100644 --- a/Shaders/road-ALS-ultra.frag +++ b/Shaders/road-ALS-ultra.frag @@ -120,52 +120,60 @@ float light_func (in float x, in float a, in float b, in float c, in float d, in } -void road_type_mapper (in vec2 coord, out float rtype_traffic_density, out float rtype_base_illumination, out float rtype_traffic_speed) +void road_type_mapper (in vec2 coord, out float rtype_traffic_density, out float rtype_base_illumination, out float rtype_traffic_speed, out int rtype_dual_lane) { if (coord.s < 0.125) { + rtype_dual_lane = 0; rtype_traffic_density = 0; rtype_base_illumination = 0; rtype_traffic_speed = 0.0; } else if (coord.s < 0.250) { + rtype_dual_lane = 0; rtype_traffic_density = 0.3; rtype_base_illumination = 0.65; rtype_traffic_speed = 0.5; } else if (coord.s < 0.375) { + rtype_dual_lane = 0; rtype_traffic_density = 1.0; rtype_base_illumination = 1.0; rtype_traffic_speed = 1.0; } else if (coord.s < 0.5) { + rtype_dual_lane = 0; rtype_traffic_density = 0.0; rtype_base_illumination = 0.0; rtype_traffic_speed = 0.0; } else if (coord.s < 0.625) { + rtype_dual_lane = 0; rtype_traffic_density = 0.0; rtype_base_illumination = 0.0; rtype_traffic_speed = 0.0; } else if (coord.s < 0.750) { + rtype_dual_lane = 1; rtype_traffic_density = 1.0; rtype_base_illumination = 0.65; rtype_traffic_speed = 1.0; } else if (coord.s < 0.875) { + rtype_dual_lane = 0; rtype_traffic_density = 0.1; rtype_base_illumination = 0.0; rtype_traffic_speed = 0.3; } else { + rtype_dual_lane = 0; rtype_traffic_density = 0.0; rtype_base_illumination = 0.0; rtype_traffic_speed = 0.0; @@ -198,7 +206,8 @@ void main (void) float rtype_traffic_density = 0.0; float rtype_base_illumination = 0.0; float rtype_traffic_speed = 0.0; - road_type_mapper (gl_TexCoord[0].st, rtype_traffic_density, rtype_base_illumination, rtype_traffic_speed); + int rtype_dual_lane = 0; + road_type_mapper (gl_TexCoord[0].st, rtype_traffic_density, rtype_base_illumination, rtype_traffic_speed, rtype_dual_lane); float pf = 0.0; float pf1 = 0.0; @@ -333,12 +342,20 @@ void main (void) if (road_traffic_enabled == 1) { float cSign = 1.0; - if (roadCoords.s > 0.5) {cSign = -1.0;} + float cOffset = 0.0; + if (roadCoords.s > 0.5) + { + if (rtype_dual_lane == 0) {cSign = -1.0;} + else {cOffset = 5.0;} + } + + if (rtype_dual_lane == 1) {cSign = -1.0;} + cSign *= road_traffic_direction; float total_traffic_density = road_traffic_density * rtype_traffic_density; - float cCoord = roadCoords.t; + 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 *= 5.0; diff --git a/gui/dialogs/multiplayer.xml b/gui/dialogs/multiplayer.xml index 3111a67cc..0323e29b2 100644 --- a/gui/dialogs/multiplayer.xml +++ b/gui/dialogs/multiplayer.xml @@ -22,6 +22,12 @@ } } } + if (getprop("/sim/multiplay/rxport") == nil or getprop("/sim/multiplay/rxport") == 0) + setprop("/sim/multiplay/rxport",5000); + + if (getprop("/sim/multiplay/txport") == nil or getprop("/sim/multiplay/txport") == 0) + setprop("/sim/multiplay/txport",5000); + if (getprop("/sim/multiplay/protocol-version") == 2) setprop("/sim/gui/dialogs/multiplay/protocol-version", "Visible to only 2017+"); else @@ -229,7 +235,26 @@ /sim/gui/dialogs/multiplay/servers - + + hbox + 3 + 1 + + 2 + right + + + + 50 + left + /sim/multiplay/rxport + + + /sim/multiplay/online + + + + @@ -276,11 +301,11 @@ nasal