final commit - merge different .pngs

This commit is contained in:
Jonathan Redpath 2018-11-19 20:16:49 +00:00
parent 32621d2db8
commit 212318421a
28 changed files with 12 additions and 370 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

BIN
Models/Effects/ATC.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

View file

@ -6,7 +6,7 @@
<lightmap-factor type="float" n="0"><use>/controls/lighting/pedestal-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/LCutoff-floodlight.png</image>
<image>Aircraft/IDG-A32X/Models/Effects/brightness-panel-ped.png</image>
<filter>linear-mipmap-linear</filter>
<wrap-s>clamp</wrap-s>
<wrap-t>clamp</wrap-t>

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

BIN
Models/Effects/engine.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 106 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 40 KiB

View file

@ -1,35 +0,0 @@
<PropertyList>
<name>panel</name>
<inherits-from>Effects/model-interior</inherits-from>
<parameters>
<lightmap-enabled type="int">1</lightmap-enabled>
<lightmap-factor type="float" n="0"><use>/controls/lighting/pedestal-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/RCutoff-floodlight.png</image>
<filter>linear-mipmap-linear</filter>
<wrap-s>clamp</wrap-s>
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
<positive-x>Models/Effects/res/white.png</positive-x>
<negative-x>Models/Effects/res/white.png</negative-x>
<positive-y>Models/Effects/res/white.png</positive-y>
<negative-y>Models/Effects/res/white.png</negative-y>
<positive-z>Models/Effects/res/white.png</positive-z>
<negative-z>Models/Effects/res/white.png</negative-z>
</images>
</texture>
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -1,35 +0,0 @@
<PropertyList>
<name>panel</name>
<inherits-from>Effects/model-interior</inherits-from>
<parameters>
<lightmap-enabled type="int">1</lightmap-enabled>
<lightmap-factor type="float" n="0"><use>/controls/lighting/pedestal-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/ATC-glare.png</image>
<filter>linear-mipmap-linear</filter>
<wrap-s>clamp</wrap-s>
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
<positive-x>Models/Effects/res/white.png</positive-x>
<negative-x>Models/Effects/res/white.png</negative-x>
<positive-y>Models/Effects/res/white.png</positive-y>
<negative-y>Models/Effects/res/white.png</negative-y>
<positive-z>Models/Effects/res/white.png</positive-z>
<negative-z>Models/Effects/res/white.png</negative-z>
</images>
</texture>
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -6,7 +6,7 @@
<lightmap-factor type="float" n="0"><use>/controls/lighting/pedestal-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/ATC-floodlight.png</image>
<image>Aircraft/IDG-A32X/Models/Effects/ATC.png</image>
<filter>linear-mipmap-linear</filter>
<wrap-s>clamp</wrap-s>
<wrap-t>clamp</wrap-t>

View file

@ -1,35 +0,0 @@
<PropertyList>
<name>panel</name>
<inherits-from>Effects/model-interior</inherits-from>
<parameters>
<lightmap-enabled type="int">1</lightmap-enabled>
<lightmap-factor type="float" n="0"><use>/controls/lighting/pedestal-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/pedestal-engine-glare.png</image>
<filter>linear-mipmap-linear</filter>
<wrap-s>clamp</wrap-s>
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
<positive-x>Models/Effects/res/white.png</positive-x>
<negative-x>Models/Effects/res/white.png</negative-x>
<positive-y>Models/Effects/res/white.png</positive-y>
<negative-y>Models/Effects/res/white.png</negative-y>
<positive-z>Models/Effects/res/white.png</positive-z>
<negative-z>Models/Effects/res/white.png</negative-z>
</images>
</texture>
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -6,7 +6,7 @@
<lightmap-factor type="float" n="0"><use>/controls/lighting/pedestal-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/pedestal-engine.png</image>
<image>Aircraft/IDG-A32X/Models/Effects/engine.png</image>
<filter>linear-mipmap-linear</filter>
<wrap-s>clamp</wrap-s>
<wrap-t>clamp</wrap-t>

View file

