Skip to content

Commit f2e2934

Browse files
Added a default gaze distance.
Fixed child layer overwrite. Fixed missing SpatialMapping references. Fixed issue with SetTargetRotation never finishing for Interpolator.
1 parent bd55e68 commit f2e2934

File tree

2 files changed

+293
-40
lines changed

2 files changed

+293
-40
lines changed

Assets/HoloToolkit-Tests/Input/Scenes/TapToPlace.unity

Lines changed: 244 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,126 @@ Prefab:
150150
m_RemovedComponents: []
151151
m_ParentPrefab: {fileID: 100100000, guid: d379ed0a5618c9f479f58bd83a2d0ad3, type: 2}
152152
m_IsPrefabParent: 0
153+
--- !u!1 &181528112
154+
GameObject:
155+
m_ObjectHideFlags: 0
156+
m_PrefabParentObject: {fileID: 0}
157+
m_PrefabInternal: {fileID: 0}
158+
serializedVersion: 5
159+
m_Component:
160+
- component: {fileID: 181528113}
161+
- component: {fileID: 181528118}
162+
- component: {fileID: 181528117}
163+
- component: {fileID: 181528116}
164+
- component: {fileID: 181528115}
165+
- component: {fileID: 181528114}
166+
m_Layer: 1
167+
m_Name: Cube (2)
168+
m_TagString: Untagged
169+
m_Icon: {fileID: 0}
170+
m_NavMeshLayer: 0
171+
m_StaticEditorFlags: 0
172+
m_IsActive: 1
173+
--- !u!4 &181528113
174+
Transform:
175+
m_ObjectHideFlags: 0
176+
m_PrefabParentObject: {fileID: 0}
177+
m_PrefabInternal: {fileID: 0}
178+
m_GameObject: {fileID: 181528112}
179+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
180+
m_LocalPosition: {x: -0.925, y: -0.83, z: 0.88699967}
181+
m_LocalScale: {x: 0.9999998, y: 0.9999998, z: 0.9999998}
182+
m_Children: []
183+
m_Father: {fileID: 1023018531}
184+
m_RootOrder: 1
185+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
186+
--- !u!114 &181528114
187+
MonoBehaviour:
188+
m_ObjectHideFlags: 0
189+
m_PrefabParentObject: {fileID: 0}
190+
m_PrefabInternal: {fileID: 0}
191+
m_GameObject: {fileID: 181528112}
192+
m_Enabled: 0
193+
m_EditorHideFlags: 0
194+
m_Script: {fileID: 11500000, guid: fb69de839bd015f4099b5bd2c45e53e5, type: 3}
195+
m_Name:
196+
m_EditorClassIdentifier:
197+
UseUnscaledTime: 1
198+
PositionPerSecond: 30
199+
RotationDegreesPerSecond: 720
200+
RotationSpeedScaler: 0
201+
ScalePerSecond: 5
202+
SmoothLerpToTarget: 0
203+
SmoothPositionLerpRatio: 0.5
204+
SmoothRotationLerpRatio: 0.5
205+
SmoothScaleLerpRatio: 0.5
206+
--- !u!114 &181528115
207+
MonoBehaviour:
208+
m_ObjectHideFlags: 0
209+
m_PrefabParentObject: {fileID: 0}
210+
m_PrefabInternal: {fileID: 0}
211+
m_GameObject: {fileID: 181528112}
212+
m_Enabled: 1
213+
m_EditorHideFlags: 0
214+
m_Script: {fileID: 11500000, guid: dbad991a9894486418e4988222483ef8, type: 3}
215+
m_Name:
216+
m_EditorClassIdentifier:
217+
DefaultGazeDistance: 2
218+
SavedAnchorFriendlyName: 5361766564416e63686f72467269656e646c794e616d65
219+
PlaceParentOnTap: 0
220+
ParentGameObjectToPlace: {fileID: 0}
221+
IsBeingPlaced: 0
222+
--- !u!23 &181528116
223+
MeshRenderer:
224+
m_ObjectHideFlags: 0
225+
m_PrefabParentObject: {fileID: 0}
226+
m_PrefabInternal: {fileID: 0}
227+
m_GameObject: {fileID: 181528112}
228+
m_Enabled: 1
229+
m_CastShadows: 1
230+
m_ReceiveShadows: 1
231+
m_MotionVectors: 1
232+
m_LightProbeUsage: 1
233+
m_ReflectionProbeUsage: 1
234+
m_Materials:
235+
- {fileID: 2100000, guid: 474f0e0481d4aa14e92a5ada98042f3a, type: 2}
236+
m_StaticBatchInfo:
237+
firstSubMesh: 0
238+
subMeshCount: 0
239+
m_StaticBatchRoot: {fileID: 0}
240+
m_ProbeAnchor: {fileID: 0}
241+
m_LightProbeVolumeOverride: {fileID: 0}
242+
m_ScaleInLightmap: 1
243+
m_PreserveUVs: 1
244+
m_IgnoreNormalsForChartDetection: 0
245+
m_ImportantGI: 0
246+
m_SelectedEditorRenderState: 3
247+
m_MinimumChartSize: 4
248+
m_AutoUVMaxDistance: 0.5
249+
m_AutoUVMaxAngle: 89
250+
m_LightmapParameters: {fileID: 0}
251+
m_SortingLayerID: 0
252+
m_SortingLayer: 0
253+
m_SortingOrder: 0
254+
--- !u!65 &181528117
255+
BoxCollider:
256+
m_ObjectHideFlags: 0
257+
m_PrefabParentObject: {fileID: 0}
258+
m_PrefabInternal: {fileID: 0}
259+
m_GameObject: {fileID: 181528112}
260+
m_Material: {fileID: 0}
261+
m_IsTrigger: 0
262+
m_Enabled: 1
263+
serializedVersion: 2
264+
m_Size: {x: 1, y: 1, z: 1}
265+
m_Center: {x: 0, y: 0, z: 0}
266+
--- !u!33 &181528118
267+
MeshFilter:
268+
m_ObjectHideFlags: 0
269+
m_PrefabParentObject: {fileID: 0}
270+
m_PrefabInternal: {fileID: 0}
271+
m_GameObject: {fileID: 181528112}
272+
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
153273
--- !u!1 &422455305
154274
GameObject:
155275
m_ObjectHideFlags: 0
@@ -190,6 +310,126 @@ MonoBehaviour:
190310
m_Script: {fileID: 11500000, guid: f122ca4ae6b527e4798205becf9a0550, type: 3}
191311
m_Name:
192312
m_EditorClassIdentifier:
313+
--- !u!1 &532765823
314+
GameObject:
315+
m_ObjectHideFlags: 0
316+
m_PrefabParentObject: {fileID: 0}
317+
m_PrefabInternal: {fileID: 0}
318+
serializedVersion: 5
319+
m_Component:
320+
- component: {fileID: 532765824}
321+
- component: {fileID: 532765829}
322+
- component: {fileID: 532765828}
323+
- component: {fileID: 532765827}
324+
- component: {fileID: 532765826}
325+
- component: {fileID: 532765825}
326+
m_Layer: 4
327+
m_Name: Cube (1)
328+
m_TagString: Untagged
329+
m_Icon: {fileID: 0}
330+
m_NavMeshLayer: 0
331+
m_StaticEditorFlags: 0
332+
m_IsActive: 1
333+
--- !u!4 &532765824
334+
Transform:
335+
m_ObjectHideFlags: 0
336+
m_PrefabParentObject: {fileID: 0}
337+
m_PrefabInternal: {fileID: 0}
338+
m_GameObject: {fileID: 532765823}
339+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
340+
m_LocalPosition: {x: 0.971, y: -0.83, z: 0.887}
341+
m_LocalScale: {x: 1, y: 1, z: 1}
342+
m_Children: []
343+
m_Father: {fileID: 1023018531}
344+
m_RootOrder: 0
345+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
346+
--- !u!114 &532765825
347+
MonoBehaviour:
348+
m_ObjectHideFlags: 0
349+
m_PrefabParentObject: {fileID: 0}
350+
m_PrefabInternal: {fileID: 0}
351+
m_GameObject: {fileID: 532765823}
352+
m_Enabled: 0
353+
m_EditorHideFlags: 0
354+
m_Script: {fileID: 11500000, guid: fb69de839bd015f4099b5bd2c45e53e5, type: 3}
355+
m_Name:
356+
m_EditorClassIdentifier:
357+
UseUnscaledTime: 1
358+
PositionPerSecond: 30
359+
RotationDegreesPerSecond: 720
360+
RotationSpeedScaler: 0
361+
ScalePerSecond: 5
362+
SmoothLerpToTarget: 0
363+
SmoothPositionLerpRatio: 0.5
364+
SmoothRotationLerpRatio: 0.5
365+
SmoothScaleLerpRatio: 0.5
366+
--- !u!114 &532765826
367+
MonoBehaviour:
368+
m_ObjectHideFlags: 0
369+
m_PrefabParentObject: {fileID: 0}
370+
m_PrefabInternal: {fileID: 0}
371+
m_GameObject: {fileID: 532765823}
372+
m_Enabled: 1
373+
m_EditorHideFlags: 0
374+
m_Script: {fileID: 11500000, guid: dbad991a9894486418e4988222483ef8, type: 3}
375+
m_Name:
376+
m_EditorClassIdentifier:
377+
DefaultGazeDistance: 2
378+
SavedAnchorFriendlyName: 5361766564416e63686f72467269656e646c794e616d65
379+
PlaceParentOnTap: 0
380+
ParentGameObjectToPlace: {fileID: 0}
381+
IsBeingPlaced: 0
382+
--- !u!23 &532765827
383+
MeshRenderer:
384+
m_ObjectHideFlags: 0
385+
m_PrefabParentObject: {fileID: 0}
386+
m_PrefabInternal: {fileID: 0}
387+
m_GameObject: {fileID: 532765823}
388+
m_Enabled: 1
389+
m_CastShadows: 1
390+
m_ReceiveShadows: 1
391+
m_MotionVectors: 1
392+
m_LightProbeUsage: 1
393+
m_ReflectionProbeUsage: 1
394+
m_Materials:
395+
- {fileID: 2100000, guid: 474f0e0481d4aa14e92a5ada98042f3a, type: 2}
396+
m_StaticBatchInfo:
397+
firstSubMesh: 0
398+
subMeshCount: 0
399+
m_StaticBatchRoot: {fileID: 0}
400+
m_ProbeAnchor: {fileID: 0}
401+
m_LightProbeVolumeOverride: {fileID: 0}
402+
m_ScaleInLightmap: 1
403+
m_PreserveUVs: 1
404+
m_IgnoreNormalsForChartDetection: 0
405+
m_ImportantGI: 0
406+
m_SelectedEditorRenderState: 3
407+
m_MinimumChartSize: 4
408+
m_AutoUVMaxDistance: 0.5
409+
m_AutoUVMaxAngle: 89
410+
m_LightmapParameters: {fileID: 0}
411+
m_SortingLayerID: 0
412+
m_SortingLayer: 0
413+
m_SortingOrder: 0
414+
--- !u!65 &532765828
415+
BoxCollider:
416+
m_ObjectHideFlags: 0
417+
m_PrefabParentObject: {fileID: 0}
418+
m_PrefabInternal: {fileID: 0}
419+
m_GameObject: {fileID: 532765823}
420+
m_Material: {fileID: 0}
421+
m_IsTrigger: 0
422+
m_Enabled: 1
423+
serializedVersion: 2
424+
m_Size: {x: 1, y: 1, z: 1}
425+
m_Center: {x: 0, y: 0, z: 0}
426+
--- !u!33 &532765829
427+
MeshFilter:
428+
m_ObjectHideFlags: 0
429+
m_PrefabParentObject: {fileID: 0}
430+
m_PrefabInternal: {fileID: 0}
431+
m_GameObject: {fileID: 532765823}
432+
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
193433
--- !u!1001 &663291579
194434
Prefab:
195435
m_ObjectHideFlags: 0
@@ -268,6 +508,7 @@ MonoBehaviour:
268508
m_Script: {fileID: 11500000, guid: dbad991a9894486418e4988222483ef8, type: 3}
269509
m_Name:
270510
m_EditorClassIdentifier:
511+
DefaultGazeDistance: 2
271512
SavedAnchorFriendlyName: 5361766564416e63686f72467269656e646c794e616d65
272513
PlaceParentOnTap: 0
273514
ParentGameObjectToPlace: {fileID: 0}
@@ -332,7 +573,9 @@ Transform:
332573
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
333574
m_LocalPosition: {x: 0, y: -0.5, z: 2}
334575
m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
335-
m_Children: []
576+
m_Children:
577+
- {fileID: 532765824}
578+
- {fileID: 181528113}
336579
m_Father: {fileID: 0}
337580
m_RootOrder: 4
338581
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

0 commit comments

Comments
 (0)