birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hasareej fix whitebox and physx cluster icons (#1398)

Browse Source 
Fixing the issue with the icons not appearing & deleting duplicate icons.
This commit is contained in:
Hasareej
2021-06-18 11:45:48 +01:00
committed by GitHub
parent aed989d038
commit 4ad97342c2
13 changed files with 6 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Editor/Icons/PhysX/Move.svg
-28
View File
@@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<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 20 20" style="enable-background:new 0 0 20 20;" xml:space="preserve">
<style type="text/css">
.st0{filter:url(#filter-1);}
.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
</style>
<filter id="filter-1">
<feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 1.000000 0 0 0 0 1.000000 0 0 0 0 1.000000 0 0 0 1.000000 0">
</feColorMatrix>
</filter>
<g id="Working-Design-Page-v2">
<g id="_x32_A---Normal-Mode---Pre-Edit-Mode" transform="translate(-343.000000, -156.000000)">
<g id="Tool-Bar-Copy-2" transform="translate(336.000000, 140.000000)">
<g id="Icons-_x2F_-Toolbar-_x2F_-Move" transform="translate(5.000000, 14.000000)" class="st0">
<g>
<g id="Group_1_" transform="translate(2.000000, 2.000000)">
<path id="Combined-Shape_1_" class="st1" d="M11,13.9v2l3.2,0L10,20l-4.1-4.1l3.2,0v-2H11z M15.9,5.9L20,10l-4.1,4.1l0-3.2h-2
V9h2L15.9,5.9z M4.1,5.9l0,3.2h2v2h-2l0,3.2L0,10L4.1,5.9z M10,0l4.1,4.1l-3.2,0v2H9v-2l-3.2,0L10,0z"/>
<rect id="Rectangle_1_" x="7" y="7" class="st1" width="6" height="6"/>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

Assets/Editor/Icons/PhysX/Rotate.svg
-21
View File
@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="20px" height="17px" viewBox="0 0 20 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Icons / Toolbar / Rotate</title>
<defs>
<filter id="filter-1">
<feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 1.000000 0 0 0 0 1.000000 0 0 0 0 1.000000 0 0 0 1.000000 0"></feColorMatrix>
</filter>
</defs>
<g id="Working-Design-Page" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="4A" transform="translate(-343.000000, -190.000000)">
<g id="Tool-Bar-Copy-2" transform="translate(336.000000, 140.000000)">
<g id="Icons-/-Toolbar-/-Rotate" transform="translate(5.000000, 45.000000)" filter="url(#filter-1)">
<g>
<rect id="Icon-Background" x="0" y="0" width="24" height="24"></rect>
<path d="M14,12.7573593 L14,21.2426407 L9.75735931,17 L14,12.7573593 Z M12,5 C17.5228475,5 22,7.3608081 22,12 C22,16.0635474 18.5649911,18.3790487 14.0010174,18.8911124 L14.0009061,16.4168268 C17.3303835,15.9561668 19.5351812,14.3225002 19.5351812,12 C19.5351812,9.23857625 16.418278,8.0041333 12,8.0041333 C7.581722,8.0041333 4.51608017,9.23857625 4.51608017,12 C4.51608017,13.8140495 5.1333787,15.673982 7.29370866,16.4168268 C7.95862159,16.7906273 8.29107806,17.0452093 8.29107806,17.180573 C8.29107806,17.3159366 7.86071871,17.2557456 7,17 C4.90930531,16.4680156 4.01338412,15.8858396 3.24544096,14.8949777 C2.71607427,14.2119464 2,13.4055574 2,12 C2,7.3608081 6.4771525,5 12,5 Z" id="Shape" fill="#FFFFFF"></path>
</g>
</g>
</g>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

Assets/Editor/Icons/PhysX/Scale.svg
-22
View File
@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Icons / Toolbar / Scale</title>
<defs>
<filter id="filter-1">
<feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 1.000000 0 0 0 0 1.000000 0 0 0 0 1.000000 0 0 0 1.000000 0"></feColorMatrix>
</filter>
</defs>
<g id="Working-Design-Page" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="4A" transform="translate(-344.000000, -219.000000)">
<g id="Tool-Bar-Copy-2" transform="translate(336.000000, 140.000000)">
<g id="Icons-/-Toolbar-/-Scale" transform="translate(5.000000, 76.000000)" filter="url(#filter-1)">
<g>
<rect id="Icon-Background" x="0" y="0" width="24" height="24"></rect>
<path d="M21,3 L20.999,4.399 L21,4.40005893 L20.999,4.401 L21,9 L18.7,6.701 L14.4000589,11 L13,9.59994107 L17.299,5.3 L15,3 L21,3 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
<path d="M3,21 L3,15 L5.356,17.356 L9.71109794,13 L11,14.2889021 L6.644,18.644 L9,21 L3,21 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
</g>
</g>
</g>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

Assets/Editor/Icons/WhiteBox/Move.svg
-28
View File
@@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<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 20 20" style="enable-background:new 0 0 20 20;" xml:space="preserve">
<style type="text/css">
.st0{filter:url(#filter-1);}
.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
</style>
<filter id="filter-1">
<feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 1.000000 0 0 0 0 1.000000 0 0 0 0 1.000000 0 0 0 1.000000 0">
</feColorMatrix>
</filter>
<g id="Working-Design-Page-v2">
<g id="_x32_A---Normal-Mode---Pre-Edit-Mode" transform="translate(-343.000000, -156.000000)">
<g id="Tool-Bar-Copy-2" transform="translate(336.000000, 140.000000)">
<g id="Icons-_x2F_-Toolbar-_x2F_-Move" transform="translate(5.000000, 14.000000)" class="st0">
<g>
<g id="Group_1_" transform="translate(2.000000, 2.000000)">
<path id="Combined-Shape_1_" class="st1" d="M11,13.9v2l3.2,0L10,20l-4.1-4.1l3.2,0v-2H11z M15.9,5.9L20,10l-4.1,4.1l0-3.2h-2
V9h2L15.9,5.9z M4.1,5.9l0,3.2h2v2h-2l0,3.2L0,10L4.1,5.9z M10,0l4.1,4.1l-3.2,0v2H9v-2l-3.2,0L10,0z"/>
<rect id="Rectangle_1_" x="7" y="7" class="st1" width="6" height="6"/>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

Assets/Editor/Icons/WhiteBox/Rotate.svg
-21
View File
@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="20px" height="17px" viewBox="0 0 20 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Icons / Toolbar / Rotate</title>
<defs>
<filter id="filter-1">
<feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 1.000000 0 0 0 0 1.000000 0 0 0 0 1.000000 0 0 0 1.000000 0"></feColorMatrix>
</filter>
</defs>
<g id="Working-Design-Page" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="4A" transform="translate(-343.000000, -190.000000)">
<g id="Tool-Bar-Copy-2" transform="translate(336.000000, 140.000000)">
<g id="Icons-/-Toolbar-/-Rotate" transform="translate(5.000000, 45.000000)" filter="url(#filter-1)">
<g>
<rect id="Icon-Background" x="0" y="0" width="24" height="24"></rect>
<path d="M14,12.7573593 L14,21.2426407 L9.75735931,17 L14,12.7573593 Z M12,5 C17.5228475,5 22,7.3608081 22,12 C22,16.0635474 18.5649911,18.3790487 14.0010174,18.8911124 L14.0009061,16.4168268 C17.3303835,15.9561668 19.5351812,14.3225002 19.5351812,12 C19.5351812,9.23857625 16.418278,8.0041333 12,8.0041333 C7.581722,8.0041333 4.51608017,9.23857625 4.51608017,12 C4.51608017,13.8140495 5.1333787,15.673982 7.29370866,16.4168268 C7.95862159,16.7906273 8.29107806,17.0452093 8.29107806,17.180573 C8.29107806,17.3159366 7.86071871,17.2557456 7,17 C4.90930531,16.4680156 4.01338412,15.8858396 3.24544096,14.8949777 C2.71607427,14.2119464 2,13.4055574 2,12 C2,7.3608081 6.4771525,5 12,5 Z" id="Shape" fill="#FFFFFF"></path>
</g>
</g>
</g>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

Assets/Editor/Icons/WhiteBox/Scale.svg
-22
View File
@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Icons / Toolbar / Scale</title>
<defs>
<filter id="filter-1">
<feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 1.000000 0 0 0 0 1.000000 0 0 0 0 1.000000 0 0 0 1.000000 0"></feColorMatrix>
</filter>
</defs>
<g id="Working-Design-Page" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="4A" transform="translate(-344.000000, -219.000000)">
<g id="Tool-Bar-Copy-2" transform="translate(336.000000, 140.000000)">
<g id="Icons-/-Toolbar-/-Scale" transform="translate(5.000000, 76.000000)" filter="url(#filter-1)">
<g>
<rect id="Icon-Background" x="0" y="0" width="24" height="24"></rect>
<path d="M21,3 L20.999,4.399 L21,4.40005893 L20.999,4.401 L21,9 L18.7,6.701 L14.4000589,11 L13,9.59994107 L17.299,5.3 L15,3 L21,3 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
<path d="M3,21 L3,15 L5.356,17.356 L9.71109794,13 L11,14.2889021 L6.644,18.644 L9,21 L3,21 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
</g>
</g>
</g>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

Assets/Editor/Icons/WhiteBox/RestoreMode.svg → Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toolbar/RestoreMode.svg
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toolbar/Translate.svg → Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toolbar/Rotate.svg
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Assets/Editor/Icons/WhiteBox/SketchMode.svg → Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toolbar/SketchMode.svg
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc
+3 -1
View File
@@ -370,6 +370,7 @@
<file>img/UI20/toolbar/Redo.svg</file>
<file>img/UI20/toolbar/remove_link.svg</file>
<file>img/UI20/toolbar/Reset_physics_state.svg</file>
<file>img/UI20/toolbar/RestoreMode.svg</file>
<file>img/UI20/toolbar/Save.svg</file>
<file>img/UI20/toolbar/Scale.svg</file>
<file>img/UI20/toolbar/Select.svg</file>
@@ -377,9 +378,10 @@
<file>img/UI20/toolbar/Select_terrain.svg</file>
<file>img/UI20/toolbar/Simulate_Physics.svg</file>
<file>img/UI20/toolbar/Simulate_Physics_on_selected_objects.svg</file>
<file>img/UI20/toolbar/SketchMode.svg</file>
<file>img/UI20/toolbar/Terrain.svg</file>
<file>img/UI20/toolbar/Terrain_Texture.svg</file>
<file>img/UI20/toolbar/Translate.svg</file>
<file>img/UI20/toolbar/Rotate.svg</file>
<file>img/UI20/toolbar/undo.svg</file>
<file>img/UI20/toolbar/Unlocked.svg</file>
<file>img/UI20/toolbar/Vertex_snapping.svg</file>
Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp
+1 -1
View File
@@ -2489,7 +2489,7 @@ namespace AzToolsFramework
// create and register the buttons (strings correspond to icons even if the values appear different)
m_translateButtonId = RegisterClusterButton(m_transformModeClusterId, "Move");
m_rotateButtonId = RegisterClusterButton(m_transformModeClusterId, "Translate");
m_rotateButtonId = RegisterClusterButton(m_transformModeClusterId, "Rotate");
m_scaleButtonId = RegisterClusterButton(m_transformModeClusterId, "Scale");
// set button tooltips
Gems/PhysX/Code/Editor/ColliderComponentMode.cpp
+1 -1
View File
@@ -223,7 +223,7 @@ namespace PhysX
AzToolsFramework::ViewportUi::ViewportUiRequestBus::EventResult(
buttonId, AzToolsFramework::ViewportUi::DefaultViewportId,
&AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::CreateClusterButton, clusterId,
AZStd::string::format("Icons/PhysX/%s.svg", iconName));
AZStd::string::format(":/stylesheet/img/UI20/toolbar/%s.svg", iconName));
return buttonId;
}
Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentMode.cpp
+1 -1
View File
@@ -465,7 +465,7 @@ namespace WhiteBox
AzToolsFramework::ViewportUi::ViewportUiRequestBus::EventResult(
buttonId, AzToolsFramework::ViewportUi::DefaultViewportId,
&AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::CreateClusterButton, clusterId,
AZStd::string::format("Icons/WhiteBox/%s.svg", iconName));
AZStd::string::format(":/stylesheet/img/UI20/toolbar/%s.svg", iconName));
return buttonId;
}