Skip to content

Commit 3dfeab5

Browse files
authored
Merge pull request #1803 from StephenHodgson/Stabilization
Moved UNET Sharing code out into examples
2 parents 8066264 + b231520 commit 3dfeab5

File tree

71 files changed

+78
-67
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

+78
-67
lines changed

Assets/HoloToolkit/SharingWithUNET/Prefabs/Player.prefab Assets/HoloToolkit-Examples/SharingWithUNET/Prefabs/Player.prefab

+20-13
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ GameObject:
1616
m_ObjectHideFlags: 0
1717
m_PrefabParentObject: {fileID: 0}
1818
m_PrefabInternal: {fileID: 100100000}
19-
serializedVersion: 4
19+
serializedVersion: 5
2020
m_Component:
21-
- 4: {fileID: 4000010264513424}
22-
- 33: {fileID: 33000010403557236}
23-
- 65: {fileID: 65000012095097042}
24-
- 23: {fileID: 23000013927414046}
21+
- component: {fileID: 4000010264513424}
22+
- component: {fileID: 33000010403557236}
23+
- component: {fileID: 65000012095097042}
24+
- component: {fileID: 23000013927414046}
2525
m_Layer: 0
2626
m_Name: Cube
2727
m_TagString: Untagged
@@ -34,11 +34,11 @@ GameObject:
3434
m_ObjectHideFlags: 0
3535
m_PrefabParentObject: {fileID: 0}
3636
m_PrefabInternal: {fileID: 100100000}
37-
serializedVersion: 4
37+
serializedVersion: 5
3838
m_Component:
39-
- 4: {fileID: 4000011307205380}
40-
- 114: {fileID: 114000013410669756}
41-
- 114: {fileID: 114000013771453016}
39+
- component: {fileID: 4000011307205380}
40+
- component: {fileID: 114000013410669756}
41+
- component: {fileID: 114000013771453016}
4242
m_Layer: 0
4343
m_Name: Player
4444
m_TagString: Untagged
@@ -55,10 +55,10 @@ Transform:
5555
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
5656
m_LocalPosition: {x: 0, y: 0, z: 0}
5757
m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
58-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
5958
m_Children: []
6059
m_Father: {fileID: 4000011307205380}
6160
m_RootOrder: 0
61+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
6262
--- !u!4 &4000011307205380
6363
Transform:
6464
m_ObjectHideFlags: 1
@@ -68,11 +68,11 @@ Transform:
6868
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
6969
m_LocalPosition: {x: 0, y: 0, z: 0}
7070
m_LocalScale: {x: 1, y: 1, z: 1}
71-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
7271
m_Children:
7372
- {fileID: 4000010264513424}
7473
m_Father: {fileID: 0}
7574
m_RootOrder: 0
75+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
7676
--- !u!23 &23000013927414046
7777
MeshRenderer:
7878
m_ObjectHideFlags: 1
@@ -82,25 +82,30 @@ MeshRenderer:
8282
m_Enabled: 1
8383
m_CastShadows: 1
8484
m_ReceiveShadows: 1
85+
m_DynamicOccludee: 1
8586
m_MotionVectors: 1
8687
m_LightProbeUsage: 1
8788
m_ReflectionProbeUsage: 1
8889
m_Materials:
8990
- {fileID: 2100000, guid: 474f0e0481d4aa14e92a5ada98042f3a, type: 2}
90-
m_SubsetIndices:
91+
m_StaticBatchInfo:
92+
firstSubMesh: 0
93+
subMeshCount: 0
9194
m_StaticBatchRoot: {fileID: 0}
9295
m_ProbeAnchor: {fileID: 0}
9396
m_LightProbeVolumeOverride: {fileID: 0}
9497
m_ScaleInLightmap: 1
9598
m_PreserveUVs: 1
9699
m_IgnoreNormalsForChartDetection: 0
97100
m_ImportantGI: 0
98-
m_SelectedWireframeHidden: 0
101+
m_StitchLightmapSeams: 0
102+
m_SelectedEditorRenderState: 3
99103
m_MinimumChartSize: 4
100104
m_AutoUVMaxDistance: 0.5
101105
m_AutoUVMaxAngle: 89
102106
m_LightmapParameters: {fileID: 0}
103107
m_SortingLayerID: 0
108+
m_SortingLayer: 0
104109
m_SortingOrder: 0
105110
--- !u!33 &33000010403557236
106111
MeshFilter:
@@ -165,3 +170,5 @@ MonoBehaviour:
165170
m_Name:
166171
m_EditorClassIdentifier:
167172
bullet: {fileID: 1000013437630216, guid: f59738f66a2923a44b1de68dd1887fd0, type: 2}
173+
CanShareAnchors: 0
174+
SharesSpatialAnchors: 0

0 commit comments

Comments
 (0)