Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(lights): Interior and exterior lighting rework and new glass textures #7947

Merged
merged 18 commits into from
Apr 8, 2023
Merged

feat(lights): Interior and exterior lighting rework and new glass textures #7947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
c7cbfcf
added changelog entry
FinalLightNL Apr 3, 2023
fd5d5f7
changes to multiple fx files including renaming them all to prevent f…
FinalLightNL Apr 3, 2023
3de1d7f
added new textures to replace the old ones and commented out backligh…
FinalLightNL Apr 3, 2023
d53b01c
fixed trim decal
FinalLightNL Apr 3, 2023
c9c7765
edited overhead emis ambient, and clock turning only on bus power.
FinalLightNL Apr 3, 2023
6be5dea
final changes and fixes to the displays and dome lights.
FinalLightNL Apr 3, 2023
ccced66
fix double quotes
FinalLightNL Apr 4, 2023
5718d70
lint whitespaces fix clock tsx
FinalLightNL Apr 4, 2023
8cc7758
added new lines
FinalLightNL Apr 4, 2023
b683964
added todo fixme notes
FinalLightNL Apr 4, 2023
6563c69
edit closest svg ref
FinalLightNL Apr 4, 2023
db1fccc
simplified clock and fix linting error
FinalLightNL Apr 4, 2023
0f32b6b
code fix
FinalLightNL Apr 4, 2023
4e15acf
fixed floating light orb and clipping light
FinalLight Apr 5, 2023
25842ec
cpt side dome fixed on ground pwr avail
FinalLight Apr 5, 2023
15cb638
Update .github/CHANGELOG.md
FinalLightNL Apr 5, 2023
ffc5c09
Merge branch 'master' into new-lights-pr-v2
2hwk Apr 8, 2023
15b05de
Merge branch 'master' into new-lights-pr-v2
2hwk Apr 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@
1. [FMS] Handle approach transitions hidden inside other transition with Navigraph data - @tracernz (Mike)
1. [ND] Do not draw background when busses are not powered - @saschl (saschl#9432)
1. [MODEL] Working windshield wipers - @tracernz (Mike)
1. [LIGHTS] Redid all cockpit interior lighting and fixed exterior wing lights - @FinalLightNL (FinalLight#2113)

## 0.9.0

Expand Down
Binary file modified ...o/SimObjects/AirPlanes/FlyByWire_A320_NEO/TEXTURE/A320NEO_COCKPIT_DECALSTEXT_EMIS.PNG.dds
View file
Open in desktop
Binary file not shown.
Binary file modified ...flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/TEXTURE/GLASS.PNG.DDS
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions ...ire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/model/A320_NEO_INTERIOR.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1809,13 +1809,13 @@
<ANIM_NAME>SWITCH_OVHD_INTLT_DOME</ANIM_NAME>
<WWISE_EVENT>lswitch</WWISE_EVENT>
<DIMMER_POS_0_VALUE>100</DIMMER_POS_0_VALUE>
<DIMMER_POS_1_VALUE>50</DIMMER_POS_1_VALUE>
<DIMMER_POS_1_VALUE>20</DIMMER_POS_1_VALUE>
<DIMMER_POS_2_VALUE>0</DIMMER_POS_2_VALUE>
<CODE_POS_0>1 (&gt;K:2:CABIN_LIGHTS_SET) 100 (&gt;K:LIGHT_POTENTIOMETER_7_SET)</CODE_POS_0>
<CODE_POS_1>1 (&gt;K:2:CABIN_LIGHTS_SET) 50 (&gt;K:LIGHT_POTENTIOMETER_7_SET)</CODE_POS_1>
<CODE_POS_1>1 (&gt;K:2:CABIN_LIGHTS_SET) 20 (&gt;K:LIGHT_POTENTIOMETER_7_SET)</CODE_POS_1>
<CODE_POS_2>0 (&gt;K:2:CABIN_LIGHTS_SET) 0 (&gt;K:LIGHT_POTENTIOMETER_7_SET)</CODE_POS_2>
<STATE0_TEST>(A:LIGHT CABIN:1, Bool) 1 == (A:LIGHT POTENTIOMETER:7, Percent) 100 == and</STATE0_TEST>
<STATE1_TEST>(A:LIGHT CABIN:1, Bool) 1 == (A:LIGHT POTENTIOMETER:7, Percent) 50 == and</STATE1_TEST>
<STATE1_TEST>(A:LIGHT CABIN:1, Bool) 1 == (A:LIGHT POTENTIOMETER:7, Percent) 20 == and</STATE1_TEST>
<STATE2_TEST>(A:LIGHT CABIN:1, Bool) 0 == (A:LIGHT POTENTIOMETER:7, Percent) 0 == and </STATE2_TEST>
</UseTemplate>
</Component>
Expand Down
335 changes: 178 additions & 157 deletions .../src/base/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/systems.cfg
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions ...t-a320-neo/effects/LIGHT_A32NX_Console.fx → ...a320-neo/effects/A32NX_Cockpit_Console.fx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ Face=1, 1, 1
[ParticleAttributes.0]
Blend Mode=2
Bounce=0.00
Color Start=255, 179, 117, 10
Color End=248, 156, 106, 10
Color Start=255, 209, 163, 1
Color End=255, 209, 163, 1
Jitter Distance=0.00
Jitter Time=0.00
uv1=0.00, 0.00
Expand All @@ -68,10 +68,10 @@ Extrude Heading Max=0.00
[LightAttributes.0]
Type=spot
Size=0.02
Range=2.0
Intensity=0.8
Softness=0.1
SpotInner=45
SpotOuter=81
Range=0.4
Intensity=5
Softness=0
SpotInner=0
SpotOuter=107
Volumetric=1
ScatDir=1
ScatDir=1
77 changes: 77 additions & 0 deletions fbw-a32nx/src/base/flybywire-aircraft-a320-neo/effects/A32NX_Cockpit_ConsoleMid.fx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
[Library Effect]
Lifetime=5
Version=2.00
Radius=-1

[Properties]
Spot=1
Tower=1
Map=1

[Emitter.0]
Lifetime=1.00, 1.00
Delay=0.00, 0.00
Bounce=0.00
Light=1
No Interpolate=1
Rate=1.00, 1.00
X Emitter Velocity=0.00, 0.00
Y Emitter Velocity=0.00, 0.00
Z Emitter Velocity=0.00, 0.00
Drag=0.00, 0.00
X Particle Velocity=0.00, 0.00
Y Particle Velocity=0.00, 0.00
Z Particle Velocity=0.00, 0.00
X Rotation=0.00, 0.00
Y Rotation=0.00, 0.00
Z Rotation=0.00, 0.00
X Offset=0.0, 0.0
Y Offset=0.0, 0.0
Z Offset=0.0, 0.0

[Particle.0]
Lifetime=0.00, 0.00
Type=19
X Scale=0.75, 0.75
Y Scale=0.75, 0.75
Z Scale=0.00, 0.00
X Scale Rate=0.00, 0.00
Y Scale Rate=0.00, 0.00
Z Scale Rate=0.00, 0.00
Drag=0.00, 0.00
Color Rate=0.00, 0.00
X Offset=0.00, 0.00
Y Offset=0.00, 0.00
Z Offset=0.00, 0.00
Fade In=0.50, 0.50
Fade Out=0.50, 0.50
Rotation=0.00, 0.00
Static=1
Face=1, 1, 1

[ParticleAttributes.0]
Blend Mode=2
Bounce=0.00
Color Start=255, 200, 150, 10
Color End=255, 200, 150, 10
Jitter Distance=0.00
Jitter Time=0.00
uv1=0.00, 0.00
uv2=1.0, 1.0
X Scale Goal=0.00
Y Scale Goal=0.00
Z Scale Goal=0.00
Extrude Length=0.00
Extrude Pitch Max=0.00
Extrude Heading Max=0.00

[LightAttributes.0]
Type=spot
Size=0.02
Range=0.8
Intensity=5
Softness=0
SpotInner=0
SpotOuter=83
Volumetric=1
ScatDir=1
16 changes: 8 additions & 8 deletions ...o/effects/LIGHT_A32NX_CockpitSpotLarge.fx → ...20-neo/effects/A32NX_Cockpit_DomeLight.fx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ Face=1, 1, 1
[ParticleAttributes.0]
Blend Mode=2
Bounce=0.00
Color Start=255, 179, 117, 10
Color End=248, 156, 106, 10
Color Start=255, 196, 137, 1
Color End=255, 196, 137, 1
Jitter Distance=0.00
Jitter Time=0.00
uv1=0.00, 0.00
Expand All @@ -67,11 +67,11 @@ Extrude Heading Max=0.00

[LightAttributes.0]
Type=spot
Size=0.1
Size=0
Range=3.0
Intensity=1
Intensity=15
Softness=0.0
SpotInner=18
SpotOuter=81
Volumetric=1
ScatDir=1
SpotInner=0
SpotOuter=101
Volumetric=0
ScatDir=1
18 changes: 9 additions & 9 deletions ...0-neo/effects/LIGHT_A32NX_ScreenOrange.fx → ...ffects/A32NX_Cockpit_DomeLightAmbient1.fx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ Face=1, 1, 1
[ParticleAttributes.0]
Blend Mode=2
Bounce=0.00
Color Start=254, 254, 254, 10
Color End=254, 254, 254, 10
Color Start=255, 196, 137, 1
Color End=255, 196, 137, 1
Jitter Distance=0.00
Jitter Time=0.00
uv1=0.00, 0.00
Expand All @@ -67,11 +67,11 @@ Extrude Heading Max=0.00

[LightAttributes.0]
Type=spot
Size=0.050
Range=0.7
Intensity=0.200
Size=0
Range=4.0
Intensity=2
Softness=0.0
SpotInner=28
SpotOuter=57
Volumetric=5
ScatDir=1
SpotInner=0
SpotOuter=62
Volumetric=0
ScatDir=0
77 changes: 77 additions & 0 deletions fbw-a32nx/src/base/flybywire-aircraft-a320-neo/effects/A32NX_Cockpit_DomeLightAmbient2.fx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
[Library Effect]
Lifetime=5
Version=2.00
Radius=-1

[Properties]
Spot=1
Tower=1
Map=1

[Emitter.0]
Lifetime=1.00, 1.00
Delay=0.00, 0.00
Bounce=0.00
Light=1
No Interpolate=1
Rate=1.00, 1.00
X Emitter Velocity=0.00, 0.00
Y Emitter Velocity=0.00, 0.00
Z Emitter Velocity=0.00, 0.00
Drag=0.00, 0.00
X Particle Velocity=0.00, 0.00
Y Particle Velocity=0.00, 0.00
Z Particle Velocity=0.00, 0.00
X Rotation=0.00, 0.00
Y Rotation=0.00, 0.00
Z Rotation=0.00, 0.00
X Offset=0.0, 0.0
Y Offset=0.0, 0.0
Z Offset=0.0, 0.0

[Particle.0]
Lifetime=0.00, 0.00
Type=19
X Scale=0.75, 0.75
Y Scale=0.75, 0.75
Z Scale=0.00, 0.00
X Scale Rate=0.00, 0.00
Y Scale Rate=0.00, 0.00
Z Scale Rate=0.00, 0.00
Drag=0.00, 0.00
Color Rate=0.00, 0.00
X Offset=0.00, 0.00
Y Offset=0.00, 0.00
Z Offset=0.00, 0.00
Fade In=0.50, 0.50
Fade Out=0.50, 0.50
Rotation=0.00, 0.00
Static=1
Face=1, 1, 1

[ParticleAttributes.0]
Blend Mode=2
Bounce=0.00
Color Start=255, 196, 137, 1
Color End=255, 196, 137, 1
Jitter Distance=0.00
Jitter Time=0.00
uv1=0.00, 0.00
uv2=1.0, 1.0
X Scale Goal=0.00
Y Scale Goal=0.00
Z Scale Goal=0.00
Extrude Length=0.00
Extrude Pitch Max=0.00
Extrude Heading Max=0.00

[LightAttributes.0]
Type=spot
Size=0
Range=1.8
Intensity=10
Softness=0.0
SpotInner=0
SpotOuter=62
Volumetric=0
ScatDir=0
72 changes: 72 additions & 0 deletions fbw-a32nx/src/base/flybywire-aircraft-a320-neo/effects/A32NX_Cockpit_EmissiveAmbientENG12.fx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
[Library Effect]
Lifetime=5
Version=2.00
Radius=-1

[Properties]
Spot=1
Tower=1
Map=1

[Emitter.0]
Lifetime=1.00, 1.00
Delay=0.00, 0.00
Bounce=0.00
Light=1
No Interpolate=1
Rate=1.00, 1.00
X Emitter Velocity=0.00, 0.00
Y Emitter Velocity=0.00, 0.00
Z Emitter Velocity=0.00, 0.00
Drag=0.00, 0.00
X Particle Velocity=0.00, 0.00
Y Particle Velocity=0.00, 0.00
Z Particle Velocity=0.00, 0.00
X Rotation=0.00, 0.00
Y Rotation=0.00, 0.00
Z Rotation=0.00, 0.00
X Offset=0.0, 0.0
Y Offset=0.0, 0.0
Z Offset=0.0, 0.0

[Particle.0]
Lifetime=0.00, 0.00
Type=19
X Scale=0.75, 0.75
Y Scale=0.75, 0.75
Z Scale=0.00, 0.00
X Scale Rate=0.00, 0.00
Y Scale Rate=0.00, 0.00
Z Scale Rate=0.00, 0.00
Drag=0.00, 0.00
Color Rate=0.00, 0.00
X Offset=0.00, 0.00
Y Offset=0.00, 0.00
Z Offset=0.00, 0.00
Fade In=0.50, 0.50
Fade Out=0.50, 0.50
Rotation=0.00, 0.00
Static=1
Face=1, 1, 1

[ParticleAttributes.0]
Blend Mode=2
Bounce=0.00
Color Start=50, 23, 0, 0
Color End=50, 23, 0, 0
Jitter Distance=0.00
Jitter Time=0.00
X Scale Goal=0.00
Y Scale Goal=0.00
Z Scale Goal=0.00

[LightAttributes.0]
Type=spot
Size=0.001
Range=0.050
Intensity=20
Softness=0
SpotInner=0
SpotOuter=69
Volumetric=0
ScatDir=0.0
14 changes: 7 additions & 7 deletions ...a320-neo/effects/LIGHT_A32NX_EmissiveM.fx → ...fects/A32NX_Cockpit_EmissiveAmbientFCU.fx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ Face=1, 1, 1
[ParticleAttributes.0]
Blend Mode=2
Bounce=0.00
Color Start=255, 80, 0, 0
Color End=255, 80, 0, 0
Color Start=100, 70, 0, 0
Color End=100, 70, 0, 0
Jitter Distance=0.00
Jitter Time=0.00
X Scale Goal=0.00
Expand All @@ -62,11 +62,11 @@ Z Scale Goal=0.00

[LightAttributes.0]
Type=spot
Size=0.002
Size=0.001
Range=0.1
Intensity=1
Softness=1
SpotInner=89.9
SpotOuter=90.0
Intensity=0.05
Softness=0
SpotInner=0
SpotOuter=55
Volumetric=0
ScatDir=0.0
Loading