Merge branch 'master' of github.com:it0uchpods/IDG-A32X

This commit is contained in:
Joshua Davidson 2017-10-02 16:08:27 -04:00
commit c1ccfbf2c3
10 changed files with 113 additions and 0 deletions

View file

@ -0,0 +1,22 @@
<PropertyList>
<name>wallconsole</name>
<inherits-from>Effects/model-combined-deferred</inherits-from>
<parameters>
<normalmap-enabled type="int">0</normalmap-enabled>
<reflection-enabled type="int">0</reflection-enabled>
<reflection-dynamic type="int">0</reflection-dynamic>
<reflect_map-enabled type="int">0</reflect_map-enabled>
<reflection-correction type="float">0.1</reflection-correction>
<lightmap-enabled type="int">1</lightmap-enabled>
<lightmap-multi type="int">0</lightmap-multi>
<lightmap-factor type="float" n="0"><use>/sim/model/lights/floor-light</use></lightmap-factor>
<lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color>
<texture n="3">
<image>Aircraft/IDG-A32X/Models/Effects/cockpitwallconsole.png</image>
<filter>linear-mipmap-linear</filter>
<wrap-s>clamp</wrap-s>
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
</parameters>
</PropertyList>

Binary file not shown.

After

Width:  |  Height:  |  Size: 173 KiB

View file

@ -0,0 +1,22 @@
<PropertyList>
<name>console</name>
<inherits-from>Effects/model-combined-deferred</inherits-from>
<parameters>
<normalmap-enabled type="int">0</normalmap-enabled>
<reflection-enabled type="int">0</reflection-enabled>
<reflection-dynamic type="int">0</reflection-dynamic>
<reflect_map-enabled type="int">0</reflect_map-enabled>
<reflection-correction type="float">0.1</reflection-correction>
<lightmap-enabled type="int">1</lightmap-enabled>
<lightmap-multi type="int">0</lightmap-multi>
<lightmap-factor type="float" n="0"><use>/sim/model/lights/floor-light</use></lightmap-factor>
<lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color>
<texture n="3">
<image>Aircraft/IDG-A32X/Models/Effects/consolelightmap.png</image>
<filter>linear-mipmap-linear</filter>
<wrap-s>clamp</wrap-s>
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
</parameters>
</PropertyList>

Binary file not shown.

After

Width:  |  Height:  |  Size: 66 KiB

View file

@ -0,0 +1,22 @@
<PropertyList>
<name>floor</name>
<inherits-from>Effects/model-combined-deferred</inherits-from>
<parameters>
<normalmap-enabled type="int">0</normalmap-enabled>
<reflection-enabled type="int">0</reflection-enabled>
<reflection-dynamic type="int">0</reflection-dynamic>
<reflect_map-enabled type="int">0</reflect_map-enabled>
<reflection-correction type="float">0.1</reflection-correction>
<lightmap-enabled type="int">1</lightmap-enabled>
<lightmap-multi type="int">0</lightmap-multi>
<lightmap-factor type="float" n="0"><use>/sim/model/lights/floor-light</use></lightmap-factor>
<lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color>
<texture n="3">
<image>Aircraft/IDG-A32X/Models/Effects/floorlightmap.png</image>
<filter>linear-mipmap-linear</filter>
<wrap-s>clamp</wrap-s>
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
</parameters>
</PropertyList>

Binary file not shown.

After

Width:  |  Height:  |  Size: 738 KiB

22
Models/Effects/tiller.eff Normal file
View file

@ -0,0 +1,22 @@
<PropertyList>
<name>tiller</name>
<inherits-from>Effects/model-combined-deferred</inherits-from>
<parameters>
<normalmap-enabled type="int">0</normalmap-enabled>
<reflection-enabled type="int">0</reflection-enabled>
<reflection-dynamic type="int">0</reflection-dynamic>
<reflect_map-enabled type="int">0</reflect_map-enabled>
<reflection-correction type="float">0.1</reflection-correction>
<lightmap-enabled type="int">1</lightmap-enabled>
<lightmap-multi type="int">0</lightmap-multi>
<lightmap-factor type="float" n="0"><use>/sim/model/lights/floor-light</use></lightmap-factor>
<lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color>
<texture n="3">
<image>Aircraft/IDG-A32X/Models/Effects/tiller.png</image>
<filter>linear-mipmap-linear</filter>
<wrap-s>clamp</wrap-s>
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
</parameters>
</PropertyList>

BIN
Models/Effects/tiller.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 256 KiB

View file

@ -5394,5 +5394,26 @@
</binding>
</action>
</animation>
<effect>
<inherits-from>Aircraft/IDG-A32X/Models/Effects/floorlightmap</inherits-from>
<object-name>object0000</object-name>
</effect>
<effect>
<inherits-from>Aircraft/IDG-A32X/Models/Effects/consolelightmap</inherits-from>
<object-name>poly000040</object-name>
</effect>
<effect>
<inherits-from>Aircraft/IDG-A32X/Models/Effects/tiller</inherits-from>
<object-name>tiller</object-name>
</effect>
<effect>
<inherits-from>Aircraft/IDG-A32X/Models/Effects/cockpitwallconsole</inherits-from>
<object-name>object.001</object-name>
</effect>
</PropertyList>

View file

@ -4831,6 +4831,10 @@
<command>property-toggle</command>
<property>controls/lighting/wing-lights</property>
</binding>
<binding>
<command>property-toggle</command>
<property>/sim/model/lights/floor-light</property> <!-- temporary until proper control panel for this light is made -->
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/switch1", 1);</script>