Skip to content

Commit d66331b

Browse files
StephenHodgsonStephenHodgson
authored
Merge pull request #3016 from keveleigh/SolverColor
Updated Solver prefabs to be cyan instead of magenta
2 parents f463a3c + c4d588f commit d66331b

File tree

4 files changed

+46
-46
lines changed

4 files changed

+46
-46
lines changed

‎Assets/MixedRealityToolkit-Examples/Demos/Solvers/Prefabs/Orbital.prefab‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ Prefab:
88
m_TransformParent: {fileID: 0}
99
m_Modifications: []
1010
m_RemovedComponents: []
11-
m_ParentPrefab: {fileID: 0}
11+
m_SourcePrefab: {fileID: 0}
1212
m_RootGameObject: {fileID: 1644659546057122}
13-
m_IsPrefabParent: 1
13+
m_IsPrefabAsset: 1
1414
--- !u!1 &1644659546057122
1515
GameObject:
1616
m_ObjectHideFlags: 0
17-
m_PrefabParentObject: {fileID: 0}
17+
m_CorrespondingSourceObject: {fileID: 0}
1818
m_PrefabInternal: {fileID: 100100000}
19-
serializedVersion: 5
19+
serializedVersion: 6
2020
m_Component:
2121
- component: {fileID: 4901806931539292}
2222
- component: {fileID: 33633702823728314}
@@ -33,7 +33,7 @@ GameObject:
3333
--- !u!4 &4901806931539292
3434
Transform:
3535
m_ObjectHideFlags: 1
36-
m_PrefabParentObject: {fileID: 0}
36+
m_CorrespondingSourceObject: {fileID: 0}
3737
m_PrefabInternal: {fileID: 100100000}
3838
m_GameObject: {fileID: 1644659546057122}
3939
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
@@ -46,7 +46,7 @@ Transform:
4646
--- !u!23 &23345689241976446
4747
MeshRenderer:
4848
m_ObjectHideFlags: 1
49-
m_PrefabParentObject: {fileID: 0}
49+
m_CorrespondingSourceObject: {fileID: 0}
5050
m_PrefabInternal: {fileID: 100100000}
5151
m_GameObject: {fileID: 1644659546057122}
5252
m_Enabled: 1
@@ -58,7 +58,7 @@ MeshRenderer:
5858
m_ReflectionProbeUsage: 1
5959
m_RenderingLayerMask: 4294967295
6060
m_Materials:
61-
- {fileID: 2100000, guid: 71d573ea4cb045cdadc98e56044f6d2c, type: 2}
61+
- {fileID: 2100000, guid: 53ea63593b32415faf734536616f5fb3, type: 2}
6262
m_StaticBatchInfo:
6363
firstSubMesh: 0
6464
subMeshCount: 0
@@ -81,14 +81,14 @@ MeshRenderer:
8181
--- !u!33 &33633702823728314
8282
MeshFilter:
8383
m_ObjectHideFlags: 1
84-
m_PrefabParentObject: {fileID: 0}
84+
m_CorrespondingSourceObject: {fileID: 0}
8585
m_PrefabInternal: {fileID: 100100000}
8686
m_GameObject: {fileID: 1644659546057122}
8787
m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
8888
--- !u!114 &114474594170136286
8989
MonoBehaviour:
9090
m_ObjectHideFlags: 1
91-
m_PrefabParentObject: {fileID: 0}
91+
m_CorrespondingSourceObject: {fileID: 0}
9292
m_PrefabInternal: {fileID: 100100000}
9393
m_GameObject: {fileID: 1644659546057122}
9494
m_Enabled: 1
@@ -105,7 +105,7 @@ MonoBehaviour:
105105
--- !u!114 &114785721768203206
106106
MonoBehaviour:
107107
m_ObjectHideFlags: 1
108-
m_PrefabParentObject: {fileID: 0}
108+
m_CorrespondingSourceObject: {fileID: 0}
109109
m_PrefabInternal: {fileID: 100100000}
110110
m_GameObject: {fileID: 1644659546057122}
111111
m_Enabled: 1

