From 70478b1a993c9f0056485e11a38903768743aff1 Mon Sep 17 00:00:00 2001 From: Vivian Meazza Date: Sat, 12 Nov 2011 23:39:40 +0000 Subject: [PATCH 1/2] Merge branch 'master' of D:\Git_New\fgdata From eeee2d4db02e2d5e2657b1b81f5bb856f55601ee Mon Sep 17 00:00:00 2001 From: Vivian Meazza Date: Sat, 19 Nov 2011 20:35:57 +0000 Subject: [PATCH 2/2] Add runway rain effect Signed-off-by: Vivian Meazza --- materials-dds.xml | 1500 ++++++++++++++++++++++++++++----------------- 1 file changed, 948 insertions(+), 552 deletions(-) diff --git a/materials-dds.xml b/materials-dds.xml index 74749307d..0198fc0a7 100644 --- a/materials-dds.xml +++ b/materials-dds.xml @@ -153,557 +153,953 @@ Shared parameters for various materials. 0.05 - - pa_taxiway - Runway/pa_taxiway.dds - - - - pa_tiedown - Runway/pa_tiedown.dds - - - - pa_dspl_thresh - Runway/pa_dspl_thresh.dds - false - - - - pa_dspl_arrows - Runway/pa_dspl_arrows.dds - false - - - - pa_shoulder - Runway/pa_shoulder.dds - 5 - - - - pa_shoulder_f - Runway/pa_shoulder_f.dds - 5 - - - - pa_threshold - Runway/pa_threshold.dds - false - false - - - - pa_stopway - Runway/pa_stopway.dds - false - - - - pa_L - Runway/pa_L.dds - false - - - - pa_R - Runway/pa_R.dds - false - - - - pa_C - Runway/pa_C.dds - false - - - - pa_0l - Runway/pa_0l.dds - false - - - - pa_0r - Runway/pa_0r.dds - false - - - - pa_1c - Runway/pa_1c.dds - false - - - - pa_1l - Runway/pa_1l.dds - false - - - - pa_1r - Runway/pa_1r.dds - false - - - - pa_11 - Runway/pa_11.dds - false - - - - pa_2c - Runway/pa_2c.dds - false - - - - pa_2l - Runway/pa_2l.dds - false - - - - pa_2r - Runway/pa_2r.dds - false - - - - pa_3c - Runway/pa_3c.dds - false - - - - pa_3l - Runway/pa_3l.dds - false - - - - pa_3r - Runway/pa_3r.dds - false - - - - pa_4c - Runway/pa_4c.dds - false - - - - pa_4r - Runway/pa_4r.dds - false - - - - pa_5c - Runway/pa_5c.dds - false - - - - pa_5r - Runway/pa_5r.dds - false - - - - pa_6c - Runway/pa_6c.dds - false - - - - pa_6r - Runway/pa_6r.dds - false - - - - pa_7c - Runway/pa_7c.dds - false - - - - pa_7r - Runway/pa_7r.dds - false - - - - pa_8c - Runway/pa_8c.dds - false - - - - pa_8r - Runway/pa_8r.dds - false - - - - pa_9c - Runway/pa_9c.dds - false - - - - pa_9r - Runway/pa_9r.dds - false - - - - pa_tz_three - Runway/pa_tz_three.dds - false - - - - pa_aim - Runway/pa_aim.dds - false - - - - pa_tz_two_a - Runway/pa_tz_two_a.dds - false - - - - pa_tz_two_b - Runway/pa_tz_two_b.dds - false - - - - pa_tz_one_a - Runway/pa_tz_one_a.dds - false - - - - pa_tz_one_b - Runway/pa_tz_one_b.dds - false - - - - pa_centerline - Runway/pa_centerline.dds - false - - - - pa_rest - Runway/pa_rest.dds - false - - - - pc_taxiway - dirt_rwytaxiway - Runway/pc_taxiway.dds - - - - pc_tiedown - dirt_rwytiedown - Runway/pc_tiedown.dds - - - - pc_dspl_thresh - Runway/pc_dspl_thresh.dds - false - - - - pc_dspl_arrows - Runway/pc_dspl_arrows.dds - false - - - - pc_shoulder - Runway/pc_shoulder.dds - 5 - - - - pc_shoulder_f - Runway/pc_shoulder_f.dds - 5 - - - - pc_threshold - dirt_rwythreshold - Runway/pc_threshold.dds - false - false - - - - pc_stopway - Runway/pc_stopway.dds - false - - - - pc_L - dirt_rwyL - Runway/pc_L.dds - false - - - - pc_R - dirt_rwyR - Runway/pc_R.dds - false - - - - pc_C - dirt_rwyC - Runway/pc_C.dds - false - - - - pc_0l - dirt_rwy0l - Runway/pc_0l.dds - false - - - - pc_0r - dirt_rwy0r - Runway/pc_0r.dds - false - - - - pc_1c - dirt_rwy1c - Runway/pc_1c.dds - false - - - - pc_1l - dirt_rwy1l - Runway/pc_1l.dds - false - - - - pc_1r - dirt_rwy1r - Runway/pc_1r.dds - false - - - - pc_11 - dirt_rwy11 - Runway/pc_11.dds - false - - - - pc_2c - dirt_rwy2c - Runway/pc_2c.dds - false - - - - pc_2l - dirt_rwy2l - Runway/pc_2l.dds - false - - - - pc_2r - dirt_rwy2r - Runway/pc_2r.dds - false - - - - pc_3c - dirt_rwy3c - Runway/pc_3c.dds - false - - - - pc_3l - dirt_rwy3l - Runway/pc_3l.dds - false - - - - pc_3r - dirt_rwy3r - Runway/pc_3r.dds - false - - - - pc_4c - dirt_rwy4c - Runway/pc_4c.dds - false - - - - pc_4r - dirt_rwy4r - Runway/pc_4r.dds - false - - - - pc_5c - dirt_rwy5c - Runway/pc_5c.dds - false - - - - pc_5r - dirt_rwy5r - Runway/pc_5r.dds - false - - - - pc_6c - dirt_rwy6c - Runway/pc_6c.dds - false - - - - pc_6r - dirt_rwy6r - Runway/pc_6r.dds - false - - - - pc_7c - dirt_rwy7c - Runway/pc_7c.dds - false - - - - pc_7r - dirt_rwy7r - Runway/pc_7r.dds - false - - - - pc_8c - dirt_rwy8c - Runway/pc_8c.dds - false - - - - pc_8r - dirt_rwy8r - Runway/pc_8r.dds - false - - - - pc_9c - dirt_rwy9c - Runway/pc_9c.dds - false - - - - pc_9r - dirt_rwy9r - Runway/pc_9r.dds - false - - - - pc_tz_three - dirt_rwytz_three - Runway/pc_tz_three.dds - false - - - - pc_aim - dirt_rwyaim - Runway/pc_aim.dds - false - - - - pc_tz_two_a - dirt_rwytz_two_a - Runway/pc_tz_two_a.dds - false - - - - pc_tz_two_b - dirt_rwytz_two_b - Runway/pc_tz_two_b.dds - false - - - - pc_tz_one_a - dirt_rwytz_one_a - Runway/pc_tz_one_a.dds - false - - - - pc_tz_one_b - dirt_rwytz_one_b - Runway/pc_tz_one_b.dds - false - - - - pc_centerline - dirt_rwycenterline - Runway/pc_centerline.dds - false - - - - pc_rest - dirt_rwyrest - Runway/pc_rest.dds - false - + + pa_taxiway + Effects/runway + + /environment/rain-norm + + Runway/pa_taxiway.dds + + + + pa_tiedown + Effects/runway + + /environment/rain-norm + + Runway/pa_tiedown.dds + + + + pa_dspl_thresh + Effects/runway + + /environment/rain-norm + + Runway/pa_dspl_thresh.dds + false + + + + pa_dspl_arrows + Effects/runway + + /environment/rain-norm + + Runway/pa_dspl_arrows.dds + false + + + + pa_threshold + Effects/runway + + /environment/rain-norm + + Runway/pa_threshold.dds + false + false + + + + pa_stopway + Effects/runway + + /environment/rain-norm + + Runway/pa_stopway.dds + false + + + + pa_L + Effects/runway + + /environment/rain-norm + + Runway/pa_L.dds + false + + + + pa_R + Effects/runway + + /environment/rain-norm + + Runway/pa_R.dds + false + + + + pa_C + Effects/runway + + /environment/rain-norm + + Runway/pa_C.dds + false + + + + pa_0l + Effects/runway + + /environment/rain-norm + + Runway/pa_0l.dds + false + + + + pa_0r + Effects/runway + + /environment/rain-norm + + Runway/pa_0r.dds + false + + + + pa_1c + Effects/runway + + /environment/rain-norm + + Runway/pa_1c.dds + false + + + + pa_1l + Effects/runway + + /environment/rain-norm + + Runway/pa_1l.dds + false + + + + pa_1r + Effects/runway + + /environment/rain-norm + + Runway/pa_1r.dds + false + + + + pa_11 + Effects/runway + + /environment/rain-norm + + Runway/pa_11.dds + false + + + + pa_2c + Effects/runway + + /environment/rain-norm + + Runway/pa_2c.dds + false + + + + pa_2l + Effects/runway + + /environment/rain-norm + + Runway/pa_2l.dds + false + + + + pa_2r + Effects/runway + + /environment/rain-norm + + Runway/pa_2r.dds + false + + + + pa_3c + Effects/runway + + /environment/rain-norm + + Runway/pa_3c.dds + false + + + + pa_3l + Effects/runway + + /environment/rain-norm + + Runway/pa_3l.dds + false + + + + pa_3r + Effects/runway + + /environment/rain-norm + + Runway/pa_3r.dds + false + + + + pa_4c + Effects/runway + + /environment/rain-norm + + Runway/pa_4c.dds + false + + + + pa_4r + Effects/runway + + /environment/rain-norm + + Runway/pa_4r.dds + false + + + + pa_5c + Effects/runway + + /environment/rain-norm + + Runway/pa_5c.dds + false + + + + pa_5r + Effects/runway + + /environment/rain-norm + + Runway/pa_5r.dds + false + + + + pa_6c + Effects/runway + + /environment/rain-norm + + Runway/pa_6c.dds + false + + + + pa_6r + Effects/runway + + /environment/rain-norm + + Runway/pa_6r.dds + false + + + + pa_7c + Effects/runway + + /environment/rain-norm + + Runway/pa_7c.dds + false + + + + pa_7r + Effects/runway + + /environment/rain-norm + + Runway/pa_7r.dds + false + + + + pa_8c + Effects/runway + + /environment/rain-norm + + Runway/pa_8c.dds + false + + + + pa_8r + Effects/runway + + /environment/rain-norm + + Runway/pa_8r.dds + false + + + + pa_9c + Effects/runway + + /environment/rain-norm + + Runway/pa_9c.dds + false + + + + pa_9r + Effects/runway + + /environment/rain-norm + + Runway/pa_9r.dds + false + + + + pa_tz_three + Effects/runway + + /environment/rain-norm + + Runway/pa_tz_three.dds + false + + + + pa_aim + Effects/runway + + /environment/rain-norm + + Runway/pa_aim.dds + false + + + + pa_tz_two_a + Effects/runway + + /environment/rain-norm + + Runway/pa_tz_two_a.dds + false + + + + pa_tz_two_b + Effects/runway + + /environment/rain-norm + + Runway/pa_tz_two_b.dds + false + + + + pa_tz_one_a + Effects/runway + + /environment/rain-norm + + Runway/pa_tz_one_a.dds + false + + + + pa_tz_one_b + Effects/runway + + /environment/rain-norm + + Runway/pa_tz_one_b.dds + false + + + + pa_centerline + Effects/runway + + /environment/rain-norm + + Runway/pa_centerline.dds + false + + + + pa_rest + Effects/runway + + /environment/rain-norm + + Runway/pa_rest.dds + false + + + + pc_taxiway + dirt_rwytaxiway + Runway/pc_taxiway.dds + + + + pc_tiedown + dirt_rwytiedown + Runway/pc_tiedown.dds + + + + pc_dspl_thresh + Effects/runway + + /environment/rain-norm + + Runway/pc_dspl_thresh.dds + false + + + + pc_dspl_arrows + Effects/runway + + /environment/rain-norm + + Runway/pc_dspl_arrows.dds + false + + + + pc_threshold + dirt_rwythreshold + Runway/pc_threshold.dds + false + false + + + + pc_stopway + Effects/runway + + /environment/rain-norm + + Runway/pc_stopway.dds + false + + + + pc_L + dirt_rwyL + Effects/runway + + /environment/rain-norm + + Runway/pc_L.dds + false + + + + pc_R + dirt_rwyR + Effects/runway + + /environment/rain-norm + + Runway/pc_R.dds + false + + + + pc_C + dirt_rwyC + Effects/runway + + /environment/rain-norm + + Runway/pc_C.dds + false + + + + pc_0l + dirt_rwy0l + Effects/runway + + /environment/rain-norm + + Runway/pc_0l.dds + false + + + + pc_0r + dirt_rwy0r + Effects/runway + + /environment/rain-norm + + Runway/pc_0r.dds + false + + + + pc_1c + dirt_rwy1c + Effects/runway + + /environment/rain-norm + + Runway/pc_1c.dds + false + + + + pc_1l + dirt_rwy1l + Effects/runway + + /environment/rain-norm + + Runway/pc_1l.dds + false + + + + pc_1r + dirt_rwy1r + Effects/runway + + /environment/rain-norm + + Runway/pc_1r.dds + false + + + + pc_11 + dirt_rwy11 + Effects/runway + + /environment/rain-norm + + Runway/pc_11.dds + false + + + + pc_2c + dirt_rwy2c + Effects/runway + + /environment/rain-norm + + Runway/pc_2c.dds + false + + + + pc_2l + dirt_rwy2l + Effects/runway + + /environment/rain-norm + + Runway/pc_2l.dds + false + + + + pc_2r + dirt_rwy2r + Effects/runway + + /environment/rain-norm + + Runway/pc_2r.dds + false + + + + pc_3c + dirt_rwy3c + Effects/runway + + /environment/rain-norm + + Runway/pc_3c.dds + false + + + + pc_3l + dirt_rwy3l + Effects/runway + + /environment/rain-norm + + Runway/pc_3l.dds + false + + + + pc_3r + dirt_rwy3r + Effects/runway + + /environment/rain-norm + + Runway/pc_3r.dds + false + + + + pc_4c + dirt_rwy4c + Effects/runway + + /environment/rain-norm + + Runway/pc_4c.dds + false + + + + pc_4r + dirt_rwy4r + Effects/runway + + /environment/rain-norm + + Runway/pc_4r.dds + false + + + + pc_5c + dirt_rwy5c + Effects/runway + + /environment/rain-norm + + Runway/pc_5c.dds + false + + + + pc_5r + dirt_rwy5r + Effects/runway + + /environment/rain-norm + + Runway/pc_5r.dds + false + + + + pc_6c + dirt_rwy6c + Effects/runway + + /environment/rain-norm + + Runway/pc_6c.dds + false + + + + pc_6r + dirt_rwy6r + Effects/runway + + /environment/rain-norm + + Runway/pc_6r.dds + false + + + + pc_7c + dirt_rwy7c + Effects/runway + + /environment/rain-norm + + Runway/pc_7c.dds + false + + + + pc_7r + dirt_rwy7r + Effects/runway + + /environment/rain-norm + + Runway/pc_7r.dds + false + + + + pc_8c + dirt_rwy8c + Effects/runway + + /environment/rain-norm + + Runway/pc_8c.dds + false + + + + pc_8r + dirt_rwy8r + Effects/runway + + /environment/rain-norm + + Runway/pc_8r.dds + false + + + + pc_9c + dirt_rwy9c + Effects/runway + + /environment/rain-norm + + Runway/pc_9c.dds + false + + + + pc_9r + dirt_rwy9r + Effects/runway + + /environment/rain-norm + + Runway/pc_9r.dds + false + + + + pc_tz_three + dirt_rwytz_three + Effects/runway + + /environment/rain-norm + + Runway/pc_tz_three.dds + false + + + + pc_aim + dirt_rwyaim + Effects/runway + + /environment/rain-norm + + Runway/pc_aim.dds + false + + + + pc_tz_two_a + dirt_rwytz_two_a + Effects/runway + + /environment/rain-norm + + Runway/pc_tz_two_a.dds + false + + + + pc_tz_two_b + dirt_rwytz_two_b + Effects/runway + + /environment/rain-norm + + Runway/pc_tz_two_b.dds + false + + + + pc_tz_one_a + dirt_rwytz_one_a + Effects/runway + + /environment/rain-norm + + Runway/pc_tz_one_a.dds + false + + + + pc_tz_one_b + dirt_rwytz_one_b + Effects/runway + + /environment/rain-norm + + Runway/pc_tz_one_b.dds + false + + + + pc_centerline + dirt_rwycenterline + Effects/runway + + /environment/rain-norm + + Runway/pc_centerline.dds + false + + + + pc_rest + dirt_rwyrest + Effects/runway + + /environment/rain-norm + + Runway/pc_rest.dds + false + + + + pa_shoulder + Effects/runway + + /environment/rain-norm + + + 0.93 + 0.95 + 0.93 + 1.0 + + + 0.1 + 0.12 + 0.1 + 1.0 + + + /environment/rain-norm + + Runway/pa_shoulder.dds + 5 + false + + + + pc_shoulder + Effects/runway + + /environment/rain-norm + + + 0.93 + 0.95 + 0.93 + 1.0 + + + 0.1 + 0.12 + 0.1 + 1.0 + + + /environment/rain-norm + + Runway/pc_shoulder.dds + 5 + false + + + + pa_shoulder_f + Effects/runway + + /environment/rain-norm + + + 0.93 + 0.95 + 0.93 + 1.0 + + + 0.1 + 0.12 + 0.1 + 1.0 + + + /environment/rain-norm + + Runway/pa_shoulder_f.dds + 5 + false + + + + pc_shoulder_f + Effects/runway + + /environment/rain-norm + + + 0.93 + 0.95 + 0.93 + 1.0 + + + 0.1 + 0.12 + 0.1 + 1.0 + + + /environment/rain-norm + + Runway/pc_shoulder_f.dds + 5 + false + @@ -907,7 +1303,7 @@ Shared parameters for various materials. 1.2 20000000.0 12000.0 - Textures.high/Trees/mixed-shrub.dds + Textures/Trees/mixed-shrub.dds 8 2.0