Skip to content

Commit 4117b68

Browse files
committed
build: updated to Unity 2022.3.5f1
1 parent 0f0a007 commit 4117b68

26 files changed

+391
-118
lines changed

arcor2_AREditor/Assets/TABLET/ImageTracking/ReferenceImageLibrary.asset

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

arcor2_AREditor/Assets/TABLET/Models/ActionModel.prefab

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ Transform:
2525
m_PrefabInstance: {fileID: 0}
2626
m_PrefabAsset: {fileID: 0}
2727
m_GameObject: {fileID: 5063280479838959153}
28+
serializedVersion: 2
2829
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
2930
m_LocalPosition: {x: 0, y: 0, z: 0}
3031
m_LocalScale: {x: 1, y: 1, z: 1}
3132
m_ConstrainProportionsScale: 0
3233
m_Children: []
3334
m_Father: {fileID: 7901566242614541636}
34-
m_RootOrder: 0
3535
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3636
--- !u!33 &9065644047113853772
3737
MeshFilter:
@@ -106,12 +106,12 @@ Transform:
106106
m_PrefabInstance: {fileID: 0}
107107
m_PrefabAsset: {fileID: 0}
108108
m_GameObject: {fileID: 6971665635724155076}
109+
serializedVersion: 2
109110
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
110111
m_LocalPosition: {x: 0, y: 0, z: 0}
111112
m_LocalScale: {x: 1, y: 1, z: 1}
112113
m_ConstrainProportionsScale: 0
113114
m_Children:
114115
- {fileID: 3708934591021103274}
115116
m_Father: {fileID: 0}
116-
m_RootOrder: 0
117117
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

arcor2_AREditor/Assets/TABLET/Models/ActionModel_0.asset

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Mesh:
77
m_PrefabInstance: {fileID: 0}
88
m_PrefabAsset: {fileID: 0}
99
m_Name: ActionModel_0
10-
serializedVersion: 10
10+
serializedVersion: 11
1111
m_SubMeshes:
1212
- serializedVersion: 2
1313
firstByte: 0
@@ -154,6 +154,7 @@ Mesh:
154154
m_Center: {x: 0, y: 0, z: 0}
155155
m_Extent: {x: 0.09160281, y: 0.021831593, z: 0.13388775}
156156
m_MeshUsageFlags: 0
157+
m_CookingOptions: 30
157158
m_BakedConvexCollisionMesh:
158159
m_BakedTriangleCollisionMesh:
159160
m_MeshMetrics[0]: 1

arcor2_AREditor/Assets/TABLET/Prefabs/ConnectionPrefab.prefab

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ GameObject:
1212
- component: {fileID: 5806945198096296325}
1313
- component: {fileID: 5806945198095790967}
1414
m_Layer: 0
15-
m_Name: ConnectionPrefab
15+
m_Name: None <> None
1616
m_TagString: Untagged
1717
m_Icon: {fileID: 0}
1818
m_NavMeshLayer: 0
@@ -25,16 +25,17 @@ Transform:
2525
m_PrefabInstance: {fileID: 0}
2626
m_PrefabAsset: {fileID: 0}
2727
m_GameObject: {fileID: 5806945198085100239}
28+
serializedVersion: 2
2829
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
2930
m_LocalPosition: {x: 0, y: 0, z: 0}
3031
m_LocalScale: {x: 1, y: 1, z: 1}
3132
m_ConstrainProportionsScale: 0
3233
m_Children: []
3334
m_Father: {fileID: 0}
34-
m_RootOrder: 0
3535
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3636
--- !u!120 &5806945198096296325
3737
LineRenderer:
38+
serializedVersion: 2
3839
m_ObjectHideFlags: 0
3940
m_CorrespondingSourceObject: {fileID: 0}
4041
m_PrefabInstance: {fileID: 0}
@@ -131,16 +132,20 @@ LineRenderer:
131132
atime6: 0
132133
atime7: 0
133134
m_Mode: 0
135+
m_ColorSpace: -1
134136
m_NumColorKeys: 2
135137
m_NumAlphaKeys: 2
136138
numCornerVertices: 0
137139
numCapVertices: 0
138140
alignment: 0
139141
textureMode: 0
142+
textureScale: {x: 1, y: 1}
140143
shadowBias: 0
141144
generateLightingData: 0
145+
m_MaskInteraction: 0
142146
m_UseWorldSpace: 1
143147
m_Loop: 0
148+
m_ApplyActiveColorSpace: 0
144149
--- !u!114 &5806945198095790967
145150
MonoBehaviour:
146151
m_ObjectHideFlags: 0
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: df71837a07684b24082222c253aa156a, type: 3}
13+
m_Name: SimulationLoader
14+
m_EditorClassIdentifier:

arcor2_AREditor/Assets/XR/Loaders/SimulationLoader.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

arcor2_AREditor/Assets/XR/Resources.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: e2b12afd4d27418a9cfb2823fe2b9ff3, type: 3}
13+
m_Name: XRSimulationRuntimeSettings
14+
m_EditorClassIdentifier:
15+
m_EnvironmentLayer: 30
16+
m_EnvironmentScanParams:
17+
m_MinimumRescanTime: 0.1
18+
m_DeltaCameraDistanceToRescan: 0.025
19+
m_DeltaCameraAngleToRescan: 4
20+
m_RaysPerCast: 10
21+
m_MaximumHitDistance: 12
22+
m_MinimumHitDistance: 0.05
23+
m_PlaneFindingParams:
24+
m_MinimumPlaneUpdateTime: 0.13
25+
m_MinPointsPerSqMeter: 30
26+
m_MinSideLength: 0.11
27+
m_InLayerMergeDistance: 0.2
28+
m_CrossLayerMergeDistance: 0.05
29+
m_CheckEmptyArea: 0
30+
m_AllowedEmptyAreaCurve:
31+
serializedVersion: 2
32+
m_Curve:
33+
- serializedVersion: 3
34+
time: 0
35+
value: 0
36+
inSlope: 0
37+
outSlope: 0
38+
tangentMode: 0
39+
weightedMode: 0
40+
inWeight: 0
41+
outWeight: 0
42+
- serializedVersion: 3
43+
time: 1
44+
value: 1
45+
inSlope: 0
46+
outSlope: 0
47+
tangentMode: 0
48+
weightedMode: 0
49+
inWeight: 0
50+
outWeight: 0
51+
m_PreInfinity: 2
52+
m_PostInfinity: 2
53+
m_RotationOrder: 4
54+
m_PointUpdateDropoutRate: 0.4
55+
m_NormalToleranceAngle: 15
56+
m_VoxelSize: 0.1
57+
m_TrackedImageDiscoveryParams:
58+
m_TrackingUpdateInterval: 0.09
59+
m_UseXRay: 1
60+
m_FlipXRayDirection: 0

arcor2_AREditor/Assets/XR/Resources/XRSimulationRuntimeSettings.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: e0688bbae6cedcd4a871944e38c19ec0, type: 3}
13+
m_Name: XRSimulationSettings
14+
m_EditorClassIdentifier:

0 commit comments

Comments
 (0)