‎Assets/MixedRealityToolkit-Examples/Demos/Solvers/Prefabs/OrbitalWithStepping.prefab‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ Prefab:
88
m_TransformParent: {fileID: 0}
99
m_Modifications: []
1010
m_RemovedComponents: []
11-
m_ParentPrefab: {fileID: 0}
11+
m_SourcePrefab: {fileID: 0}
1212
m_RootGameObject: {fileID: 1644659546057122}
13-
m_IsPrefabParent: 1
13+
m_IsPrefabAsset: 1
1414
--- !u!1 &1644659546057122
1515
GameObject:
1616
m_ObjectHideFlags: 0
17-
m_PrefabParentObject: {fileID: 0}
17+
m_CorrespondingSourceObject: {fileID: 0}
1818
m_PrefabInternal: {fileID: 100100000}
19-
serializedVersion: 5
19+
serializedVersion: 6
2020
m_Component:
2121
- component: {fileID: 4901806931539292}
2222
- component: {fileID: 33633702823728314}
@@ -33,7 +33,7 @@ GameObject:
3333
--- !u!4 &4901806931539292
3434
Transform:
3535
m_ObjectHideFlags: 1
36-
m_PrefabParentObject: {fileID: 0}
36+
m_CorrespondingSourceObject: {fileID: 0}
3737
m_PrefabInternal: {fileID: 100100000}
3838
m_GameObject: {fileID: 1644659546057122}
3939
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
@@ -46,7 +46,7 @@ Transform:
4646
--- !u!23 &23345689241976446
4747
MeshRenderer:
4848
m_ObjectHideFlags: 1
49-
m_PrefabParentObject: {fileID: 0}
49+
m_CorrespondingSourceObject: {fileID: 0}
5050
m_PrefabInternal: {fileID: 100100000}
5151
m_GameObject: {fileID: 1644659546057122}
5252
m_Enabled: 1
@@ -58,7 +58,7 @@ MeshRenderer:
5858
m_ReflectionProbeUsage: 1
5959
m_RenderingLayerMask: 4294967295
6060
m_Materials:
61-
- {fileID: 2100000, guid: 71d573ea4cb045cdadc98e56044f6d2c, type: 2}
61+
- {fileID: 2100000, guid: 53ea63593b32415faf734536616f5fb3, type: 2}
6262
m_StaticBatchInfo:
6363
firstSubMesh: 0
6464
subMeshCount: 0
@@ -81,14 +81,14 @@ MeshRenderer:
8181
--- !u!33 &33633702823728314
8282
MeshFilter:
8383
m_ObjectHideFlags: 1
84-
m_PrefabParentObject: {fileID: 0}
84+
m_CorrespondingSourceObject: {fileID: 0}
8585
m_PrefabInternal: {fileID: 100100000}
8686
m_GameObject: {fileID: 1644659546057122}
8787
m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
8888
--- !u!114 &114474594170136286
8989
MonoBehaviour:
9090
m_ObjectHideFlags: 1
91-
m_PrefabParentObject: {fileID: 0}
91+
m_CorrespondingSourceObject: {fileID: 0}
9292
m_PrefabInternal: {fileID: 100100000}
9393
m_GameObject: {fileID: 1644659546057122}
9494
m_Enabled: 1
@@ -105,7 +105,7 @@ MonoBehaviour:
105105
--- !u!114 &114785721768203206
106106
MonoBehaviour:
107107
m_ObjectHideFlags: 1
108-
m_PrefabParentObject: {fileID: 0}
108+
m_CorrespondingSourceObject: {fileID: 0}
109109
m_PrefabInternal: {fileID: 100100000}
110110
m_GameObject: {fileID: 1644659546057122}
111111
m_Enabled: 1

