fly/A320-family
1
0
Fork 0
Code Activity

Rework clustered shading lights (the problems with inside views are known) and add logo lightmap

Browse source
This commit is contained in:
legoboyvdlp R 2020-12-24 16:35:48 +00:00
parent cd09a721b8
commit 447b978d2e
8 changed files with 344 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

244
Models/A320-common.xml
View file

@ -477,10 +477,10 @@
</specular>
<attenuation>
<c>1.0</c>
<l>2.25</l>
<q>12.0</q>
<l>0.7</l>
<q>1.80</q>
</attenuation>
<range-m>2.5</range-m>
<range-m>7</range-m>
</light>
<light>
@ -511,10 +511,10 @@
</specular>
<attenuation>
<c>1.0</c>
<l>2.25</l>
<q>12.0</q>
<l>0.90</l>
<q>3.00</q>
</attenuation>
<range-m>2.5</range-m>
<range-m>5</range-m>
</light>
<light>
@ -550,12 +550,12 @@
</specular>
<attenuation>
<c>1.0</c>
<l>0.09</l>
<q>0.032</q>
<l>0.045</l>
<q>0.0075</q>
</attenuation>
<spot-exponent>5</spot-exponent>
<spot-cutoff>40</spot-cutoff>
<range-m>50</range-m>
<spot-exponent>10</spot-exponent>
<spot-cutoff>20</spot-cutoff>
<range-m>100</range-m>
</light>
<light>
@ -589,6 +589,47 @@
<b>0.9</b>
<a>1</a>
</specular>
<attenuation>
<c>1.0</c>
<l>0.045</l>
<q>0.0075</q>
</attenuation>
<spot-exponent>10</spot-exponent>
<spot-cutoff>20</spot-cutoff>
<range-m>100</range-m>
</light>
<light>
<name>Taxi Light Compositor</name>
<type>spot</type>
<position>
<x-m>-13.461</x-m>
<y-m>0.20414</y-m>
<z-m>-2.28819</z-m>
</position>
<direction>
<x>-1.0</x>
<y>0</y>
<z>0</z>
</direction>
<ambient>
<r>0.03</r>
<g>0.03</g>
<b>0.03</b>
<a>1</a>
</ambient>
<diffuse>
<r>0.95</r>
<g>0.9</g>
<b>0.9</b>
<a>1</a>
</diffuse>
<specular>
<r>0.95</r>
<g>0.9</g>
<b>0.9</b>
<a>1</a>
</specular>
<attenuation>
<c>1.0</c>
<l>0.09</l>
@ -599,6 +640,129 @@
<range-m>50</range-m>
</light>
<light>
<name>Left Turnoff Compositor</name>
<type>spot</type>
<position>
<x-m>-13.5034</x-m>
<y-m>-0.20993</y-m>
<z-m>-2.83921</z-m>
</position>
<direction>
<x>-1.0</x>
<y>-0.571953125</y>
<z>0</z>
</direction>
<ambient>
<r>0.03</r>
<g>0.03</g>
<b>0.03</b>
<a>1</a>
</ambient>
<diffuse>
<r>0.95</r>
<g>0.9</g>
<b>0.9</b>
<a>1</a>
</diffuse>
<specular>
<r>0.95</r>
<g>0.9</g>
<b>0.9</b>
<a>1</a>
</specular>
<attenuation>
<c>1.0</c>
<l>0.09</l>
<q>0.032</q>
</attenuation>
<spot-exponent>5</spot-exponent>
<spot-cutoff>20</spot-cutoff>
<range-m>50</range-m>
</light>
<light>
<name>Right Turnoff Compositor</name>
<type>spot</type>
<position>
<x-m>-13.5034</x-m>
<y-m> 0.20914</y-m>
<z-m>-2.83921</z-m>
</position>
<direction>
<x>-1.0</x>
<y>0.571953125</y>
<z>0</z>
</direction>
<ambient>
<r>0.03</r>
<g>0.03</g>
<b>0.03</b>
<a>1</a>
</ambient>
<diffuse>
<r>0.95</r>
<g>0.9</g>
<b>0.9</b>
<a>1</a>
</diffuse>
<specular>
<r>0.95</r>
<g>0.9</g>
<b>0.9</b>
<a>1</a>
</specular>
<attenuation>
<c>1.0</c>
<l>0.09</l>
<q>0.032</q>
</attenuation>
<spot-exponent>5</spot-exponent>
<spot-cutoff>20</spot-cutoff>
<range-m>50</range-m>
</light>
<light>
<name>Nose Landing Light Compositor</name>
<type>spot</type>
<position>
<x-m>-13.5119</x-m>
<y-m>-0.185175</y-m>
<z-m>-2.30747</z-m>
</position>
<direction>
<x>-1.0</x>
<y>0</y>
<z>0</z>
</direction>
<ambient>
<r>0.03</r>
<g>0.03</g>
<b>0.03</b>
<a>1</a>
</ambient>
<diffuse>
<r>0.95</r>
<g>0.9</g>
<b>0.9</b>
<a>1</a>
</diffuse>
<specular>
<r>0.95</r>
<g>0.9</g>
<b>0.9</b>
<a>1</a>
</specular>
<attenuation>
<c>1.0</c>
<l>0.045</l>
<q>0.0075</q>
</attenuation>
<spot-exponent>10</spot-exponent>
<spot-cutoff>40</spot-cutoff>
<range-m>100</range-m>
</light>
<animation>
<type>select</type>
<object-name>Top Beacon Compositor</object-name>
@ -624,6 +788,64 @@
</condition>
</animation>
<animation>
<type>select</type>
<object-name>Left Turnoff Compositor</object-name>
<condition>
<property>controls/lighting/leftturnoff</property>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>Right Turnoff Compositor</object-name>
<condition>
<property>controls/lighting/rightturnoff</property>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>Taxi Light Compositor</object-name>
<condition>
<and>
<not>
<equals>
<property>sim/model/lights/nose-lights</property>
<value>1.0</value>
</equals>
</not>
<not>
<equals>
<property>sim/model/lights/nose-lights</property>
<value>0.0</value>
</equals>
</not>
<greater-than>
<property>gear/gear/position-norm</property>
<value>0.1</value>
</greater-than>
</and>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>Nose Landing Light Compositor</object-name>
<condition>
<and>
<equals>
<property>sim/model/lights/nose-lights</property>
<value>1.0</value>
</equals>
<greater-than>
<property>gear/gear/position-norm</property>
<value>0.1</value>
</greater-than>
</and>
</condition>
</animation>
<model>
<name>Port landing light ALS</name>
<path>Aircraft/A320-family/Models/Lights/ALS/landinglightL.xml</path>

