UDRI-XRT/Stratasys-Fortus-450mc
1
0
Fork 0
mirror of https://udrimavric.com/MAVRIC/Stratasys-Fortus-450mc.git synced 2025-01-22 07:09:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3 from LlamaWithOwl/feature/MAVRIC-1961_UI-Fixes

Browse Source 
Fixed some RectTransform sizings on the AR Menu
This commit is contained in:
LlamaWithOwl 2023-07-24 18:47:32 -04:00 committed by GitHub
commit 68ca73e92f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 72 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Assets/Prefabs/MainScreen.prefab
View File

@ -1029,11 +1029,11 @@ RectTransform:
m_Father: {fileID: 2378901702852761775}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 273.30908, y: 0}
m_SizeDelta: {x: -546.6179, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 250, y: 0}
m_Pivot: {x: 1, y: 0.5}
--- !u!222 &5290039615213878431
CanvasRenderer:
m_ObjectHideFlags: 0
@ -1449,7 +1449,7 @@ RectTransform:
m_GameObject: {fileID: 4621803784076255448}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.46, y: 1, z: 1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1534727026883823158}
@ -1457,10 +1457,10 @@ RectTransform:
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -90, y: -175}
m_SizeDelta: {x: -426.2043, y: -375.7948}
m_Pivot: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 40, y: 5}
m_SizeDelta: {x: 120, y: 50}
m_Pivot: {x: 0, y: 0}
--- !u!222 &2046113156646485283
CanvasRenderer:
m_ObjectHideFlags: 0
@ -1591,8 +1591,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -126.69, y: 0}
m_SizeDelta: {x: -253.39, y: 0}
m_AnchoredPosition: {x: -125, y: 0}
m_SizeDelta: {x: -250, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &845379038916283193
CanvasRenderer:
@ -2467,8 +2467,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 4.2578125, y: 8.515625}
m_SizeDelta: {x: -93.672, y: -85.1564}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -20, y: -20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3250050729920779439
CanvasRenderer:
@ -2595,18 +2595,18 @@ RectTransform:
m_GameObject: {fileID: 6870836796891459789}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.24, y: 1, z: 1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 824412590138687873}
m_Father: {fileID: 4336615397329087232}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 142, y: -175}
m_SizeDelta: {x: -400.8122, y: -375.79}
m_Pivot: {x: 0.5, y: 0.5}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -40, y: 5}
m_SizeDelta: {x: 120, y: 50}
m_Pivot: {x: 1, y: 0}
--- !u!222 &4948932952534349834
CanvasRenderer:
m_ObjectHideFlags: 0
@ -2736,8 +2736,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -0.0009765625, y: 0}
m_SizeDelta: {x: -0.0019531, y: 0}
m_AnchoredPosition: {x: 0, y: 27.5}
m_SizeDelta: {x: 0, y: -55}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7751429889742699712
CanvasRenderer:

184
Assets/Scenes/Fortus-450mc-Demo.unity
View File