‎Assets/MixedRealityToolkit-Examples/Demos/Solvers/Prefabs/SurfaceMagnetism.prefab‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ Prefab:
88
m_TransformParent: {fileID: 0}
99
m_Modifications: []
1010
m_RemovedComponents: []
11-
m_ParentPrefab: {fileID: 0}
11+
m_SourcePrefab: {fileID: 0}
1212
m_RootGameObject: {fileID: 1179292221703190}
13-
m_IsPrefabParent: 1
13+
m_IsPrefabAsset: 1
1414
--- !u!1 &1179292221703190
1515
GameObject:
1616
m_ObjectHideFlags: 0
17-
m_PrefabParentObject: {fileID: 0}
17+
m_CorrespondingSourceObject: {fileID: 0}
1818
m_PrefabInternal: {fileID: 100100000}
19-
serializedVersion: 5
19+
serializedVersion: 6
2020
m_Component:
2121
- component: {fileID: 4308712392116548}
2222
- component: {fileID: 33929012368511022}
@@ -33,9 +33,9 @@ GameObject:
3333
--- !u!1 &1351302580768088
3434
GameObject:
3535
m_ObjectHideFlags: 0
36-
m_PrefabParentObject: {fileID: 0}
36+
m_CorrespondingSourceObject: {fileID: 0}
3737
m_PrefabInternal: {fileID: 100100000}
38-
serializedVersion: 5
38+
serializedVersion: 6
3939
m_Component:
4040
- component: {fileID: 4322429649936706}
4141
- component: {fileID: 33989687625900974}
@@ -50,7 +50,7 @@ GameObject:
5050
--- !u!4 &4308712392116548
5151
Transform:
5252
m_ObjectHideFlags: 1
53-
m_PrefabParentObject: {fileID: 0}
53+
m_CorrespondingSourceObject: {fileID: 0}
5454
m_PrefabInternal: {fileID: 100100000}
5555
m_GameObject: {fileID: 1179292221703190}
5656
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
@@ -64,7 +64,7 @@ Transform:
6464
--- !u!4 &4322429649936706
6565
Transform:
6666
m_ObjectHideFlags: 1
67-
m_PrefabParentObject: {fileID: 0}
67+
m_CorrespondingSourceObject: {fileID: 0}
6868
m_PrefabInternal: {fileID: 100100000}
6969
m_GameObject: {fileID: 1351302580768088}
7070
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
@@ -77,7 +77,7 @@ Transform:
7777
--- !u!23 &23885476246180956
7878
MeshRenderer:
7979
m_ObjectHideFlags: 1
80-
m_PrefabParentObject: {fileID: 0}
80+
m_CorrespondingSourceObject: {fileID: 0}
8181
m_PrefabInternal: {fileID: 100100000}
8282
m_GameObject: {fileID: 1179292221703190}
8383
m_Enabled: 1
@@ -89,7 +89,7 @@ MeshRenderer:
8989
m_ReflectionProbeUsage: 1
9090
m_RenderingLayerMask: 4294967295
9191
m_Materials:
92-
- {fileID: 2100000, guid: 71d573ea4cb045cdadc98e56044f6d2c, type: 2}
92+
- {fileID: 2100000, guid: 53ea63593b32415faf734536616f5fb3, type: 2}
9393
m_StaticBatchInfo:
9494
firstSubMesh: 0
9595
subMeshCount: 0
@@ -112,21 +112,21 @@ MeshRenderer:
112112
--- !u!33 &33929012368511022
113113
MeshFilter:
114114
m_ObjectHideFlags: 1
115-
m_PrefabParentObject: {fileID: 0}
115+
m_CorrespondingSourceObject: {fileID: 0}
116116
m_PrefabInternal: {fileID: 100100000}
117117
m_GameObject: {fileID: 1179292221703190}
118118
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
119119
--- !u!33 &33989687625900974
120120
MeshFilter:
121121
m_ObjectHideFlags: 1
122-
m_PrefabParentObject: {fileID: 0}
122+
m_CorrespondingSourceObject: {fileID: 0}
123123
m_PrefabInternal: {fileID: 100100000}
124124
m_GameObject: {fileID: 1351302580768088}
125125
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
126126
--- !u!65 &65977897168068534
127127
BoxCollider:
128128
m_ObjectHideFlags: 1
129-
m_PrefabParentObject: {fileID: 0}
129+
m_CorrespondingSourceObject: {fileID: 0}
130130
m_PrefabInternal: {fileID: 100100000}
131131
m_GameObject: {fileID: 1351302580768088}
132132
m_Material: {fileID: 0}
@@ -138,7 +138,7 @@ BoxCollider:
138138
--- !u!114 &114396026402588154
139139
MonoBehaviour:
140140
m_ObjectHideFlags: 1
141-
m_PrefabParentObject: {fileID: 0}
141+
m_CorrespondingSourceObject: {fileID: 0}
142142
m_PrefabInternal: {fileID: 100100000}
143143
m_GameObject: {fileID: 1179292221703190}
144144
m_Enabled: 1
@@ -175,7 +175,7 @@ MonoBehaviour:
175175
--- !u!114 &114842819766563628
176176
MonoBehaviour:
177177
m_ObjectHideFlags: 1
178-
m_PrefabParentObject: {fileID: 0}
178+
m_CorrespondingSourceObject: {fileID: 0}
179179
m_PrefabInternal: {fileID: 100100000}
180180
m_GameObject: {fileID: 1179292221703190}
181181
m_Enabled: 1

