From 64a509d62a26101d9f7286bffbb396b168fad157 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=2E=20Fatih=20C=C4=B1r=C4=B1t?= Date: Fri, 1 Nov 2024 17:19:36 +0300 Subject: [PATCH] fix: update point type to PointXYZIRCAEDT (#175) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: M. Fatih Cırıt --- Assets/.gitignore | 1 - Assets/AWSIM/Scenes/Environments/.gitignore | 1 - Assets/AWSIM/Scenes/Main/.gitignore | 1 - Assets/AWSIM/Scenes/Main/Parking Area/.gitignore | 1 - .../Scripts/Sensors/LiDAR/PointCloudFormatLibrary.cs | 8 ++++---- Assets/AWSIM/Scripts/Sensors/LiDAR/RglLidarPublisher.cs | 2 +- ProjectSettings/ProjectSettings.asset | 2 +- 7 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Assets/.gitignore b/Assets/.gitignore index fff77e145..29b385327 100644 --- a/Assets/.gitignore +++ b/Assets/.gitignore @@ -10,4 +10,3 @@ /NatureManufacture Assets.meta /Town Constructor 3/ /Town Constructor 3.meta - diff --git a/Assets/AWSIM/Scenes/Environments/.gitignore b/Assets/AWSIM/Scenes/Environments/.gitignore index 95367a67b..03c325517 100644 --- a/Assets/AWSIM/Scenes/Environments/.gitignore +++ b/Assets/AWSIM/Scenes/Environments/.gitignore @@ -1,3 +1,2 @@ /Shinjuku/ /Shinjuku.meta - diff --git a/Assets/AWSIM/Scenes/Main/.gitignore b/Assets/AWSIM/Scenes/Main/.gitignore index 32bf4eb22..51a1bfc9e 100644 --- a/Assets/AWSIM/Scenes/Main/.gitignore +++ b/Assets/AWSIM/Scenes/Main/.gitignore @@ -1,3 +1,2 @@ /AutowareSimulationScenarioSimulator/ /AutowareSimulationScenarioSimulator.meta - diff --git a/Assets/AWSIM/Scenes/Main/Parking Area/.gitignore b/Assets/AWSIM/Scenes/Main/Parking Area/.gitignore index 3b907af4f..18700d8f0 100644 --- a/Assets/AWSIM/Scenes/Main/Parking Area/.gitignore +++ b/Assets/AWSIM/Scenes/Main/Parking Area/.gitignore @@ -3,4 +3,3 @@ /Parking Area ss2/ /Parking Area ss2.meta - diff --git a/Assets/AWSIM/Scripts/Sensors/LiDAR/PointCloudFormatLibrary.cs b/Assets/AWSIM/Scripts/Sensors/LiDAR/PointCloudFormatLibrary.cs index f16b33551..ffeb8078b 100644 --- a/Assets/AWSIM/Scripts/Sensors/LiDAR/PointCloudFormatLibrary.cs +++ b/Assets/AWSIM/Scripts/Sensors/LiDAR/PointCloudFormatLibrary.cs @@ -22,7 +22,7 @@ public enum PointCloudFormat : UInt32 { Pcl24, Pcl48, - PointXYZIRCEADT, + PointXYZIRCAEDT, MLInstanceSegmentation, RadarSmartMicro, Custom, @@ -61,15 +61,15 @@ public static class PointCloudFormatLibrary RGLField.PADDING_32, RGLField.TIME_STAMP_F64 }}, - // PointXYZIRCEADT format used by Autoware - {PointCloudFormat.PointXYZIRCEADT, new[] + // PointXYZIRCAEDT format used by Autoware + {PointCloudFormat.PointXYZIRCAEDT, new[] { RGLField.XYZ_VEC3_F32, RGLField.INTENSITY_U8, RGLField.RETURN_TYPE_U8, RGLField.RING_ID_U16, - RGLField.ELEVATION_F32, RGLField.AZIMUTH_F32, + RGLField.ELEVATION_F32, RGLField.DISTANCE_F32, RGLField.TIME_STAMP_U32 }}, diff --git a/Assets/AWSIM/Scripts/Sensors/LiDAR/RglLidarPublisher.cs b/Assets/AWSIM/Scripts/Sensors/LiDAR/RglLidarPublisher.cs index d6b89d123..310b5fc26 100644 --- a/Assets/AWSIM/Scripts/Sensors/LiDAR/RglLidarPublisher.cs +++ b/Assets/AWSIM/Scripts/Sensors/LiDAR/RglLidarPublisher.cs @@ -151,7 +151,7 @@ public class RglLidarPublisher : MonoBehaviour { topic = "lidar/pointcloud_ex", publish = true, - fieldsPreset = PointCloudFormat.PointXYZIRCEADT, + fieldsPreset = PointCloudFormat.PointXYZIRCAEDT, }, }; diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 3aea69f78..56bdd14b7 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -141,7 +141,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 1.5.2 + bundleVersion: 1.5.3 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0