Skip to content

Commit 28ec341

Browse files
another patch for the config files
1 parent 6957444 commit 28ec341

File tree

71 files changed

+161
-152
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+161
-152
lines changed

Assets/MixedRealityToolkit.Examples/Experimental/Demos/UX/BoundsControl/Scenes/BoundsControlConfigs/CoffeeCup1BoxDisplayConfiguration.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: 240d9483db94993408ff1d02335ea212, type: 3}
1313
m_Name: CoffeeCup1BoxDisplayConfiguration
1414
m_EditorClassIdentifier:
15-
boxMaterial: {fileID: 0}
16-
boxGrabbedMaterial: {fileID: 0}
15+
boxMaterial: {fileID: 2100000, guid: 4a9aae3094118f44593e7f8000e24c31, type: 2}
16+
boxGrabbedMaterial: {fileID: 2100000, guid: 7e4095c5609075846b657c8917aae797, type: 2}
1717
flattenAxisDisplayScale: 0

Assets/MixedRealityToolkit.Examples/Experimental/Demos/UX/BoundsControl/Scenes/BoundsControlConfigs/CoffeeCup1BoxDisplayConfiguration.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/MixedRealityToolkit.Examples/Experimental/Demos/UX/BoundsControl/Scenes/BoundsControlConfigs/CoffeeCup1LinksConfiguration.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ MonoBehaviour:
1515
wireframeMaterial: {fileID: 2100000, guid: ac37c7c0a1a7e8646b4f9f3ab4a6bfd9, type: 2}
1616
wireframeEdgeRadius: 0.001
1717
wireframeShape: 0
18-
showWireframe: 1
18+
showWireframe: 0

Assets/MixedRealityToolkit.Examples/Experimental/Demos/UX/BoundsControl/Scenes/BoundsControlConfigs/CoffeeCup1LinksConfiguration.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/MixedRealityToolkit.Examples/Experimental/Demos/UX/BoundsControl/Scenes/BoundsControlConfigs/CoffeeCup1ProximityEffectConfiguration.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: 4ae6b815054539c4cbce3013daf8f276, type: 3}
1313
m_Name: CoffeeCup1ProximityEffectConfiguration
1414
m_EditorClassIdentifier:
15-
proximityEffectActive: 0
15+
proximityEffectActive: 1
1616
objectMediumProximity: 0.1
17-
objectCloseProximity: 0.03
17+
objectCloseProximity: 0.016
1818
farScale: 0
1919
mediumScale: 1
2020
closeScale: 1.5

Assets/MixedRealityToolkit.Examples/Experimental/Demos/UX/BoundsControl/Scenes/BoundsControlConfigs/CoffeeCup1ProximityEffectConfiguration.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/MixedRealityToolkit.Examples/Experimental/Demos/UX/BoundsControl/Scenes/BoundsControlConfigs/CoffeeCup1RotationHandlesConfiguration.asset

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: 36981d974b5546a4cbfa0b4bfa0c0ecb, type: 3}
1313
m_Name: CoffeeCup1RotationHandlesConfiguration
1414
m_EditorClassIdentifier:
15-
handleMaterial: {fileID: 2100000, guid: ac37c7c0a1a7e8646b4f9f3ab4a6bfd9, type: 2}
16-
handleGrabbedMaterial: {fileID: 2100000, guid: ac37c7c0a1a7e8646b4f9f3ab4a6bfd9,
15+
handleMaterial: {fileID: 2100000, guid: 986558eab447a9847bbe138149edc1b4, type: 2}
16+
handleGrabbedMaterial: {fileID: 2100000, guid: bf37b5eab60b288498d02fd524325d10,
1717
type: 2}
18-
handlePrefab: {fileID: 0}
18+
handlePrefab: {fileID: 3868891704370700786, guid: 969c9b04d1b1848489de0d6efe6250fc,
19+
type: 3}
1920
handleSize: 0.016
2021
colliderPadding: {x: 0.016, y: 0.016, z: 0.016}
2122
rotationHandlePrefabColliderType: 1

Assets/MixedRealityToolkit.Examples/Experimental/Demos/UX/BoundsControl/Scenes/BoundsControlConfigs/CoffeeCup1RotationHandlesConfiguration.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/MixedRealityToolkit.Examples/Experimental/Demos/UX/BoundsControl/Scenes/BoundsControlConfigs/CoffeeCup1ScaleHandlesConfiguration.asset

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,13 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: a0d3e2fcd636d0243820f1bebf6e167b, type: 3}
1313
m_Name: CoffeeCup1ScaleHandlesConfiguration
1414
m_EditorClassIdentifier:
15-
handleMaterial: {fileID: 2100000, guid: ac37c7c0a1a7e8646b4f9f3ab4a6bfd9, type: 2}
16-
handleGrabbedMaterial: {fileID: 2100000, guid: ac37c7c0a1a7e8646b4f9f3ab4a6bfd9,
15+
handleMaterial: {fileID: 2100000, guid: 986558eab447a9847bbe138149edc1b4, type: 2}
16+
handleGrabbedMaterial: {fileID: 2100000, guid: bf37b5eab60b288498d02fd524325d10,
1717
type: 2}
18-
handlePrefab: {fileID: 0}
18+
handlePrefab: {fileID: 1361136173122186969, guid: ba9083550f965e545a628b53bfa80c9e,
19+
type: 3}
1920
handleSize: 0.016
2021
colliderPadding: {x: 0.016, y: 0.016, z: 0.016}
21-
handleSlatePrefab: {fileID: 0}
22+
handleSlatePrefab: {fileID: 1134031327877807717, guid: c45e552a6d92491468c421c35c5dd63d,
23+
type: 3}
2224
showScaleHandles: 1

Assets/MixedRealityToolkit.Examples/Experimental/Demos/UX/BoundsControl/Scenes/BoundsControlConfigs/CoffeeCup1ScaleHandlesConfiguration.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)