From 63cfbd1a6673e7186000850d71351294efb1b954 Mon Sep 17 00:00:00 2001 From: Ignacio Gomez Date: Thu, 5 Jun 2025 18:10:24 -0600 Subject: [PATCH 1/8] =?UTF-8?q?Adjusments=20in=20clippling=C2=A0planes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/MeasuringSystem.unity | 4 ++-- ProjectSettings/ProjectSettings.asset | 10 +--------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/Assets/Scenes/MeasuringSystem.unity b/Assets/Scenes/MeasuringSystem.unity index cdde39f..02d3dd4 100644 --- a/Assets/Scenes/MeasuringSystem.unity +++ b/Assets/Scenes/MeasuringSystem.unity @@ -1430,8 +1430,8 @@ Camera: width: 1 height: 1 near clip plane: 0.1 - far clip plane: 20 - field of view: 60 + far clip plane: 1000 + field of view: 26.991467 orthographic: 0 orthographic size: 5 m_Depth: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index ca5751b..45ff254 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -13,7 +13,7 @@ PlayerSettings: useOnDemandResources: 0 accelerometerFrequency: 60 companyName: ImaageQ - productName: ImaageQ + productName: Dreamviewer defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} @@ -149,14 +149,6 @@ PlayerSettings: - {fileID: 4800000, guid: b02d09082cbc14569ae46c12d9836abc, type: 3} - {fileID: 4800000, guid: f40a6c94c8e1b494d93d434ae522a14f, type: 3} - {fileID: 4800000, guid: 0f45334fa661448c886e4f99ba812a7e, type: 3} - - {fileID: 479186601668263405, guid: e04dc9557a6bcec40b5d8576988f74a3, type: 2} - - {fileID: 11400000, guid: 6bfaaf31cb485f64fb956f1d691a0e1d, type: 2} - - {fileID: -7180841881952691092, guid: 228964b93c232624fac8c242b79176e5, type: 2} - - {fileID: 4800000, guid: b1d4c517492046e1a4e4cc49b0b73b42, type: 3} - - {fileID: 4800000, guid: 2b7e3540272684e0b8e12fed2c4609de, type: 3} - - {fileID: 11400000, guid: 911becadf2ac07e4da62b8afa0b9ea7f, type: 2} - - {fileID: 4800000, guid: c9f956787b1d945e7b36e0516201fc76, type: 3} - - {fileID: 4800000, guid: 0945859e5a1034c2cb6dce53cb4fb899, type: 3} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 -- 2.49.1 From fe4268713927b1574f72ee66038b17f3577f6c93 Mon Sep 17 00:00:00 2001 From: Ignacio Gomez Date: Sun, 22 Jun 2025 04:41:52 -0600 Subject: [PATCH 2/8] Minor fixes --- Assets/Prefab/SandiaOriginal.prefab | 18 +++++++++++++----- Assets/Scenes/MeasuringSystem.unity | 2 +- ProjectSettings/ProjectSettings.asset | 8 ++++++++ 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/Assets/Prefab/SandiaOriginal.prefab b/Assets/Prefab/SandiaOriginal.prefab index 2108193..ff0ee2b 100644 --- a/Assets/Prefab/SandiaOriginal.prefab +++ b/Assets/Prefab/SandiaOriginal.prefab @@ -50,11 +50,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -7994797705509562334, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} propertyPath: m_Layer - value: 6 + value: 0 objectReference: {fileID: 0} - target: {fileID: -2483457360873903965, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} propertyPath: m_Layer - value: 6 + value: 0 objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} propertyPath: m_Name @@ -70,15 +70,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1048557623486924390, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} propertyPath: m_Layer - value: 6 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2286881742900085478, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} propertyPath: m_Layer - value: 6 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3945538079416287108, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} + propertyPath: m_CastShadows + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3945538079416287108, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} + propertyPath: m_ReceiveShadows + value: 1 objectReference: {fileID: 0} - target: {fileID: 8159868104006456718, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} propertyPath: m_Layer - value: 6 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: diff --git a/Assets/Scenes/MeasuringSystem.unity b/Assets/Scenes/MeasuringSystem.unity index 02d3dd4..3e6d38e 100644 --- a/Assets/Scenes/MeasuringSystem.unity +++ b/Assets/Scenes/MeasuringSystem.unity @@ -1431,7 +1431,7 @@ Camera: height: 1 near clip plane: 0.1 far clip plane: 1000 - field of view: 26.991467 + field of view: 60 orthographic: 0 orthographic size: 5 m_Depth: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 45ff254..31d83a2 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -149,6 +149,14 @@ PlayerSettings: - {fileID: 4800000, guid: b02d09082cbc14569ae46c12d9836abc, type: 3} - {fileID: 4800000, guid: f40a6c94c8e1b494d93d434ae522a14f, type: 3} - {fileID: 4800000, guid: 0f45334fa661448c886e4f99ba812a7e, type: 3} + - {fileID: 479186601668263405, guid: e04dc9557a6bcec40b5d8576988f74a3, type: 2} + - {fileID: 11400000, guid: 6bfaaf31cb485f64fb956f1d691a0e1d, type: 2} + - {fileID: -7180841881952691092, guid: 228964b93c232624fac8c242b79176e5, type: 2} + - {fileID: 4800000, guid: b1d4c517492046e1a4e4cc49b0b73b42, type: 3} + - {fileID: 4800000, guid: 2b7e3540272684e0b8e12fed2c4609de, type: 3} + - {fileID: 11400000, guid: 911becadf2ac07e4da62b8afa0b9ea7f, type: 2} + - {fileID: 4800000, guid: c9f956787b1d945e7b36e0516201fc76, type: 3} + - {fileID: 4800000, guid: 0945859e5a1034c2cb6dce53cb4fb899, type: 3} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 -- 2.49.1 From 23cc4ab8f047232ce7844e5e4dcee0e0497ceb3d Mon Sep 17 00:00:00 2001 From: Ignacio Gomez Date: Wed, 25 Jun 2025 20:06:08 -0600 Subject: [PATCH 3/8] First version of UI consumed from API --- Assets/API.meta | 8 + Assets/API/FurnitureFetcher.cs | 62 + Assets/API/FurnitureFetcher.cs.meta | 11 + Assets/API/FurnitureSceneLoader.cs | 18 + Assets/API/FurnitureSceneLoader.cs.meta | 11 + Assets/API/Models.meta | 8 + Assets/API/Models/FurnitureItem.cs | 30 + Assets/API/Models/FurnitureItem.cs.meta | 11 + Assets/API/Styles.meta | 8 + Assets/API/Styles/FurnitureItem.uxml | 7 + Assets/API/Styles/FurnitureItem.uxml.meta | 10 + Assets/API/Styles/MainScreen.uxml | 6 + Assets/API/Styles/MainScreen.uxml.meta | 10 + Assets/Scenes/ARScreen.unity | 315 +++- Assets/Scenes/FurnitureListScene.unity | 498 ++++++ Assets/Scenes/FurnitureListScene.unity.meta | 7 + Assets/UI Toolkit.meta | 8 + Assets/UI Toolkit/PanelSettings.asset | 38 + Assets/UI Toolkit/PanelSettings.asset.meta | 8 + Assets/UI Toolkit/UnityThemes.meta | 8 + .../UnityThemes/UnityDefaultRuntimeTheme.tss | 1 + .../UnityDefaultRuntimeTheme.tss.meta | 11 + Packages/manifest.json | 2 +- Packages/packages-lock.json | 4 +- ProjectSettings/EditorBuildSettings.asset | 5 +- ProjectSettings/ProjectSettings.asset | 8 +- UIElementsSchema/UIElements.xsd | 13 + UIElementsSchema/Unity.Profiling.Editor.xsd | 104 ++ UIElementsSchema/Unity.UI.Builder.xsd | 975 +++++++++++ .../UnityEditor.Experimental.GraphView.xsd | 66 + UIElementsSchema/UnityEditor.Overlays.xsd | 50 + ...UnityEditor.PackageManager.UI.Internal.xsd | 606 +++++++ UIElementsSchema/UnityEditor.Search.xsd | 28 + .../UnityEditor.ShortcutManagement.xsd | 46 + .../UnityEditor.UIElements.Debugger.xsd | 25 + UIElementsSchema/UnityEditor.UIElements.xsd | 567 +++++++ UIElementsSchema/UnityEngine.UIElements.xsd | 1459 +++++++++++++++++ 37 files changed, 5043 insertions(+), 9 deletions(-) create mode 100644 Assets/API.meta create mode 100644 Assets/API/FurnitureFetcher.cs create mode 100644 Assets/API/FurnitureFetcher.cs.meta create mode 100644 Assets/API/FurnitureSceneLoader.cs create mode 100644 Assets/API/FurnitureSceneLoader.cs.meta create mode 100644 Assets/API/Models.meta create mode 100644 Assets/API/Models/FurnitureItem.cs create mode 100644 Assets/API/Models/FurnitureItem.cs.meta create mode 100644 Assets/API/Styles.meta create mode 100644 Assets/API/Styles/FurnitureItem.uxml create mode 100644 Assets/API/Styles/FurnitureItem.uxml.meta create mode 100644 Assets/API/Styles/MainScreen.uxml create mode 100644 Assets/API/Styles/MainScreen.uxml.meta create mode 100644 Assets/Scenes/FurnitureListScene.unity create mode 100644 Assets/Scenes/FurnitureListScene.unity.meta create mode 100644 Assets/UI Toolkit.meta create mode 100644 Assets/UI Toolkit/PanelSettings.asset create mode 100644 Assets/UI Toolkit/PanelSettings.asset.meta create mode 100644 Assets/UI Toolkit/UnityThemes.meta create mode 100644 Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss create mode 100644 Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss.meta create mode 100644 UIElementsSchema/UIElements.xsd create mode 100644 UIElementsSchema/Unity.Profiling.Editor.xsd create mode 100644 UIElementsSchema/Unity.UI.Builder.xsd create mode 100644 UIElementsSchema/UnityEditor.Experimental.GraphView.xsd create mode 100644 UIElementsSchema/UnityEditor.Overlays.xsd create mode 100644 UIElementsSchema/UnityEditor.PackageManager.UI.Internal.xsd create mode 100644 UIElementsSchema/UnityEditor.Search.xsd create mode 100644 UIElementsSchema/UnityEditor.ShortcutManagement.xsd create mode 100644 UIElementsSchema/UnityEditor.UIElements.Debugger.xsd create mode 100644 UIElementsSchema/UnityEditor.UIElements.xsd create mode 100644 UIElementsSchema/UnityEngine.UIElements.xsd diff --git a/Assets/API.meta b/Assets/API.meta new file mode 100644 index 0000000..81ab039 --- /dev/null +++ b/Assets/API.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 85542efa4a532704d8e1dbc3007e92b9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/API/FurnitureFetcher.cs b/Assets/API/FurnitureFetcher.cs new file mode 100644 index 0000000..6aac1a0 --- /dev/null +++ b/Assets/API/FurnitureFetcher.cs @@ -0,0 +1,62 @@ +using System.Collections; +using System.Collections.Generic; +using System.Text; +using UnityEngine; +using UnityEngine.Networking; +using UnityEngine.UIElements; + +class FurnitureFetcher : MonoBehaviour +{ + public VisualTreeAsset itemTemplate; + public UIDocument uiDocument; + + public static string API_URL = "http://100.123.31.103:5102/api/v1/FurnitureVariant/GetByIds"; + + private void Awake() + { + StartCoroutine(GetFurnitureData()); + } + + IEnumerator GetFurnitureData() + { + Debug.Log($"API URL: {API_URL}"); + List variantIds = new() + { + "ab6fd51f-81f0-490d-b713-8d4f3de61a58", + "1f3b348f-b3ee-4985-b76f-7f6d61f2c835" + }; + + FurnitureIdsRequest data = new() { ids = variantIds }; + string json = JsonUtility.ToJson(data); + + using UnityWebRequest request = new(API_URL, "POST"); + byte[] bodyRaw = Encoding.UTF8.GetBytes(json); + request.uploadHandler = new UploadHandlerRaw(bodyRaw); + request.downloadHandler = new DownloadHandlerBuffer(); + request.SetRequestHeader("Content-Type", "application/json"); + + yield return request.SendWebRequest(); + + if (request.result == UnityWebRequest.Result.Success) + { + string wrappedJson = "{\"items\":" + request.downloadHandler.text + "}"; + FurnitureVariantList list = JsonUtility.FromJson(wrappedJson); + + var root = uiDocument.rootVisualElement; + var scrollView = root.Q("furniture-list"); + + foreach (var variant in list.items) + { + VisualElement item = itemTemplate.CloneTree(); + item.Q