From 50773f4ac44319d962c575d88cfec19afd158765 Mon Sep 17 00:00:00 2001 From: Jonathan Redpath Date: Wed, 24 Oct 2018 14:45:20 +0100 Subject: [PATCH] Transition to model-interior, add shadows in cockpit --- Models/Effects/cockpit-irradiance.eff | 24 +++++++++++++++------ Models/Effects/panel-flood.eff | 6 +----- Models/Effects/reading-light-checklist.eff | 6 +----- Models/Effects/reading-light.eff | 6 +----- Models/Effects/res/0001.png | Bin 0 -> 6039 bytes Models/Effects/res/0002.png | Bin 0 -> 6535 bytes Models/Effects/res/0003.png | Bin 0 -> 6325 bytes Models/Effects/res/0004.png | Bin 0 -> 3391 bytes Models/Effects/res/0005.png | Bin 0 -> 3391 bytes Models/Effects/res/0006.png | Bin 0 -> 3391 bytes 10 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 Models/Effects/res/0001.png create mode 100644 Models/Effects/res/0002.png create mode 100644 Models/Effects/res/0003.png create mode 100644 Models/Effects/res/0004.png create mode 100644 Models/Effects/res/0005.png create mode 100644 Models/Effects/res/0006.png 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 @@ panel - Effects/model-combined-deferred + Effects/model-interior 2 0.1 - 0 - 0 - 0 - 0.0 - 0 + + cubemap + + Models/Effects/res/0004.png + Models/Effects/res/0002.png + Models/Effects/res/0001.png + Models/Effects/res/0003.png + Models/Effects/res/0006.png + Models/Effects/res/0005.png + + + + 0.207344 0.0 0.797276 + 0.672 0.672 0.672 + 0.0 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 @@ panel - Effects/model-combined-deferred + Effects/model-interior - 0 - 0 - 0 - 0.0 1 /controls/lighting/panel-light 1.0 1.0 1.0 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 @@ panel - Effects/model-combined-deferred + Effects/model-interior - 0 - 0 - 0 - 0.0 1 /controls/lighting/reading-light*0.5 1.0 1.0 1.0 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 @@ panel - Effects/model-combined-deferred + Effects/model-interior - 0 - 0 - 0 - 0.0 1 /controls/lighting/reading-light 1.0 1.0 1.0 diff --git a/Models/Effects/res/0001.png b/Models/Effects/res/0001.png new file mode 100644 index 0000000000000000000000000000000000000000..8eb8465030d293c6212fe404e5dda2ed44e7f3a8 GIT binary patch literal 6039 zcmeHLiCYuNwm+T4KtzZT5z#RLm2FT0D4Re60U-*q2#O9PVMjrT0Y}_OqjLdwL`M-( zqeex?1(#76QJY0UFDRmp!HpoOa9uz}z(CTsg715O!~4Exz9iLsPMu$!`c<8Cs(W+j z{D3h`b0z?c5e52%1JKYV4fH6e>6KMILXEy8aB(KUXcOHJgOXA+Bot=(M`g`fmX-)Y zkLbwEL}_NUG%-OE8|{~|Iz25THX$>5S$bBYbXkUUdS*&&LdNRp@vGtzSHw!D$4e7q zvofSJ;?fe+6SCs1Y!IB84$dz&D-oP{j&2T)JO`(lT*sLnPHrAN_rqZus!$)6u200W z6^X#(dHm1U@qMjT4bm}2+>yp2rQ`Xc%T`D0P8^P0N|gTZAkH&*j<^0*?G9iXCGzu$$bS0a#WQKg6=Qm+?Q4=ueCxBh zUKnodzfo{(-P!s(?veTh|9;8!y72Yi-QHgPEFq@;6`KTFxUuX~APJ!P$c%wWneF#N}@fBLxZASyx7Y<_R<|HW&uDwyX zi2~O}q=Oqionh8s>Nl1NS<^mNsk-R6Ase`~ZcYKQ)Q`@Dz7BPp3J3|(TdF8Q)$^cb z0mvEM9I>SbRN5krLklRdFH@5t4Dg61Cr@SOvT|Iu-FzP7Ts+Hm|!Ma5yHg* z3lw4apB0UxQfXY|{0xiMNgWr*6x_by=gox6)*5QUQEK5f#6f$(h#x79U-_NK4#pW4 zZl=I=5t;8EovTV)pf~~o=N3M&4pU%7AemgTh8tD`cv(x8@w_qm0d_ zLO>u%qz(*ixE`kTNRpixl{<+IVuM9T68@T?k&z38v~9T+GP! zN-v=TZRKja+L(F1YFW)vpQeBPmh`5Fynp#dV|dpcYXPyYMIR8=1n1*A7ZDk;G-Y7u z#XXqXVZt4hIl6URRa%z+bMK5^47UF`tI!oB*IM5lE({b`kH)wdS_NuuH$EELk4k%>G%J6$K!-PsK-WG5-U%tC} z#WZRV^2hWEDKI%d8$X*g=aBg-8(_y}wsp=hfw^H&=BsX-s;O;%+&&F>wsiPUkrtcG zc0n4O>U%e=G_{Z4b$z%OpGwIKg@*fMN7pIxsX`l=YOTpIo-KcDexbxz60Qr&*9|{6 zHzi$UyXKtVyC>M*gPwLEZMlua$gU*Cx#%PluUuCBWx2)zX-@sz! z?KP}JbWentur+44HdfvgeCPCgckMm;V3V~VA%0)XZf9bxZNo~qZv%?BYcac%xa?

