Skip to content

Commit 5d0d432

Browse files
kringkring
authored
Merge pull request CesiumGS#1313 from CesiumGS/upgrade-native
Upgrade cesium-native.
2 parents 8fafedf + d94a41f commit 5d0d432

22 files changed

+95
-96
lines changed

‎Source/CesiumRuntime/CesiumRuntime.Build.cs

+3
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,17 @@ public CesiumRuntime(ReadOnlyTargetRules Target) : base(Target)
8383
{
8484
"async++",
8585
"Cesium3DTiles",
86+
"Cesium3DTilesContent",
8687
"Cesium3DTilesReader",
8788
"Cesium3DTilesSelection",
8889
"CesiumAsync",
8990
"CesiumGeometry",
9091
"CesiumGeospatial",
9192
"CesiumGltfReader",
93+
"CesiumGltfContent",
9294
"CesiumGltf",
9395
"CesiumJsonReader",
96+
"CesiumRasterOverlays",
9497
"CesiumUtility",
9598
"draco",
9699
"ktx_read",

‎Source/CesiumRuntime/Private/Cesium3DTileset.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,7 @@ class UnrealResourcePreparer
782782
}
783783

784784
virtual void* prepareRasterInMainThread(
785-
Cesium3DTilesSelection::RasterOverlayTile& rasterTile,
785+
CesiumRasterOverlays::RasterOverlayTile& rasterTile,
786786
void* pLoadThreadResult) override {
787787

788788
TUniquePtr<CesiumTextureUtility::LoadedTextureResult> pLoadedTexture{
@@ -813,7 +813,7 @@ class UnrealResourcePreparer
813813
}
814814

815815
virtual void freeRaster(
816-
const Cesium3DTilesSelection::RasterOverlayTile& rasterTile,
816+
const CesiumRasterOverlays::RasterOverlayTile& rasterTile,
817817
void* pLoadThreadResult,
818818
void* pMainThreadResult) noexcept override {
819819
if (pLoadThreadResult) {
@@ -834,7 +834,7 @@ class UnrealResourcePreparer
834834
virtual void attachRasterInMainThread(
835835
const Cesium3DTilesSelection::Tile& tile,
836836
int32_t overlayTextureCoordinateID,
837-
const Cesium3DTilesSelection::RasterOverlayTile& rasterTile,
837+
const CesiumRasterOverlays::RasterOverlayTile& rasterTile,
838838
void* pMainThreadRendererResources,
839839
const glm::dvec2& translation,
840840
const glm::dvec2& scale) override {
@@ -860,7 +860,7 @@ class UnrealResourcePreparer
860860
virtual void detachRasterInMainThread(
861861
const Cesium3DTilesSelection::Tile& tile,
862862
int32_t overlayTextureCoordinateID,
863-
const Cesium3DTilesSelection::RasterOverlayTile& rasterTile,
863+
const CesiumRasterOverlays::RasterOverlayTile& rasterTile,
864864
void* pMainThreadRendererResources) noexcept override {
865865
const Cesium3DTilesSelection::TileContent& content = tile.getContent();
866866
const Cesium3DTilesSelection::TileRenderContent* pRenderContent =

‎Source/CesiumRuntime/Private/CesiumBingMapsRasterOverlay.cpp

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
// Copyright 2020-2021 CesiumGS, Inc. and Contributors
22

33
#include "CesiumBingMapsRasterOverlay.h"
4-
#include "Cesium3DTilesSelection/BingMapsRasterOverlay.h"
54
#include "Cesium3DTilesSelection/Tileset.h"
5+
#include "CesiumRasterOverlays/BingMapsRasterOverlay.h"
66

7-
std::unique_ptr<Cesium3DTilesSelection::RasterOverlay>
7+
std::unique_ptr<CesiumRasterOverlays::RasterOverlay>
88
UCesiumBingMapsRasterOverlay::CreateOverlay(
9-
const Cesium3DTilesSelection::RasterOverlayOptions& options) {
9+
const CesiumRasterOverlays::RasterOverlayOptions& options) {
1010
std::string mapStyle;
1111

1212
switch (this->MapStyle) {
1313
case EBingMapsStyle::Aerial:
14-
mapStyle = Cesium3DTilesSelection::BingMapsStyle::AERIAL;
14+
mapStyle = CesiumRasterOverlays::BingMapsStyle::AERIAL;
1515
break;
1616
case EBingMapsStyle::AerialWithLabelsOnDemand:
1717
mapStyle =
18-
Cesium3DTilesSelection::BingMapsStyle::AERIAL_WITH_LABELS_ON_DEMAND;
18+
CesiumRasterOverlays::BingMapsStyle::AERIAL_WITH_LABELS_ON_DEMAND;
1919
break;
2020
case EBingMapsStyle::RoadOnDemand:
21-
mapStyle = Cesium3DTilesSelection::BingMapsStyle::ROAD_ON_DEMAND;
21+
mapStyle = CesiumRasterOverlays::BingMapsStyle::ROAD_ON_DEMAND;
2222
break;
2323
case EBingMapsStyle::CanvasDark:
24-
mapStyle = Cesium3DTilesSelection::BingMapsStyle::CANVAS_DARK;
24+
mapStyle = CesiumRasterOverlays::BingMapsStyle::CANVAS_DARK;
2525
break;
2626
case EBingMapsStyle::CanvasLight:
27-
mapStyle = Cesium3DTilesSelection::BingMapsStyle::CANVAS_LIGHT;
27+
mapStyle = CesiumRasterOverlays::BingMapsStyle::CANVAS_LIGHT;
2828
break;
2929
case EBingMapsStyle::CanvasGray:
30-
mapStyle = Cesium3DTilesSelection::BingMapsStyle::CANVAS_GRAY;
30+
mapStyle = CesiumRasterOverlays::BingMapsStyle::CANVAS_GRAY;
3131
break;
3232
case EBingMapsStyle::OrdnanceSurvey:
33-
mapStyle = Cesium3DTilesSelection::BingMapsStyle::ORDNANCE_SURVEY;
33+
mapStyle = CesiumRasterOverlays::BingMapsStyle::ORDNANCE_SURVEY;
3434
break;
3535
case EBingMapsStyle::CollinsBart:
36-
mapStyle = Cesium3DTilesSelection::BingMapsStyle::COLLINS_BART;
36+
mapStyle = CesiumRasterOverlays::BingMapsStyle::COLLINS_BART;
3737
break;
3838
}
3939

40-
return std::make_unique<Cesium3DTilesSelection::BingMapsRasterOverlay>(
40+
return std::make_unique<CesiumRasterOverlays::BingMapsRasterOverlay>(
4141
TCHAR_TO_UTF8(*this->MaterialLayerKey),
4242
"https://dev.virtualearth.net",
4343
TCHAR_TO_UTF8(*this->BingMapsKey),

‎Source/CesiumRuntime/Private/CesiumCreditSystem.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// Copyright 2020-2021 CesiumGS, Inc. and Contributors
22

33
#include "CesiumCreditSystem.h"
4-
#include "Cesium3DTilesSelection/CreditSystem.h"
54
#include "CesiumCreditSystemBPLoader.h"
65
#include "CesiumRuntime.h"
6+
#include "CesiumUtility/CreditSystem.h"
77
#include "Engine/World.h"
88
#include "EngineUtils.h"
99
#include "ScreenCreditsWidget.h"
@@ -168,7 +168,7 @@ ACesiumCreditSystem::GetDefaultCreditSystem(const UObject* WorldContextObject) {
168168

169169
ACesiumCreditSystem::ACesiumCreditSystem()
170170
: AActor(),
171-
_pCreditSystem(std::make_shared<Cesium3DTilesSelection::CreditSystem>()),
171+
_pCreditSystem(std::make_shared<CesiumUtility::CreditSystem>()),
172172
_lastCreditsCount(0) {
173173
PrimaryActorTick.bCanEverTick = true;
174174
#if WITH_EDITOR
@@ -326,7 +326,7 @@ void ACesiumCreditSystem::Tick(float DeltaTime) {
326326
return;
327327
}
328328

329-
const std::vector<Cesium3DTilesSelection::Credit>& creditsToShowThisFrame =
329+
const std::vector<CesiumUtility::Credit>& creditsToShowThisFrame =
330330
_pCreditSystem->getCreditsToShowThisFrame();
331331

332332
// if the credit list has changed, we want to reformat the credits
@@ -342,7 +342,7 @@ void ACesiumCreditSystem::Tick(float DeltaTime) {
342342

343343
bool firstCreditOnScreen = true;
344344
for (int i = 0; i < creditsToShowThisFrame.size(); i++) {
345-
const Cesium3DTilesSelection::Credit& credit = creditsToShowThisFrame[i];
345+
const CesiumUtility::Credit& credit = creditsToShowThisFrame[i];
346346

347347
FString CreditRtf;
348348
const std::string& html = _pCreditSystem->getHtml(credit);

‎Source/CesiumRuntime/Private/CesiumDebugColorizeTilesRasterOverlay.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// Copyright 2020-2021 CesiumGS, Inc. and Contributors
22

33
#include "CesiumDebugColorizeTilesRasterOverlay.h"
4-
#include "Cesium3DTilesSelection/DebugColorizeTilesRasterOverlay.h"
54
#include "Cesium3DTilesSelection/Tileset.h"
5+
#include "CesiumRasterOverlays/DebugColorizeTilesRasterOverlay.h"
66

7-
std::unique_ptr<Cesium3DTilesSelection::RasterOverlay>
7+
std::unique_ptr<CesiumRasterOverlays::RasterOverlay>
88
UCesiumDebugColorizeTilesRasterOverlay::CreateOverlay(
9-
const Cesium3DTilesSelection::RasterOverlayOptions& options) {
9+
const CesiumRasterOverlays::RasterOverlayOptions& options) {
1010
return std::make_unique<
11-
Cesium3DTilesSelection::DebugColorizeTilesRasterOverlay>(
11+
CesiumRasterOverlays::DebugColorizeTilesRasterOverlay>(
1212
TCHAR_TO_UTF8(*this->MaterialLayerKey),
1313
options);
1414
}

‎Source/CesiumRuntime/Private/CesiumGltfComponent.cpp

+7-8
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
#include "CesiumGltfComponent.h"
44
#include "Async/Async.h"
5-
#include "Cesium3DTilesSelection/GltfUtilities.h"
6-
#include "Cesium3DTilesSelection/RasterOverlay.h"
7-
#include "Cesium3DTilesSelection/RasterOverlayTile.h"
85
#include "CesiumCommon.h"
96
#include "CesiumEncodedFeaturesMetadata.h"
107
#include "CesiumEncodedMetadataUtility.h"
@@ -20,10 +17,13 @@
2017
#include "CesiumGltf/ExtensionModelExtStructuralMetadata.h"
2118
#include "CesiumGltf/PropertyType.h"
2219
#include "CesiumGltf/TextureInfo.h"
20+
#include "CesiumGltfContent/GltfUtilities.h"
2321
#include "CesiumGltfPointsComponent.h"
2422
#include "CesiumGltfPrimitiveComponent.h"
2523
#include "CesiumMaterialUserData.h"
2624
#include "CesiumRasterOverlays.h"
25+
#include "CesiumRasterOverlays/RasterOverlay.h"
26+
#include "CesiumRasterOverlays/RasterOverlayTile.h"
2727
#include "CesiumRuntime.h"
2828
#include "CesiumTextureUtility.h"
2929
#include "CesiumTransforms.h"
@@ -1859,9 +1859,8 @@ static void loadModelAnyThreadPart(
18591859
glm::dmat4x4 rootTransform = transform;
18601860

18611861
{
1862-
rootTransform = Cesium3DTilesSelection::GltfUtilities::applyRtcCenter(
1863-
model,
1864-
rootTransform);
1862+
rootTransform =
1863+
CesiumGltfContent::GltfUtilities::applyRtcCenter(model, rootTransform);
18651864
applyGltfUpAxisTransform(model, rootTransform);
18661865
}
18671866

@@ -2944,7 +2943,7 @@ void forEachPrimitiveComponent(UCesiumGltfComponent* pGltf, Func&& f) {
29442943

29452944
void UCesiumGltfComponent::AttachRasterTile(
29462945
const Cesium3DTilesSelection::Tile& tile,
2947-
const Cesium3DTilesSelection::RasterOverlayTile& rasterTile,
2946+
const CesiumRasterOverlays::RasterOverlayTile& rasterTile,
29482947
UTexture2D* pTexture,
29492948
const glm::dvec2& translation,
29502949
const glm::dvec2& scale,
@@ -3012,7 +3011,7 @@ void UCesiumGltfComponent::AttachRasterTile(
30123011

30133012
void UCesiumGltfComponent::DetachRasterTile(
30143013
const Cesium3DTilesSelection::Tile& tile,
3015-
const Cesium3DTilesSelection::RasterOverlayTile& rasterTile,
3014+
const CesiumRasterOverlays::RasterOverlayTile& rasterTile,
30163015
UTexture2D* pTexture) {
30173016

30183017
forEachPrimitiveComponent(

‎Source/CesiumRuntime/Private/CesiumGltfComponent.h

+7-4
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,19 @@ class UStaticMeshComponent;
2222

2323
namespace CreateGltfOptions {
2424
struct CreateModelOptions;
25-
} // namespace CreateGltfOptions
25+
}
2626

2727
namespace CesiumGltf {
2828
struct Model;
2929
}
3030

3131
namespace Cesium3DTilesSelection {
3232
class Tile;
33+
}
34+
35+
namespace CesiumRasterOverlays {
3336
class RasterOverlayTile;
34-
} // namespace Cesium3DTilesSelection
37+
}
3538

3639
namespace CesiumGeometry {
3740
struct Rectangle;
@@ -104,15 +107,15 @@ class UCesiumGltfComponent : public USceneComponent {
104107

105108
void AttachRasterTile(
106109
const Cesium3DTilesSelection::Tile& Tile,
107-
const Cesium3DTilesSelection::RasterOverlayTile& RasterTile,
110+
const CesiumRasterOverlays::RasterOverlayTile& RasterTile,
108111
UTexture2D* Texture,
109112
const glm::dvec2& Translation,
110113
const glm::dvec2& Scale,
111114
int32_t TextureCoordinateID);
112115

113116
void DetachRasterTile(
114117
const Cesium3DTilesSelection::Tile& Tile,
115-
const Cesium3DTilesSelection::RasterOverlayTile& RasterTile,
118+
const CesiumRasterOverlays::RasterOverlayTile& RasterTile,
116119
UTexture2D* Texture);
117120

118121
UFUNCTION(BlueprintCallable, Category = "Collision")

‎Source/CesiumRuntime/Private/CesiumIonRasterOverlay.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
// Copyright 2020-2021 CesiumGS, Inc. and Contributors
22

33
#include "CesiumIonRasterOverlay.h"
4-
#include "Cesium3DTilesSelection/IonRasterOverlay.h"
54
#include "Cesium3DTilesSelection/Tileset.h"
65
#include "CesiumActors.h"
6+
#include "CesiumRasterOverlays/IonRasterOverlay.h"
77
#include "CesiumRuntime.h"
88
#include "CesiumRuntimeSettings.h"
99

1010
void UCesiumIonRasterOverlay::TroubleshootToken() {
1111
OnCesiumRasterOverlayIonTroubleshooting.Broadcast(this);
1212
}
1313

14-
std::unique_ptr<Cesium3DTilesSelection::RasterOverlay>
14+
std::unique_ptr<CesiumRasterOverlays::RasterOverlay>
1515
UCesiumIonRasterOverlay::CreateOverlay(
16-
const Cesium3DTilesSelection::RasterOverlayOptions& options) {
16+
const CesiumRasterOverlays::RasterOverlayOptions& options) {
1717
if (this->IonAssetID <= 0) {
1818
// Don't create an overlay for an invalid asset ID.
1919
return nullptr;
@@ -24,14 +24,14 @@ UCesiumIonRasterOverlay::CreateOverlay(
2424
? GetDefault<UCesiumRuntimeSettings>()->DefaultIonAccessToken
2525
: this->IonAccessToken;
2626
if (!this->IonAssetEndpointUrl.IsEmpty()) {
27-
return std::make_unique<Cesium3DTilesSelection::IonRasterOverlay>(
27+
return std::make_unique<CesiumRasterOverlays::IonRasterOverlay>(
2828
TCHAR_TO_UTF8(*this->MaterialLayerKey),
2929
this->IonAssetID,
3030
TCHAR_TO_UTF8(*token),
3131
options,
3232
TCHAR_TO_UTF8(*this->IonAssetEndpointUrl));
3333
}
34-
return std::make_unique<Cesium3DTilesSelection::IonRasterOverlay>(
34+
return std::make_unique<CesiumRasterOverlays::IonRasterOverlay>(
3535
TCHAR_TO_UTF8(*this->MaterialLayerKey),
3636
this->IonAssetID,
3737
TCHAR_TO_UTF8(*token),

‎Source/CesiumRuntime/Private/CesiumPolygonRasterOverlay.cpp

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
// Copyright 2020-2021 CesiumGS, Inc. and Contributors
22

33
#include "CesiumPolygonRasterOverlay.h"
4-
#include "Cesium3DTilesSelection/RasterizedPolygonsOverlay.h"
54
#include "Cesium3DTilesSelection/RasterizedPolygonsTileExcluder.h"
65
#include "Cesium3DTilesSelection/Tileset.h"
76
#include "Cesium3DTileset.h"
87
#include "CesiumBingMapsRasterOverlay.h"
98
#include "CesiumCartographicPolygon.h"
9+
#include "CesiumRasterOverlays/RasterizedPolygonsOverlay.h"
1010

11-
using namespace CesiumGeospatial;
1211
using namespace Cesium3DTilesSelection;
12+
using namespace CesiumGeospatial;
13+
using namespace CesiumRasterOverlays;
1314

1415
UCesiumPolygonRasterOverlay::UCesiumPolygonRasterOverlay()
1516
: UCesiumRasterOverlay() {
1617
this->MaterialLayerKey = TEXT("Clipping");
1718
}
1819

19-
std::unique_ptr<Cesium3DTilesSelection::RasterOverlay>
20+
std::unique_ptr<CesiumRasterOverlays::RasterOverlay>
2021
UCesiumPolygonRasterOverlay::CreateOverlay(
21-
const Cesium3DTilesSelection::RasterOverlayOptions& options) {
22+
const CesiumRasterOverlays::RasterOverlayOptions& options) {
2223
ACesium3DTileset* pTileset = this->GetOwner<ACesium3DTileset>();
2324

2425
FTransform worldToTileset =
@@ -37,7 +38,7 @@ UCesiumPolygonRasterOverlay::CreateOverlay(
3738
polygons.emplace_back(std::move(polygon));
3839
}
3940

40-
return std::make_unique<Cesium3DTilesSelection::RasterizedPolygonsOverlay>(
41+
return std::make_unique<CesiumRasterOverlays::RasterizedPolygonsOverlay>(
4142
TCHAR_TO_UTF8(*this->MaterialLayerKey),
4243
polygons,
4344
this->InvertSelection,

‎Source/CesiumRuntime/Private/CesiumRasterOverlay.cpp

+7-8
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
#include "CesiumRasterOverlay.h"
44
#include "Async/Async.h"
5-
#include "Cesium3DTilesSelection/RasterOverlayLoadFailureDetails.h"
65
#include "Cesium3DTilesSelection/Tileset.h"
76
#include "Cesium3DTileset.h"
87
#include "CesiumAsync/IAssetResponse.h"
8+
#include "CesiumRasterOverlays/RasterOverlayLoadFailureDetails.h"
99
#include "CesiumRuntime.h"
1010

1111
FCesiumRasterOverlayLoadFailure OnCesiumRasterOverlayLoadFailure{};
@@ -43,26 +43,25 @@ void UCesiumRasterOverlay::AddToTileset() {
4343
return;
4444
}
4545

46-
Cesium3DTilesSelection::RasterOverlayOptions options{};
46+
CesiumRasterOverlays::RasterOverlayOptions options{};
4747
options.maximumScreenSpaceError = this->MaximumScreenSpaceError;
4848
options.maximumSimultaneousTileLoads = this->MaximumSimultaneousTileLoads;
4949
options.maximumTextureSize = this->MaximumTextureSize;
5050
options.subTileCacheBytes = this->SubTileCacheBytes;
5151
options.showCreditsOnScreen = this->ShowCreditsOnScreen;
5252
options.rendererOptions = &this->rendererOptions;
5353
options.loadErrorCallback =
54-
[this](const Cesium3DTilesSelection::RasterOverlayLoadFailureDetails&
54+
[this](const CesiumRasterOverlays::RasterOverlayLoadFailureDetails&
5555
details) {
5656
static_assert(
5757
uint8_t(ECesiumRasterOverlayLoadType::CesiumIon) ==
58-
uint8_t(Cesium3DTilesSelection::RasterOverlayLoadType::CesiumIon));
58+
uint8_t(CesiumRasterOverlays::RasterOverlayLoadType::CesiumIon));
5959
static_assert(
6060
uint8_t(ECesiumRasterOverlayLoadType::TileProvider) ==
61-
uint8_t(
62-
Cesium3DTilesSelection::RasterOverlayLoadType::TileProvider));
61+
uint8_t(CesiumRasterOverlays::RasterOverlayLoadType::TileProvider));
6362
static_assert(
6463
uint8_t(ECesiumRasterOverlayLoadType::Unknown) ==
65-
uint8_t(Cesium3DTilesSelection::RasterOverlayLoadType::Unknown));
64+
uint8_t(CesiumRasterOverlays::RasterOverlayLoadType::Unknown));
6665

6766
uint8_t typeValue = uint8_t(details.type);
6867
assert(
@@ -90,7 +89,7 @@ void UCesiumRasterOverlay::AddToTileset() {
9089
});
9190
};
9291

93-
std::unique_ptr<Cesium3DTilesSelection::RasterOverlay> pOverlay =
92+
std::unique_ptr<CesiumRasterOverlays::RasterOverlay> pOverlay =
9493
this->CreateOverlay(options);
9594

9695
if (pOverlay) {

0 commit comments

Comments
 (0)