Skip to content

Commit 894afa1

Browse files
authored
Merge branch 'main' into azure-overlay
2 parents 856b160 + d5a1aae commit 894afa1

File tree

3 files changed

+32
-6
lines changed

3 files changed

+32
-6
lines changed

.github/workflows/buildLinux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: Removed unneeded packages to gain disk space
4040
run: |
4141
sudo apt update
42-
sudo apt remove google-chrome-stable clang-13 clang-14 clang-15 clang-format-13 clang-format-14 clang-format-15 llvm-13-dev llvm-13-linker-tools llvm-13-runtime llvm-13-tools llvm-13 llvm-14-dev llvm-14-linker-tools llvm-14-runtime llvm-14-tools llvm-14 llvm-15-dev llvm-15-linker-tools llvm-15-runtime llvm-15-tools llvm-15 x11-common xserver-common aspnetcore-runtime-6.0 aspnetcore-runtime-7.0 aspnetcore-runtime-8.0 aspnetcore-runtime-9.0 aspnetcore-targeting-pack-6.0 aspnetcore-targeting-pack-7.0 aspnetcore-targeting-pack-8.0 aspnetcore-targeting-pack-9.0 docker-ce-cli docker-ce dotnet-apphost-pack-6.0 dotnet-apphost-pack-7.0 dotnet-apphost-pack-8.0 dotnet-apphost-pack-9.0 dotnet-host dotnet-hostfxr-6.0 dotnet-hostfxr-7.0 dotnet-hostfxr-8.0 dotnet-hostfxr-9.0 dotnet-runtime-6.0 dotnet-runtime-7.0 dotnet-runtime-8.0 dotnet-runtime-9.0 dotnet-runtime-deps-6.0 dotnet-runtime-deps-7.0 dotnet-runtime-deps-8.0 dotnet-runtime-deps-9.0 dotnet-sdk-6.0 dotnet-sdk-7.0 dotnet-sdk-8.0 dotnet-sdk-9.0 dotnet-targeting-pack-6.0 dotnet-targeting-pack-7.0 dotnet-targeting-pack-8.0 dotnet-targeting-pack-9.0 eatmydata emacsen-common firebird3.0-common-doc firebird3.0-common firefox kubectl mercurial-common mercurial microsoft-edge-stable mssql-tools mysql-client-8.0 mysql-client-core-8.0 mysql-client mysql-common mysql-server-8.0 php8.1 postgresql-14 azure-cli microsoft-edge-stable google-cloud-cli temurin-21-jdk temurin-17-jdk temurin-11-jdk temurin-8-jdk powershell google-cloud-cli-anthoscli mysql-server-core-8.0 containerd.io libllvm15 libllvm14 libllvm13 mono-devel libclang-common-15-dev libclang-common-14-dev libclang-common-13-dev apache2-bin apache2-data apache2-utils apache2 containerd.io cpp-9 cpp-10 cpp-11 cpp-12 cpp docker-ce-cli docker-ce emacsen-common g++-9 g++-10 g++-11 g++-12 g++ gcc-9-base gcc-10-base gcc-11-base gcc-9 gcc-10 gcc-11 gcc-12 gcc gfortran-9 gfortran-10 gfortran-11 gfortran-12 gfortran ruby-dev ruby-full ruby-net-telnet ruby-rubygems ruby-webrick ruby-xmlrpc ruby3.0-dev ruby3.0-doc ruby3.0 ruby rubygems-integration alsa-topology-conf alsa-ucm-conf ant byobu cifs-utils conmon crun debugedit dirmngr imagemagick-6.q16 imagemagick-6-common imagemagick golang-github-containernetworking-plugin-dnsname golang-github-containers-common golang-github-containers-image java-common javascript-common postgresql-client-14 postgresql-client-common postgresql-common-dev postgresql-common vim vim-common vim-runtime vim-tiny tex-common texinfo
42+
sudo apt remove google-chrome-stable clang-13 clang-14 clang-15 clang-format-13 clang-format-14 clang-format-15 llvm-13-dev llvm-13-linker-tools llvm-13-runtime llvm-13-tools llvm-13 llvm-14-dev llvm-14-linker-tools llvm-14-runtime llvm-14-tools llvm-14 llvm-15-dev llvm-15-linker-tools llvm-15-runtime llvm-15-tools llvm-15 x11-common xserver-common aspnetcore-runtime-6.0 aspnetcore-runtime-7.0 aspnetcore-runtime-8.0 aspnetcore-runtime-9.0 aspnetcore-targeting-pack-6.0 aspnetcore-targeting-pack-7.0 aspnetcore-targeting-pack-8.0 aspnetcore-targeting-pack-9.0 docker-ce-cli docker-ce dotnet-apphost-pack-6.0 dotnet-apphost-pack-7.0 dotnet-apphost-pack-8.0 dotnet-apphost-pack-9.0 dotnet-host dotnet-hostfxr-6.0 dotnet-hostfxr-7.0 dotnet-hostfxr-8.0 dotnet-hostfxr-9.0 dotnet-runtime-6.0 dotnet-runtime-7.0 dotnet-runtime-8.0 dotnet-runtime-9.0 dotnet-runtime-deps-6.0 dotnet-runtime-deps-7.0 dotnet-runtime-deps-8.0 dotnet-runtime-deps-9.0 dotnet-sdk-6.0 dotnet-sdk-7.0 dotnet-sdk-8.0 dotnet-sdk-9.0 dotnet-targeting-pack-6.0 dotnet-targeting-pack-7.0 dotnet-targeting-pack-8.0 dotnet-targeting-pack-9.0 eatmydata emacsen-common firebird3.0-common-doc firebird3.0-common firefox kubectl mercurial-common mercurial microsoft-edge-stable mssql-tools mysql-client-8.0 mysql-client-core-8.0 mysql-client mysql-common mysql-server-8.0 php8.1 postgresql-14 azure-cli microsoft-edge-stable google-cloud-cli temurin-21-jdk temurin-17-jdk temurin-11-jdk temurin-8-jdk powershell google-cloud-cli-anthoscli mysql-server-core-8.0 containerd.io libllvm15 libllvm14 libllvm13 mono-devel libclang-common-15-dev libclang-common-14-dev libclang-common-13-dev apache2-bin apache2-data apache2-utils apache2 containerd.io cpp-9 cpp-10 cpp-11 cpp-12 cpp docker-ce-cli docker-ce emacsen-common g++-9 g++-10 g++-11 g++-12 g++ gcc-9-base gcc-10-base gcc-11-base gcc-9 gcc-10 gcc-11 gcc-12 gcc gfortran-9 gfortran-10 gfortran-11 gfortran-12 gfortran ruby-dev ruby-full ruby-net-telnet ruby-rubygems ruby-webrick ruby-xmlrpc ruby3.0-dev ruby3.0-doc ruby3.0 ruby rubygems-integration alsa-topology-conf alsa-ucm-conf ant byobu cifs-utils conmon crun debugedit dirmngr imagemagick-6.q16 imagemagick-6-common imagemagick golang-github-containernetworking-plugin-dnsname golang-github-containers-common golang-github-containers-image java-common javascript-common postgresql-client-14 postgresql-client-common postgresql-common vim vim-common vim-runtime vim-tiny tex-common texinfo
4343
df -h
4444
sudo rm -rf /usr/local/lib/android || true
4545
sudo rm -rf /usr/share/dotnet || true

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
##### Fixes :wrench:
1010

