mirror of
https://github.com/overte-org/overte.git
synced 2025-04-07 19:12:28 +02:00
Merge pull request #907 from AleziaKurdis/CreateApp_DEC2020_Material_Icons
Create app dec2020 material icons
This commit is contained in:
Kalila
GitHub
commit
df1feaf4f1
8 changed files with 131 additions and 235 deletions
5
scripts/system/create/assets/images/icon-material.svg
Normal file
5
scripts/system/create/assets/images/icon-material.svg
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" style="" xml:space="preserve" width="512" height="512"><rect id="backgroundrect" width="100%" height="100%" x="0" y="0" fill="none" stroke="none"/>
|
||||
|
||||
|
||||
|
||||
<g class="currentLayer" style=""><title>Layer 1</title><g class=""><rect fill="#ffffff" stroke-dashoffset="" fill-rule="nonzero" id="svg_5" x="160.85614078625295" y="158.9852023923402" width="10.531234830969368" height="98.06203275549922" style="color: rgb(0, 0, 0);" class="" fill-opacity="1"/><rect fill="#ffffff" stroke-dashoffset="" fill-rule="nonzero" x="209.15666843567067" y="108.3932784182918" width="10.843375325202928" height="102.80722260475153" style="color: rgb(0, 0, 0);" class="" fill-opacity="1" id="svg_9" transform="matrix(-0.0018477934675853714,0.9538420822131074,-0.9712119570660508,-0.0018147461589597617,367.3500746247034,-41.18663668001403) "/><rect fill="#ffffff" stroke-dashoffset="" fill-rule="nonzero" x="207.3494403472917" y="201.76676589082615" width="10.843375325202928" height="102.80722260475153" style="color: rgb(0, 0, 0);" class="" fill-opacity="1" transform="matrix(-0.0018477934675853714,0.9538420822131074,-0.9712119570660508,-0.0018147461589597617,456.2769576505074,49.770340126555396) " id="svg_10"/><rect fill="#ffffff" stroke-dashoffset="" fill-rule="nonzero" x="248.61641124634482" y="158.98520352941063" width="10.531234830969368" height="98.06203275549922" style="color: rgb(0, 0, 0);" class="" fill-opacity="1" id="svg_8"/></g><g class="" id="svg_11"><rect fill="#ffffff" stroke-dashoffset="" fill-rule="nonzero" id="svg_12" x="253.65058110708242" y="251.20481491088867" width="10.843375325202942" height="102.80722260475159" style="color: rgb(0, 0, 0);" class="" fill-opacity="1"/><rect fill="#ffffff" stroke-dashoffset="" fill-rule="nonzero" x="300.6385287498856" y="204.2168674468994" width="10.843375325202942" height="102.80722260475159" style="color: rgb(0, 0, 0);" class="" fill-opacity="1" id="svg_13" transform="rotate(90.1090087890625 306.0600280761718,255.6206359863281) "/><rect fill="#ffffff" stroke-dashoffset="" fill-rule="nonzero" x="298.8313006615067" y="297.5903549194336" width="10.843375325202942" height="102.80722260475159" style="color: rgb(0, 0, 0);" class="" fill-opacity="1" transform="rotate(90.1090087890625 304.25280761718756,348.9941101074219) " id="svg_14"/><rect fill="#ffffff" stroke-dashoffset="" fill-rule="nonzero" x="344.01202176565175" y="251.20481610298157" width="10.843375325202942" height="102.80722260475159" style="color: rgb(0, 0, 0);" class="" fill-opacity="1" id="svg_15"/></g><path d="M353.92333081107876,157.9109143298332 c1.8017621501637127,0 3.1795802649947857,1.468567041994318 3.1795802649947857,3.146929375702109 v190.28432958412085 c0,1.7832599795645292 -1.3778181148310744,3.146929375702109 -3.1795802649947857,3.146929375702109 H161.77069679656054 c-1.695776141330552,0 -3.1795802649947857,-1.3636693961375808 -3.1795802649947857,-3.146929375702109 V161.05784370553528 c0,-1.678362333707791 1.483804123664234,-3.146929375702109 3.1795802649947857,-3.146929375702109 H353.92333081107876 M353.92333081107876,140.07831453418788 H161.77069679656054 c-11.65846097164755,0 -21.197201766631906,9.440788127106327 -21.197201766631906,20.979529171347394 v190.28432958412085 c0,11.538741044241068 9.538740794984358,20.979529171347394 21.197201766631906,20.979529171347394 h192.2586200233514 c11.65846097164755,0 21.197201766631906,-9.440788127106327 21.197201766631906,-20.979529171347394 V161.05784370553528 C375.12053257771066,149.51910266129423 365.68777779155954,140.07831453418788 353.92333081107876,140.07831453418788 L353.92333081107876,140.07831453418788 z" class="" id="svg_4" fill="#ffffff" fill-opacity="1"/><path d="M348.5,162.5c1.7,0,3,1.4,3,3v181.4c0,1.7-1.3,3-3,3H167.2c-1.6,0-3-1.3-3-3V165.5c0-1.6,1.4-3,3-3H348.5 M348.5,145.5 H167.2c-11,0-20,9-20,20v181.4c0,11,9,20,20,20h181.4c11,0,20-9,20-20V165.5C368.5,154.5,359.6,145.5,348.5,145.5L348.5,145.5z" id="svg_1" class="" fill="#242424" fill-opacity="1"/><rect x="160.3951836560118" y="253.60000610351562" width="97.50482530835689" height="97.50482530835689" id="svg_2" class="" fill="#242424" fill-opacity="1"/><rect x="256.1000061035156" y="159.8000030517578" width="97.80964364091233" height="94.79759099712055" id="svg_3" class=""/><rect x="256.1000061035156" y="157.99277523323144" width="99.61686881173529" height="96.60481879341887" class="" id="svg_19" fill="#242424" fill-opacity="1"/></g></svg>
|
||||
|
After Width: | Height: | Size: 4.4 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 9.2 KiB |
|
|
@ -1,57 +1,48 @@
|
|||
<?xml version="1.0" encoding="iso-8859-1"?>
|
||||
<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 960 560" style="enable-background:new 0 0 960 560;" xml:space="preserve">
|
||||
<g>
|
||||
<g>
|
||||
<path style="fill:#333333;" d="M478.879,127.676c-83.872,0-152.325,68.454-152.325,152.325s68.454,152.325,152.325,152.325
|
||||
s152.325-67.837,152.325-152.325C631.204,196.13,563.366,127.676,478.879,127.676z"/>
|
||||
<path style="fill:#FFFFFF;" d="M478.881,437.281C392.156,437.281,321.6,366.725,321.6,280s70.557-157.281,157.281-157.281
|
||||
S636.157,193.275,636.157,280S565.606,437.281,478.881,437.281z M478.881,132.627c-81.263,0-147.373,66.115-147.373,147.373
|
||||
s66.11,147.373,147.373,147.373c81.258,0,147.368-66.115,147.368-147.373S560.138,132.627,478.881,132.627z"/>
|
||||
</g>
|
||||
<g>
|
||||
<rect x="459.145" y="4.952" style="fill:#333333;" width="40.086" height="75.237"/>
|
||||
<path style="fill:#FFFFFF;" d="M504.183,85.147h-49.99V0h49.99V85.147z M464.1,75.239h30.174V9.908H464.1V75.239z"/>
|
||||
</g>
|
||||
<g>
|
||||
|
||||
<rect x="272.766" y="90.696" transform="matrix(-0.707 -0.7072 0.7072 -0.707 451.5123 408.5368)" style="fill:#333333;" width="75.236" height="40.085"/>
|
||||
<path style="fill:#FFFFFF;" d="M322.809,158.519l-60.198-60.212l35.351-35.346l60.198,60.212L322.809,158.519z M276.621,98.307
|
||||
l46.188,46.202l21.34-21.335l-46.188-46.202L276.621,98.307z"/>
|
||||
</g>
|
||||
<g>
|
||||
<rect x="201.98" y="257.8" style="fill:#333333;" width="75.237" height="40.086"/>
|
||||
<path style="fill:#FFFFFF;" d="M282.17,302.845h-85.142V252.85h85.142V302.845z M206.936,292.937h65.327v-30.179h-65.327V292.937z
|
||||
"/>
|
||||
</g>
|
||||
<g>
|
||||
|
||||
<rect x="287.46" y="408.97" transform="matrix(0.7072 0.707 -0.707 0.7072 405.7749 -86.6482)" style="fill:#333333;" width="40.085" height="75.236"/>
|
||||
<path style="fill:#FFFFFF;" d="M295.083,494.359l-35.355-35.346l60.198-60.212l35.355,35.346L295.083,494.359z M273.738,459.013
|
||||
l21.345,21.335l46.187-46.202l-21.345-21.335L273.738,459.013z"/>
|
||||
</g>
|
||||
<g>
|
||||
<rect x="454.827" y="479.812" style="fill:#333333;" width="40.086" height="75.237"/>
|
||||
<path style="fill:#FFFFFF;" d="M499.868,560h-49.995v-85.137h49.995V560z M459.781,550.091h30.179V484.77h-30.179V550.091z"/>
|
||||
</g>
|
||||
<g>
|
||||
|
||||
<rect x="606.017" y="429.505" transform="matrix(0.707 0.7072 -0.7072 0.707 506.5034 -323.4691)" style="fill:#333333;" width="75.236" height="40.085"/>
|
||||
<path style="fill:#FFFFFF;" d="M656.06,497.32l-60.198-60.212l35.351-35.346l60.198,60.212L656.06,497.32z M609.872,437.107
|
||||
l46.187,46.202l21.34-21.335l-46.188-46.202L609.872,437.107z"/>
|
||||
</g>
|
||||
<g>
|
||||
<rect x="676.839" y="262.117" style="fill:#333333;" width="75.237" height="40.086"/>
|
||||
<path style="fill:#FFFFFF;" d="M757.032,307.16h-85.147v-49.995h85.147V307.16z M681.792,297.252h65.332v-30.179h-65.332V297.252z
|
||||
"/>
|
||||
</g>
|
||||
<g>
|
||||
|
||||
<rect x="626.205" y="75.756" transform="matrix(-0.7072 -0.707 0.707 -0.7072 1023.1211 650.4535)" style="fill:#333333;" width="40.085" height="75.236"/>
|
||||
<path style="fill:#FFFFFF;" d="M633.825,161.161l-35.351-35.346l60.198-60.212l35.351,35.346L633.825,161.161z M612.485,125.815
|
||||
l21.34,21.335l46.188-46.202l-21.34-21.335L612.485,125.815z"/>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" style="enable-background:new 0 0 960 560;" xml:space="preserve" width="960" height="560"><rect id="backgroundrect" width="100%" height="100%" x="0" y="0" fill="none" stroke="none"/>
|
||||
|
||||
<g class="currentLayer" style=""><title>Layer 1</title>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<g class="selected"><path style="" d="M478.879,127.676c-83.872,0-152.325,68.454-152.325,152.325s68.454,152.325,152.325,152.325 s152.325-67.837,152.325-152.325C631.204,196.13,563.366,127.676,478.879,127.676z" id="svg_3" class="" fill="#242424" fill-opacity="1"/><path style="fill:#FFFFFF;" d="M478.881,437.281C392.156,437.281,321.6,366.725,321.6,280s70.557-157.281,157.281-157.281 S636.157,193.275,636.157,280S565.606,437.281,478.881,437.281z M478.881,132.627c-81.263,0-147.373,66.115-147.373,147.373 s66.11,147.373,147.373,147.373c81.258,0,147.368-66.115,147.368-147.373S560.138,132.627,478.881,132.627z" id="svg_4" class=""/><rect x="459.1449890136719" y="4.952000141143799" style="" width="40.08599853515625" height="75.23699951171875" id="svg_6" class="" fill="#242424" fill-opacity="1"/><path style="fill:#FFFFFF;" d="M504.183,85.147h-49.99V0h49.99V85.147z M464.1,75.239h30.174V9.908H464.1V75.239z" id="svg_7" class=""/><rect x="272.7659912109375" y="90.69599914550781" transform="matrix(-0.707,-0.7072,0.7072,-0.707,451.5123,408.5368) " style="" width="75.23600006103516" height="40.084999084472656" id="svg_9" class="" fill="#242424" fill-opacity="1"/><path style="fill:#FFFFFF;" d="M322.809,158.519l-60.198-60.212l35.351-35.346l60.198,60.212L322.809,158.519z M276.621,98.307 l46.188,46.202l21.34-21.335l-46.188-46.202L276.621,98.307z" id="svg_10" class=""/><rect x="201.97999572753906" y="257.79998779296875" style="" width="75.23699951171875" height="40.08599853515625" id="svg_12" class="" fill="#242424" fill-opacity="1"/><path style="fill:#FFFFFF;" d="M282.17,302.845h-85.142V252.85h85.142V302.845z M206.936,292.937h65.327v-30.179h-65.327V292.937z " id="svg_13" class=""/><g id="svg_14" class="">
|
||||
|
||||
<rect x="287.4599914550781" y="408.9700012207031" transform="matrix(0.7072,0.707,-0.707,0.7072,405.7749,-86.6482) " style="fill:#333333;" width="40.084999084472656" height="75.23600006103516" id="svg_15"/>
|
||||
<path style="fill:#FFFFFF;" d="M295.083,494.359l-35.355-35.346l60.198-60.212l35.355,35.346L295.083,494.359z M273.738,459.013 l21.345,21.335l46.187-46.202l-21.345-21.335L273.738,459.013z" id="svg_16"/>
|
||||
</g><rect x="676.8389892578125" y="262.11700439453125" style="" width="75.23699951171875" height="40.08599853515625" id="svg_24" class="" fill="#242424" fill-opacity="1"/><path style="fill:#FFFFFF;" d="M757.032,307.16h-85.147v-49.995h85.147V307.16z M681.792,297.252h65.332v-30.179h-65.332V297.252z " id="svg_25" class=""/><rect x="626.2050170898438" y="75.75599670410156" transform="matrix(-0.7072,-0.707,0.707,-0.7072,1023.1211,650.4535) " style="" width="40.084999084472656" height="75.23600006103516" id="svg_27" class="" fill="#242424" fill-opacity="1"/><path style="fill:#FFFFFF;" d="M633.825,161.161l-35.351-35.346l60.198-60.212l35.351,35.346L633.825,161.161z M612.485,125.815 l21.34,21.335l46.188-46.202l-21.34-21.335L612.485,125.815z" id="svg_28" class=""/><rect x="287.4599914550781" y="408.9700012207031" transform="matrix(0.7072,0.707,-0.707,0.7072,405.7749,-86.6482) " style="" width="40.084999084472656" height="75.23600006103516" id="svg_31" class="" fill="#242424" fill-opacity="1"/><path style="fill:#FFFFFF;" d="M295.083,494.359l-35.355-35.346l60.198-60.212l35.355,35.346L295.083,494.359z M273.738,459.013 l21.345,21.335l46.187-46.202l-21.345-21.335L273.738,459.013z" id="svg_33" class=""/><rect x="454.8269958496094" y="479.81201171875" style="" width="40.08599853515625" height="75.23699951171875" id="svg_18" class="" fill="#242424" fill-opacity="1"/><path style="fill:#FFFFFF;" d="M499.868,560h-49.995v-85.137h49.995V560z M459.781,550.091h30.179V484.77h-30.179V550.091z" id="svg_19" class=""/><rect x="606.0170288085938" y="429.5050048828125" transform="matrix(0.707,0.7072,-0.7072,0.707,506.5034,-323.4691) " style="" width="75.23600006103516" height="40.084999084472656" id="svg_21" class="" fill="#242424" fill-opacity="1"/><path style="fill:#FFFFFF;" d="M656.06,497.32l-60.198-60.212l35.351-35.346l60.198,60.212L656.06,497.32z M609.872,437.107 l46.187,46.202l21.34-21.335l-46.188-46.202L609.872,437.107z" id="svg_22" class=""/></g></g></svg>
|
||||
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 4.5 KiB |
|
|
@ -1,37 +1,26 @@
|
|||
<?xml version="1.0" encoding="iso-8859-1"?>
|
||||
<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg version="1.1" id="Layer_2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="3.44 0 735.338 557.9" style="enable-background:new 3.44 0 735.338 557.9;" xml:space="preserve">
|
||||
<g>
|
||||
<g>
|
||||
<rect x="503.95" y="260.767" style="fill:#333333;" width="227.728" height="36.376"/>
|
||||
<path style="fill:#FFFFFF;" d="M738.778,304.24H496.854v-50.566h241.924V304.24z M511.052,290.042H724.58v-22.17H511.052V290.042z
|
||||
"/>
|
||||
</g>
|
||||
<g>
|
||||
<g>
|
||||
<g>
|
||||
|
||||
<rect x="426.085" y="465.518" transform="matrix(-0.9213 -0.3888 0.3888 -0.9213 849.3369 1139.2869)" style="fill:#333333;" width="227.719" height="36.374"/>
|
||||
<path style="fill:#FFFFFF;" d="M641.55,554.032l-222.88-94.06l19.668-46.6l222.88,94.06L641.55,554.032z M437.277,452.401
|
||||
l196.717,83.024l8.617-20.423l-196.717-83.024L437.277,452.401z"/>
|
||||
</g>
|
||||
<g>
|
||||
|
||||
<rect x="426.295" y="56.081" transform="matrix(0.9213 -0.3888 0.3888 0.9213 13.624 215.8596)" style="fill:#333333;" width="227.719" height="36.374"/>
|
||||
<path style="fill:#FFFFFF;" d="M438.545,144.598l-19.668-46.6l222.887-94.06l19.667,46.6L438.545,144.598z M437.484,105.568
|
||||
l8.617,20.423l196.724-83.024l-8.617-20.423L437.484,105.568z"/>
|
||||
</g>
|
||||
</g>
|
||||
<g>
|
||||
<path style="fill:#333333;" d="M430.774,280.311c0-50.839-32.955-93.895-78.642-109.198V13.262L124.404,165.081H10.54v227.728
|
||||
h113.864l227.728,151.819V389.51C397.818,374.206,430.774,331.151,430.774,280.311z"/>
|
||||
<path style="fill:#FFFFFF;" d="M359.23,557.9L122.257,399.908H3.44V157.978h118.816L359.23,0v166.117
|
||||
c47.245,18.038,78.642,63.308,78.642,114.192s-31.397,96.154-78.642,114.192V557.9z M17.638,385.711h108.917l218.478,145.652
|
||||
V384.407l4.846-1.622c44.139-14.794,73.796-55.973,73.796-102.476s-29.657-87.682-73.796-102.476l-4.846-1.622V26.538
|
||||
L126.555,172.176H17.638V385.711z"/>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" style="enable-background:new 3.44 0 735.338 557.9;" xml:space="preserve" width="735.338" height="557.9"><rect id="backgroundrect" width="100%" height="100%" x="0" y="0" fill="none" stroke="none"/>
|
||||
|
||||
<g class="currentLayer" style=""><title>Layer 1</title>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<g class="selected"><rect x="503.95001220703125" y="260.7669982910156" style="" width="227.72799682617188" height="36.375999450683594" id="svg_3" class="" fill="#242424" fill-opacity="1"/><path style="fill:#FFFFFF;" d="M738.778,304.24H496.854v-50.566h241.924V304.24z M511.052,290.042H724.58v-22.17H511.052V290.042z " id="svg_4" class=""/><rect x="426.0849914550781" y="465.51800537109375" transform="matrix(-0.9213,-0.3888,0.3888,-0.9213,849.3369,1139.2869) " style="" width="227.718994140625" height="36.374000549316406" id="svg_8" class="" fill="#242424" fill-opacity="1"/><path style="fill:#FFFFFF;" d="M641.55,554.032l-222.88-94.06l19.668-46.6l222.88,94.06L641.55,554.032z M437.277,452.401 l196.717,83.024l8.617-20.423l-196.717-83.024L437.277,452.401z" id="svg_9" class=""/><rect x="426.2950134277344" y="56.08100128173828" transform="matrix(0.9213,-0.3888,0.3888,0.9213,13.624,215.8596) " style="" width="227.718994140625" height="36.374000549316406" id="svg_11" class="" fill="#242424" fill-opacity="1"/><path style="fill:#FFFFFF;" d="M438.545,144.598l-19.668-46.6l222.887-94.06l19.667,46.6L438.545,144.598z M437.484,105.568 l8.617,20.423l196.724-83.024l-8.617-20.423L437.484,105.568z" id="svg_12" class=""/><path style="" d="M430.774,280.311c0-50.839-32.955-93.895-78.642-109.198V13.262L124.404,165.081H10.54v227.728 h113.864l227.728,151.819V389.51C397.818,374.206,430.774,331.151,430.774,280.311z" id="svg_14" class="" fill="#242424" fill-opacity="1"/><path style="fill:#FFFFFF;" d="M359.23,557.9L122.257,399.908H3.44V157.978h118.816L359.23,0v166.117 c47.245,18.038,78.642,63.308,78.642,114.192s-31.397,96.154-78.642,114.192V557.9z M17.638,385.711h108.917l218.478,145.652 V384.407l4.846-1.622c44.139-14.794,73.796-55.973,73.796-102.476s-29.657-87.682-73.796-102.476l-4.846-1.622V26.538 L126.555,172.176H17.638V385.711z" id="svg_15" class=""/></g></g></svg>
|
||||
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.3 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 24 KiB |
|
|
@ -87,21 +87,24 @@ var PARTICLE_SYSTEM_URL = Script.resolvePath("assets/images/icon-particles.svg")
|
|||
var POINT_LIGHT_URL = Script.resolvePath("assets/images/icon-point-light.svg");
|
||||
var SPOT_LIGHT_URL = Script.resolvePath("assets/images/icon-spot-light.svg");
|
||||
var ZONE_URL = Script.resolvePath("assets/images/icon-zone.svg");
|
||||
var MATERIAL_URL = Script.resolvePath("assets/images/icon-material.svg");
|
||||
|
||||
var entityIconOverlayManager = new EntityIconOverlayManager(['Light', 'ParticleEffect', 'Zone'], function(entityID) {
|
||||
var properties = Entities.getEntityProperties(entityID, ['type', 'isSpotlight']);
|
||||
if (properties.type === 'Light') {
|
||||
return {
|
||||
url: properties.isSpotlight ? SPOT_LIGHT_URL : POINT_LIGHT_URL,
|
||||
};
|
||||
} else if (properties.type === 'Zone') {
|
||||
return {
|
||||
url: ZONE_URL,
|
||||
var entityIconOverlayManager = new EntityIconOverlayManager(["Light", "ParticleEffect", "Zone", "Material"], function(entityID) {
|
||||
var properties = Entities.getEntityProperties(entityID, ["type", "isSpotlight", "parentID", "name"]);
|
||||
if (properties.type === "Light") {
|
||||
return {
|
||||
imageURL: properties.isSpotlight ? SPOT_LIGHT_URL : POINT_LIGHT_URL
|
||||
};
|
||||
} else if (properties.type === "Zone") {
|
||||
return { imageURL: ZONE_URL };
|
||||
} else if (properties.type === "Material") {
|
||||
if (properties.parentID !== Uuid.NULL && properties.name !== "MATERIAL_" + entityShapeVisualizerSessionName) {
|
||||
return { imageURL: MATERIAL_URL };
|
||||
} else {
|
||||
return { imageURL: "" };
|
||||
}
|
||||
} else {
|
||||
return {
|
||||
url: PARTICLE_SYSTEM_URL,
|
||||
};
|
||||
return { imageURL: PARTICLE_SYSTEM_URL };
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -154,8 +157,7 @@ var MENU_CREATE_SEPARATOR = "Create Application";
|
|||
var SUBMENU_ENTITY_EDITOR_PREFERENCES = "Edit > Preferences";
|
||||
var MENU_AUTO_FOCUS_ON_SELECT = "Auto Focus on Select";
|
||||
var MENU_EASE_ON_FOCUS = "Ease Orientation on Focus";
|
||||
var MENU_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE = "Show Lights and Particle Systems in Create Mode";
|
||||
var MENU_SHOW_ZONES_IN_EDIT_MODE = "Show Zones in Create Mode";
|
||||
var MENU_SHOW_ICONS_IN_CREATE_MODE = "Show Icons in Create Mode";
|
||||
var MENU_CREATE_ENTITIES_GRABBABLE = "Create Entities As Grabbable (except Zones, Particles, and Lights)";
|
||||
var MENU_ALLOW_SELECTION_LARGE = "Allow Selecting of Large Models";
|
||||
var MENU_ALLOW_SELECTION_SMALL = "Allow Selecting of Small Models";
|
||||
|
|
@ -1041,8 +1043,7 @@ var toolBar = (function () {
|
|||
// everybody else to think that Interface has lost focus overall. fogbugzid:558
|
||||
// Window.setFocus();
|
||||
}
|
||||
entityIconOverlayManager.setVisible(isActive && Menu.isOptionChecked(MENU_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE));
|
||||
Entities.setDrawZoneBoundaries(isActive && Menu.isOptionChecked(MENU_SHOW_ZONES_IN_EDIT_MODE));
|
||||
entityIconOverlayManager.setVisible(isActive && Menu.isOptionChecked(MENU_SHOW_ICONS_IN_CREATE_MODE));
|
||||
};
|
||||
|
||||
initialize();
|
||||
|
|
@ -1465,22 +1466,15 @@ function setupModelMenus() {
|
|||
});
|
||||
Menu.addMenuItem({
|
||||
menuName: SUBMENU_ENTITY_EDITOR_PREFERENCES,
|
||||
menuItemName: MENU_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE,
|
||||
menuItemName: MENU_SHOW_ICONS_IN_CREATE_MODE,
|
||||
afterItem: MENU_EASE_ON_FOCUS,
|
||||
isCheckable: true,
|
||||
isChecked: Settings.getValue(SETTING_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE) !== "false"
|
||||
});
|
||||
Menu.addMenuItem({
|
||||
menuName: SUBMENU_ENTITY_EDITOR_PREFERENCES,
|
||||
menuItemName: MENU_SHOW_ZONES_IN_EDIT_MODE,
|
||||
afterItem: MENU_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE,
|
||||
isCheckable: true,
|
||||
isChecked: Settings.getValue(SETTING_SHOW_ZONES_IN_EDIT_MODE) !== "false"
|
||||
});
|
||||
Menu.addMenuItem({
|
||||
menuName: SUBMENU_ENTITY_EDITOR_PREFERENCES,
|
||||
menuItemName: MENU_ENTITY_LIST_DEFAULT_RADIUS,
|
||||
afterItem: MENU_SHOW_ZONES_IN_EDIT_MODE
|
||||
afterItem: MENU_SHOW_ICONS_IN_CREATE_MODE
|
||||
});
|
||||
|
||||
Entities.setLightsArePickable(false);
|
||||
|
|
@ -1497,8 +1491,7 @@ function cleanupModelMenus() {
|
|||
Menu.removeMenuItem(SUBMENU_ENTITY_EDITOR_PREFERENCES, MENU_ALLOW_SELECTION_LIGHTS);
|
||||
Menu.removeMenuItem(SUBMENU_ENTITY_EDITOR_PREFERENCES, MENU_AUTO_FOCUS_ON_SELECT);
|
||||
Menu.removeMenuItem(SUBMENU_ENTITY_EDITOR_PREFERENCES, MENU_EASE_ON_FOCUS);
|
||||
Menu.removeMenuItem(SUBMENU_ENTITY_EDITOR_PREFERENCES, MENU_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE);
|
||||
Menu.removeMenuItem(SUBMENU_ENTITY_EDITOR_PREFERENCES, MENU_SHOW_ZONES_IN_EDIT_MODE);
|
||||
Menu.removeMenuItem(SUBMENU_ENTITY_EDITOR_PREFERENCES, MENU_SHOW_ICONS_IN_CREATE_MODE);
|
||||
Menu.removeMenuItem(SUBMENU_ENTITY_EDITOR_PREFERENCES, MENU_CREATE_ENTITIES_GRABBABLE);
|
||||
Menu.removeMenuItem(SUBMENU_ENTITY_EDITOR_PREFERENCES, MENU_ENTITY_LIST_DEFAULT_RADIUS);
|
||||
Menu.removeMenu(SUBMENU_ENTITY_EDITOR_PREFERENCES);
|
||||
|
|
@ -1511,8 +1504,7 @@ Script.scriptEnding.connect(function () {
|
|||
toolBar.setActive(false);
|
||||
Settings.setValue(SETTING_AUTO_FOCUS_ON_SELECT, Menu.isOptionChecked(MENU_AUTO_FOCUS_ON_SELECT));
|
||||
Settings.setValue(SETTING_EASE_ON_FOCUS, Menu.isOptionChecked(MENU_EASE_ON_FOCUS));
|
||||
Settings.setValue(SETTING_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE, Menu.isOptionChecked(MENU_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE));
|
||||
Settings.setValue(SETTING_SHOW_ZONES_IN_EDIT_MODE, Menu.isOptionChecked(MENU_SHOW_ZONES_IN_EDIT_MODE));
|
||||
Settings.setValue(SETTING_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE, Menu.isOptionChecked(MENU_SHOW_ICONS_IN_CREATE_MODE));
|
||||
|
||||
Settings.setValue(SETTING_EDIT_PREFIX + MENU_ALLOW_SELECTION_LARGE, Menu.isOptionChecked(MENU_ALLOW_SELECTION_LARGE));
|
||||
Settings.setValue(SETTING_EDIT_PREFIX + MENU_ALLOW_SELECTION_SMALL, Menu.isOptionChecked(MENU_ALLOW_SELECTION_SMALL));
|
||||
|
|
@ -1869,10 +1861,8 @@ function handleMenuEvent(menuItem) {
|
|||
undoHistory.undo();
|
||||
} else if (menuItem === "Redo") {
|
||||
undoHistory.redo();
|
||||
} else if (menuItem === MENU_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE) {
|
||||
entityIconOverlayManager.setVisible(isActive && Menu.isOptionChecked(MENU_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE));
|
||||
} else if (menuItem === MENU_SHOW_ZONES_IN_EDIT_MODE) {
|
||||
Entities.setDrawZoneBoundaries(isActive && Menu.isOptionChecked(MENU_SHOW_ZONES_IN_EDIT_MODE));
|
||||
} else if (menuItem === MENU_SHOW_ICONS_IN_CREATE_MODE) {
|
||||
entityIconOverlayManager.setVisible(isActive && Menu.isOptionChecked(MENU_SHOW_ICONS_IN_CREATE_MODE));
|
||||
} else if (menuItem === MENU_CREATE_ENTITIES_GRABBABLE) {
|
||||
Settings.setValue(SETTING_EDIT_PREFIX + menuItem, Menu.isOptionChecked(menuItem));
|
||||
} else if (menuItem === MENU_ENTITY_LIST_DEFAULT_RADIUS) {
|
||||
|
|
|
|||
|
|
@ -143,6 +143,7 @@ EntityShape.prototype = {
|
|||
var PROJECTED_MATERIALS = false;
|
||||
this.materialEntity = Entities.addEntity({
|
||||
type: "Material",
|
||||
name: "MATERIAL_" + this.entityShapeVisualizerSessionName,
|
||||
localPosition: Vec3.ZERO,
|
||||
localRotation: Quat.IDENTITY,
|
||||
localDimensions: properties.localDimensions,
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
|
|||
overlayProperties[key] = customProperties[key];
|
||||
}
|
||||
}
|
||||
Overlays.editOverlay(entityOverlays[entityID], overlayProperties);
|
||||
Entities.editEntity(entityOverlays[entityID], overlayProperties);
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -63,7 +63,7 @@ EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
|
|||
if (visible !== isVisible) {
|
||||
visible = isVisible;
|
||||
for (var id in entityOverlays) {
|
||||
Overlays.editOverlay(entityOverlays[id], {
|
||||
Entities.editEntity(entityOverlays[id], {
|
||||
visible: visible,
|
||||
ignorePickIntersection: !visible
|
||||
});
|
||||
|
|
@ -75,7 +75,11 @@ EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
|
|||
function getOverlay() {
|
||||
var overlay;
|
||||
if (unusedOverlays.length === 0) {
|
||||
overlay = Overlays.addOverlay("image3d", {});
|
||||
overlay = Entities.addEntity({
|
||||
type: "Image",
|
||||
billboardMode: "full",
|
||||
emissive: true
|
||||
}, "local");
|
||||
allOverlays.push(overlay);
|
||||
} else {
|
||||
overlay = unusedOverlays.pop();
|
||||
|
|
@ -85,7 +89,7 @@ EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
|
|||
|
||||
function releaseOverlay(overlay) {
|
||||
unusedOverlays.push(overlay);
|
||||
Overlays.editOverlay(overlay, {
|
||||
Entities.editEntity(overlay, {
|
||||
visible: false,
|
||||
ignorePickIntersection: true
|
||||
});
|
||||
|
|
@ -103,9 +107,8 @@ EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
|
|||
visible: visible,
|
||||
ignorePickIntersection: !visible,
|
||||
alpha: 0.9,
|
||||
scale: 0.5,
|
||||
drawInFront: true,
|
||||
isFacingAvatar: true,
|
||||
dimensions: { x: 0.5, y: 0.5, z: 0.01 },
|
||||
renderLayer: "front",
|
||||
color: {
|
||||
red: 255,
|
||||
green: 255,
|
||||
|
|
@ -118,7 +121,7 @@ EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
|
|||
overlayProperties[key] = customProperties[key];
|
||||
}
|
||||
}
|
||||
Overlays.editOverlay(overlay, overlayProperties);
|
||||
Entities.editEntity(overlay, overlayProperties);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -149,7 +152,7 @@ EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
|
|||
|
||||
Script.scriptEnding.connect(function() {
|
||||
for (var i = 0; i < allOverlays.length; i++) {
|
||||
Overlays.deleteOverlay(allOverlays[i]);
|
||||
Entities.deleteEntity(allOverlays[i]);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue