From b42abceaef37f34ef2ea88c9290f7b895f0f9efc Mon Sep 17 00:00:00 2001 From: Lubos Lenco Date: Tue, 15 Aug 2017 11:39:06 +0200 Subject: [PATCH] Sample ies files --- Assets/ies/Comet.ies | 13 ++++++ Assets/ies/CylinderNarrow.ies | 16 +++++++ Assets/ies/JellyFish.ies | 80 +++++++++++++++++++++++++++++++++++ Assets/ies/SoftArrow.ies | 14 ++++++ Assets/ies/Umbrella.ies | 24 +++++++++++ Assets/ies/XArrow.ies | 13 ++++++ Assets/ies/readme.md | 1 + Shaders/std/ies.glsl | 5 +++ 8 files changed, 166 insertions(+) create mode 100755 Assets/ies/Comet.ies create mode 100755 Assets/ies/CylinderNarrow.ies create mode 100755 Assets/ies/JellyFish.ies create mode 100755 Assets/ies/SoftArrow.ies create mode 100755 Assets/ies/Umbrella.ies create mode 100755 Assets/ies/XArrow.ies create mode 100644 Assets/ies/readme.md diff --git a/Assets/ies/Comet.ies b/Assets/ies/Comet.ies new file mode 100755 index 00000000..deeff16b --- /dev/null +++ b/Assets/ies/Comet.ies @@ -0,0 +1,13 @@ +IESNA:LM-63-1995 +[TEST] INFINITY LIGHTING PHOTOMETRIC REPORT NO. W00006 +[LUMINAIRE] ICEAL8-2X150-FL-CG1 +TILT=NONE +2 11000 1 19 5 1 1 1.375 1.04167 0 +1 1 314 +0 5 10 15 20 25 30 35 40 45 50 55 60 65 70 75 80 85 90 +0 22.5 45 67.5 90 +9085.62 9033.58 8923.24 8687.43 8145.53 7454.18 6336.9 5050.9 3180.16 2162.21 1292.02 677.24 243.87 48.44 16.1 6.48 6.25 6.99 3.31 +9085.62 8902.2 8825.21 8578.38 8462.81 7787.37 6902.89 5633.64 3822.33 2423.91 1614.81 927.01 382.27 72.18 18.92 8.91 6.41 5.19 2.16 +9085.62 9029.2 9168.27 8989.93 8818.57 8434.18 7791.45 6806.71 5489.39 3939.15 2518.39 1573.92 770.93 308.04 81.18 28.92 14.71 8.88 4.75 +9085.62 9404.94 9244.69 9202.21 9146.45 8779.2 8121.15 7346.47 6513.38 5407.45 3976.98 2453.4 1106.06 428.6 117.57 35.96 12.34 7.19 1.55 +9085.62 9315.27 9317.59 9459.68 9433.84 9128.13 8380.85 7752.85 6655.4 5439.5 3990.21 2472.54 1140.85 377.1 65.79 17.41 9 4.71 2.77 diff --git a/Assets/ies/CylinderNarrow.ies b/Assets/ies/CylinderNarrow.ies new file mode 100755 index 00000000..8de41aee --- /dev/null +++ b/Assets/ies/CylinderNarrow.ies @@ -0,0 +1,16 @@ + IESNA:LM-63-1995 + [TEST]BALLABS TEST NO. 10974.0 + [MANUFAC] INFINITY LIGHTING INC - CARTHAGE, MISSOURI + [LUMINAIRE] 1/250W HALOGEN CLEAR MINICAN 7.5"DIA RECESSED LUMINAIRE + [LUMINAIRE] FACETED HYDROFORMED SEMI-SPECULAR REFLECTOR + [LUMINAIRE] CLEAR GLASS LENS w/4"DEEPSPUN SPECULAR ALUMINUM CONE +[LUMCAT]CATALOG NO. : TH75-250-T4 NARROW w/SPACER I +[LAMPCAT]LAMP CODE : 250Q/CL/MC (EHT) +TILT=NONE + 1 5000. 1.000000 19 1 1 1 .625 .625 .000 + 1.0000 1.0000 247.0000 + .0 5.0 10.0 15.0 20.0 25.0 30.0 35.0 40.0 45.0 + 50.0 55.0 60.0 65.0 70.0 75.0 80.0 85.0 90.0 + .0 + 8183. 6729. 4775. 3866. 2714. 1600. 992. 715. 373. 119. + 46. 20. 8. 4. 0. 0. 0. 0. 0. diff --git a/Assets/ies/JellyFish.ies b/Assets/ies/JellyFish.ies new file mode 100755 index 00000000..9be75b19 --- /dev/null +++ b/Assets/ies/JellyFish.ies @@ -0,0 +1,80 @@ +IESNA:LM-63-1995 +[TEST]BALLABS TEST NO. 12788.0 +[MANUFAC] INFINITY LIGHTING INC - CARTHAGE, MISSOURI +[LUMINAIRE] 1/100W ICETRON INDUCTION 20x15"DIRECT AREALIGHT LUMINAIRE +[LUMINAIRE] MIRO4 SPEC ALUM TYPE II OPTICS & CLEAR FLAT GLASS LENS +[LUMINAIRE] BLACK PANEL STREET SIDE SYLVANIA # QT 1x150 ICE/UNV-T +[LUMCAT] ICEAL2-150S-TYPE2/CG1-277 +[LAMPCAT] ICE100/QT150 2PIN +TILT=NONE + 1 11000. 1.000000 25 21 1 1 .938 1.266 .000 + 1.0000 1.0000 140.0000 + .0 5.0 10.0 15.0 20.0 25.0 30.0 35.0 40.0 45.0 + 50.0 55.0 60.0 62.5 65.0 67.5 70.0 72.5 75.0 77.5 + 80.0 82.5 85.0 87.5 90.0 + .0 5.0 15.0 25.0 35.0 45.0 55.0 65.0 75.0 85.0 + 90.0 95.0 105.0 115.0 125.0 135.0 145.0 155.0 165.0 175.0 + 180.0 + 1789. 1841. 1911. 1979. 2023. 2025. 1994. 1867. 1718. 1551. + 1374. 1208. 990. 808. 637. 469. 347. 202. 89. 18. + 9. 7. 7. 6. 0. + 1789. 1831. 1908. 1969. 2013. 2018. 1983. 1865. 1701. 1548. + 1353. 1193. 981. 842. 661. 503. 352. 172. 68. 19. + 8. 6. 6. 5. 0. + 1789. 1828. 1891. 1939. 1958. 1939. 1908. 1808. 1668. 1559. + 1428. 1300. 1222. 1161. 999. 778. 580. 318. 129. 39. + 10. 7. 7. 4. 0. + 1789. 1818. 1865. 1891. 1942. 1959. 1927. 1843. 1761. 1714. + 1673. 1599. 1445. 1325. 1165. 948. 668. 400. 186. 75. + 30. 9. 7. 2. 0. + 1789. 1811. 1821. 1891. 1941. 1974. 1980. 1943. 1993. 2082. + 1963. 1808. 1621. 1601. 1424. 1166. 829. 487. 279. 152. + 65. 15. 8. 2. 0. + 1789. 1794. 1804. 1893. 1935. 1995. 2020. 2145. 2342. 2221. + 2063. 2135. 2157. 1694. 948. 340. 101. 8. 0. 185. + 94. 32. 9. 0. 0. + 1789. 1775. 1803. 1868. 1931. 1992. 2076. 2357. 2333. 2285. + 2254. 2608. 2375. 2010. 1722. 1448. 981. 661. 376. 244. + 122. 38. 8. 0. 0. + 1789. 1763. 1798. 1839. 1918. 1961. 2151. 2291. 2310. 2263. + 2575. 2700. 2380. 2075. 1792. 1483. 1102. 702. 430. 298. + 192. 67. 11. 2. 0. + 1789. 1746. 1801. 1827. 1871. 1923. 2176. 2119. 2124. 2062. + 2553. 2596. 2201. 1907. 1678. 1368. 1015. 673. 440. 303. + 178. 63. 10. 1. 0. + 1789. 1738. 1788. 1808. 1830. 1895. 2081. 2024. 1953. 1883. + 2313. 2285. 1854. 1661. 1400. 1139. 833. 577. 404. 267. + 157. 54. 12. 1. 0. + 1789. 1735. 1783. 1797. 1812. 1868. 2046. 1983. 1911. 1805. + 2191. 2151. 1759. 1513. 1288. 1033. 802. 568. 386. 243. + 134. 56. 10. 3. 0. + 1789. 1734. 1778. 1786. 1797. 1838. 2016. 1951. 1871. 1766. + 2128. 2078. 1681. 1474. 1248. 1009. 739. 523. 349. 228. + 144. 52. 13. 2. 0. + 1789. 1733. 1774. 1773. 1771. 1777. 1959. 1895. 1811. 1647. + 2034. 1957. 1595. 1293. 1118. 925. 717. 481. 319. 208. + 125. 51. 7. 1. 0. + 1789. 1738. 1763. 1755. 1744. 1704. 1880. 1794. 1752. 1541. + 1772. 1720. 1427. 1191. 1003. 795. 588. 427. 274. 166. + 98. 39. 8. 3. 0. + 1789. 1734. 1744. 1732. 1708. 1647. 1674. 1703. 1620. 1413. + 1325. 1423. 1205. 983. 808. 642. 464. 312. 192. 107. + 57. 18. 8. 3. 0. + 1789. 1735. 1714. 1725. 1673. 1590. 1481. 1511. 1373. 1230. + 982. 993. 902. 771. 626. 456. 300. 187. 112. 60. + 31. 14. 8. 4. 0. + 1789. 1736. 1681. 1700. 1617. 1511. 1381. 1252. 1210. 1043. + 875. 657. 554. 487. 398. 294. 195. 122. 70. 40. + 19. 11. 8. 3. 0. + 1789. 1737. 1666. 1641. 1577. 1471. 1333. 1172. 1015. 890. + 728. 574. 409. 326. 243. 181. 114. 72. 40. 24. + 14. 9. 7. 4. 0. + 1789. 1740. 1679. 1601. 1493. 1388. 1268. 1114. 956. 769. + 624. 481. 347. 267. 201. 141. 85. 41. 25. 16. + 10. 7. 6. 3. 0. + 1789. 1737. 1693. 1616. 1479. 1340. 1187. 1041. 896. 724. + 572. 431. 303. 233. 167. 117. 62. 29. 18. 12. + 9. 6. 6. 4. 1. + 1789. 1742. 1698. 1623. 1491. 1354. 1196. 1040. 894. 722. + 565. 421. 302. 227. 159. 108. 57. 20. 14. 10. + 8. 6. 6. 5. 0. diff --git a/Assets/ies/SoftArrow.ies b/Assets/ies/SoftArrow.ies new file mode 100755 index 00000000..013b588b --- /dev/null +++ b/Assets/ies/SoftArrow.ies @@ -0,0 +1,14 @@ +IESNA91 +[MANUFAC] Halo,Recessed +[LUMCAT] H7t-301 +[LUMINAIRE] Open Trim (75W R-30 Flood) +[LAMP] +[REPORT] +TILT=NONE +1 900.0 1.0 36 1 1 1 0.0 -0.32 0.0 +1.0 1.0 75.0 +0.0 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 17.5 20.0 22.5 25.0 27.5 30.0 32.5 35.0 37.5 40.0 45.0 +50.0 55.0 60.0 65.0 70.0 75.0 80.0 85.0 90.0 +0.0 +1512.0 1516.0 1508.0 1487.0 1453.0 1409.0 1357.0 1294.0 1229.0 1158.0 1085.0 1008.0 934.0 862.0 795.0 727.0 578.0 459.0 368.0 +304.0 256.0 222.0 197.0 177.0 163.0 153.0 141.0 124.0 73.0 28.0 23.0 18.0 13.0 9.0 4.0 1.0 diff --git a/Assets/ies/Umbrella.ies b/Assets/ies/Umbrella.ies new file mode 100755 index 00000000..2f5fa5b3 --- /dev/null +++ b/Assets/ies/Umbrella.ies @@ -0,0 +1,24 @@ +IESNA:LM-63-1995 +[TEST]BALLABS TEST NO. 12447.0 +[MANUFAC] INFINITY LIGHTING INC - CARTHAGE, MISSOURI +[LUMINAIRE] 1/100W ICETRON INDUCTION LAMP 20x15"AREALIGHT LUMINAIRE +[LUMINAIRE] MIRO4 HIGHLY SPEC FLOOD OPTICS w/CLEAR GLASS LENS +[LUMINAIRE] SYLVANIA BALLAST #QT1x150 ICE/UNV-T WATTS=145 +[LUMCAT] ICE DC-150W/41K-FL/CGI-MTV @277VOLTS +[LAMPCAT] ICETRON100/QT150 +TILT=NONE + 1 11000. 1.000000 19 5 1 1 .938 1.266 .000 + 1.0000 1.0000 145.0000 + .0 5.0 10.0 15.0 20.0 25.0 30.0 35.0 40.0 45.0 + 50.0 55.0 60.0 65.0 70.0 75.0 80.0 85.0 90.0 + .0 22.5 45.0 67.5 90.0 + 5122. 5161. 5246. 5337. 5360. 5211. 4910. 4510. 3890. 3056. + 1952. 1153. 451. 139. 30. 15. 3. 0. 0. + 5122. 5138. 5234. 5291. 5289. 5129. 4754. 4318. 3676. 2838. + 2069. 1240. 482. 172. 37. 11. 6. 1. 0. + 5122. 5134. 5160. 5118. 4967. 4781. 4477. 3831. 2940. 1851. + 1139. 685. 306. 85. 25. 13. 7. 1. 0. + 5122. 5119. 5076. 4880. 4697. 4385. 3786. 2876. 1738. 1121. + 711. 388. 120. 30. 11. 6. 4. 1. 0. + 5122. 5113. 5032. 4843. 4615. 4130. 3464. 2374. 1519. 1017. + 589. 293. 73. 27. 11. 6. 3. 1. 0. diff --git a/Assets/ies/XArrow.ies b/Assets/ies/XArrow.ies new file mode 100755 index 00000000..b5fcf691 --- /dev/null +++ b/Assets/ies/XArrow.ies @@ -0,0 +1,13 @@ +IESNA:LM-63-1995 +[TEST] BE1680 +[DATE] 12-FEB-96 +[MANUFAC] BEGA +[LUMCAT] 6340 +[LUMINAIRE] SURFACE MOUNTED WALL LUMINAIRE +[LAMP] (1) 100W A-19 INC +TILT=NONE + 1 1750 1.75 73 1 1 2 -.1 0 .05 + 1 1 100 + 0 2.5 5 7.5 10 12.5 15 17.5 20 22.5 25 27.5 30 32.5 35 37.5 40 42.5 45 47.5 50 52.5 55 57.5 60 62.5 65 67.5 70 72.5 75 77.5 80 82.5 85 87.5 90 92.5 95 97.5 100 102.5 105 107.5 110 112.5 115 117.5 120 122.5 125 127.5 130 132.5 135 137.5 140 142.5 145 147.5 150 152.5 155 157.5 160 162.5 165 167.5 170 172.5 175 177.5 180 + 0 + 167.3 168.9 173 179.9 179.2 151.2 119.4 95.63 81.03 71.95 66.46 62.67 60.25 57.67 52.18 46.62 48.91 63.15 83.15 95.41 97.4 87.75 62.6 43.08 39.26 47.36 52.89 45.74 31.45 18.17 10.5 7.888 8.112 7.592 3.665 .6467 .498 .4252 .3735 .3185 .2765 .2279 .2199 .2021 .1746 .1407 .1358 .1277 .1326 .1342 .1406 .1374 .1358 .1375 .1488 .1488 .1536 .1925 .2183 .2328 .2345 .249 .2765 .3023 .3266 .3476 .3557 .3638 .3541 .3573 .3638 .3719 .3816 diff --git a/Assets/ies/readme.md b/Assets/ies/readme.md new file mode 100644 index 00000000..bc270b74 --- /dev/null +++ b/Assets/ies/readme.md @@ -0,0 +1 @@ +Using IES profiles from http://www.derekjenson.com/3d-blog/ies-light-profiles \ No newline at end of file diff --git a/Shaders/std/ies.glsl b/Shaders/std/ies.glsl index 8030b34c..2764a4b3 100644 --- a/Shaders/std/ies.glsl +++ b/Shaders/std/ies.glsl @@ -17,4 +17,9 @@ float iesAttenuation(vec3 L, ShadowLightInfo light) { vec3 pl = normalize(p - lightPos); float f = asin(dot(pl, l)) / PI + 0.5; return texture(texIES, vec2(f, 0.0)).r; + + // 1D texture + float cosTheta = dot(lightToPos, lightDir); + float angle = acos(cosTheta) * (1.0 / PI); + return texture(texIES, vec2(angle, 0.0), 0.0).r; }