From 5413f80ee2f35aff7def97761765d738d7850b14 Mon Sep 17 00:00:00 2001 From: Ignacio Gomez Date: Thu, 26 Jun 2025 19:49:14 -0600 Subject: [PATCH] Added styles and fix button for API --- Assets/API/Styles/FurnitureItem.uxml | 7 ---- Assets/Outline.mat | 18 +++++----- Assets/Scenes/ARScreen.unity | 14 ++++---- Assets/Scenes/FurnitureListScene.unity | 6 ++-- Assets/UI Toolkit/FurnitureItem.uxml | 8 +++++ .../FurnitureItem.uxml.meta | 0 .../Styles => UI Toolkit}/MainScreen.uxml | 7 ++-- .../MainScreen.uxml.meta | 0 Assets/UI Toolkit/PanelSettings.asset | 4 +-- Assets/{API => UI Toolkit}/Styles.meta | 2 +- Assets/UI Toolkit/Styles/FurnitureItem.uss | 33 +++++++++++++++++++ .../UI Toolkit/Styles/FurnitureItem.uss.meta | 11 +++++++ Assets/UI Toolkit/Styles/MainScreen.uss | 13 ++++++++ Assets/UI Toolkit/Styles/MainScreen.uss.meta | 11 +++++++ 14 files changed, 101 insertions(+), 33 deletions(-) delete mode 100644 Assets/API/Styles/FurnitureItem.uxml create mode 100644 Assets/UI Toolkit/FurnitureItem.uxml rename Assets/{API/Styles => UI Toolkit}/FurnitureItem.uxml.meta (100%) rename Assets/{API/Styles => UI Toolkit}/MainScreen.uxml (52%) rename Assets/{API/Styles => UI Toolkit}/MainScreen.uxml.meta (100%) rename Assets/{API => UI Toolkit}/Styles.meta (77%) create mode 100644 Assets/UI Toolkit/Styles/FurnitureItem.uss create mode 100644 Assets/UI Toolkit/Styles/FurnitureItem.uss.meta create mode 100644 Assets/UI Toolkit/Styles/MainScreen.uss create mode 100644 Assets/UI Toolkit/Styles/MainScreen.uss.meta diff --git a/Assets/API/Styles/FurnitureItem.uxml b/Assets/API/Styles/FurnitureItem.uxml deleted file mode 100644 index 8898f58..0000000 --- a/Assets/API/Styles/FurnitureItem.uxml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/Assets/Outline.mat b/Assets/Outline.mat index 9ba3124..6028042 100644 --- a/Assets/Outline.mat +++ b/Assets/Outline.mat @@ -11,15 +11,13 @@ Material: m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _ALPHAPREMULTIPLY_ON + m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: - RenderType: Transparent + m_CustomRenderQueue: -1 + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: @@ -66,20 +64,20 @@ Material: - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - - _DstBlend: 10 + - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0 + - _Glossiness: 0.5 - _GlossyReflections: 1 - _Metallic: 0 - - _Mode: 3 + - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 - - _ZWrite: 0 + - _ZWrite: 1 m_Colors: - - _Color: {r: 0, g: 0.6, b: 1, a: 0.2627451} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Scenes/ARScreen.unity b/Assets/Scenes/ARScreen.unity index 47cd8f8..f2287f3 100644 --- a/Assets/Scenes/ARScreen.unity +++ b/Assets/Scenes/ARScreen.unity @@ -540,7 +540,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 245160786} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -550,7 +550,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 150, y: -724} + m_AnchoredPosition: {x: 396, y: -155} m_SizeDelta: {x: 200, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &245160788 @@ -623,9 +623,9 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: b39ac48ceb755004e80883797405640d, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 + m_Maskable: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -868,7 +868,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1498425121} m_HandleRect: {fileID: 1498425120} m_Direction: 0 - m_Value: 0.00957893 + m_Value: 0.23729025 m_Size: 0.31336498 m_NumberOfSteps: 0 m_OnValueChanged: @@ -1494,7 +1494,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 1177.0267, y: -184} + m_AnchoredPosition: {x: 630.512, y: -184} m_SizeDelta: {x: 2400.033, y: 265} m_Pivot: {x: 0.5, y: 0} --- !u!1 &782628375 @@ -2747,7 +2747,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1610579915} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -2} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Scenes/FurnitureListScene.unity b/Assets/Scenes/FurnitureListScene.unity index fa33f20..9fab0fd 100644 --- a/Assets/Scenes/FurnitureListScene.unity +++ b/Assets/Scenes/FurnitureListScene.unity @@ -380,10 +380,10 @@ Camera: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1716745794} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 2 - m_ClearFlags: 2 - m_BackGroundColor: {r: 1, g: 0.94654083, b: 0.94654083, a: 0} + m_ClearFlags: 1 + m_BackGroundColor: {r: 1, g: 1, b: 1, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 diff --git a/Assets/UI Toolkit/FurnitureItem.uxml b/Assets/UI Toolkit/FurnitureItem.uxml new file mode 100644 index 0000000..57ee480 --- /dev/null +++ b/Assets/UI Toolkit/FurnitureItem.uxml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/Assets/API/Styles/FurnitureItem.uxml.meta b/Assets/UI Toolkit/FurnitureItem.uxml.meta similarity index 100% rename from Assets/API/Styles/FurnitureItem.uxml.meta rename to Assets/UI Toolkit/FurnitureItem.uxml.meta diff --git a/Assets/API/Styles/MainScreen.uxml b/Assets/UI Toolkit/MainScreen.uxml similarity index 52% rename from Assets/API/Styles/MainScreen.uxml rename to Assets/UI Toolkit/MainScreen.uxml index cc0d051..b86715b 100644 --- a/Assets/API/Styles/MainScreen.uxml +++ b/Assets/UI Toolkit/MainScreen.uxml @@ -1,6 +1,7 @@ - - - + + + + diff --git a/Assets/API/Styles/MainScreen.uxml.meta b/Assets/UI Toolkit/MainScreen.uxml.meta similarity index 100% rename from Assets/API/Styles/MainScreen.uxml.meta rename to Assets/UI Toolkit/MainScreen.uxml.meta diff --git a/Assets/UI Toolkit/PanelSettings.asset b/Assets/UI Toolkit/PanelSettings.asset index 7d244d1..cea065d 100644 --- a/Assets/UI Toolkit/PanelSettings.asset +++ b/Assets/UI Toolkit/PanelSettings.asset @@ -26,12 +26,12 @@ MonoBehaviour: m_TargetDisplay: 0 m_ClearDepthStencil: 1 m_ClearColor: 0 - m_ColorClearValue: {r: 0, g: 0, b: 0, a: 0} + m_ColorClearValue: {r: 1, g: 1, b: 1, a: 0} m_DynamicAtlasSettings: m_MinAtlasSize: 64 m_MaxAtlasSize: 4096 m_MaxSubTextureSize: 64 - m_ActiveFilters: 31 + m_ActiveFilters: -1 m_AtlasBlitShader: {fileID: 9101, guid: 0000000000000000f000000000000000, type: 0} m_RuntimeShader: {fileID: 9100, guid: 0000000000000000f000000000000000, type: 0} m_RuntimeWorldShader: {fileID: 9102, guid: 0000000000000000f000000000000000, type: 0} diff --git a/Assets/API/Styles.meta b/Assets/UI Toolkit/Styles.meta similarity index 77% rename from Assets/API/Styles.meta rename to Assets/UI Toolkit/Styles.meta index 763a8ca..2f4672d 100644 --- a/Assets/API/Styles.meta +++ b/Assets/UI Toolkit/Styles.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 10d82c400c9a6bd48bd2e50509bf8e8f +guid: da2874f5108006a4bba0f3f672b0fae4 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/UI Toolkit/Styles/FurnitureItem.uss b/Assets/UI Toolkit/Styles/FurnitureItem.uss new file mode 100644 index 0000000..97a7095 --- /dev/null +++ b/Assets/UI Toolkit/Styles/FurnitureItem.uss @@ -0,0 +1,33 @@ +.furniture-item { + padding: 10px; + margin-bottom: 8px; + background-color: #2c2c2c; + border-radius: 8px; + border-width: 1px; + border-color: #555; + flex-direction: column; + color: white; + + flex-grow: 0; + flex-shrink: 0; + height: auto; +} + +.furniture-title { + font-size: 14px; + -unity-font-style: bold; + color: white; + + white-space: normal; + word-wrap: break-word; + overflow: hidden; +} + +.furniture-subtitle { + font-size: 13px; + color: #cccccc; +} + +#FurnitureItemDocumentUI-container{ +display:none; +} diff --git a/Assets/UI Toolkit/Styles/FurnitureItem.uss.meta b/Assets/UI Toolkit/Styles/FurnitureItem.uss.meta new file mode 100644 index 0000000..4bd015c --- /dev/null +++ b/Assets/UI Toolkit/Styles/FurnitureItem.uss.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 99e4a78981d0caa41bdd60d9258bba6d +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0} + disableValidation: 0 diff --git a/Assets/UI Toolkit/Styles/MainScreen.uss b/Assets/UI Toolkit/Styles/MainScreen.uss new file mode 100644 index 0000000..8c18339 --- /dev/null +++ b/Assets/UI Toolkit/Styles/MainScreen.uss @@ -0,0 +1,13 @@ +.main-screen { + flex-grow: 1; + padding: 10px; + background-color: rgb(255, 255, 255); +} + +.title-label { + background-color: transparent; + color: black; + font-size: 24px; + font-weight: bold; + margin-bottom: 10px; +} \ No newline at end of file diff --git a/Assets/UI Toolkit/Styles/MainScreen.uss.meta b/Assets/UI Toolkit/Styles/MainScreen.uss.meta new file mode 100644 index 0000000..7fc5b87 --- /dev/null +++ b/Assets/UI Toolkit/Styles/MainScreen.uss.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1993886af6eb1494f9f4a4f3c968807a +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0} + disableValidation: 0