From 5675f78dc0685b1a167405c042988c1f52eda586 Mon Sep 17 00:00:00 2001 From: fly Date: Sat, 31 Jul 2021 11:44:35 +0000 Subject: [PATCH] Work over mp Signed-off-by: fly --- Models/A320-200-CFM.xml | 4 ++-- Models/A320-200-IAE.xml | 11 ++++++++--- Nasal/Libraries/canvasLiv.nas | 2 +- Nasal/Libraries/libraries.nas | 6 +++--- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Models/A320-200-CFM.xml b/Models/A320-200-CFM.xml index 0327cbd6..40a66d4f 100644 --- a/Models/A320-200-CFM.xml +++ b/Models/A320-200-CFM.xml @@ -22,10 +22,10 @@ livery_update.stop(); diff --git a/Models/A320-200-IAE.xml b/Models/A320-200-IAE.xml index 0b2ef1af..3feeb471 100644 --- a/Models/A320-200-IAE.xml +++ b/Models/A320-200-IAE.xml @@ -18,9 +18,14 @@ - - var livery_update = aircraft.livery_update.new("Aircraft/A320-family/Models/Liveries/A320/IAE"); - + livery_update.stop(); diff --git a/Nasal/Libraries/canvasLiv.nas b/Nasal/Libraries/canvasLiv.nas index fd29c2bb..2e003e26 100644 --- a/Nasal/Libraries/canvasLiv.nas +++ b/Nasal/Libraries/canvasLiv.nas @@ -174,7 +174,7 @@ var canvas_livery_update = { return nil; } me.targets[name].layers["base"] = me.targets[name].groups["base"].createChild("image").setFile(me.liveriesdir ~ "/" ~ resStr ~ "/" ~ getprop(property)).setSize(resolution,resolution); - me.targets[name].listener = setlistener(property, func(property) { + me.targets[name].listener = setlistener("/ai/models/multiplayer[" ~ me.module_id ~ "]/" ~ property, func(property) { resStr = findTexByRes(me.liveriesdir, property.getValue(), resolution); if (resStr == nil) { return nil; diff --git a/Nasal/Libraries/libraries.nas b/Nasal/Libraries/libraries.nas index b5a49e04..f09551da 100644 --- a/Nasal/Libraries/libraries.nas +++ b/Nasal/Libraries/libraries.nas @@ -40,17 +40,17 @@ var aero = getprop("/sim/aero"); if (aero == "A320-200-CFM") { var livery = aircraft.canvas_livery.init("Models/Liveries/A320/CFM"); elements = ["EngineCFM56R", "EngineCFM56L", "PylonCFM56R", "PylonCFM56L", "ReverserRDoor1", "ReverserRDoor2", "ReverserRDoor3", "ReverserRDoor4", "ReverserLDoor1", "ReverserLDoor2", "ReverserLDoor3", "ReverserLDoor4"]; - livery.createTarget("engines", elements, "/sim/model/livery/texture-engine"); + livery.createTarget("engines", elements, "sim/model/livery/texture-engine"); livery.addLayer("engines", "dirt", "Aircraft/A320-family/Models/Liveries/A320/CFM/engine-dirt.png"); } else if (aero == "A320-200-IAE") { var livery = aircraft.canvas_livery.init("Models/Liveries/A320/IAE"); elements = ["EngineIAEV2500R", "EngineIAEV2500L", "PylonIAEV2500R", "PylonIAEV2500R", "ReverserRDoor", "ReverserLDoor"]; - livery.createTarget("engines", elements, "/sim/model/livery/texture-engine"); + livery.createTarget("engines", elements, "sim/model/livery/texture-engine"); livery.addLayer("engines", "dirt", "Aircraft/A320-family/Models/Liveries/A320/IAE/engine-dirt.png"); } var elements = ["Fuselage", "Wings", "Hstabs", "ElevatorL", "ElevatorR", "FlapL1", "FlapL2", "FlapR1", "FlapR2", "SpoilerL1", "SpoilerL2", "SpoilerL3", "SpoilerL4", "SpoilerL5", "SpoilerR1", "SpoilerR2", "SpoilerR3", "SpoilerR4", "SpoilerR5", "DoorL1", "DoorL4", "DoorR1", "DoorR4", "Cargo1", "Cargo2", "Cargo3", "MLGGearDoorR", "MLGGearDoorL", "MLGWingDoorR1", "MLGWingDoorL1", "MLGWingDoorR2", "MLGWingDoorL2", "NLGForewardDoorL", "NLGForewardDoorR", "NLGAftDoorL", "NLGAftDoorR", "GPUServiceDoor", "AvionicsVentDoor", "OutflowValveDoor1", "OutflowValveDoor2", "ApuFlap", "Rudder", "Sharklet", "WingtipFence", "RatDoorL", "RatDoorR"]; -livery.createTarget("fuselage", elements, "/sim/model/livery/texture-fuselage", resolution=16384); +livery.createTarget("fuselage", elements, "sim/model/livery/texture-fuselage", resolution=16384); livery.addLayer("fuselage", "dirt", "Aircraft/A320-family/Models/Liveries/A320/fuselage-dirt.png"); #########