Skip to content

Commit 0941376

Browse files
Cameron-MickaCameron-Micka
authored
Improved XR Placement (#140)
1 parent 18f3dac commit 0941376

2 files changed

Lines changed: 71 additions & 27 deletions

File tree

‎com.microsoft.mrtk.graphicstools.unity/Samples~/Experimental/Magnifier/Magnifier.unity‎

Lines changed: 61 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -132,15 +132,15 @@ PrefabInstance:
132132
m_Modifications:
133133
- target: {fileID: 2605718042319707029, guid: d2eb3a9405371294bb1453b4af85960e, type: 3}
134134
propertyPath: m_RootOrder
135-
value: 0
135+
value: 1
136136
objectReference: {fileID: 0}
137137
- target: {fileID: 2605718042319707029, guid: d2eb3a9405371294bb1453b4af85960e, type: 3}
138138
propertyPath: m_LocalPosition.x
139139
value: 0
140140
objectReference: {fileID: 0}
141141
- target: {fileID: 2605718042319707029, guid: d2eb3a9405371294bb1453b4af85960e, type: 3}
142142
propertyPath: m_LocalPosition.y
143-
value: 0
143+
value: 1
144144
objectReference: {fileID: 0}
145145
- target: {fileID: 2605718042319707029, guid: d2eb3a9405371294bb1453b4af85960e, type: 3}
146146
propertyPath: m_LocalPosition.z
@@ -152,15 +152,15 @@ PrefabInstance:
152152
objectReference: {fileID: 0}
153153
- target: {fileID: 2605718042319707029, guid: d2eb3a9405371294bb1453b4af85960e, type: 3}
154154
propertyPath: m_LocalRotation.x
155-
value: 0
155+
value: -0
156156
objectReference: {fileID: 0}
157157
- target: {fileID: 2605718042319707029, guid: d2eb3a9405371294bb1453b4af85960e, type: 3}
158158
propertyPath: m_LocalRotation.y
159-
value: 0
159+
value: -0
160160
objectReference: {fileID: 0}
161161
- target: {fileID: 2605718042319707029, guid: d2eb3a9405371294bb1453b4af85960e, type: 3}
162162
propertyPath: m_LocalRotation.z
163-
value: 0
163+
value: -0
164164
objectReference: {fileID: 0}
165165
- target: {fileID: 2605718042319707029, guid: d2eb3a9405371294bb1453b4af85960e, type: 3}
166166
propertyPath: m_LocalEulerAnglesHint.x
@@ -266,13 +266,46 @@ Transform:
266266
m_PrefabInstance: {fileID: 0}
267267
m_PrefabAsset: {fileID: 0}
268268
m_GameObject: {fileID: 551594401}
269-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
269+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
270270
m_LocalPosition: {x: 0, y: 0, z: 0}
271271
m_LocalScale: {x: 1, y: 1, z: 1}
272272
m_Children: []
273273
m_Father: {fileID: 0}
274274
m_RootOrder: 2
275275
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
276+
--- !u!1 &656687268
277+
GameObject:
278+
m_ObjectHideFlags: 0
279+
m_CorrespondingSourceObject: {fileID: 0}
280+
m_PrefabInstance: {fileID: 0}
281+
m_PrefabAsset: {fileID: 0}
282+
serializedVersion: 6
283+
m_Component:
284+
- component: {fileID: 656687269}
285+
m_Layer: 0
286+
m_Name: XROrigin
287+
m_TagString: Untagged
288+
m_Icon: {fileID: 0}
289+
m_NavMeshLayer: 0
290+
m_StaticEditorFlags: 0
291+
m_IsActive: 1
292+
--- !u!4 &656687269
293+
Transform:
294+
m_ObjectHideFlags: 0
295+
m_CorrespondingSourceObject: {fileID: 0}
296+
m_PrefabInstance: {fileID: 0}
297+
m_PrefabAsset: {fileID: 0}
298+
m_GameObject: {fileID: 656687268}
299+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
300+
m_LocalPosition: {x: 0, y: 1, z: 0}
301+
m_LocalScale: {x: 1, y: 1, z: 1}
302+
m_Children:
303+
- {fileID: 1298507361}
304+
- {fileID: 1522697104}
305+
- {fileID: 1735108141}
306+
m_Father: {fileID: 0}
307+
m_RootOrder: 0
308+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
276309
--- !u!4 &691126601 stripped
277310
Transform:
278311
m_CorrespondingSourceObject: {fileID: 2605718042319707029, guid: d2eb3a9405371294bb1453b4af85960e, type: 3}
@@ -390,7 +423,7 @@ PrefabInstance:
390423
m_ObjectHideFlags: 0
391424
serializedVersion: 2
392425
m_Modification:
393-
m_TransformParent: {fileID: 0}
426+
m_TransformParent: {fileID: 656687269}
394427
m_Modifications:
395428
- target: {fileID: 6733848283173587094, guid: bc34e7c17b5a44044832aee5f56a71f0, type: 3}
396429
propertyPath: m_text
@@ -420,7 +453,7 @@ PrefabInstance:
420453
objectReference: {fileID: 0}
421454
- target: {fileID: 6733848283233855919, guid: bc34e7c17b5a44044832aee5f56a71f0, type: 3}
422455
propertyPath: m_RootOrder
423-
value: 1
456+
value: 0
424457
objectReference: {fileID: 0}
425458
- target: {fileID: 6733848283233855919, guid: bc34e7c17b5a44044832aee5f56a71f0, type: 3}
426459
propertyPath: m_AnchorMax.x
@@ -464,15 +497,15 @@ PrefabInstance:
464497
objectReference: {fileID: 0}
465498
- target: {fileID: 6733848283233855919, guid: bc34e7c17b5a44044832aee5f56a71f0, type: 3}
466499
propertyPath: m_LocalRotation.x
467-
value: 0
500+
value: -0
468501
objectReference: {fileID: 0}
469502
- target: {fileID: 6733848283233855919, guid: bc34e7c17b5a44044832aee5f56a71f0, type: 3}
470503
propertyPath: m_LocalRotation.y
471-
value: 0
504+
value: -0
472505
objectReference: {fileID: 0}
473506
- target: {fileID: 6733848283233855919, guid: bc34e7c17b5a44044832aee5f56a71f0, type: 3}
474507
propertyPath: m_LocalRotation.z
475-
value: 0
508+
value: -0
476509
objectReference: {fileID: 0}
477510
- target: {fileID: 6733848283233855919, guid: bc34e7c17b5a44044832aee5f56a71f0, type: 3}
478511
propertyPath: m_AnchoredPosition.x
@@ -500,6 +533,11 @@ PrefabInstance:
500533
objectReference: {fileID: 0}
501534
m_RemovedComponents: []
502535
m_SourcePrefab: {fileID: 100100000, guid: bc34e7c17b5a44044832aee5f56a71f0, type: 3}
536+
--- !u!224 &1298507361 stripped
537+
RectTransform:
538+
m_CorrespondingSourceObject: {fileID: 6733848283233855919, guid: bc34e7c17b5a44044832aee5f56a71f0, type: 3}
539+
m_PrefabInstance: {fileID: 1298507360}
540+
m_PrefabAsset: {fileID: 0}
503541
--- !u!1 &1522697100
504542
GameObject:
505543
m_ObjectHideFlags: 0
@@ -589,23 +627,23 @@ Transform:
589627
m_PrefabInstance: {fileID: 0}
590628
m_PrefabAsset: {fileID: 0}
591629
m_GameObject: {fileID: 1522697100}
592-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
630+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
593631
m_LocalPosition: {x: 0, y: 0, z: 1}
594632
m_LocalScale: {x: 0.44704, y: 0.5588, z: 1}
595633
m_Children: []
596-
m_Father: {fileID: 0}
597-
m_RootOrder: 4
634+
m_Father: {fileID: 656687269}
635+
m_RootOrder: 1
598636
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
599637
--- !u!1001 &1735108140
600638
PrefabInstance:
601639
m_ObjectHideFlags: 0
602640
serializedVersion: 2
603641
m_Modification:
604-
m_TransformParent: {fileID: 0}
642+
m_TransformParent: {fileID: 656687269}
605643
m_Modifications:
606644
- target: {fileID: -8679921383154817045, guid: 75b6b4d92fce8d741bc18ad89d4dc297, type: 3}
607645
propertyPath: m_RootOrder
608-
value: 5
646+
value: 2
609647
objectReference: {fileID: 0}
610648
- target: {fileID: -8679921383154817045, guid: 75b6b4d92fce8d741bc18ad89d4dc297, type: 3}
611649
propertyPath: m_LocalPosition.x
@@ -625,15 +663,15 @@ PrefabInstance:
625663
objectReference: {fileID: 0}
626664
- target: {fileID: -8679921383154817045, guid: 75b6b4d92fce8d741bc18ad89d4dc297, type: 3}
627665
propertyPath: m_LocalRotation.x
628-
value: 0
666+
value: -0
629667
objectReference: {fileID: 0}
630668
- target: {fileID: -8679921383154817045, guid: 75b6b4d92fce8d741bc18ad89d4dc297, type: 3}
631669
propertyPath: m_LocalRotation.y
632670
value: -0.42261827
633671
objectReference: {fileID: 0}
634672
- target: {fileID: -8679921383154817045, guid: 75b6b4d92fce8d741bc18ad89d4dc297, type: 3}
635673
propertyPath: m_LocalRotation.z
636-
value: 0
674+
value: -0
637675
objectReference: {fileID: 0}
638676
- target: {fileID: -8679921383154817045, guid: 75b6b4d92fce8d741bc18ad89d4dc297, type: 3}
639677
propertyPath: m_LocalEulerAnglesHint.x
@@ -657,6 +695,11 @@ PrefabInstance:
657695
objectReference: {fileID: 0}
658696
m_RemovedComponents: []
659697
m_SourcePrefab: {fileID: 100100000, guid: 75b6b4d92fce8d741bc18ad89d4dc297, type: 3}
698+
--- !u!4 &1735108141 stripped
699+
Transform:
700+
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 75b6b4d92fce8d741bc18ad89d4dc297, type: 3}
701+
m_PrefabInstance: {fileID: 1735108140}
702+
m_PrefabAsset: {fileID: 0}
660703
--- !u!1 &1837192617
661704
GameObject:
662705
m_ObjectHideFlags: 0

