Skip to content

Commit 8d5d544

Browse files
author
David Kline
authored
Merge pull request #7098 from thalbern/user/bethalha/bc_example_patch
Adjusted bounds control example scene
2 parents 6831c31 + 28ec341 commit 8d5d544

File tree

73 files changed

+1306
-594
lines changed

Some content is hidden

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

73 files changed

+1306
-594
lines changed

‎Assets/MixedRealityToolkit.Examples/Experimental/Demos/UX/BoundsControl/Scenes/BoundsControlConfigs.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.

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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: 240d9483db94993408ff1d02335ea212, type: 3}
13+
m_Name: CoffeeCup1BoxDisplayConfiguration
14+
m_EditorClassIdentifier:
15+
boxMaterial: {fileID: 2100000, guid: 4a9aae3094118f44593e7f8000e24c31, type: 2}
16+
boxGrabbedMaterial: {fileID: 2100000, guid: 7e4095c5609075846b657c8917aae797, type: 2}
17+
flattenAxisDisplayScale: 0

‎Assets/MixedRealityToolkit.Examples/Experimental/Demos/UX/BoundsControl/Scenes/BoundsControlConfigs/CoffeeCup1BoxDisplayConfiguration.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.

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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: b80d41f9007c4b948b0808690195e77c, type: 3}
13+
m_Name: CoffeeCup1LinksConfiguration
14+
m_EditorClassIdentifier:
15+
wireframeMaterial: {fileID: 2100000, guid: ac37c7c0a1a7e8646b4f9f3ab4a6bfd9, type: 2}
16+
wireframeEdgeRadius: 0.001
17+
wireframeShape: 0
18+
showWireframe: 0

‎Assets/MixedRealityToolkit.Examples/Experimental/Demos/UX/BoundsControl/Scenes/BoundsControlConfigs/CoffeeCup1LinksConfiguration.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.

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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: 4ae6b815054539c4cbce3013daf8f276, type: 3}
13+
m_Name: CoffeeCup1ProximityEffectConfiguration
14+
m_EditorClassIdentifier:
15+
proximityEffectActive: 1
16+
objectMediumProximity: 0.1
17+
objectCloseProximity: 0.016
18+
farScale: 0
19+
mediumScale: 1
20+
closeScale: 1.5
21+
farGrowRate: 0.3
22+
mediumGrowRate: 0.2
23+
closeGrowRate: 0.3

‎Assets/MixedRealityToolkit.Examples/Experimental/Demos/UX/BoundsControl/Scenes/BoundsControlConfigs/CoffeeCup1ProximityEffectConfiguration.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.

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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: 36981d974b5546a4cbfa0b4bfa0c0ecb, type: 3}
13+
m_Name: CoffeeCup1RotationHandlesConfiguration
14+
m_EditorClassIdentifier:
15+
handleMaterial: {fileID: 2100000, guid: 986558eab447a9847bbe138149edc1b4, type: 2}
16+
handleGrabbedMaterial: {fileID: 2100000, guid: bf37b5eab60b288498d02fd524325d10,
17+
type: 2}
18+
handlePrefab: {fileID: 3868891704370700786, guid: 969c9b04d1b1848489de0d6efe6250fc,
19+
type: 3}
20+
handleSize: 0.016
21+
colliderPadding: {x: 0.016, y: 0.016, z: 0.016}
22+
rotationHandlePrefabColliderType: 1
23+
showRotationHandleForX: 1
24+
showRotationHandleForY: 1
25+
showRotationHandleForZ: 1

‎Assets/MixedRealityToolkit.Examples/Experimental/Demos/UX/BoundsControl/Scenes/BoundsControlConfigs/CoffeeCup1RotationHandlesConfiguration.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.

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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: a0d3e2fcd636d0243820f1bebf6e167b, type: 3}
13+
m_Name: CoffeeCup1ScaleHandlesConfiguration
14+
m_EditorClassIdentifier:
15+
handleMaterial: {fileID: 2100000, guid: 986558eab447a9847bbe138149edc1b4, type: 2}
16+
handleGrabbedMaterial: {fileID: 2100000, guid: bf37b5eab60b288498d02fd524325d10,
17+
type: 2}
18+
handlePrefab: {fileID: 1361136173122186969, guid: ba9083550f965e545a628b53bfa80c9e,
19+
type: 3}
20+
handleSize: 0.016
21+
colliderPadding: {x: 0.016, y: 0.016, z: 0.016}
22+
handleSlatePrefab: {fileID: 1134031327877807717, guid: c45e552a6d92491468c421c35c5dd63d,
23+
type: 3}
24+
showScaleHandles: 1

0 commit comments

Comments
 (0)