Skip to content

Commit e5cd08e

Browse files
joseph-kailejoseph-kaile
authored
Merge pull request #52 from CesiumGS/refactor-flyto-script
2 parents e26deae + 40007b3 commit e5cd08e

12 files changed

+443
-225
lines changed

‎Assets/CesiumForUnitySamples/Scenes/01_CesiumWorld.unity‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,11 @@ MonoBehaviour:
185185
_enforceCulledScreenSpaceError: 0
186186
_culledScreenSpaceError: 64
187187
_opaqueMaterial: {fileID: 0}
188+
_pointCloudShading:
189+
_attenuation: 0
190+
_geometricErrorScale: 1
191+
_maximumAttenuation: 0
192+
_baseResolution: 0
188193
_suspendUpdate: 0
189194
_showTilesInHierarchy: 0
190195
_updateInEditor: 1
@@ -268,6 +273,11 @@ MonoBehaviour:
268273
_enforceCulledScreenSpaceError: 0
269274
_culledScreenSpaceError: 64
270275
_opaqueMaterial: {fileID: 0}
276+
_pointCloudShading:
277+
_attenuation: 0
278+
_geometricErrorScale: 1
279+
_maximumAttenuation: 0
280+
_baseResolution: 0
271281
_suspendUpdate: 0
272282
_showTilesInHierarchy: 0
273283
_updateInEditor: 1

‎Assets/CesiumForUnitySamples/Scenes/02_CesiumMelbourne.unity‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,11 @@ MonoBehaviour:
337337
_enforceCulledScreenSpaceError: 0
338338
_culledScreenSpaceError: 64
339339
_opaqueMaterial: {fileID: 0}
340+
_pointCloudShading:
341+
_attenuation: 0
342+
_geometricErrorScale: 1
343+
_maximumAttenuation: 0
344+
_baseResolution: 0
340345
_suspendUpdate: 0
341346
_showTilesInHierarchy: 0
342347
_updateInEditor: 1
@@ -636,6 +641,11 @@ MonoBehaviour:
636641
_enforceCulledScreenSpaceError: 0
637642
_culledScreenSpaceError: 64
638643
_opaqueMaterial: {fileID: 0}
644+
_pointCloudShading:
645+
_attenuation: 0
646+
_geometricErrorScale: 1
647+
_maximumAttenuation: 0
648+
_baseResolution: 0
639649
_suspendUpdate: 0
640650
_showTilesInHierarchy: 0
641651
_updateInEditor: 1

‎Assets/CesiumForUnitySamples/Scenes/03_CesiumSanFrancisco.unity‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -579,6 +579,11 @@ MonoBehaviour:
579579
_enforceCulledScreenSpaceError: 1
580580
_culledScreenSpaceError: 64
581581
_opaqueMaterial: {fileID: 0}
582+
_pointCloudShading:
583+
_attenuation: 0
584+
_geometricErrorScale: 1
585+
_maximumAttenuation: 0
586+
_baseResolution: 0
582587
_suspendUpdate: 0
583588
_showTilesInHierarchy: 0
584589
_updateInEditor: 1
@@ -1031,6 +1036,11 @@ MonoBehaviour:
10311036
_enforceCulledScreenSpaceError: 1
10321037
_culledScreenSpaceError: 8
10331038
_opaqueMaterial: {fileID: 0}
1039+
_pointCloudShading:
1040+
_attenuation: 0
1041+
_geometricErrorScale: 1
1042+
_maximumAttenuation: 0
1043+
_baseResolution: 0
10341044
_suspendUpdate: 0
10351045
_showTilesInHierarchy: 0
10361046
_updateInEditor: 1

‎Assets/CesiumForUnitySamples/Scenes/04_CesiumSubScenes.unity‎