95
Models/Effects/reflection-rudder.eff Normal file
View file

@ -0,0 +1,95 @@
<?xml version="1.0"?>
<PropertyList>
<name>reflection</name>
<inherits-from>Effects/model-combined-deferred</inherits-from>
<parameters>
<reflection-enabled type="int">1</reflection-enabled>
<reflection-dynamic type="int">1</reflection-dynamic>
<reflect_map-enabled type="int">0</reflect_map-enabled>
<reflection-correction type="float"><use>/sim/model/reflection/reflection-correction</use></reflection-correction>
<reflection-type type="int">2</reflection-type>
<ambient-correction type="float"><use>/sim/model/reflection/ambient-correction</use></ambient-correction>
<lightmap-enabled type="int">1</lightmap-enabled>
<lightmap-multi type="int">0</lightmap-multi>
<normalmap-enabled type="int">1</normalmap-enabled>
<texture n="2">
<image>Aircraft/A320-family/Models/Effects/res/Fuse-Main-Normal.png</image>
<filter>linear-mipmap-linear</filter>
<wrap-s>clamp</wrap-s>
<wrap-t>clamp</wrap-t>
</texture>
<lightmap-factor type="float" n="0"><use>sim/model/lights/logo-lights</use></lightmap-factor>
<lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color>
<texture n="3">
<image>Aircraft/A320-family/Models/Effects/res/rudder-lightmap.png</image>
<filter>linear-mipmap-linear</filter>
<wrap-s>clamp</wrap-s>
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<texture n="5">
<type>cubemap</type>
<images>
<positive-x>Aircraft/Generic/Effects/CubeMaps/fgfs-sky/1.png</positive-x>
<negative-x>Aircraft/Generic/Effects/CubeMaps/fgfs-sky/4.png</negative-x>
<positive-y>Aircraft/Generic/Effects/CubeMaps/fgfs-sky/2.png</positive-y>
<negative-y>Aircraft/Generic/Effects/CubeMaps/fgfs-sky/3.png</negative-y>
<positive-z>Aircraft/Generic/Effects/CubeMaps/fgfs-sky/6.png</positive-z>
<negative-z>Aircraft/Generic/Effects/CubeMaps/fgfs-sky/5.png</negative-z>
</images>
</texture>
</parameters>
<!-- ####################
### NORMALMAP INCLUDE ###
######################### -->
<generate>
<tangent type="int">6</tangent>
<binormal type="int">7</binormal>
</generate>
<technique n="4">
<pass>
<program>
<attribute>
<name>tangent</name>
<index>6</index>
</attribute>
<attribute>
<name>binormal</name>
<index>7</index>
</attribute>
</program>
</pass>
</technique>
<technique n="7">
<pass>
<program>
<attribute>
<name>tangent</name>
<index>6</index>
</attribute>
<attribute>
<name>binormal</name>
<index>7</index>
</attribute>
</program>
</pass>
</technique>
<technique n="9">
<pass>
<program>
<attribute>
<name>tangent</name>
<index>6</index>
</attribute>
<attribute>
<name>binormal</name>
<index>7</index>
</attribute>
</program>
</pass>
</technique>
<!-- ########################
### END NORMALMAP INCLUDE ###
############################# -->
</PropertyList>

