Skip to content

Commit

Permalink
Merge pull request #272 from CesiumGS/categories
Browse files Browse the repository at this point in the history
Put all our blueprints props/funcs in a category.
  • Loading branch information
kring authored Mar 25, 2021
2 parents d68d487 + c7cd46a commit d1be591
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion Source/CesiumEditor/Private/CesiumEditorSettings.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ class UCesiumEditorSettings : public UDeveloperSettings {
* The token used to access Cesium ion. If this is blank or invalid, the
* Cesium panel will prompt you to log in to Cesium ion with OAuth2.
*/
UPROPERTY(Config, EditAnywhere)
UPROPERTY(Config, EditAnywhere, Category = "Cesium")
FString CesiumIonAccessToken;
};
4 changes: 2 additions & 2 deletions Source/CesiumRuntime/Private/CesiumGltfComponent.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ class CESIUMRUNTIME_API UCesiumGltfComponent : public USceneComponent {
UCesiumGltfComponent();
virtual ~UCesiumGltfComponent();

UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category = "Cesium")
UMaterial* BaseMaterial;

UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category = "Cesium")
UMaterial* OpacityMaskMaterial;

void UpdateTransformFromCesium(const glm::dmat4& CesiumToUnrealTransform);
Expand Down
4 changes: 2 additions & 2 deletions Source/CesiumRuntime/Public/CesiumCreditSystem.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ class CESIUMRUNTIME_API ACesiumCreditSystem : public AActor {
/**
* The credits text to display.
*/
UPROPERTY(BlueprintReadOnly)
UPROPERTY(BlueprintReadOnly, Category = "Cesium")
FString Credits = "";

/**
* Whether the credit string has changed since last frame.
*/
UPROPERTY(BlueprintReadOnly)
UPROPERTY(BlueprintReadOnly, Category = "Cesium")
bool CreditsUpdated = false;

// Called every frame
Expand Down
34 changes: 17 additions & 17 deletions Source/CesiumRuntime/Public/CesiumGeoreference.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,33 +47,33 @@ struct FCesiumSubLevel {
/**
* The plain name of the sub level, without any prefixes.
*/
UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category = "Cesium")
FString LevelName;

/**
* The WGS84 longitude in degrees of where this level should sit on the
* globe.
*/
UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category = "Cesium")
double LevelLongitude = 0.0;

/**
* The WGS84 latitude in degrees of where this level should sit on the globe.
*/
UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category = "Cesium")
double LevelLatitude = 0.0;

/**
* The height in meters above the WGS84 globe this level should sit.
*/
UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category = "Cesium")
double LevelHeight = 0.0;

/**
* How far in meters from the sublevel local origin the camera needs to be to
* load the level.
*/
UPROPERTY(EditAnywhere)
UPROPERTY(EditAnywhere, Category = "Cesium")
double LoadRadius = 0.0;

/**
Expand Down Expand Up @@ -101,7 +101,7 @@ class CESIUMRUNTIME_API ACesiumGeoreference : public AActor {
GENERATED_BODY()

public:
UFUNCTION(BlueprintCallable)
UFUNCTION(BlueprintCallable, Category = "Cesium")
static ACesiumGeoreference* GetDefaultForActor(AActor* Actor);

ACesiumGeoreference();
Expand Down Expand Up @@ -288,7 +288,7 @@ class CESIUMRUNTIME_API ACesiumGeoreference : public AActor {
* degrees (y), and height in meters (z) to Unreal's world origin. I.e. it
* rotates the globe so that these coordinates exactly fall on the origin.
*/
UFUNCTION(BlueprintCallable)
UFUNCTION(BlueprintCallable, Category = "Cesium")
void
InaccurateSetGeoreferenceOrigin(const FVector& TargetLongitudeLatitudeHeight);

