From d1754173fbcec353ed4c1e97b2afd4181c81a44d Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Tue, 28 Jul 2020 12:23:23 +0100 Subject: [PATCH] Split effects for engine normal map --- .../Effects/reflection-chrome-engine-CFM.eff | 85 +++++++++++++++++++ .../Effects/reflection-chrome-engine-IAE.eff | 85 +++++++++++++++++++ Models/Effects/reflection-chrome.eff | 62 +++++++++++++- Models/Effects/reflection-engine-CFM.eff | 85 +++++++++++++++++++ Models/Effects/reflection-engine-IAE.eff | 85 +++++++++++++++++++ ...att.eff => reflection-matt-engine-CFM.eff} | 0 Models/Effects/reflection-matt-engine-IAE.eff | 85 +++++++++++++++++++ Models/Effects/reflection-matt-wing.eff | 85 +++++++++++++++++++ Models/Engines/XMLs/a320.cfm.xml | 6 +- Models/Engines/XMLs/a320.v2500.xml | 6 +- Models/Fuselages/A320/fuselage.xml | 2 +- 11 files changed, 578 insertions(+), 8 deletions(-) create mode 100644 Models/Effects/reflection-chrome-engine-CFM.eff create mode 100644 Models/Effects/reflection-chrome-engine-IAE.eff create mode 100644 Models/Effects/reflection-engine-CFM.eff create mode 100644 Models/Effects/reflection-engine-IAE.eff rename Models/Effects/{reflection-matt.eff => reflection-matt-engine-CFM.eff} (100%) create mode 100644 Models/Effects/reflection-matt-engine-IAE.eff create mode 100644 Models/Effects/reflection-matt-wing.eff diff --git a/Models/Effects/reflection-chrome-engine-CFM.eff b/Models/Effects/reflection-chrome-engine-CFM.eff new file mode 100644 index 00000000..cb30feed --- /dev/null +++ b/Models/Effects/reflection-chrome-engine-CFM.eff @@ -0,0 +1,85 @@ + + + reflection-correction + Effects/model-combined-deferred + + 1 + 1 + 0 + /sim/model/reflection/reflection-correction-chrome + 2 + /sim/model/reflection/ambient-correction-chrome + 0 + 0 + 1 + + Aircraft/A320-family/Models/Effects/res/Fuse-Main-Normal.png + clamp + clamp + + + cubemap + + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/1.png + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/4.png + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/2.png + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/3.png + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/6.png + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/5.png + + + + + + + 6 + 7 + + + + + + tangent + 6 + + + binormal + 7 + + + + + + + + + tangent + 6 + + + binormal + 7 + + + + + + + + + tangent + 6 + + + binormal + 7 + + + + + + diff --git a/Models/Effects/reflection-chrome-engine-IAE.eff b/Models/Effects/reflection-chrome-engine-IAE.eff new file mode 100644 index 00000000..cb30feed --- /dev/null +++ b/Models/Effects/reflection-chrome-engine-IAE.eff @@ -0,0 +1,85 @@ + + + reflection-correction + Effects/model-combined-deferred + + 1 + 1 + 0 + /sim/model/reflection/reflection-correction-chrome + 2 + /sim/model/reflection/ambient-correction-chrome + 0 + 0 + 1 + + Aircraft/A320-family/Models/Effects/res/Fuse-Main-Normal.png + clamp + clamp + + + cubemap + + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/1.png + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/4.png + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/2.png + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/3.png + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/6.png + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/5.png + + + + + + + 6 + 7 + + + + + + tangent + 6 + + + binormal + 7 + + + + + + + + + tangent + 6 + + + binormal + 7 + + + + + + + + + tangent + 6 + + + binormal + 7 + + + + + + diff --git a/Models/Effects/reflection-chrome.eff b/Models/Effects/reflection-chrome.eff index 9e08b249..cb30feed 100644 --- a/Models/Effects/reflection-chrome.eff +++ b/Models/Effects/reflection-chrome.eff @@ -11,6 +11,12 @@ /sim/model/reflection/ambient-correction-chrome 0 0 + 1 + + Aircraft/A320-family/Models/Effects/res/Fuse-Main-Normal.png + clamp + clamp + cubemap @@ -21,5 +27,59 @@ Aircraft/Generic/Effects/CubeMaps/fgfs-sky/6.png Aircraft/Generic/Effects/CubeMaps/fgfs-sky/5.png - + + + + + + 6 + 7 + + + + + + tangent + 6 + + + binormal + 7 + + + + + + + + + tangent + 6 + + + binormal + 7 + + + + + + + + + tangent + 6 + + + binormal + 7 + + + + + diff --git a/Models/Effects/reflection-engine-CFM.eff b/Models/Effects/reflection-engine-CFM.eff new file mode 100644 index 00000000..6ca1b32a --- /dev/null +++ b/Models/Effects/reflection-engine-CFM.eff @@ -0,0 +1,85 @@ + + + reflection + Effects/model-combined-deferred + + 1 + 1 + 0 + /sim/model/reflection/reflection-correction + 2 + /sim/model/reflection/ambient-correction + 0 + 0 + 1 + + Aircraft/A320-family/Models/Effects/res/Fuse-Main-Normal.png + clamp + clamp + + + cubemap + + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/1.png + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/4.png + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/2.png + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/3.png + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/6.png + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/5.png + + + + + + + 6 + 7 + + + + + + tangent + 6 + + + binormal + 7 + + + + + + + + + tangent + 6 + + + binormal + 7 + + + + + + + + + tangent + 6 + + + binormal + 7 + + + + + + diff --git a/Models/Effects/reflection-engine-IAE.eff b/Models/Effects/reflection-engine-IAE.eff new file mode 100644 index 00000000..6ca1b32a --- /dev/null +++ b/Models/Effects/reflection-engine-IAE.eff @@ -0,0 +1,85 @@ + + + reflection + Effects/model-combined-deferred + + 1 + 1 + 0 + /sim/model/reflection/reflection-correction + 2 + /sim/model/reflection/ambient-correction + 0 + 0 + 1 + + Aircraft/A320-family/Models/Effects/res/Fuse-Main-Normal.png + clamp + clamp + + + cubemap + + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/1.png + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/4.png + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/2.png + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/3.png + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/6.png + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/5.png + + + + + + + 6 + 7 + + + + + + tangent + 6 + + + binormal + 7 + + + + + + + + + tangent + 6 + + + binormal + 7 + + + + + + + + + tangent + 6 + + + binormal + 7 + + + + + + diff --git a/Models/Effects/reflection-matt.eff b/Models/Effects/reflection-matt-engine-CFM.eff similarity index 100% rename from Models/Effects/reflection-matt.eff rename to Models/Effects/reflection-matt-engine-CFM.eff diff --git a/Models/Effects/reflection-matt-engine-IAE.eff b/Models/Effects/reflection-matt-engine-IAE.eff new file mode 100644 index 00000000..a3d9e05c --- /dev/null +++ b/Models/Effects/reflection-matt-engine-IAE.eff @@ -0,0 +1,85 @@ + + + reflection + Effects/model-combined-deferred + + 1 + 1 + 0 + /sim/model/reflection/reflection-correction-wing + 2 + /sim/model/reflection/ambient-correction-wing + 0 + 0 + 1 + + Aircraft/A320-family/Models/Effects/res/Fuse-Main-Normal.png + clamp + clamp + + + cubemap + + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/1.png + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/4.png + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/2.png + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/3.png + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/6.png + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/5.png + + + + + + + 6 + 7 + + + + + + tangent + 6 + + + binormal + 7 + + + + + + + + + tangent + 6 + + + binormal + 7 + + + + + + + + + tangent + 6 + + + binormal + 7 + + + + + + diff --git a/Models/Effects/reflection-matt-wing.eff b/Models/Effects/reflection-matt-wing.eff new file mode 100644 index 00000000..a3d9e05c --- /dev/null +++ b/Models/Effects/reflection-matt-wing.eff @@ -0,0 +1,85 @@ + + + reflection + Effects/model-combined-deferred + + 1 + 1 + 0 + /sim/model/reflection/reflection-correction-wing + 2 + /sim/model/reflection/ambient-correction-wing + 0 + 0 + 1 + + Aircraft/A320-family/Models/Effects/res/Fuse-Main-Normal.png + clamp + clamp + + + cubemap + + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/1.png + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/4.png + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/2.png + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/3.png + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/6.png + Aircraft/Generic/Effects/CubeMaps/fgfs-sky/5.png + + + + + + + 6 + 7 + + + + + + tangent + 6 + + + binormal + 7 + + + + + + + + + tangent + 6 + + + binormal + 7 + + + + + + + + + tangent + 6 + + + binormal + 7 + + + + + + diff --git a/Models/Engines/XMLs/a320.cfm.xml b/Models/Engines/XMLs/a320.cfm.xml index 52c81b7c..2092b6e9 100644 --- a/Models/Engines/XMLs/a320.cfm.xml +++ b/Models/Engines/XMLs/a320.cfm.xml @@ -518,7 +518,7 @@ - Aircraft/A320-family/Models/Effects/reflection + Aircraft/A320-family/Models/Effects/reflection-engine-CFM EngineCFM56L EngineCFM56R ReverserLDoor1 @@ -532,13 +532,13 @@ - Aircraft/A320-family/Models/Effects/reflection-matt + Aircraft/A320-family/Models/Effects/reflection-matt-engine-CFM PylonCFM56L PylonCFM56R - Aircraft/A320-family/Models/Effects/reflection-chrome + Aircraft/A320-family/Models/Effects/reflection-chrome-engine-CFM IntakeCFM56L IntakeCFM56R diff --git a/Models/Engines/XMLs/a320.v2500.xml b/Models/Engines/XMLs/a320.v2500.xml index 29e6ad05..f3b00473 100644 --- a/Models/Engines/XMLs/a320.v2500.xml +++ b/Models/Engines/XMLs/a320.v2500.xml @@ -408,7 +408,7 @@ - Aircraft/A320-family/Models/Effects/reflection + Aircraft/A320-family/Models/Effects/reflection-engine-IAE EngineIAEV2500L EngineIAEV2500R ReverserLDoor @@ -416,13 +416,13 @@ - Aircraft/A320-family/Models/Effects/reflection-matt + Aircraft/A320-family/Models/Effects/reflection-matt-engine-IAE PylonIAEV2500L PylonIAEV2500R - Aircraft/A320-family/Models/Effects/reflection-chrome + Aircraft/A320-family/Models/Effects/reflection-chrome-engine-IAE IntakeIAEV2500L IntakeIAEV2500R diff --git a/Models/Fuselages/A320/fuselage.xml b/Models/Fuselages/A320/fuselage.xml index 81b6a612..bae9e4b3 100644 --- a/Models/Fuselages/A320/fuselage.xml +++ b/Models/Fuselages/A320/fuselage.xml @@ -33,7 +33,7 @@ - Aircraft/A320-family/Models/Effects/reflection-matt + Aircraft/A320-family/Models/Effects/reflection-matt-wing Wings FlapL1 FlapL2