Skip to content

Commit c7ab653

Browse files
argallegosargallegos
authored
Merge pull request #4 from CesiumGS/gtm-quickfixes
Gtm quickfixes
2 parents 474af20 + 6fa1758 commit c7ab653

File tree

7 files changed

+734
-259
lines changed

7 files changed

+734
-259
lines changed

‎Images/Cesium_for_O3DE_dark_onWhite.jpg

84.6 KB
Loading

‎Images/Cesium_for_O3DE_light_ui.png

41.4 KB
Loading

‎Levels/01_CesiumWorld/01_CesiumWorld.prefab

-127
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
"$type": "EditorEntitySortComponent",
2020
"Id": 14126657869720434043,
2121
"Child Entity Order": [
22-
"Entity_[1176639161715]",
2322
"Entity_[33258681235730]",
2423
"Entity_[1343916613601]",
2524
"Entity_[1335326679009]",
@@ -151,132 +150,6 @@
151150
}
152151
},
153152
"Entities": {
154-
"Entity_[1176639161715]": {
155-
"Id": "Entity_[1176639161715]",
156-
"Name": "GameManager",
157-
"Components": {
158-
"Component_[10757302973393310045]": {
159-
"$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
160-
"Id": 10757302973393310045,
161-
"Parent Entity": "Entity_[1146574390643]"
162-
},
163-
"Component_[14505817420424255464]": {
164-
"$type": "EditorInspectorComponent",
165-
"Id": 14505817420424255464,
166-
"ComponentOrderEntryArray": [
167-
{
168-
"ComponentId": 10757302973393310045
169-
}
170-
]
171-
},
172-
"Component_[14988041764659020032]": {
173-
"$type": "EditorLockComponent",
174-
"Id": 14988041764659020032
175-
},
176-
"Component_[15808690248755038124]": {
177-
"$type": "SelectionComponent",
178-
"Id": 15808690248755038124
179-
},
180-
"Component_[15900837685796817138]": {
181-
"$type": "EditorVisibilityComponent",
182-
"Id": 15900837685796817138
183-
},
184-
"Component_[3298767348226484884]": {
185-
"$type": "EditorOnlyEntityComponent",
186-
"Id": 3298767348226484884
187-
},
188-
"Component_[3383771529754581062]": {
189-
"$type": "GenericComponentWrapper",
190-
"Id": 3383771529754581062,
191-
"m_template": {
192-
"$type": "InputConfigurationComponent",
193-
"Input Event Bindings": {
194-
"assetId": {
195-
"guid": "{9C5D7A0A-7808-5755-AE04-2366502E7B60}"
196-
},
197-
"assetHint": "assets/inputs/globeflying.inputbindings"
198-
}
199-
}
200-
},
201-
"Component_[4076975109609220594]": {
202-
"$type": "EditorPendingCompositionComponent",
203-
"Id": 4076975109609220594
204-
},
205-
"Component_[5679760548946028854]": {
206-
"$type": "EditorDisabledCompositionComponent",
207-
"Id": 5679760548946028854
208-
},
209-
"Component_[5855590796136709437]": {
210-
"$type": "EditorEntitySortComponent",
211-
"Id": 5855590796136709437
212-
},
213-
"Component_[7345448390833112084]": {
214-
"$type": "EditorScriptCanvasComponent",
215-
"Id": 7345448390833112084,
216-
"m_name": "FlyBetweenLocations",
217-
"m_assetHolder": {
218-
"m_asset": {
219-
"assetId": {
220-
"guid": "{09A0DCBE-DE92-5CDE-8B05-9B3236CE0B42}"
221-
},
222-
"assetHint": "scriptcanvas/flybetweenlocations.scriptcanvas"
223-
}
224-
},
225-
"runtimeDataIsValid": true,
226-
"runtimeDataOverrides": {
227-
"source": {
228-
"assetId": {
229-
"guid": "{09A0DCBE-DE92-5CDE-8B05-9B3236CE0B42}"
230-
},
231-
"assetHint": "scriptcanvas/flybetweenlocations.scriptcanvas"
232-
},
233-
"entityId": [
234-
[
235-
{
236-
"m_id": "{BDDD937F-6365-4F51-BB9F-E8E7BCED394A}"
237-
},
238-
""
239-
]
240-
],
241-
"overrides": [
242-
{
243-
"Datum": {
244-
"scriptCanvasType": {
245-
"m_type": 1
246-
},
247-
"isNullPointer": false,
248-
"$type": "EntityId",
249-
"value": ""
250-
},
251-
"InputControlVisibility": {
252-
"Value": 850104567
253-
},
254-
"VariableId": {
255-
"m_id": "{BDDD937F-6365-4F51-BB9F-E8E7BCED394A}"
256-
},
257-
"VariableName": "Camera [11198443766720610195]",
258-
"InitialValueSource": 1
259-
}
260-
]
261-
}
262-
},
263-
"Component_[9277695270015777859]": {
264-
"$type": "EditorEntityIconComponent",
265-
"Id": 9277695270015777859
266-
},
267-
"Component_[9509939493103505549]": {
268-
"$type": "GenericComponentWrapper",
269-
"Id": 9509939493103505549,
270-
"m_template": {
271-
"$type": "UiCanvasAssetRefComponent",
272-
"CanvasAssetRef": {
273-
"AssetPath": "ui/controlmenu.uicanvas"
274-
},
275-
"IsAutoLoad": true
276-
}
277-
}
278-
}
279-
},
280153
"Entity_[12267472318042]": {
281154
"Id": "Entity_[12267472318042]",
282155
"Name": "New York City 3D Buildings",

‎Levels/02_CesiumBase/02_CesiumBase.prefab renamed to ‎Levels/02_CesiumQuickstart/02_CesiumQuickstart.prefab

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
"ECEFPicker": {
4242
"SampleOriginMethod": 1,
4343
"SampledEntityId": "",
44-
"PositionType": 1,
4544
"Position": [
4645
1334926.2155496497,
4746
-4652376.221433976,
@@ -196,6 +195,7 @@
196195
"Configuration": {
197196
"Intensity": 1.0,
198197
"CameraEntityId": "",
198+
"ShadowFarClipDistance": 1000.0,
199199
"ShadowFilterMethod": 1
200200
}
201201
}
@@ -487,7 +487,7 @@
487487
0.0
488488
],
489489
[
490-
-4.803578897843997e-8,
490+
-4.8035788978439984e-8,
491491
1.347948260685015e-7,
492492
0.9999999924355292,
493493
0.0

‎Levels/02_CesiumBase/tags.txt renamed to ‎Levels/02_CesiumQuickstart/tags.txt

File renamed without changes.

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![Cesium for O3DE Logo](Images/Cesium_for_O3DE_dark_color.png)
1+
![Cesium for O3DE Logo](Images/Cesium_for_O3DE_dark_onWhite.jpg)
22

33
# Cesium for O3DE Samples
44

@@ -28,7 +28,7 @@ Have questions? Ask them on the [community forum](https://community.cesium.com).
2828

2929
Explore different tilesets and locations on the globe in this introductory level. Press play, then use keyboard keys 1-3 to fly to New York City, USA, Mount Fuji, Japan, and Melbourne, Australia. This level demonstrates using the Script Canvas and the Cesium plugin to fly smoothly between different locations on the globe.
3030

31-
### :two: Level 02_CesiumBase
31+
### :two: Level 02_CesiumQuickstart
3232

3333
This level is a simple template level consisting only of lighting, Cesium World Terrain and Cesium OSM Buildings, and the basic camera settings that you'll typically want in all your Cesium levels. Use this level as a jumping-off point to more rapidly build new experiences with Cesium and O3DE!
3434

0 commit comments

Comments
 (0)