@ -1,35 +0,0 @@
<PropertyList>
<name>panel</name>
<inherits-from>Effects/model-interior</inherits-from>
<parameters>
<lightmap-enabled type="int">1</lightmap-enabled>
<lightmap-factor type="float" n="0"><use>/controls/lighting/pedestal-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/mode-selector-ped-flood.png</image>
<filter>linear-mipmap-linear</filter>
<wrap-s>clamp</wrap-s>
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
<positive-x>Models/Effects/res/white.png</positive-x>
<negative-x>Models/Effects/res/white.png</negative-x>
<positive-y>Models/Effects/res/white.png</positive-y>
<negative-y>Models/Effects/res/white.png</negative-y>
<positive-z>Models/Effects/res/white.png</positive-z>
<negative-z>Models/Effects/res/white.png</negative-z>
</images>
</texture>
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -1,35 +0,0 @@
<PropertyList>
<name>panel</name>
<inherits-from>Effects/model-interior</inherits-from>
<parameters>
<lightmap-enabled type="int">1</lightmap-enabled>
<lightmap-factor type="float" n="0"><use>/controls/lighting/pedestal-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/radar-glare.png</image>
<filter>linear-mipmap-linear</filter>
<wrap-s>clamp</wrap-s>
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
<positive-x>Models/Effects/res/white.png</positive-x>
<negative-x>Models/Effects/res/white.png</negative-x>
<positive-y>Models/Effects/res/white.png</positive-y>
<negative-y>Models/Effects/res/white.png</negative-y>
<positive-z>Models/Effects/res/white.png</positive-z>
<negative-z>Models/Effects/res/white.png</negative-z>
</images>
</texture>
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -6,7 +6,7 @@
<lightmap-factor type="float" n="0"><use>/controls/lighting/pedestal-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/radar-floodlight.png</image>
<image>Aircraft/IDG-A32X/Models/Effects/radar.png</image>
<filter>linear-mipmap-linear</filter>
<wrap-s>clamp</wrap-s>
<wrap-t>clamp</wrap-t>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

View file

@ -1,35 +0,0 @@
<PropertyList>
<name>panel</name>
<inherits-from>Effects/model-interior</inherits-from>
<parameters>
<lightmap-enabled type="int">1</lightmap-enabled>
<lightmap-factor type="float" n="0"><use>/controls/lighting/pedestal-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/mode-floodlight.png</image>
<filter>linear-mipmap-linear</filter>
<wrap-s>clamp</wrap-s>
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
<positive-x>Models/Effects/res/white.png</positive-x>
<negative-x>Models/Effects/res/white.png</negative-x>
<positive-y>Models/Effects/res/white.png</positive-y>
<negative-y>Models/Effects/res/white.png</negative-y>
<positive-z>Models/Effects/res/white.png</positive-z>
<negative-z>Models/Effects/res/white.png</negative-z>
</images>
</texture>
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -1,35 +0,0 @@
<PropertyList>
<name>panel</name>
<inherits-from>Effects/model-interior</inherits-from>
<parameters>
<lightmap-enabled type="int">1</lightmap-enabled>
<lightmap-factor type="float" n="0"><use>/controls/lighting/pedestal-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/tilt-floodlight.png</image>
<filter>linear-mipmap-linear</filter>
<wrap-s>clamp</wrap-s>
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
<positive-x>Models/Effects/res/white.png</positive-x>
<negative-x>Models/Effects/res/white.png</negative-x>
<positive-y>Models/Effects/res/white.png</positive-y>
<negative-y>Models/Effects/res/white.png</negative-y>
<positive-z>Models/Effects/res/white.png</positive-z>
<negative-z>Models/Effects/res/white.png</negative-z>
</images>
</texture>
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

BIN
Models/Effects/radar.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

View file

@ -1,35 +0,0 @@
<PropertyList>
<name>panel</name>
<inherits-from>Effects/model-interior</inherits-from>
<parameters>
<lightmap-enabled type="int">1</lightmap-enabled>
<lightmap-factor type="float" n="0"><use>/controls/lighting/pedestal-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/right-light-brightness-glare.png</image>
<filter>linear-mipmap-linear</filter>
<wrap-s>clamp</wrap-s>
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
<positive-x>Models/Effects/res/white.png</positive-x>
<negative-x>Models/Effects/res/white.png</negative-x>
<positive-y>Models/Effects/res/white.png</positive-y>
<negative-y>Models/Effects/res/white.png</negative-y>
<positive-z>Models/Effects/res/white.png</positive-z>
<negative-z>Models/Effects/res/white.png</negative-z>
</images>
</texture>
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

