Skip to content

Commit 380fa13

Browse files
committed
CesiumMetadataValueAccess => FCesiumMetadataValueAccess
1 parent 5d357f5 commit 380fa13

File tree

3 files changed

+29
-14
lines changed

3 files changed

+29
-14
lines changed

Source/CesiumRuntime/Private/CesiumMetadataValue.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ TMap<FString, FString> UCesiumMetadataValueBlueprintLibrary::GetValuesAsStrings(
334334
return strings;
335335
}
336336

337-
uint64 CesiumMetadataValueAccess::GetUnsignedInteger64(
337+
uint64 FCesiumMetadataValueAccess::GetUnsignedInteger64(
338338
const FCesiumMetadataValue& Value,
339339
uint64 DefaultValue) {
340340
return swl::visit(

Source/CesiumRuntime/Private/Tests/CesiumMetadataValue.spec.cpp

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1274,49 +1274,64 @@ void FCesiumMetadataValueSpec::Define() {
12741274
FCesiumMetadataValue value(std::numeric_limits<uint64_t>::max() - 1);
12751275
TestEqual<uint64_t>(
12761276
"uint64_t",
1277-
CesiumMetadataValueAccess::GetUnsignedInteger64(value, defaultValue),
1277+
FCesiumMetadataValueAccess::GetUnsignedInteger64(
1278+
value,
1279+
defaultValue),
12781280
std::numeric_limits<uint64_t>::max() - 1);
12791281

1280-
value = FCesiumMetadataValue(std::numeric_limits<int64_t>::max() - 1);
1282+
value =
1283+
FCesiumMetadataValue(std::numeric_limits<int64_t>::max() - 1);
12811284
TestEqual<uint64_t>(
12821285
"int64_t",
1283-
CesiumMetadataValueAccess::GetUnsignedInteger64(value, defaultValue),
1286+
FCesiumMetadataValueAccess::GetUnsignedInteger64(
1287+
value,
1288+
defaultValue),
12841289
static_cast<uint64_t>(std::numeric_limits<int64_t>::max() - 1));
12851290

12861291
value = FCesiumMetadataValue(static_cast<int16_t>(12345));
12871292
TestEqual<uint64_t>(
12881293
"smaller signed integer",
1289-
CesiumMetadataValueAccess::GetUnsignedInteger64(value, defaultValue),
1294+
FCesiumMetadataValueAccess::GetUnsignedInteger64(
1295+
value,
1296+
defaultValue),
12901297
static_cast<uint64_t>(12345));
12911298

12921299
value = FCesiumMetadataValue(static_cast<uint8_t>(255));
12931300
TestEqual<uint64_t>(
12941301
"smaller unsigned integer",
1295-
CesiumMetadataValueAccess::GetUnsignedInteger64(value, defaultValue),
1302+
FCesiumMetadataValueAccess::GetUnsignedInteger64(
1303+
value,
1304+
defaultValue),
12961305
static_cast<uint64_t>(255));
12971306
});
12981307

12991308
It("gets from boolean", [this, defaultValue]() {
13001309
FCesiumMetadataValue value(true);
13011310
TestEqual<uint64_t>(
13021311
"value",
1303-
CesiumMetadataValueAccess::GetUnsignedInteger64(value, defaultValue),
1312+
FCesiumMetadataValueAccess::GetUnsignedInteger64(
1313+
value,
1314+
defaultValue),
13041315
static_cast<uint64_t>(1));
13051316
});
13061317

13071318
It("gets from in-range floating point number", [this, defaultValue]() {
13081319
FCesiumMetadataValue value(1234.56f);
13091320
TestEqual<uint64_t>(
13101321
"float",
1311-
CesiumMetadataValueAccess::GetUnsignedInteger64(value, defaultValue),
1322+
FCesiumMetadataValueAccess::GetUnsignedInteger64(
1323+
value,
1324+
defaultValue),
13121325
static_cast<uint64_t>(1234));
13131326
});
13141327

13151328
It("gets from string", [this, defaultValue]() {
13161329
FCesiumMetadataValue value(std::string_view("1234"));
13171330
TestEqual<uint64_t>(
13181331
"value",
1319-
CesiumMetadataValueAccess::GetUnsignedInteger64(value, defaultValue),
1332+
FCesiumMetadataValueAccess::GetUnsignedInteger64(
1333+
value,
1334+
defaultValue),
13201335
static_cast<uint64_t>(1234));
13211336
});
13221337

@@ -1325,23 +1340,23 @@ void FCesiumMetadataValueSpec::Define() {
13251340
FCesiumMetadataValue value(-5);
13261341
TestEqual<uint64_t>(
13271342
"negative integer",
1328-
CesiumMetadataValueAccess::GetUnsignedInteger64(
1343+
FCesiumMetadataValueAccess::GetUnsignedInteger64(
13291344
value,
13301345
defaultValue),
13311346
defaultValue);
13321347

13331348
value = FCesiumMetadataValue(-59.62f);
13341349
TestEqual<uint64_t>(
13351350
"negative floating-point number",
1336-
CesiumMetadataValueAccess::GetUnsignedInteger64(
1351+
FCesiumMetadataValueAccess::GetUnsignedInteger64(
13371352
value,
13381353
defaultValue),
13391354
defaultValue);
13401355

13411356
value = FCesiumMetadataValue(std::numeric_limits<float>::max());
13421357
TestEqual<uint64_t>(
13431358
"positive floating-point number",
1344-
CesiumMetadataValueAccess::GetUnsignedInteger64(
1359+
FCesiumMetadataValueAccess::GetUnsignedInteger64(
13451360
value,
13461361
defaultValue),
13471362
defaultValue);

Source/CesiumRuntime/Public/CesiumMetadataValue.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ struct CESIUMRUNTIME_API FCesiumMetadataValue {
265265
TSharedPtr<FCesiumMetadataEnum> _pEnumDefinition;
266266

267267
friend class UCesiumMetadataValueBlueprintLibrary;
268-
friend class CesiumMetadataValueAccess;
268+
friend class FCesiumMetadataValueAccess;
269269
};
270270

271271
UCLASS()
@@ -867,7 +867,7 @@ class CESIUMRUNTIME_API UCesiumMetadataValueBlueprintLibrary
867867
* These should be moved to UCesiumMetadataValueBlueprintLibrary if those types
868868
* become compatible with Blueprints in the future.
869869
*/
870-
class CESIUMRUNTIME_API CesiumMetadataValueAccess {
870+
class CESIUMRUNTIME_API FCesiumMetadataValueAccess {
871871

872872
public:
873873
/**

0 commit comments

Comments
 (0)