Expand All @@ -309,7 +309,7 @@ class CESIUMRUNTIME_API ACesiumGeoreference : public AActor {
* degrees (y), and height in meters (z) into Earth-Centered, Earth-Fixed
* (ECEF) coordinates.
*/
UFUNCTION(BlueprintCallable)
UFUNCTION(BlueprintCallable, Category = "Cesium")
FVector InaccurateTransformLongitudeLatitudeHeightToEcef(
const FVector& LongitudeLatitudeHeight) const;

Expand All @@ -326,7 +326,7 @@ class CESIUMRUNTIME_API ACesiumGeoreference : public AActor {
* WGS84 longitude in degrees (x), latitude in degrees (y), and height in
* meters (z).
*/
UFUNCTION(BlueprintCallable)
UFUNCTION(BlueprintCallable, Category = "Cesium")
FVector
InaccurateTransformEcefToLongitudeLatitudeHeight(const FVector& Ecef) const;

Expand All @@ -343,7 +343,7 @@ class CESIUMRUNTIME_API ACesiumGeoreference : public AActor {
* degrees (y), and height in meters (z) into Unreal world coordinates
* (relative to the floating origin).
*/
UFUNCTION(BlueprintCallable)
UFUNCTION(BlueprintCallable, Category = "Cesium")
FVector InaccurateTransformLongitudeLatitudeHeightToUe(
const FVector& LongitudeLatitudeHeight) const;

Expand All @@ -359,7 +359,7 @@ class CESIUMRUNTIME_API ACesiumGeoreference : public AActor {
* WGS84 longitude in degrees (x), latitude in degrees (y), and height in
* meters (z).
*/
UFUNCTION(BlueprintCallable)
UFUNCTION(BlueprintCallable, Category = "Cesium")
FVector
InaccurateTransformUeToLongitudeLatitudeHeight(const FVector& Ue) const;

Expand All @@ -373,7 +373,7 @@ class CESIUMRUNTIME_API ACesiumGeoreference : public AActor {
* Transforms the given point from Earth-Centered, Earth-Fixed (ECEF) into
* Unreal relative world (relative to the floating origin).
*/
UFUNCTION(BlueprintCallable)
UFUNCTION(BlueprintCallable, Category = "Cesium")
FVector InaccurateTransformEcefToUe(const FVector& Ecef) const;

/**
Expand All @@ -386,7 +386,7 @@ class CESIUMRUNTIME_API ACesiumGeoreference : public AActor {
* Transforms the given point from Unreal relative world (relative to the
* floating origin) to Earth-Centered, Earth-Fixed (ECEF).
*/
UFUNCTION(BlueprintCallable)
UFUNCTION(BlueprintCallable, Category = "Cesium")
FVector InaccurateTransformUeToEcef(const FVector& Ue) const;

/**
Expand All @@ -401,7 +401,7 @@ class CESIUMRUNTIME_API ACesiumGeoreference : public AActor {
* Transforms a rotator from Unreal world to East-North-Up at the given
* Unreal relative world location (relative to the floating origin).
*/
UFUNCTION(BlueprintCallable)
UFUNCTION(BlueprintCallable, Category = "Cesium")
FRotator InaccurateTransformRotatorUeToEnu(
const FRotator& UeRotator,
const FVector& UeLocation) const;
Expand All @@ -418,7 +418,7 @@ class CESIUMRUNTIME_API ACesiumGeoreference : public AActor {
* Transforms a rotator from East-North-Up to Unreal world at the given
* Unreal relative world location (relative to the floating origin).
*/
UFUNCTION(BlueprintCallable)
UFUNCTION(BlueprintCallable, Category = "Cesium")
FRotator InaccurateTransformRotatorEnuToUe(
const FRotator& EnuRotator,
const FVector& UeLocation) const;
Expand All @@ -437,7 +437,7 @@ class CESIUMRUNTIME_API ACesiumGeoreference : public AActor {
* origin). The returned transformation works in Unreal's left-handed
* coordinate system.
*/
UFUNCTION(BlueprintCallable)
UFUNCTION(BlueprintCallable, Category = "Cesium")
FMatrix InaccurateComputeEastNorthUpToUnreal(const FVector& Ue) const;

/**
Expand All @@ -450,7 +450,7 @@ class CESIUMRUNTIME_API ACesiumGeoreference : public AActor {
* Computes the rotation matrix from the local East-North-Up to
* Earth-Centered, Earth-Fixed (ECEF) at the specified ECEF location.
*/
UFUNCTION(BlueprintCallable)
UFUNCTION(BlueprintCallable, Category = "Cesium")
FMatrix InaccurateComputeEastNorthUpToEcef(const FVector& Ecef) const;

/*
Expand Down
4 changes: 2 additions & 2 deletions Source/CesiumRuntime/Public/CesiumGeoreferenceComponent.h
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ class CESIUMRUNTIME_API UCesiumGeoreferenceComponent
* Move the actor to the specified WGS84 longitude in degrees (x), latitude
* in degrees (y), and height in meters (z).
*/
UFUNCTION(BlueprintCallable)
UFUNCTION(BlueprintCallable, Category = "Cesium")
void InaccurateMoveToLongitudeLatitudeHeight(
const FVector& TargetLongitudeLatitudeHeight,
bool MaintainRelativeOrientation = true);
Expand All @@ -129,7 +129,7 @@ class CESIUMRUNTIME_API UCesiumGeoreferenceComponent
* Move the actor to the specified Earth-Centered, Earth-Fixed (ECEF)
* coordinates.
*/
UFUNCTION(BlueprintCallable)
UFUNCTION(BlueprintCallable, Category = "Cesium")
void InaccurateMoveToECEF(
const FVector& TargetEcef,
bool MaintainRelativeOrientation = true);
Expand Down
4 changes: 2 additions & 2 deletions Source/CesiumRuntime/Public/GlobeAwareDefaultPawn.h
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ class CESIUMRUNTIME_API AGlobeAwareDefaultPawn
* {@see FlyToMaximumAltitudeCurve}, {@see FlyToDuration}, and
* {@see FlyToGranularityDegrees}.
*/
UFUNCTION(BlueprintCallable)
UFUNCTION(BlueprintCallable, Category = "Cesium")
void InaccurateFlyToLocationECEF(
const FVector& ECEFDestination,
float YawAtDestination,
Expand Down Expand Up @@ -180,7 +180,7 @@ class CESIUMRUNTIME_API AGlobeAwareDefaultPawn
* {@see FlyToProgressCurve}, {@see FlyToMaximumAltitudeCurve},
* {@see FlyToDuration}, and {@see FlyToGranularityDegrees}.
*/
UFUNCTION(BlueprintCallable)
UFUNCTION(BlueprintCallable, Category = "Cesium")
void InaccurateFlyToLocationLongitudeLatitudeHeight(
const FVector& LongitudeLatitudeHeightDestination,
float YawAtDestination,
Expand Down

0 comments on commit d1be591

Please sign in to comment.