View file

@ -1,35 +0,0 @@
<PropertyList>
<name>panel</name>
<inherits-from>Effects/model-interior</inherits-from>
<parameters>
<lightmap-enabled type="int">1</lightmap-enabled>
<lightmap-factor type="float" n="0"><use>/controls/lighting/pedestal-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/right-light-brightness.png</image>
<filter>linear-mipmap-linear</filter>
<wrap-s>clamp</wrap-s>
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
<positive-x>Models/Effects/res/white.png</positive-x>
<negative-x>Models/Effects/res/white.png</negative-x>
<positive-y>Models/Effects/res/white.png</positive-y>
<negative-y>Models/Effects/res/white.png</negative-y>
<positive-z>Models/Effects/res/white.png</positive-z>
<negative-z>Models/Effects/res/white.png</negative-z>
</images>
</texture>
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

View file

@ -46,66 +46,24 @@
<effect>
<inherits-from>Aircraft/IDG-A32X/Models/Effects/pedestal-flood-atc</inherits-from>
<object-name>atc_body</object-name>
</effect>
<effect>
<inherits-from>Aircraft/IDG-A32X/Models/Effects/pedestal-flood-atc-glare</inherits-from>
<object-name>atc_glare</object-name>
<object-name>atc_body</object-name>
</effect>
<effect>
<inherits-from>Aircraft/IDG-A32X/Models/Effects/pedestal-flood-engine</inherits-from>
<object-name>engine_body</object-name>
</effect>
<effect>
<inherits-from>Aircraft/IDG-A32X/Models/Effects/pedestal-flood-engine-glare</inherits-from>
<object-name>engine_glare</object-name>
</effect>
<effect>
<inherits-from>Aircraft/IDG-A32X/Models/Effects/pedestal-flood-radar</inherits-from>
<object-name>radar_body</object-name>
</effect>
<effect>
<inherits-from>Aircraft/IDG-A32X/Models/Effects/pedestal-flood-radar-glare</inherits-from>
<object-name>radar_glare</object-name>
</effect>
<effect>
<inherits-from>Aircraft/IDG-A32X/Models/Effects/pedestal-flood-LCutoff</inherits-from>
<object-name>eng_mode</object-name>
<object-name>Lcutoff</object-name>
</effect>
<effect>
<inherits-from>Aircraft/IDG-A32X/Models/Effects/pedestal-flood-RCutoff</inherits-from>
<object-name>Rcutoff</object-name>
</effect>
<effect>
<inherits-from>Aircraft/IDG-A32X/Models/Effects/pedestal-flood-mode-selector</inherits-from>
<object-name>eng_mode</object-name>
</effect>
<effect>
<inherits-from>Aircraft/IDG-A32X/Models/Effects/left-light-brightness</inherits-from>
<inherits-from>Aircraft/IDG-A32X/Models/Effects/brightness-panel-ped</inherits-from>
<object-name>vu111_body</object-name>
</effect>
<effect>
<inherits-from>Aircraft/IDG-A32X/Models/Effects/left-light-brightness-glare</inherits-from>
<object-name>vu111_glare</object-name>
</effect>
<effect>
<inherits-from>Aircraft/IDG-A32X/Models/Effects/right-light-brightness</inherits-from>
<object-name>vu112_body</object-name>
</effect>
<effect>
<inherits-from>Aircraft/IDG-A32X/Models/Effects/right-light-brightness-glare</inherits-from>
<object-name>vu111_glare</object-name>
<object-name>vu112_glare</object-name>
</effect>
@ -115,14 +73,13 @@
</effect>
<effect>
<inherits-from>Aircraft/IDG-A32X/Models/Effects/radar-mode</inherits-from>
<inherits-from>Aircraft/IDG-A32X/Models/Effects/pedestal-flood-radar</inherits-from>
<object-name>radar_mode</object-name>
<object-name>radar_tilt</object-name>
<object-name>radar_body</object-name>
<object-name>radar_glare</object-name>
</effect>
<effect>
<inherits-from>Aircraft/IDG-A32X/Models/Effects/radar-tilt</inherits-from>
<object-name>radar_tilt</object-name>
</effect>
<effect>
<inherits-from>Aircraft/IDG-A32X/Models/Effects/cockpit-irradiance</inherits-from>