Skip to content

Commit dce58da

Browse files
committed
Update to match Native changes
1 parent a7c7ccc commit dce58da

File tree

3 files changed

+20
-17
lines changed

3 files changed

+20
-17
lines changed

Source/CesiumRuntime/Private/CesiumITwinAPIBlueprintLibrary.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void UCesiumITwinAPIAuthorizeAsyncAction::Activate() {
4545
TArray<FString>());
4646
})
4747
.thenInMainThread([this](CesiumUtility::Result<
48-
CesiumITwinClient::Connection>&& connection) {
48+
CesiumUtility::IntrusivePointer<CesiumITwinClient::Connection>>&& connection) {
4949
if (!IsValid(this)) {
5050
UE_LOG(
5151
LogCesium,
@@ -55,19 +55,17 @@ void UCesiumITwinAPIAuthorizeAsyncAction::Activate() {
5555
return;
5656
}
5757

58-
if (!connection.value) {
58+
if (!connection.pValue) {
5959
this->OnAuthorizationEvent.Broadcast(
6060
ECesiumITwinAuthorizationDelegateType::Failure,
6161
FString(),
6262
nullptr,
6363
errorListToArray(connection.errors));
6464
} else {
65-
TSharedPtr<CesiumITwinClient::Connection> pInternalConnection =
66-
MakeShared<CesiumITwinClient::Connection>(
67-
MoveTemp(*connection.value));
65+
6866
UCesiumITwinConnection* pConnection =
6967
NewObject<UCesiumITwinConnection>();
70-
pConnection->SetConnection(pInternalConnection);
68+
pConnection->SetConnection(connection.pValue);
7169
this->OnAuthorizationEvent.Broadcast(
7270
ECesiumITwinAuthorizationDelegateType::Success,
7371
FString(),

Source/CesiumRuntime/Public/CesiumITwinAPIBlueprintLibrary.h

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ class UCesiumITwinConnection : public UObject {
2020
public:
2121
UCesiumITwinConnection() : UObject(), pConnection(nullptr) {}
2222

23-
UCesiumITwinConnection(TSharedPtr<CesiumITwinClient::Connection> pConnection)
23+
UCesiumITwinConnection(
24+
CesiumUtility::IntrusivePointer<CesiumITwinClient::Connection>&
25+
pConnection)
2426
: UObject(), pConnection(MoveTemp(pConnection)) {}
2527

2628
UFUNCTION(BlueprintCallable, BlueprintPure, Category = "Cesium|iTwin")
@@ -31,15 +33,18 @@ class UCesiumITwinConnection : public UObject {
3133
return UTF8_TO_TCHAR(this->pConnection->getAuthToken().getToken().c_str());
3234
}
3335

34-
TSharedPtr<CesiumITwinClient::Connection>& GetConnection() {
36+
CesiumUtility::IntrusivePointer<CesiumITwinClient::Connection>&
37+
GetConnection() {
3538
return this->pConnection;
3639
}
3740

38-
void SetConnection(TSharedPtr<CesiumITwinClient::Connection> pConnection_) {
41+
void
42+
SetConnection(CesiumUtility::IntrusivePointer<CesiumITwinClient::Connection>&
43+
pConnection_) {
3944
this->pConnection = pConnection_;
4045
}
4146

42-
TSharedPtr<CesiumITwinClient::Connection> pConnection;
47+
CesiumUtility::IntrusivePointer<CesiumITwinClient::Connection> pConnection;
4348
};
4449

4550
UENUM(BlueprintType)
@@ -141,7 +146,7 @@ class CESIUMRUNTIME_API UCesiumITwinAPIGetProfileAsyncAction
141146

142147
virtual void Activate() override;
143148

144-
TSharedPtr<CesiumITwinClient::Connection> pConnection;
149+
CesiumUtility::IntrusivePointer<CesiumITwinClient::Connection> pConnection;
145150
};
146151

147152
UENUM(BlueprintType)
@@ -244,7 +249,7 @@ class CESIUMRUNTIME_API UCesiumITwinAPIGetITwinsAsyncAction
244249

245250
virtual void Activate() override;
246251

247-
TSharedPtr<CesiumITwinClient::Connection> pConnection;
252+
CesiumUtility::IntrusivePointer<CesiumITwinClient::Connection> pConnection;
248253
int page;
249254
};
250255

@@ -348,7 +353,7 @@ class CESIUMRUNTIME_API UCesiumITwinAPIGetIModelsAsyncAction
348353

349354
virtual void Activate() override;
350355

351-
TSharedPtr<CesiumITwinClient::Connection> pConnection;
356+
CesiumUtility::IntrusivePointer<CesiumITwinClient::Connection> pConnection;
352357
int page;
353358
FString iTwinId;
354359
};
@@ -459,7 +464,7 @@ class CESIUMRUNTIME_API UCesiumITwinAPIGetIModelMeshExportsAsyncAction
459464

460465
virtual void Activate() override;
461466

462-
TSharedPtr<CesiumITwinClient::Connection> pConnection;
467+
CesiumUtility::IntrusivePointer<CesiumITwinClient::Connection> pConnection;
463468
int page;
464469
FString iModelId;
465470
};
@@ -610,7 +615,7 @@ class CESIUMRUNTIME_API UCesiumITwinAPIGetRealityDataAsyncAction
610615

611616
virtual void Activate() override;
612617

613-
TSharedPtr<CesiumITwinClient::Connection> pConnection;
618+
CesiumUtility::IntrusivePointer<CesiumITwinClient::Connection> pConnection;
614619
int page;
615620
FString iTwinId;
616621
};
@@ -756,5 +761,5 @@ class CESIUMRUNTIME_API UCesiumITwinAPIListCesiumCuratedContentAsyncAction
756761

757762
virtual void Activate() override;
758763

759-
TSharedPtr<CesiumITwinClient::Connection> pConnection;
764+
CesiumUtility::IntrusivePointer<CesiumITwinClient::Connection> pConnection;
760765
};

extern/cesium-native

0 commit comments

Comments
 (0)