‎com.microsoft.mrtk.graphicstools.unity/Samples~/Experimental/Magnifier/Materials/MagnifierBorder.mat‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ Material:
2222
m_PrefabAsset: {fileID: 0}
2323
m_Name: MagnifierBorder
2424
m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3}
25-
m_ShaderKeywords: _ALPHABLEND_ON _DISABLE_ALBEDO_MAP _EDGE_SMOOTHING_AUTOMATIC
26-
_GRADIENT_FOUR_POINT _ROUND_CORNERS _SPECULAR_HIGHLIGHTS _SPECULAR_SETUP _USE_WORLD_SCALE
25+
m_ShaderKeywords: _ALPHABLEND_ON _BORDER_LIGHT _BORDER_LIGHT_OPAQUE _BORDER_LIGHT_REPLACES_ALBEDO
26+
_BORDER_LIGHT_USES_GRADIENT _DISABLE_ALBEDO_MAP _EDGE_SMOOTHING_AUTOMATIC _GRADIENT_FOUR_POINT
27+
_ROUND_CORNERS _SPECULAR_HIGHLIGHTS _SPECULAR_SETUP _USE_WORLD_SCALE
2728
m_LightmapFlags: 4
2829
m_EnableInstancingVariants: 0
2930
m_DoubleSidedGI: 0
@@ -119,13 +120,13 @@ Material:
119120
- _BlurBorderIntensity: 0
120121
- _BlurMode: 0
121122
- _BlurTextureIntensity: 1
122-
- _BorderColorMode: 0
123-
- _BorderLight: 0
124-
- _BorderLightOpaque: 0
125-
- _BorderLightOpaqueAlpha: 1
126-
- _BorderLightReplacesAlbedo: 0
123+
- _BorderColorMode: 3
124+
- _BorderLight: 1
125+
- _BorderLightOpaque: 1
126+
- _BorderLightOpaqueAlpha: 0.5
127+
- _BorderLightReplacesAlbedo: 1
127128
- _BorderMinValue: 0.1
128-
- _BorderWidth: 0.1
129+
- _BorderWidth: 0.01
129130
- _BumpScale: 1
130131
- _ClearCoatMask: 0
131132
- _ClearCoatSmoothness: 0
@@ -225,7 +226,7 @@ Material:
225226
- _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1}
226227
- _BorderColor: {r: 1, g: 1, b: 1, a: 0}
227228
- _ClippingBorderColor: {r: 1, g: 0.19999996, b: 0, a: 1}
228-
- _Color: {r: 0, g: 0, b: 0, a: 0.5019608}
229+
- _Color: {r: 0, g: 0, b: 0, a: 0}
229230
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
230231
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
231232
- _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}

0 commit comments

Comments
 (0)