Lines changed: 40 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,11 @@ MonoBehaviour:
240240
_enforceCulledScreenSpaceError: 0
241241
_culledScreenSpaceError: 64
242242
_opaqueMaterial: {fileID: 0}
243+
_pointCloudShading:
244+
_attenuation: 0
245+
_geometricErrorScale: 1
246+
_maximumAttenuation: 0
247+
_baseResolution: 0
243248
_suspendUpdate: 0
244249
_showTilesInHierarchy: 0
245250
_updateInEditor: 1
@@ -323,6 +328,11 @@ MonoBehaviour:
323328
_enforceCulledScreenSpaceError: 0
324329
_culledScreenSpaceError: 64
325330
_opaqueMaterial: {fileID: 0}
331+
_pointCloudShading:
332+
_attenuation: 0
333+
_geometricErrorScale: 1
334+
_maximumAttenuation: 0
335+
_baseResolution: 0
326336
_suspendUpdate: 0
327337
_showTilesInHierarchy: 0
328338
_updateInEditor: 1
@@ -911,17 +921,25 @@ MonoBehaviour:
911921
m_Script: {fileID: 11500000, guid: b29a5872289de9349bb16d5f25d8e87c, type: 3}
912922
m_Name:
913923
m_EditorClassIdentifier:
914-
subScenes:
915-
- {fileID: 1339608741}
916-
- {fileID: 911748173}
917-
- {fileID: 1184409368}
918-
- {fileID: 5875669}
919-
subSceneYawAndPitch:
924+
flyToController: {fileID: 485487350}
925+
locations:
926+
- x: -104.988892
927+
y: 39.743462
928+
z: 1798.679443
929+
- x: -112.108161
930+
y: 36.061385
931+
z: 2157.885751
932+
- x: -71.041824
933+
y: 42.357479
934+
z: 378.686462
935+
- x: 2.297891
936+
y: 48.85609
937+
z: 150
938+
yawAndPitchAngles:
920939
- {x: -45, y: 10}
921940
- {x: 60, y: 10}
922941
- {x: -90, y: 20}
923942
- {x: -45, y: 10}
924-
flyToController: {fileID: 485487350}
925943
--- !u!1 &832575517
926944
GameObject:
927945
m_ObjectHideFlags: 0
@@ -1292,6 +1310,11 @@ MonoBehaviour:
12921310
_enforceCulledScreenSpaceError: 0
12931311
_culledScreenSpaceError: 64
12941312
_opaqueMaterial: {fileID: 2100000, guid: d2032d88bf6556a459f397ec48ec5573, type: 2}
1313+
_pointCloudShading:
1314+
_attenuation: 0
1315+
_geometricErrorScale: 1
1316+
_maximumAttenuation: 0
1317+
_baseResolution: 0
12951318
_suspendUpdate: 0
12961319
_showTilesInHierarchy: 0
12971320
_updateInEditor: 1
@@ -1553,6 +1576,11 @@ MonoBehaviour:
15531576
_enforceCulledScreenSpaceError: 1
15541577
_culledScreenSpaceError: 64
15551578
_opaqueMaterial: {fileID: 0}
1579+
_pointCloudShading:
1580+
_attenuation: 0
1581+
_geometricErrorScale: 1
1582+
_maximumAttenuation: 0
1583+
_baseResolution: 0
15561584
_suspendUpdate: 0
15571585
_showTilesInHierarchy: 0
15581586
_updateInEditor: 1
@@ -1569,8 +1597,9 @@ PrefabInstance:
15691597
type: 3}
15701598
propertyPath: m_text
15711599
value: 'In the previous three scenes, you explored terrain and photogrammetry
1572-
around the world. In this level, we use CesiumSubScenes to fly around the
1573-
world in the same scene.
1600+
around the world at single locations. In this scene, we use CesiumSubScenes
1601+
to place objects in multiple locations around the world, then fly between
1602+
them, all in the same scene.
15741603
15751604
15761605
This is possible with Cesium''s georeferencing
@@ -1579,7 +1608,7 @@ PrefabInstance:
15791608
15801609
15811610
The scene starts with a view of Denver. Use
1582-
the following keys in play mode to fly through the sublevels.
1611+
the following keys in play mode to fly through the sub-scenes.
15831612
15841613
"1"
15851614
- Denver (Photogrammetry)
@@ -1710,7 +1739,7 @@ PrefabInstance:
17101739
- target: {fileID: 7752603227654311266, guid: d1f6fb4b452d026489986bf620a2d8bc,
17111740
type: 3}
17121741
propertyPath: m_SizeDelta.y
1713-
value: 180
1742+
value: 200
17141743
objectReference: {fileID: 0}
17151744
m_RemovedComponents: []
17161745
m_SourcePrefab: {fileID: 100100000, guid: d1f6fb4b452d026489986bf620a2d8bc, type: 3}

‎Assets/CesiumForUnitySamples/Scenes/05_CesiumMetadata.unity‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,11 @@ MonoBehaviour:
335335
_enforceCulledScreenSpaceError: 1
336336
_culledScreenSpaceError: 64
337337
_opaqueMaterial: {fileID: 0}
338+
_pointCloudShading:
339+
_attenuation: 0
340+
_geometricErrorScale: 1
341+
_maximumAttenuation: 0
342+
_baseResolution: 0
338343
_suspendUpdate: 0
339344
_showTilesInHierarchy: 0
340345
_updateInEditor: 1
@@ -418,6 +423,11 @@ MonoBehaviour:
418423
_enforceCulledScreenSpaceError: 1
419424
_culledScreenSpaceError: 64
420425
_opaqueMaterial: {fileID: 0}
426+
_pointCloudShading:
427+
_attenuation: 0
428+
_geometricErrorScale: 1
429+
_maximumAttenuation: 0
430+
_baseResolution: 0
421431
_suspendUpdate: 0
422432
_showTilesInHierarchy: 0
423433
_updateInEditor: 1

0 commit comments

Comments
 (0)