Skip to content
This repository was archived by the owner on Jul 24, 2023. It is now read-only.

Commit 495cd30

Browse files
committed
Merge branch 'develop'
2 parents 2b7f7ad + 2a246e6 commit 495cd30

15 files changed

Lines changed: 862 additions & 18 deletions
2 KB
Binary file not shown.
0 Bytes
Binary file not shown.

Assets/SolAR/Debug.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: 323 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,323 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &2372330669182179693
4+
GameObject:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
serializedVersion: 6
10+
m_Component:
11+
- component: {fileID: 2372330669182179690}
12+
- component: {fileID: 2372330669182179689}
13+
- component: {fileID: 2372330669182179688}
14+
- component: {fileID: 2372330669182179691}
15+
m_Layer: 0
16+
m_Name: X
17+
m_TagString: Untagged
18+
m_Icon: {fileID: 0}
19+
m_NavMeshLayer: 0
20+
m_StaticEditorFlags: 0
21+
m_IsActive: 1
22+
--- !u!4 &2372330669182179690
23+
Transform:
24+
m_ObjectHideFlags: 0
25+
m_CorrespondingSourceObject: {fileID: 0}
26+
m_PrefabInstance: {fileID: 0}
27+
m_PrefabAsset: {fileID: 0}
28+
m_GameObject: {fileID: 2372330669182179693}
29+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
30+
m_LocalPosition: {x: 0.0351, y: 0, z: 0}
31+
m_LocalScale: {x: 0.1, y: 0.03, z: 0.03}
32+
m_Children: []
33+
m_Father: {fileID: 2372330669795547718}
34+
m_RootOrder: 0
35+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
36+
--- !u!33 &2372330669182179689
37+
MeshFilter:
38+
m_ObjectHideFlags: 0
39+
m_CorrespondingSourceObject: {fileID: 0}
40+
m_PrefabInstance: {fileID: 0}
41+
m_PrefabAsset: {fileID: 0}
42+
m_GameObject: {fileID: 2372330669182179693}
43+
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
44+
--- !u!23 &2372330669182179688
45+
MeshRenderer:
46+
m_ObjectHideFlags: 0
47+
m_CorrespondingSourceObject: {fileID: 0}
48+
m_PrefabInstance: {fileID: 0}
49+
m_PrefabAsset: {fileID: 0}
50+
m_GameObject: {fileID: 2372330669182179693}
51+
m_Enabled: 1
52+
m_CastShadows: 1
53+
m_ReceiveShadows: 1
54+
m_DynamicOccludee: 1
55+
m_StaticShadowCaster: 0
56+
m_MotionVectors: 1
57+
m_LightProbeUsage: 1
58+
m_ReflectionProbeUsage: 1
59+
m_RayTracingMode: 2
60+
m_RayTraceProcedural: 0
61+
m_RenderingLayerMask: 1
62+
m_RendererPriority: 0
63+
m_Materials:
64+
- {fileID: 2100000, guid: 8fbfea50f6fa15f40b5729d712688662, type: 2}
65+
m_StaticBatchInfo:
66+
firstSubMesh: 0
67+
subMeshCount: 0
68+
m_StaticBatchRoot: {fileID: 0}
69+
m_ProbeAnchor: {fileID: 0}
70+
m_LightProbeVolumeOverride: {fileID: 0}
71+
m_ScaleInLightmap: 1
72+
m_ReceiveGI: 1
73+
m_PreserveUVs: 0
74+
m_IgnoreNormalsForChartDetection: 0
75+
m_ImportantGI: 0
76+
m_StitchLightmapSeams: 1
77+
m_SelectedEditorRenderState: 3
78+
m_MinimumChartSize: 4
79+
m_AutoUVMaxDistance: 0.5
80+
m_AutoUVMaxAngle: 89
81+
m_LightmapParameters: {fileID: 0}
82+
m_SortingLayerID: 0
83+
m_SortingLayer: 0
84+
m_SortingOrder: 0
85+
m_AdditionalVertexStreams: {fileID: 0}
86+
--- !u!65 &2372330669182179691
87+
BoxCollider:
88+
m_ObjectHideFlags: 0
89+
m_CorrespondingSourceObject: {fileID: 0}
90+
m_PrefabInstance: {fileID: 0}
91+
m_PrefabAsset: {fileID: 0}
92+
m_GameObject: {fileID: 2372330669182179693}
93+
m_Material: {fileID: 0}
94+
m_IsTrigger: 0
95+
m_Enabled: 1
96+
serializedVersion: 2
97+
m_Size: {x: 1, y: 1, z: 1}
98+
m_Center: {x: 0, y: 0, z: 0}
99+
--- !u!1 &2372330669410076984
100+
GameObject:
101+
m_ObjectHideFlags: 0
102+
m_CorrespondingSourceObject: {fileID: 0}
103+
m_PrefabInstance: {fileID: 0}
104+
m_PrefabAsset: {fileID: 0}
105+
serializedVersion: 6
106+
m_Component:
107+
- component: {fileID: 2372330669410076985}
108+
- component: {fileID: 2372330669410076980}
109+
- component: {fileID: 2372330669410076983}
110+
- component: {fileID: 2372330669410076982}
111+
m_Layer: 0
112+
m_Name: Z
113+
m_TagString: Untagged
114+
m_Icon: {fileID: 0}
115+
m_NavMeshLayer: 0
116+
m_StaticEditorFlags: 0
117+
m_IsActive: 1
118+
--- !u!4 &2372330669410076985
119+
Transform:
120+
m_ObjectHideFlags: 0
121+
m_CorrespondingSourceObject: {fileID: 0}
122+
m_PrefabInstance: {fileID: 0}
123+
m_PrefabAsset: {fileID: 0}
124+
m_GameObject: {fileID: 2372330669410076984}
125+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
126+
m_LocalPosition: {x: 0, y: 0, z: 0.035}
127+
m_LocalScale: {x: 0.03, y: 0.03, z: 0.1}
128+
m_Children: []
129+
m_Father: {fileID: 2372330669795547718}
130+
m_RootOrder: 2
131+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
132+
--- !u!33 &2372330669410076980
133+
MeshFilter:
134+
m_ObjectHideFlags: 0
135+
m_CorrespondingSourceObject: {fileID: 0}
136+
m_PrefabInstance: {fileID: 0}
137+
m_PrefabAsset: {fileID: 0}
138+
m_GameObject: {fileID: 2372330669410076984}
139+
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
140+
--- !u!23 &2372330669410076983
141+
MeshRenderer:
142+
m_ObjectHideFlags: 0
143+
m_CorrespondingSourceObject: {fileID: 0}
144+
m_PrefabInstance: {fileID: 0}
145+
m_PrefabAsset: {fileID: 0}
146+
m_GameObject: {fileID: 2372330669410076984}
147+
m_Enabled: 1
148+
m_CastShadows: 1
149+
m_ReceiveShadows: 1
150+
m_DynamicOccludee: 1
151+
m_StaticShadowCaster: 0
152+
m_MotionVectors: 1
153+
m_LightProbeUsage: 1
154+
m_ReflectionProbeUsage: 1
155+
m_RayTracingMode: 2
156+
m_RayTraceProcedural: 0
157+
m_RenderingLayerMask: 1
158+
m_RendererPriority: 0
159+
m_Materials:
160+
- {fileID: 2100000, guid: a82112c622cd15d44a49c0b2a778e70b, type: 2}
161+
m_StaticBatchInfo:
162+
firstSubMesh: 0
163+
subMeshCount: 0
164+
m_StaticBatchRoot: {fileID: 0}
165+
m_ProbeAnchor: {fileID: 0}
166+
m_LightProbeVolumeOverride: {fileID: 0}
167+
m_ScaleInLightmap: 1
168+
m_ReceiveGI: 1
169+
m_PreserveUVs: 0
170+
m_IgnoreNormalsForChartDetection: 0
171+
m_ImportantGI: 0
172+
m_StitchLightmapSeams: 1
173+
m_SelectedEditorRenderState: 3
174+
m_MinimumChartSize: 4
175+
m_AutoUVMaxDistance: 0.5
176+
m_AutoUVMaxAngle: 89
177+
m_LightmapParameters: {fileID: 0}
178+
m_SortingLayerID: 0
179+
m_SortingLayer: 0
180+
m_SortingOrder: 0
181+
m_AdditionalVertexStreams: {fileID: 0}
182+
--- !u!65 &2372330669410076982
183+
BoxCollider:
184+
m_ObjectHideFlags: 0
185+
m_CorrespondingSourceObject: {fileID: 0}
186+
m_PrefabInstance: {fileID: 0}
187+
m_PrefabAsset: {fileID: 0}
188+
m_GameObject: {fileID: 2372330669410076984}
189+
m_Material: {fileID: 0}
190+
m_IsTrigger: 0
191+
m_Enabled: 1
192+
serializedVersion: 2
193+
m_Size: {x: 1, y: 1, z: 1}
194+
m_Center: {x: 0, y: 0, z: 0}
195+
--- !u!1 &2372330669795547721
196+
GameObject:
197+
m_ObjectHideFlags: 0
198+
m_CorrespondingSourceObject: {fileID: 0}
199+
m_PrefabInstance: {fileID: 0}
200+
m_PrefabAsset: {fileID: 0}
201+
serializedVersion: 6
202+
m_Component:
203+
- component: {fileID: 2372330669795547718}
204+
m_Layer: 0
205+
m_Name: 3DAxesMesh
206+
m_TagString: Untagged
207+
m_Icon: {fileID: 0}
208+
m_NavMeshLayer: 0
209+
m_StaticEditorFlags: 0
210+
m_IsActive: 1
211+
--- !u!4 &2372330669795547718
212+
Transform:
213+
m_ObjectHideFlags: 0
214+
m_CorrespondingSourceObject: {fileID: 0}
215+
m_PrefabInstance: {fileID: 0}
216+
m_PrefabAsset: {fileID: 0}
217+
m_GameObject: {fileID: 2372330669795547721}
218+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
219+
m_LocalPosition: {x: 0.060201168, y: -0.21673533, z: 0.9605859}
220+
m_LocalScale: {x: 1, y: 1, z: 1}
221+
m_Children:
222+
- {fileID: 2372330669182179690}
223+
- {fileID: 2372330670008374090}
224+
- {fileID: 2372330669410076985}
225+
m_Father: {fileID: 0}
226+
m_RootOrder: 0
227+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
228+
--- !u!1 &2372330670008374093
229+
GameObject:
230+
m_ObjectHideFlags: 0
231+
m_CorrespondingSourceObject: {fileID: 0}
232+
m_PrefabInstance: {fileID: 0}
233+
m_PrefabAsset: {fileID: 0}
234+
serializedVersion: 6
235+
m_Component:
236+
- component: {fileID: 2372330670008374090}
237+
- component: {fileID: 2372330670008374089}
238+
- component: {fileID: 2372330670008374088}
239+
- component: {fileID: 2372330670008374091}
240+
m_Layer: 0
241+
m_Name: Y
242+
m_TagString: Untagged
243+
m_Icon: {fileID: 0}
244+
m_NavMeshLayer: 0
245+
m_StaticEditorFlags: 0
246+
m_IsActive: 1
247+
--- !u!4 &2372330670008374090
248+
Transform:
249+
m_ObjectHideFlags: 0
250+
m_CorrespondingSourceObject: {fileID: 0}
251+
m_PrefabInstance: {fileID: 0}
252+
m_PrefabAsset: {fileID: 0}
253+
m_GameObject: {fileID: 2372330670008374093}
254+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
255+
m_LocalPosition: {x: 0, y: 0.0347, z: 0}
256+
m_LocalScale: {x: 0.03, y: 0.1, z: 0.03}
257+
m_Children: []
258+
m_Father: {fileID: 2372330669795547718}
259+
m_RootOrder: 1
260+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
261+
--- !u!33 &2372330670008374089
262+
MeshFilter:
263+
m_ObjectHideFlags: 0
264+
m_CorrespondingSourceObject: {fileID: 0}
265+
m_PrefabInstance: {fileID: 0}
266+
m_PrefabAsset: {fileID: 0}
267+
m_GameObject: {fileID: 2372330670008374093}
268+
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
269+
--- !u!23 &2372330670008374088
270+
MeshRenderer:
271+
m_ObjectHideFlags: 0
272+
m_CorrespondingSourceObject: {fileID: 0}
273+
m_PrefabInstance: {fileID: 0}
274+
m_PrefabAsset: {fileID: 0}
275+
m_GameObject: {fileID: 2372330670008374093}
276+
m_Enabled: 1
277+
m_CastShadows: 1
278+
m_ReceiveShadows: 1
279+
m_DynamicOccludee: 1
280+
m_StaticShadowCaster: 0
281+
m_MotionVectors: 1
282+
m_LightProbeUsage: 1
283+
m_ReflectionProbeUsage: 1
284+
m_RayTracingMode: 2
285+
m_RayTraceProcedural: 0
286+
m_RenderingLayerMask: 1
287+
m_RendererPriority: 0
288+
m_Materials:
289+
- {fileID: 2100000, guid: c276e6e1844c94f4e9fb84a7704c03bd, type: 2}
290+
m_StaticBatchInfo:
291+
firstSubMesh: 0
292+
subMeshCount: 0
293+
m_StaticBatchRoot: {fileID: 0}
294+
m_ProbeAnchor: {fileID: 0}
295+
m_LightProbeVolumeOverride: {fileID: 0}
296+
m_ScaleInLightmap: 1
297+
m_ReceiveGI: 1
298+
m_PreserveUVs: 0
299+
m_IgnoreNormalsForChartDetection: 0
300+
m_ImportantGI: 0
301+
m_StitchLightmapSeams: 1
302+
m_SelectedEditorRenderState: 3
303+
m_MinimumChartSize: 4
304+
m_AutoUVMaxDistance: 0.5
305+
m_AutoUVMaxAngle: 89
306+
m_LightmapParameters: {fileID: 0}
307+
m_SortingLayerID: 0
308+
m_SortingLayer: 0
309+
m_SortingOrder: 0
310+
m_AdditionalVertexStreams: {fileID: 0}
311+
--- !u!65 &2372330670008374091
312+
BoxCollider:
313+
m_ObjectHideFlags: 0
314+
m_CorrespondingSourceObject: {fileID: 0}
315+
m_PrefabInstance: {fileID: 0}
316+
m_PrefabAsset: {fileID: 0}
317+
m_GameObject: {fileID: 2372330670008374093}
318+
m_Material: {fileID: 0}
319+
m_IsTrigger: 0
320+
m_Enabled: 1
321+
serializedVersion: 2
322+
m_Size: {x: 1, y: 1, z: 1}
323+
m_Center: {x: 0, y: 0, z: 0}

Assets/SolAR/Debug/3DAxesMesh.prefab.meta

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

0 commit comments

Comments
 (0)