11
Models/Effects/reflection.eff
View file

@ -9,7 +9,7 @@
<reflection-correction type="float"><use>/sim/model/reflection/reflection-correction</use></reflection-correction>
<reflection-type type="int">2</reflection-type>
<ambient-correction type="float"><use>/sim/model/reflection/ambient-correction</use></ambient-correction>
<lightmap-enabled type="int">0</lightmap-enabled>
<lightmap-enabled type="int">1</lightmap-enabled>
<lightmap-multi type="int">0</lightmap-multi>
<normalmap-enabled type="int">1</normalmap-enabled>
<texture n="2">
@ -18,6 +18,15 @@
<wrap-s>clamp</wrap-s>
<wrap-t>clamp</wrap-t>
</texture>
<lightmap-factor type="float" n="0"><use>sim/model/lights/logo-lights</use></lightmap-factor>
<lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color>
<texture n="3">
<image>Aircraft/A320-family/Models/Effects/res/fin-lightmap.png</image>
<filter>linear-mipmap-linear</filter>
<wrap-s>clamp</wrap-s>
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<texture n="5">
<type>cubemap</type>
<images>

BIN
Models/Effects/res/fin-lightmap.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 440 KiB

BIN
Models/Effects/res/rudder-lightmap.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 373 KiB

6
Models/Fuselages/A320/fuselage.xml
View file

@ -11,7 +11,6 @@
<inherits-from>Aircraft/A320-family/Models/Effects/reflection</inherits-from>
<object-name>Fuselage</object-name>
<object-name>NLGFittingPanel</object-name>
<object-name>Rudder</object-name>
<object-name>DoorL1</object-name>
<object-name>DoorL4</object-name>
<object-name>DoorR1</object-name>
@ -35,7 +34,10 @@
<object-name>OutflowValveDoor2</object-name>
<object-name>GPUServiceDoor</object-name>
</effect>
<effect>
<inherits-from>Aircraft/A320-family/Models/Effects/reflection-rudder</inherits-from>
<object-name>Rudder</object-name>
</effect>
<effect>
<inherits-from>Aircraft/A320-family/Models/Effects/reflection-matt-wing</inherits-from>
<object-name>Wings</object-name>

2
Nasal/Effects/light-manager.nas
View file

@ -148,7 +148,7 @@ var light_manager = {
setprop("/sim/rendering/als-secondary-lights/flash-radius", 13);
me.start();
#me.start();
},
start: func {

11
Systems/a320-lights.xml
View file

@ -92,7 +92,7 @@
</test>
</switch>
<switch name="controls/lighting/leftturnoff">
<switch name="/controls/lighting/leftturnoff">
<default value="0"/>
<test logic="AND" value="1">
/controls/lighting/turnoff-light-switch eq 1
@ -110,15 +110,6 @@
</test>
</switch>
<switch name="/controls/lighting/rightturnoff">
<default value="0"/>
<test logic="AND" value="1">
/controls/lighting/turnoff-light-switch eq 1
/gear/gear[0]/position-norm gt 0.8
/systems/electrical/bus/ac-2 ge 110
</test>
</switch>
<switch name="/systems/electrical/nav-lights-power">
<default value="0"/>
<test logic="OR" value="1">