diff --git a/Models/Effects/cockpit-irradiance.eff b/Models/Effects/cockpit-irradiance.eff new file mode 100644 index 00000000..ba1defa0 --- /dev/null +++ b/Models/Effects/cockpit-irradiance.eff @@ -0,0 +1,13 @@ + + panel + Effects/model-combined-deferred + + 2 + 0.1 + 0 + 0 + 0 + 0.0 + 0 + + diff --git a/Models/Effects/cockpitwallconsole.eff b/Models/Effects/cockpitwallconsole.eff deleted file mode 100644 index 2d750a6a..00000000 --- a/Models/Effects/cockpitwallconsole.eff +++ /dev/null @@ -1,22 +0,0 @@ - - wallconsole - Effects/model-combined-deferred - - 0 - 0 - 0 - 0 - 0.1 - 1 - 0 - /controls/lighting/main-flood-norm - 1.0 1.0 1.0 - - Aircraft/IDG-A32X/Models/Effects/cockpitwallconsole.png - linear-mipmap-linear - clamp - clamp - normalized - - - diff --git a/Models/Effects/cockpitwallconsole.png b/Models/Effects/cockpitwallconsole.png deleted file mode 100644 index 21db6f49..00000000 Binary files a/Models/Effects/cockpitwallconsole.png and /dev/null differ diff --git a/Models/Effects/consolelightmap.eff b/Models/Effects/consolelightmap.eff deleted file mode 100644 index 61ba2613..00000000 --- a/Models/Effects/consolelightmap.eff +++ /dev/null @@ -1,22 +0,0 @@ - - console - Effects/model-combined-deferred - - 0 - 0 - 0 - 0 - 0.1 - 1 - 0 - /controls/lighting/main-flood-norm - 1.0 1.0 1.0 - - Aircraft/IDG-A32X/Models/Effects/consolelightmap.png - linear-mipmap-linear - clamp - clamp - normalized - - - diff --git a/Models/Effects/consolelightmap.png b/Models/Effects/consolelightmap.png deleted file mode 100644 index 931ba05d..00000000 Binary files a/Models/Effects/consolelightmap.png and /dev/null differ diff --git a/Models/Effects/floorlightmap.eff b/Models/Effects/floorlightmap.eff deleted file mode 100644 index c20e8843..00000000 --- a/Models/Effects/floorlightmap.eff +++ /dev/null @@ -1,22 +0,0 @@ - - floor - Effects/model-combined-deferred - - 0 - 0 - 0 - 0 - 0.1 - 1 - 0 - /controls/lighting/main-flood-norm - 1.0 1.0 1.0 - - Aircraft/IDG-A32X/Models/Effects/floorlightmap.png - linear-mipmap-linear - clamp - clamp - normalized - - - diff --git a/Models/Effects/floorlightmap.png b/Models/Effects/floorlightmap.png deleted file mode 100644 index 8f4b5f27..00000000 Binary files a/Models/Effects/floorlightmap.png and /dev/null differ diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml index 577192ef..1a5567b5 100644 --- a/Models/FlightDeck/a320.flightdeck.xml +++ b/Models/FlightDeck/a320.flightdeck.xml @@ -5685,6 +5685,333 @@ Aircraft/IDG-A32X/Models/Effects/panel-flood main_panel + + + + Aircraft/IDG-A32X/Models/Effects/cockpit-irradiance + ACP + beam + beam_a + beam_f + box + cabinet + carpet + ceiling + clock + clock.001 + clock_body + compass_box + cpit_lamp_cpt + cpit_lamp_fo + DoorC + FCU + efis_box_1 + efis_box_2 + efis_box_2.001 + efis_box_3 + efis_box_4 + extinguisher + a-thr + a-thr_led + alt-sel + alt-sel-mode + ap1 + ap1_led + ap2 + ap2_led + appr + appr_led + arpt + arpt_led + arpt.001 + arpt_led.001 + autoland_light + autoland_light_on + cstr + cstr_led + cstr.001 + cstr_led.001 + cylinder30 + cylinder30.002 + cylinder30.003 + cylinder30.004 + efis_display_foil + exped + exped_led + fcu_integ_knb + fcu_panel + fcu_panel_emit + fd1 + fd1_led + fd2 + fd2_led + hdg-sel + hdg-vs + hud_brt + hud_brt.mark + hud_declutter_btn + hud_norm_sw + ils + ils_led + ils2 + ils2_led + loc + loc_led + lt_knb_1 + lt_knb_1.001 + master_caution + master_caution_on + master_warning + master_warning_on + metric_alt + nd_mode + nd_mode.mark + nd_mode_fo + nd_mode_fo.mark + nd_range + nd_range.mark + nd_range_fo + nd_range_fo.mark + ndb + ndb_led + ndb.001 + ndb_led.001 + prio_capt + prio_capt.arrow + prio_capt.capt + prio_fo_fo + prio_capt.arrow.001 + prio_capt.capt.001 + prio_fo + prio_fo.arrow + qnh_cpt_knb + qnh_cpt_sw + qnh_fo_knb + qnh_fo_sw + rect.003 + rect.004 + spd-mach + spd-sel + vor-adf-1 + vor-adf-1-right + vor-adf-2 + vor-adf-2-right + vord + vord_led + vord.001 + vord_led.001 + vs-sel + wpt + wpt_led + wpt.001 + wpt_led.001 + footrest3 + footrest_cpt + footrest_cpt2 + footrest_fo + footrest_fo2 + gallery_l + gear_lever_body + hud + hud_1 + hud_1_label + hud_2 + hud_3 + hud_glass + hud_screen + hud_box + hud_box_grid + hud_ceiling + lamp_flood_main + lamp_s + land_sw + level0 + level0.001 + level0_2 + level1 + level1_2 + level2 + level2_2 + level3 + level3_2 + light_console_cpt_sw + light_console_cpt_sw.axis + light_console_fo_sw + light_console_fo_sw.axis + LRudderPedalL + LRudderPedalR + Main-Panel + abs_low + abs_low_on + abs_max + abs_max_on + abs_med + abs_med_on + brightness_nd_1_cpt + brightness_nd_1_fo + brightness_nd_1_fo.mark + brightness_nd_2_cpt + brightness_nd_2_cpt.mark + brightness_nd_2_fo + brightness_nd_2_fo.mark + brightness_panel_emit + brk_fan + dec_low_on + dec_max_on + dec_med_on + foot_warmer_cpt_sw + foot_warmer_cpt_sw.mark + foot_warmer_fo_sw + foot_warmer_fo_sw.mark + gear_lever + gear_lever_slot + gpws_gs_sw + iesi + iesi_baro_knb + iesi_btn_bugs + iesi_btn_ls + iesi_btn_minus + iesi_btn_plus + iesi_btn_rst + iesi_labels + iesi_screen + lgear + lgear_down + lgear_unlk + main_panel_box + main_panel_signboard + ngear + ngear_down + ngear_unlk + pfd_brt_cpt + pfd_brt_cpt.mark + pfd_brt_fo + pfd_brt_fo.mark + pfd_nd_xfr_sw + pfd_nd_xfr_sw2 + rect + rgear + rgear_down + rgear_unlk + speaker_volume_cpt + speaker_volume_cpt.mark + speaker_volume_fo + speaker_volume_fo.mark + switch_bas + ohpanel2 + ohpanel2_knob + ohpanel2_knob.mark + ped_footrest + pedal_adjust + pedals_block_capt + pedals_indicator_1 + Pedestal-Low + CockpitDoorFault + CockpitDoorOpen + CockpitDoorSwitch + CockpitDoorSwitch.mark + CockpitDoorVideoButton + FlapsLever + gravity_gear + ParkBrk + RudderTrim + RudderTrim.mark + RudderTrimReset + SpdBrk + pedestal1 + pedestal3 + pedestal_low + pedestal_map_case + phone + phone2 + pl + poly000041 + RMP + RRudderPedalL + RRudderPedalR + screws + Seat + seat0 + seat1 + seat2 + seat4 + seat6 + seat7 + seat8 + seat_belt + seat_label + seat_label.001 + seat3 + seat3.001 + seat4.001 + seat4.002 + sfl.001 + sfl.002 + sfl.006 + sfl.010 + sfl.011 + sfl.012 + sfl.013 + sfl.014 + side_base.002 + side_base_lamp + sidestick_1 + sidestick_1.axis.002 + sidestick_2 + so.000 + so.1 + so.2 + sphere + sphere.007 + sts + sts.001 + sts.003 + sts.004 + sts.006 + sts.007 + thr_l + rev_l + thr_l_body + thr_l_button + thr_l_screw + thr_quad + thr_quad_lts + thr_r + rev_r + thr_button + thr_r_body + thr_r_screw + tiller + tillerFo + tray0-fo + tray1-cpt + tray0-cpt + tray1-fo + tray2-cpt + tray2-fo + trim_wheel + trim_1 + trim_2 + trim_2_lts + trray_slide + visor_cpt + visor_fo + visor_glass_cpt + visor_glass_fo + wall_1 + wall_2 + window_frame + WindowCpt + HeadsetCpt + Sticker + WindowGlassCpt + WindowOpenerCpt + WindowFo + HeadsetFo + WindowGlassFo + WindowOpenerFo + WX + Panel lighting diff --git a/Models/Instruments/ATC/ATC.xml b/Models/Instruments/ATC/ATC.xml index 2bbd266e..2de90b65 100644 --- a/Models/Instruments/ATC/ATC.xml +++ b/Models/Instruments/ATC/ATC.xml @@ -21,4 +21,46 @@ sim/model/lights/dome-light + + + Aircraft/IDG-A32X/Models/Effects/cockpit-irradiance + atc_0 + atc_1 + atc_2 + atc_3 + atc_4 + atc_5 + atc_6 + atc_7 + atc_abv + atc_body + atc_clr + atc_fail + atc_ident + atc_screen + atc_stby + atc_sys + atc_thrt + + + + Aircraft/IDG-A32X/Models/Effects/cockpit-irradiance + atc_0 + atc_1 + atc_2 + atc_3 + atc_4 + atc_5 + atc_6 + atc_7 + atc_abv + atc_body + atc_clr + atc_fail + atc_ident + atc_screen + atc_stby + atc_sys + atc_thrt + diff --git a/Models/Instruments/Audio/Audio1.xml b/Models/Instruments/Audio/Audio1.xml index 5e9fe569..fff7c6eb 100644 --- a/Models/Instruments/Audio/Audio1.xml +++ b/Models/Instruments/Audio/Audio1.xml @@ -21,4 +21,9 @@ sim/model/lights/dome-light + + + Aircraft/IDG-A32X/Models/Effects/cockpit-irradiance + audio_body + diff --git a/Models/Instruments/Audio/Audio2.xml b/Models/Instruments/Audio/Audio2.xml index 5e9fe569..fff7c6eb 100644 --- a/Models/Instruments/Audio/Audio2.xml +++ b/Models/Instruments/Audio/Audio2.xml @@ -21,4 +21,9 @@ sim/model/lights/dome-light + + + Aircraft/IDG-A32X/Models/Effects/cockpit-irradiance + audio_body + diff --git a/Models/Instruments/Brakes/Brakes.xml b/Models/Instruments/Brakes/Brakes.xml index 1f3a2a38..f323667e 100644 --- a/Models/Instruments/Brakes/Brakes.xml +++ b/Models/Instruments/Brakes/Brakes.xml @@ -60,5 +60,22 @@ brakes_accum_psi.axis + + + Panel lighting + material + brakes_body + + 0.3 + 0.3 + 0.3 + sim/model/lights/dome-light + + + + + Aircraft/IDG-A32X/Models/Effects/cockpit-irradiance + brakes_body + \ No newline at end of file diff --git a/Models/Instruments/DDRMI/DDRMI.xml b/Models/Instruments/DDRMI/DDRMI.xml index 5c271c14..8ce19101 100644 --- a/Models/Instruments/DDRMI/DDRMI.xml +++ b/Models/Instruments/DDRMI/DDRMI.xml @@ -173,5 +173,28 @@ ddrmi_vor_adf_flag_2.axis + + + Panel lighting + material + ddrmi_body + ddrmi_inside + ddrmi_vor_adf_select_1 + ddrmi_vor_adf_select_2 + + 0.3 + 0.3 + 0.3 + sim/model/lights/dome-light + + + + + Aircraft/IDG-A32X/Models/Effects/cockpit-irradiance + ddrmi_body + ddrmi_inside + ddrmi_vor_adf_select_1 + ddrmi_vor_adf_select_2 + diff --git a/Models/Instruments/MCDU/MCDU1.xml b/Models/Instruments/MCDU/MCDU1.xml index cf4b277a..0b2ce2d2 100644 --- a/Models/Instruments/MCDU/MCDU1.xml +++ b/Models/Instruments/MCDU/MCDU1.xml @@ -1384,4 +1384,9 @@ + + Aircraft/IDG-A32X/Models/Effects/cockpit-irradiance + mcdu_body + + diff --git a/Models/Instruments/MCDU/MCDU2.xml b/Models/Instruments/MCDU/MCDU2.xml index 7c780a5e..a47c9d22 100644 --- a/Models/Instruments/MCDU/MCDU2.xml +++ b/Models/Instruments/MCDU/MCDU2.xml @@ -1384,4 +1384,9 @@ + + Aircraft/IDG-A32X/Models/Effects/cockpit-irradiance + mcdu_body + + diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml index e98f8cd4..7bd67f76 100644 --- a/Models/Instruments/OHpanel/OHpanel.xml +++ b/Models/Instruments/OHpanel/OHpanel.xml @@ -988,7 +988,50 @@ sim/model/lights/dome-light - + + + Aircraft/IDG-A32X/Models/Effects/cockpit-irradiance + Panel + Eng1FireCover + Eng2FireCover + APUFireCover + firebtnapu + firebtn1 + firebtn2 + RATManGuard + Eng1FireTst + Eng2FireTst + APUFireTst + IR1ModeKnb + IR2ModeKnb + IR3ModeKnb + IDG1Prot + IDG2Prot + EvacCommandProt + EvacHornOff + EvacCapt-Purs + EmerGenTestGuard + EmerManOnGuard + MaskManOnGuard + ACFlowKnb + CockpitACKnb + FwdCabinACKnb + AftCabinACKnb + CargoHeatAftKnb + FwdCargoDischGuard + AftCargoDischGuard + XbleedKnb + RamAirBtnProt + OHPMarkLtKnb + LdgElevKnb + LeftWiperKnb + RightWiperKnb + DitchProt + Eng1ManStartProt + Eng2ManStartProt + EmerCallProt + + pick diff --git a/Models/Instruments/Pedestal_up/Pedestal_up.xml b/Models/Instruments/Pedestal_up/Pedestal_up.xml index ccd39add..661b31d2 100644 --- a/Models/Instruments/Pedestal_up/Pedestal_up.xml +++ b/Models/Instruments/Pedestal_up/Pedestal_up.xml @@ -24,6 +24,9 @@ throttle_1_label dummy_1 dummy_2 + Lcutoff + Rcutoff + eng_mode 0.3 0.3 @@ -32,4 +35,21 @@ + + Aircraft/IDG-A32X/Models/Effects/cockpit-irradiance + atc_body + ecam_body + ecam_switch_body + engine_body + radar_body + vu111_body + vu112_body + throttle_1 + throttle_1_label + dummy_1 + dummy_2 + Lcutoff + Rcutoff + eng_mode + diff --git a/Models/Instruments/Radio/Radio1.xml b/Models/Instruments/Radio/Radio1.xml index b7ba778d..ea769585 100644 --- a/Models/Instruments/Radio/Radio1.xml +++ b/Models/Instruments/Radio/Radio1.xml @@ -1716,5 +1716,10 @@ sim/model/lights/dome-light + + + Aircraft/IDG-A32X/Models/Effects/cockpit-irradiance + radio_body + diff --git a/Models/Instruments/Radio/Radio2.xml b/Models/Instruments/Radio/Radio2.xml index a8d1e75f..be7ac934 100644 --- a/Models/Instruments/Radio/Radio2.xml +++ b/Models/Instruments/Radio/Radio2.xml @@ -1716,5 +1716,10 @@ sim/model/lights/dome-light + + + Aircraft/IDG-A32X/Models/Effects/cockpit-irradiance + radio_body +