diff --git a/Models/Effects/cockpit-irradiance.eff b/Models/Effects/cockpit-irradiance.eff index ba1defa0..3117ff1c 100644 --- a/Models/Effects/cockpit-irradiance.eff +++ b/Models/Effects/cockpit-irradiance.eff @@ -1,13 +1,25 @@ <PropertyList> <name>panel</name> - <inherits-from>Effects/model-combined-deferred</inherits-from> + <inherits-from>Effects/model-interior</inherits-from> <parameters> <irradiance-map-type type="int">2</irradiance-map-type> <irradiance-map-strength type="float">0.1</irradiance-map-strength> - <normalmap-enabled type="int">0</normalmap-enabled> - <reflection-enabled type="int">0</reflection-enabled> - <dirt-enabled type="int">0</dirt-enabled> - <ambient-correction type="float">0.0</ambient-correction> - <lightmap-enabled type="int">0</lightmap-enabled> + <texture n="4"> + <type>cubemap</type> + <images> + <positive-x>Models/Effects/res/0004.png</positive-x> + <negative-x>Models/Effects/res/0002.png</negative-x> + <positive-y>Models/Effects/res/0001.png</positive-y> + <negative-y>Models/Effects/res/0003.png</negative-y> + <positive-z>Models/Effects/res/0006.png</positive-z> + <negative-z>Models/Effects/res/0005.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> diff --git a/Models/Effects/panel-flood.eff b/Models/Effects/panel-flood.eff index e711bace..3ffeaa4b 100644 --- a/Models/Effects/panel-flood.eff +++ b/Models/Effects/panel-flood.eff @@ -1,11 +1,7 @@ <PropertyList> <name>panel</name> - <inherits-from>Effects/model-combined-deferred</inherits-from> + <inherits-from>Effects/model-interior</inherits-from> <parameters> - <normalmap-enabled type="int">0</normalmap-enabled> - <reflection-enabled type="int">0</reflection-enabled> - <dirt-enabled type="int">0</dirt-enabled> - <ambient-correction type="float">0.0</ambient-correction> <lightmap-enabled type="int">1</lightmap-enabled> <lightmap-factor type="float" n="0"><use>/controls/lighting/panel-light</use></lightmap-factor> <lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color> diff --git a/Models/Effects/reading-light-checklist.eff b/Models/Effects/reading-light-checklist.eff index 84c8f865..7999bbcc 100644 --- a/Models/Effects/reading-light-checklist.eff +++ b/Models/Effects/reading-light-checklist.eff @@ -1,11 +1,7 @@ <PropertyList> <name>panel</name> - <inherits-from>Effects/model-combined-deferred</inherits-from> + <inherits-from>Effects/model-interior</inherits-from> <parameters> - <normalmap-enabled type="int">0</normalmap-enabled> - <reflection-enabled type="int">0</reflection-enabled> - <dirt-enabled type="int">0</dirt-enabled> - <ambient-correction type="float">0.0</ambient-correction> <lightmap-enabled type="int">1</lightmap-enabled> <lightmap-factor type="float" n="0"><use>/controls/lighting/reading-light</use>*0.5</lightmap-factor> <lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color> diff --git a/Models/Effects/reading-light.eff b/Models/Effects/reading-light.eff index 5a05f813..c8749a73 100644 --- a/Models/Effects/reading-light.eff +++ b/Models/Effects/reading-light.eff @@ -1,11 +1,7 @@ <PropertyList> <name>panel</name> - <inherits-from>Effects/model-combined-deferred</inherits-from> + <inherits-from>Effects/model-interior</inherits-from> <parameters> - <normalmap-enabled type="int">0</normalmap-enabled> - <reflection-enabled type="int">0</reflection-enabled> - <dirt-enabled type="int">0</dirt-enabled> - <ambient-correction type="float">0.0</ambient-correction> <lightmap-enabled type="int">1</lightmap-enabled> <lightmap-factor type="float" n="0"><use>/controls/lighting/reading-light</use></lightmap-factor> <lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color> diff --git a/Models/Effects/res/0001.png b/Models/Effects/res/0001.png new file mode 100644 index 00000000..8eb84650 Binary files /dev/null and b/Models/Effects/res/0001.png differ diff --git a/Models/Effects/res/0002.png b/Models/Effects/res/0002.png new file mode 100644 index 00000000..df1b8a76 Binary files /dev/null and b/Models/Effects/res/0002.png differ diff --git a/Models/Effects/res/0003.png b/Models/Effects/res/0003.png new file mode 100644 index 00000000..a409bf84 Binary files /dev/null and b/Models/Effects/res/0003.png differ diff --git a/Models/Effects/res/0004.png b/Models/Effects/res/0004.png new file mode 100644 index 00000000..a71e6627 Binary files /dev/null and b/Models/Effects/res/0004.png differ diff --git a/Models/Effects/res/0005.png b/Models/Effects/res/0005.png new file mode 100644 index 00000000..7abb7803 Binary files /dev/null and b/Models/Effects/res/0005.png differ diff --git a/Models/Effects/res/0006.png b/Models/Effects/res/0006.png new file mode 100644 index 00000000..f5498594 Binary files /dev/null and b/Models/Effects/res/0006.png differ