AgileWebs/ImaageQ_Unity_App
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

development #3

Merged
Ignacio_Gomez merged 9 commits from development into release/rc1 2025-08-20 07:22:28 +00:00
Conversation 0 Commits 9 Files Changed 97 +101 -33
14 changed files with 101 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5413f80ee2 - Show all commits

7
Assets/API/Styles/FurnitureItem.uxml
View File

@@ -1,7 +0,0 @@
<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<ui:VisualElement class="item-container" style="margin: 5px; padding: 8px; border-bottom: 1px solid #ccc;">
<ui:Label name="nameLabel" />
<ui:Label name="colorLabel" />
<ui:Label name="lineLabel" />
</ui:VisualElement>
</ui:UXML>

18
Assets/Outline.mat
View File

@@ -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: []

14
Assets/Scenes/ARScreen.unity
View File

@@ -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: []

6
Assets/Scenes/FurnitureListScene.unity
View File

@@ -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

8
Assets/UI Toolkit/FurnitureItem.uxml Normal file
View File

@@ -0,0 +1,8 @@
<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<ui:Style src="Styles/FurnitureItem.uss" />
<ui:VisualElement class="furniture-item">
<ui:Label name="nameLabel" class="furniture-title"/>
<ui:Label name="colorLabel" class="furniture-subtitle"/>
<ui:Label name="lineLabel" class="furniture-subtitle"/>
</ui:VisualElement>
</ui:UXML>

0
Assets/API/Styles/FurnitureItem.uxml.meta → Assets/UI Toolkit/FurnitureItem.uxml.meta
View File

7
Assets/API/Styles/MainScreen.uxml → Assets/UI Toolkit/MainScreen.uxml
View File

@@ -1,6 +1,7 @@
<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<ui:VisualElement style="flex-grow: 1; padding: 10px;">
<ui:Label text="Furniture List" style="unity-font-style: bold; font-size: 20px; margin-bottom: 10px;" />
<ui:ScrollView name="furniture-list" style="flex-grow: 1;" />
<ui:Style src="Styles/MainScreen.uss" />
<ui:VisualElement class="main-screen">
<ui:Label text="Furniture List" class="title-label" />
<ui:ScrollView name="furniture-list" style="flex-grow: 1" />
</ui:VisualElement>
</ui:UXML>

0
Assets/API/Styles/MainScreen.uxml.meta → Assets/UI Toolkit/MainScreen.uxml.meta
View File

4
Assets/UI Toolkit/PanelSettings.asset
View File

@@ -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}

2
Assets/API/Styles.meta → Assets/UI Toolkit/Styles.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 10d82c400c9a6bd48bd2e50509bf8e8f
guid: da2874f5108006a4bba0f3f672b0fae4
folderAsset: yes
DefaultImporter:
externalObjects: {}

33
Assets/UI Toolkit/Styles/FurnitureItem.uss Normal file
View File

@@ -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;
}

11
Assets/UI Toolkit/Styles/FurnitureItem.uss.meta Normal file
View File

@@ -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

13
Assets/UI Toolkit/Styles/MainScreen.uss Normal file
View File

@@ -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;
}

11
Assets/UI Toolkit/Styles/MainScreen.uss.meta Normal file
View File

@@ -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