1111
- Fixed a bug where `CesiumCreditSystem` would not filter out empty credits, resulting in duplicate on-screen delimiters.
12+
- Fixed a problem where multi-selecting `UCesiumGlobeAnchorComponent` could cause the selected components to teleport to 0 degrees longitude and 0 degrees latitude. Now, the geospatial position and orientation fields are hidden while multi-selecting.
1213

1314
### v2.20.0 - 2025-10-01
1415

Source/CesiumEditor/Private/CesiumGlobeAnchorCustomization.cpp

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,12 @@
77
#include "CesiumGlobeAnchorComponent.h"
88
#include "DetailCategoryBuilder.h"
99
#include "DetailLayoutBuilder.h"
10+
#include "DetailWidgetRow.h"
1011
#include "IDetailGroup.h"
1112
#include "Widgets/SToolTip.h"
13+
#include "Widgets/Text/STextBlock.h"
14+
15+
#define LOCTEXT_NAMESPACE "CesiumGlobeAnchorCustomization"
1216

1317
FName FCesiumGlobeAnchorCustomization::RegisteredLayoutName;
1418

@@ -36,6 +40,7 @@ FCesiumGlobeAnchorCustomization::MakeInstance() {
3640
void FCesiumGlobeAnchorCustomization::CustomizeDetails(
3741
IDetailLayoutBuilder& DetailBuilder) {
3842
DetailBuilder.GetObjectsBeingCustomized(this->SelectedObjects);
43+
const bool bIsMultiSelect = this->SelectedObjects.Num() > 1;
3944

4045
IDetailCategoryBuilder& CesiumCategory = DetailBuilder.EditCategory("Cesium");
4146

@@ -67,11 +72,29 @@ void FCesiumGlobeAnchorCustomization::CustomizeDetails(
6772
UCesiumGlobeAnchorComponent,
6873
TeleportWhenUpdatingTransform));
6974

70-
this->UpdateDerivedProperties();
71-
72-
this->CreatePositionLongitudeLatitudeHeight(DetailBuilder, CesiumCategory);
73-
this->CreatePositionEarthCenteredEarthFixed(DetailBuilder, CesiumCategory);
74-
this->CreateRotationEastSouthUp(DetailBuilder, CesiumCategory);
75+
if (!bIsMultiSelect) {
76+
this->UpdateDerivedProperties();
77+
this->CreatePositionLongitudeLatitudeHeight(DetailBuilder, CesiumCategory);
78+
this->CreatePositionEarthCenteredEarthFixed(DetailBuilder, CesiumCategory);
79+
this->CreateRotationEastSouthUp(DetailBuilder, CesiumCategory);
80+
} else {
81+
FDetailWidgetRow& Row =
82+
CesiumCategory
83+
.AddCustomRow(
84+
LOCTEXT("MultipleSelectionFilter", "Multiple Selection"))
85+
.FilterString(LOCTEXT(
86+
"MultipleSelectionFilters",
87+
"Latitude Longitude Height ECEF ESU"));
88+
89+
Row.WholeRowContent()[SNew(SBox).Padding(FMargin(
90+
0.f,
91+
4.f))[SNew(STextBlock)
92+
.Text(LOCTEXT(
93+
"MultiSelectInfo",
94+
"Multiple actors selected. Geodetic position (Latitude, Longitude, Height; ECEF) and "
95+
"ESU rotation cannot be edited in multi-select. Select a single actor to edit these values."))
96+
.AutoWrapText(true)]];
97+
}
7598
}
7699

77100
void FCesiumGlobeAnchorCustomization::CreatePositionEarthCenteredEarthFixed(
@@ -296,3 +319,5 @@ TStatId UCesiumGlobeAnchorDerivedProperties::GetStatId() const {
296319
UCesiumGlobeAnchorRotationEastSouthUp,
297320
STATGROUP_Tickables);
298321
}
322+
323+
#undef LOCTEXT_NAMESPACE

0 commit comments

Comments
 (0)