‎Assets/MixedRealityToolkit-Examples/Demos/Solvers/Prefabs/SurfaceMagnetismAndRadialView.prefab‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ Prefab:
88
m_TransformParent: {fileID: 0}
99
m_Modifications: []
1010
m_RemovedComponents: []
11-
m_ParentPrefab: {fileID: 0}
11+
m_SourcePrefab: {fileID: 0}
1212
m_RootGameObject: {fileID: 1832389131935346}
13-
m_IsPrefabParent: 1
13+
m_IsPrefabAsset: 1
1414
--- !u!1 &1832389131935346
1515
GameObject:
1616
m_ObjectHideFlags: 0
17-
m_PrefabParentObject: {fileID: 0}
17+
m_CorrespondingSourceObject: {fileID: 0}
1818
m_PrefabInternal: {fileID: 100100000}
19-
serializedVersion: 5
19+
serializedVersion: 6
2020
m_Component:
2121
- component: {fileID: 4031760943160574}
2222
- component: {fileID: 33945530532809340}
@@ -34,7 +34,7 @@ GameObject:
3434
--- !u!4 &4031760943160574
3535
Transform:
3636
m_ObjectHideFlags: 1
37-
m_PrefabParentObject: {fileID: 0}
37+
m_CorrespondingSourceObject: {fileID: 0}
3838
m_PrefabInternal: {fileID: 100100000}
3939
m_GameObject: {fileID: 1832389131935346}
4040
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
@@ -47,7 +47,7 @@ Transform:
4747
--- !u!23 &23718145193287392
4848
MeshRenderer:
4949
m_ObjectHideFlags: 1
50-
m_PrefabParentObject: {fileID: 0}
50+
m_CorrespondingSourceObject: {fileID: 0}
5151
m_PrefabInternal: {fileID: 100100000}
5252
m_GameObject: {fileID: 1832389131935346}
5353
m_Enabled: 1
@@ -59,7 +59,7 @@ MeshRenderer:
5959
m_ReflectionProbeUsage: 1
6060
m_RenderingLayerMask: 4294967295
6161
m_Materials:
62-
- {fileID: 2100000, guid: 71d573ea4cb045cdadc98e56044f6d2c, type: 2}
62+
- {fileID: 2100000, guid: 53ea63593b32415faf734536616f5fb3, type: 2}
6363
m_StaticBatchInfo:
6464
firstSubMesh: 0
6565
subMeshCount: 0
@@ -82,14 +82,14 @@ MeshRenderer:
8282
--- !u!33 &33945530532809340
8383
MeshFilter:
8484
m_ObjectHideFlags: 1
85-
m_PrefabParentObject: {fileID: 0}
85+
m_CorrespondingSourceObject: {fileID: 0}
8686
m_PrefabInternal: {fileID: 100100000}
8787
m_GameObject: {fileID: 1832389131935346}
8888
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
8989
--- !u!114 &114383769280500332
9090
MonoBehaviour:
9191
m_ObjectHideFlags: 1
92-
m_PrefabParentObject: {fileID: 0}
92+
m_CorrespondingSourceObject: {fileID: 0}
9393
m_PrefabInternal: {fileID: 100100000}
9494
m_GameObject: {fileID: 1832389131935346}
9595
m_Enabled: 1
@@ -117,7 +117,7 @@ MonoBehaviour:
117117
--- !u!114 &114755908734741902
118118
MonoBehaviour:
119119
m_ObjectHideFlags: 1
120-
m_PrefabParentObject: {fileID: 0}
120+
m_CorrespondingSourceObject: {fileID: 0}
121121
m_PrefabInternal: {fileID: 100100000}
122122
m_GameObject: {fileID: 1832389131935346}
123123
m_Enabled: 1
@@ -154,7 +154,7 @@ MonoBehaviour:
154154
--- !u!114 &114855406103909200
155155
MonoBehaviour:
156156
m_ObjectHideFlags: 1
157-
m_PrefabParentObject: {fileID: 0}
157+
m_CorrespondingSourceObject: {fileID: 0}
158158
m_PrefabInternal: {fileID: 100100000}
159159
m_GameObject: {fileID: 1832389131935346}
160160
m_Enabled: 1

0 commit comments

Comments
 (0)