Enhance safety zone checks for unmanned vehicles and update build process documentation
This commit is contained in:
parent
017da906f7
commit
4cc18fae34
@ -443,6 +443,19 @@ void System::checkUnmannedVehicleSafetyZones(
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 仅允许注册表内对象参与安全区风险计算:
|
||||||
|
// - 航空器:必须在 VehicleRegistry 中标记为 HANGKONG
|
||||||
|
// - 车辆目标:必须是受管车辆(WUREN/TEQIN)
|
||||||
|
bool eligibleTarget = false;
|
||||||
|
if (obj->isAircraft()) {
|
||||||
|
eligibleTarget = controllableVehicles_.isSelectedAircraft(obj->id);
|
||||||
|
} else if (obj->isSpecialVehicle()) {
|
||||||
|
eligibleTarget = controllableVehicles_.isManagedVehicle(obj->id);
|
||||||
|
}
|
||||||
|
if (!eligibleTarget) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if ((obj->isAircraft() || obj->isSpecialVehicle()) &&
|
if ((obj->isAircraft() || obj->isSpecialVehicle()) &&
|
||||||
zone->isObjectInZone(*obj)) {
|
zone->isObjectInZone(*obj)) {
|
||||||
// 创建风险对象
|
// 创建风险对象
|
||||||
|
|||||||
8
命令.md
8
命令.md
@ -1,6 +1,8 @@
|
|||||||
|
|
||||||
|
## 打包流程
|
||||||
rm -rf build
|
先进入docker容器合成
|
||||||
|
docker run -it --network host -v D:/App/C++/CollisionAvoidance:/src -w /src b601b0dd5f3f bash
|
||||||
|
rm -rf build
|
||||||
|
|
||||||
export PATH=/opt/rh/devtoolset-9/root/usr/bin:$PATH
|
export PATH=/opt/rh/devtoolset-9/root/usr/bin:$PATH
|
||||||
export LD_LIBRARY_PATH=/opt/rh/devtoolset-9/root/usr/lib64:$LD_LIBRARY_PATH
|
export LD_LIBRARY_PATH=/opt/rh/devtoolset-9/root/usr/lib64:$LD_LIBRARY_PATH
|
||||||
@ -23,8 +25,8 @@ ldd /opt/collision_avoidance/bin/collision_avoidancenew | grep "not found" || tr
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
docker run -it --network host -v D:/App/C++/CollisionAvoidance:/src -w /src centos:7 bash
|
|
||||||
|
|
||||||
|
### 之前自己制作的镜像,用来编译
|
||||||
docker commit --pause=false 5f4a906adb1b qdairporttestbackend:20260128
|
docker commit --pause=false 5f4a906adb1b qdairporttestbackend:20260128
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user