Cd^Hn$dd<)|tGVKYyzY1l5WltM|deFYjgcU8{3g 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 CUvHZL literal 0 HcmV?d00001 diff --git a/Models/Effects/res/0003.png b/Models/Effects/res/0003.png new file mode 100644 index 0000000000000000000000000000000000000000..a409bf849de101b3afa1c85d82b5f67865bb1485 GIT binary patch literal 6325 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 KUZ)p}^8N>x^5@t9 literal 0 HcmV?d00001 diff --git a/Models/Effects/res/0004.png b/Models/Effects/res/0004.png new file mode 100644 index 0000000000000000000000000000000000000000..a71e66275901d9bdb6e238f2e7c559f2c3d90f96 GIT binary patch literal 3391 zcmeAS@N?(olHy`uVBq!ia0y~yU;#2&7&w@K)Q9>#SAY~}fk$L90|U1(2s1Lwnj--e zbS`m?C~?coNo8=hiU}=FEh>&FN=+$9jB&{?&&$bAOev1Z%qvMP%FHj)EzU?x$uHMU zE=@|!O)St&E=o--$uH7N%1O;jDM?n-02(I&GR`HjB$dI)z|cb9&_LhFM8VL+%E-dX z(6Y_T=Pyu=07y+pW^O8jfq@kinao*v$rmWc4t7paB2d!g{tt(hKp|d`kTX!ED3Jj| zW&D5t5-7n9k_b*t%}ZqflTQ_6rvZh9LBc^mC#4p_Eiu+JF|+TTIFEsWhr!duF{I+w z+k=d}K*fg^eD}}gGhYB?j)Kt;7!85Z5Eu=C(GVC7fzc2c4S~@R7!85p76Nv>Y!?_9 TAFb`v0{P6-)z4*}Q$iB}=9OhB literal 0 HcmV?d00001 diff --git a/Models/Effects/res/0005.png b/Models/Effects/res/0005.png new file mode 100644 index 0000000000000000000000000000000000000000..7abb780319fc827a8719f47dd9a9efa639036228 GIT binary patch literal 3391 zcmeAS@N?(olHy`uVBq!ia0y~yU;#2&7&w@K)Q9>#SAY~}fk$L90|U1(2s1Lwnj--e zbS`m?C~?coNo8=hiU}=FEh>&FN=+$9jB&{?&&$bAOev1Z%qvMP%FHj)EzU?x$uHMU zE=@|!O)St&E=o--$uH7N%1O;jDM?n-02(I&GR`HjB$dI)z|cb9&_LhFM8VL+%E-dX z$k=z&HwB;?0g#%I%-mE40|P54GJU=7(QTj{JJ>lzi9kuy75@wDfkM0>A!ndSQ6d9` z%J~2OB~XGJBoUmPnwQD|CZ8(CP6G-HgM@>CPD(9;TVkwdY92Uof+qt54}+(RV@SoV zw+9({fr<|;`0k&}XTAW)90j8xFd71*Aut*OqaiRF0;3@?8UmvsFd72GEd=a%*)A|J TK3dzS1@f7vtDnm{r-UW|OE+a~ literal 0 HcmV?d00001 diff --git a/Models/Effects/res/0006.png b/Models/Effects/res/0006.png new file mode 100644 index 0000000000000000000000000000000000000000..f5498594c95f550331840b5baa2aa344388a9cf7 GIT binary patch literal 3391 zcmeAS@N?(olHy`uVBq!ia0y~yU;#2&7&w@K)Q9>#SAY~}fk$L90|U1(2s1Lwnj--e zbS`m?C~?coNo8=hiU}=FEh>&FN=+$9jB&{?&&$bAOev1Z%qvMP%FHj)EzU?x$uHMU zE=@|!O)St&E=o--$uH7N%1O;jDM?n-02(I&GR`HjB$dI)z|cb9&_LhFM8VL+%E-dX z$jtTz(|Vv90g#%I%-mE40|P54GAmlXIT0ww4t7paB2d!I@S9>QP>2^KgTe~DWM4f?Tci# literal 0 HcmV?d00001