Skip to content

Commit 0439749

Browse files
reverted scene changes
1 parent ce55087 commit 0439749

File tree

1 file changed

+113
-105
lines changed

1 file changed

+113
-105
lines changed

Assets/MixedRealityToolkit-Examples/Demos/StandardShader/Scenes/StandardMaterialComparison.unity

Lines changed: 113 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -1054,105 +1054,6 @@ MeshFilter:
10541054
m_PrefabInternal: {fileID: 0}
10551055
m_GameObject: {fileID: 110422351}
10561056
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
1057-
--- !u!1 &118065344
1058-
GameObject:
1059-
m_ObjectHideFlags: 0
1060-
m_PrefabParentObject: {fileID: 0}
1061-
m_PrefabInternal: {fileID: 0}
1062-
serializedVersion: 5
1063-
m_Component:
1064-
- component: {fileID: 118065345}
1065-
- component: {fileID: 118065348}
1066-
- component: {fileID: 118065347}
1067-
- component: {fileID: 118065346}
1068-
m_Layer: 0
1069-
m_Name: UIRaycastCamera
1070-
m_TagString: Untagged
1071-
m_Icon: {fileID: 0}
1072-
m_NavMeshLayer: 0
1073-
m_StaticEditorFlags: 0
1074-
m_IsActive: 1
1075-
--- !u!4 &118065345
1076-
Transform:
1077-
m_ObjectHideFlags: 0
1078-
m_PrefabParentObject: {fileID: 0}
1079-
m_PrefabInternal: {fileID: 0}
1080-
m_GameObject: {fileID: 118065344}
1081-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1082-
m_LocalPosition: {x: 0, y: 0, z: 0}
1083-
m_LocalScale: {x: 1, y: 1, z: 1}
1084-
m_Children: []
1085-
m_Father: {fileID: 1491404204}
1086-
m_RootOrder: 0
1087-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1088-
--- !u!114 &118065346
1089-
MonoBehaviour:
1090-
m_ObjectHideFlags: 0
1091-
m_PrefabParentObject: {fileID: 0}
1092-
m_PrefabInternal: {fileID: 0}
1093-
m_GameObject: {fileID: 118065344}
1094-
m_Enabled: 1
1095-
m_EditorHideFlags: 0
1096-
m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
1097-
m_Name:
1098-
m_EditorClassIdentifier:
1099-
m_HorizontalAxis: Horizontal
1100-
m_VerticalAxis: Vertical
1101-
m_SubmitButton: Submit
1102-
m_CancelButton: Cancel
1103-
m_InputActionsPerSecond: 10
1104-
m_RepeatDelay: 0.5
1105-
m_ForceModuleActive: 0
1106-
--- !u!114 &118065347
1107-
MonoBehaviour:
1108-
m_ObjectHideFlags: 0
1109-
m_PrefabParentObject: {fileID: 0}
1110-
m_PrefabInternal: {fileID: 0}
1111-
m_GameObject: {fileID: 118065344}
1112-
m_Enabled: 1
1113-
m_EditorHideFlags: 0
1114-
m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
1115-
m_Name:
1116-
m_EditorClassIdentifier:
1117-
m_FirstSelected: {fileID: 0}
1118-
m_sendNavigationEvents: 1
1119-
m_DragThreshold: 10
1120-
--- !u!20 &118065348
1121-
Camera:
1122-
m_ObjectHideFlags: 0
1123-
m_PrefabParentObject: {fileID: 0}
1124-
m_PrefabInternal: {fileID: 0}
1125-
m_GameObject: {fileID: 118065344}
1126-
m_Enabled: 0
1127-
serializedVersion: 2
1128-
m_ClearFlags: 3
1129-
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
1130-
m_NormalizedViewPortRect:
1131-
serializedVersion: 2
1132-
x: 0
1133-
y: 0
1134-
width: 1
1135-
height: 1
1136-
near clip plane: 0.1
1137-
far clip plane: 1000
1138-
field of view: 60
1139-
orthographic: 1
1140-
orthographic size: 0.5
1141-
m_Depth: 0
1142-
m_CullingMask:
1143-
serializedVersion: 2
1144-
m_Bits: 4294967295
1145-
m_RenderingPath: -1
1146-
m_TargetTexture: {fileID: 0}
1147-
m_TargetDisplay: 1
1148-
m_TargetEye: 3
1149-
m_HDR: 0
1150-
m_AllowMSAA: 0
1151-
m_AllowDynamicResolution: 0
1152-
m_ForceIntoRT: 0
1153-
m_OcclusionCulling: 0
1154-
m_StereoConvergence: 10
1155-
m_StereoSeparation: 0.022
11561057
--- !u!1 &124818511
11571058
GameObject:
11581059
m_ObjectHideFlags: 0
@@ -13849,26 +13750,28 @@ Transform:
1384913750
type: 2}
1385013751
m_PrefabInternal: {fileID: 0}
1385113752
m_GameObject: {fileID: 1491404203}
13852-
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
13753+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1385313754
m_LocalPosition: {x: 0, y: 0, z: 0}
1385413755
m_LocalScale: {x: 1, y: 1, z: 1}
1385513756
m_Children:
13856-
- {fileID: 118065345}
13757+
- {fileID: 1944927946}
1385713758
m_Father: {fileID: 1289414260}
1385813759
m_RootOrder: 0
1385913760
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1386013761
--- !u!114 &1491404205
1386113762
MonoBehaviour:
1386213763
m_ObjectHideFlags: 0
13863-
m_PrefabParentObject: {fileID: 0}
13764+
m_PrefabParentObject: {fileID: 114508633870072526, guid: 03e1a152a7ef93e479c9e1135a1b02b1,
13765+
type: 2}
1386413766
m_PrefabInternal: {fileID: 0}
1386513767
m_GameObject: {fileID: 1491404203}
1386613768
m_Enabled: 1
1386713769
m_EditorHideFlags: 0
1386813770
m_Script: {fileID: 11500000, guid: bf98dd1206224111a38765365e98e207, type: 3}
1386913771
m_Name:
1387013772
m_EditorClassIdentifier:
13871-
cursorPrefab: {fileID: 0}
13773+
cursorPrefab: {fileID: 1000012072213228, guid: 5b3e2856904e43c680f84f326861032a,
13774+
type: 2}
1387213775
maxGazeCollisionDistance: 10
1387313776
raycastLayerMasks:
1387413777
- serializedVersion: 2
@@ -13882,7 +13785,8 @@ MonoBehaviour:
1388213785
--- !u!114 &1491404206
1388313786
MonoBehaviour:
1388413787
m_ObjectHideFlags: 0
13885-
m_PrefabParentObject: {fileID: 0}
13788+
m_PrefabParentObject: {fileID: 114893101135001648, guid: 03e1a152a7ef93e479c9e1135a1b02b1,
13789+
type: 2}
1388613790
m_PrefabInternal: {fileID: 0}
1388713791
m_GameObject: {fileID: 1491404203}
1388813792
m_Enabled: 1
@@ -13891,7 +13795,7 @@ MonoBehaviour:
1389113795
m_Name:
1389213796
m_EditorClassIdentifier:
1389313797
pointingExtent: 10
13894-
uiRaycastCamera: {fileID: 118065348}
13798+
uiRaycastCamera: {fileID: 1944927949}
1389513799
pointingRaycastLayerMasks:
1389613800
- serializedVersion: 2
1389713801
m_Bits: 4294967291
@@ -17883,6 +17787,110 @@ Material:
1788317787
m_Colors:
1788417788
- _Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1}
1788517789
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
17790+
--- !u!1 &1944927945
17791+
GameObject:
17792+
m_ObjectHideFlags: 0
17793+
m_PrefabParentObject: {fileID: 1386653657810408, guid: 03e1a152a7ef93e479c9e1135a1b02b1,
17794+
type: 2}
17795+
m_PrefabInternal: {fileID: 0}
17796+
serializedVersion: 5
17797+
m_Component:
17798+
- component: {fileID: 1944927946}
17799+
- component: {fileID: 1944927949}
17800+
- component: {fileID: 1944927948}
17801+
- component: {fileID: 1944927947}
17802+
m_Layer: 0
17803+
m_Name: UIRaycastCamera
17804+
m_TagString: Untagged
17805+
m_Icon: {fileID: 0}
17806+
m_NavMeshLayer: 0
17807+
m_StaticEditorFlags: 0
17808+
m_IsActive: 1
17809+
--- !u!4 &1944927946
17810+
Transform:
17811+
m_ObjectHideFlags: 0
17812+
m_PrefabParentObject: {fileID: 4534477953653268, guid: 03e1a152a7ef93e479c9e1135a1b02b1,
17813+
type: 2}
17814+
m_PrefabInternal: {fileID: 0}
17815+
m_GameObject: {fileID: 1944927945}
17816+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
17817+
m_LocalPosition: {x: 0, y: 0, z: 0}
17818+
m_LocalScale: {x: 1, y: 1, z: 1}
17819+
m_Children: []
17820+
m_Father: {fileID: 1491404204}
17821+
m_RootOrder: 0
17822+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
17823+
--- !u!114 &1944927947
17824+
MonoBehaviour:
17825+
m_ObjectHideFlags: 0
17826+
m_PrefabParentObject: {fileID: 114577618389656682, guid: 03e1a152a7ef93e479c9e1135a1b02b1,
17827+
type: 2}
17828+
m_PrefabInternal: {fileID: 0}
17829+
m_GameObject: {fileID: 1944927945}
17830+
m_Enabled: 1
17831+
m_EditorHideFlags: 0
17832+
m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
17833+
m_Name:
17834+
m_EditorClassIdentifier:
17835+
m_HorizontalAxis: Horizontal
17836+
m_VerticalAxis: Vertical
17837+
m_SubmitButton: Submit
17838+
m_CancelButton: Cancel
17839+
m_InputActionsPerSecond: 10
17840+
m_RepeatDelay: 0.5
17841+
m_ForceModuleActive: 0
17842+
--- !u!114 &1944927948
17843+
MonoBehaviour:
17844+
m_ObjectHideFlags: 0
17845+
m_PrefabParentObject: {fileID: 114898526756992990, guid: 03e1a152a7ef93e479c9e1135a1b02b1,
17846+
type: 2}
17847+
m_PrefabInternal: {fileID: 0}
17848+
m_GameObject: {fileID: 1944927945}
17849+
m_Enabled: 1
17850+
m_EditorHideFlags: 0
17851+
m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
17852+
m_Name:
17853+
m_EditorClassIdentifier:
17854+
m_FirstSelected: {fileID: 0}
17855+
m_sendNavigationEvents: 1
17856+
m_DragThreshold: 10
17857+
--- !u!20 &1944927949
17858+
Camera:
17859+
m_ObjectHideFlags: 0
17860+
m_PrefabParentObject: {fileID: 20089925551936286, guid: 03e1a152a7ef93e479c9e1135a1b02b1,
17861+
type: 2}
17862+
m_PrefabInternal: {fileID: 0}
17863+
m_GameObject: {fileID: 1944927945}
17864+
m_Enabled: 0
17865+
serializedVersion: 2
17866+
m_ClearFlags: 3
17867+
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
17868+
m_NormalizedViewPortRect:
17869+
serializedVersion: 2
17870+
x: 0
17871+
y: 0
17872+
width: 1
17873+
height: 1
17874+
near clip plane: 0.1
17875+
far clip plane: 1000
17876+
field of view: 60
17877+
orthographic: 1
17878+
orthographic size: 0.5
17879+
m_Depth: 0
17880+
m_CullingMask:
17881+
serializedVersion: 2
17882+
m_Bits: 4294967295
17883+
m_RenderingPath: -1
17884+
m_TargetTexture: {fileID: 0}
17885+
m_TargetDisplay: 1
17886+
m_TargetEye: 3
17887+
m_HDR: 0
17888+
m_AllowMSAA: 0
17889+
m_AllowDynamicResolution: 0
17890+
m_ForceIntoRT: 0
17891+
m_OcclusionCulling: 0
17892+
m_StereoConvergence: 10
17893+
m_StereoSeparation: 0.022
1788617894
--- !u!1 &1945468513
1788717895
GameObject:
1788817896
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)