@ -123,11 +123,6 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!4 &123793376 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5001426942032394313, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
m_PrefabInstance: {fileID: 1882957471}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &506652576
PrefabInstance:
m_ObjectHideFlags: 0
@ -342,10 +337,7 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 8760413228547238992, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
insertIndex: -1
addedObject: {fileID: 1053564324}
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
--- !u!1 &506652577 stripped
@ -386,11 +378,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &506652581 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8760413228547238992, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
m_PrefabInstance: {fileID: 506652576}
m_PrefabAsset: {fileID: 0}
--- !u!1 &529620192
GameObject:
m_ObjectHideFlags: 0
@ -702,72 +689,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &1053564323
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 506652581}
m_Modifications:
- target: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
propertyPath: m_RootOrder
value: -1
objectReference: {fileID: 0}
- target: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
propertyPath: m_LocalPosition.y
value: -0.156
objectReference: {fileID: 0}
- target: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
propertyPath: m_LocalRotation.w
value: 0.50856435
objectReference: {fileID: 0}
- target: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
propertyPath: m_LocalRotation.x
value: -0.49128637
objectReference: {fileID: 0}
- target: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
propertyPath: m_LocalRotation.y
value: 0.50856435
objectReference: {fileID: 0}
- target: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
propertyPath: m_LocalRotation.z
value: -0.49128637
objectReference: {fileID: 0}
- target: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 90
objectReference: {fileID: 0}
- target: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -88.02
objectReference: {fileID: 0}
- target: {fileID: 5906286381360451428, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
propertyPath: m_Name
value: Cartridge_Full_Model
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
--- !u!4 &1053564324 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
m_PrefabInstance: {fileID: 1053564323}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1243805569
GameObject:
m_ObjectHideFlags: 0
@ -930,99 +851,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1001 &1882957471
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 6076211927436386728}
m_Modifications:
- target: {fileID: 1269322098343870099, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1870626934748538968, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 051cd3b0800bfc34c9d53822a066f5a2, type: 2}
- target: {fileID: 3848796925145863350, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4254675097513070378, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4505335131898626314, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5001426942032394313, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_RootOrder
value: -1
objectReference: {fileID: 0}
- target: {fileID: 5001426942032394313, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5001426942032394313, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_LocalPosition.y
value: -0.156
objectReference: {fileID: 0}
- target: {fileID: 5001426942032394313, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5001426942032394313, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_LocalRotation.w
value: 0.50856435
objectReference: {fileID: 0}
- target: {fileID: 5001426942032394313, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_LocalRotation.x
value: -0.49128637
objectReference: {fileID: 0}
- target: {fileID: 5001426942032394313, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_LocalRotation.y
value: 0.50856435
objectReference: {fileID: 0}
- target: {fileID: 5001426942032394313, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_LocalRotation.z
value: -0.49128637
objectReference: {fileID: 0}
- target: {fileID: 5001426942032394313, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5001426942032394313, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 90
objectReference: {fileID: 0}
- target: {fileID: 5001426942032394313, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -88.02
objectReference: {fileID: 0}
- target: {fileID: 5024481001895468269, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5059303799277590478, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5149811130857127022, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5906622177446004882, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_Name
value: Cartridge_Guide_Model
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
--- !u!1001 &1058417658004860609
PrefabInstance:
m_ObjectHideFlags: 0
@ -1569,10 +1397,7 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 2995049788487289996, guid: 7dd0d6045dc2d80419e4a5081c1e9f0b, type: 3}
insertIndex: -1
addedObject: {fileID: 123793376}
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7dd0d6045dc2d80419e4a5081c1e9f0b, type: 3}
--- !u!1 &6076211927436386727 stripped
@ -1580,8 +1405,3 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 6575707842653958062, guid: 7dd0d6045dc2d80419e4a5081c1e9f0b, type: 3}
m_PrefabInstance: {fileID: 1058417658004860609}
m_PrefabAsset: {fileID: 0}
--- !u!4 &6076211927436386728 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2995049788487289996, guid: 7dd0d6045dc2d80419e4a5081c1e9f0b, type: 3}
m_PrefabInstance: {fileID: 1058417658004860609}
m_PrefabAsset: {fileID: 0}

34
Assets/XR/XRGeneralSettingsPerBuildTarget.asset
View File

@ -1,5 +1,19 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-8091937080874747369
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d236b7d11115f2143951f1e14045df39, type: 3}
m_Name: iPhone Settings
m_EditorClassIdentifier:
m_LoaderManagerInstance: {fileID: -5542977311442407696}
m_InitManagerOnStart: 1
--- !u!114 &-7080945439590093866
MonoBehaviour:
m_ObjectHideFlags: 0
@ -14,6 +28,23 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_LoaderManagerInstance: {fileID: -5421934399749878753}
m_InitManagerOnStart: 1
--- !u!114 &-5542977311442407696
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4c3631f5e58749a59194e0cf6baf6d5, type: 3}
m_Name: iPhone Providers
m_EditorClassIdentifier:
m_RequiresSettingsUpdate: 0
m_AutomaticLoading: 0
m_AutomaticRunning: 0
m_Loaders:
- {fileID: 11400000, guid: 118fa0c0ef9bf84419641fe61a38766e, type: 2}
--- !u!114 &-5421934399749878753
MonoBehaviour:
m_ObjectHideFlags: 0
@ -73,11 +104,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d2dc886499c26824283350fa532d087d, type: 3}
m_Name: XRGeneralSettingsPerBuildTarget
m_EditorClassIdentifier:
Keys: 010000000e00000007000000
Keys: 010000000e0000000700000004000000
Values:
- {fileID: 7037673418525292223}
- {fileID: -4460110507102755492}
- {fileID: -7080945439590093866}
- {fileID: -8091937080874747369}
--- !u!114 &2327010244761241824
MonoBehaviour:
m_ObjectHideFlags: 0

16
ProjectSettings/BurstAotSettings_iOS.json Normal file
View File

@ -0,0 +1,16 @@
{
"MonoBehaviour": {
"Version": 4,
"EnableBurstCompilation": true,
"EnableOptimisations": true,
"EnableSafetyChecks": false,
"EnableDebugInAllBuilds": false,
"DebugDataKind": 1,
"EnableArmv9SecurityFeatures": false,
"CpuMinTargetX32": 0,
"CpuMaxTargetX32": 0,
"CpuMinTargetX64": 0,
"CpuMaxTargetX64": 0,
"OptimizeFor": 0
}
}