tasiaiso/viz1090
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fixed border margin on label dynamics

Browse source
This commit is contained in:
nathan 2022-01-12 17:39:31 -08:00
parent e549aab7c4
commit d5d43a43fe
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
AircraftLabel.cpp
View file

@ -169,8 +169,8 @@ void AircraftLabel::calculateForces(Aircraft *check_p) {
if((p_left - radius) * (p_left - radius) + (p_top - radius) * (p_top - radius) > ((radius - edge_margin) * (radius - edge_margin))) { if((p_left - radius) * (p_left - radius) + (p_top - radius) * (p_top - radius) > ((radius - edge_margin) * (radius - edge_margin))) {
float pointnorm = sqrt((p_left - radius) * (p_left - radius) + (p_top - radius) * (p_top - radius)); float pointnorm = sqrt((p_left - radius) * (p_left - radius) + (p_top - radius) * (p_top - radius));
ddx += boundary_force * (radius * (p_left - radius) / pointnorm - (p_left - radius)); ddx += boundary_force * ((radius - edge_margin) * (p_left - radius) / pointnorm - (p_left - radius));
ddy += boundary_force * (radius * (p_top - radius) / pointnorm - (p_top - radius)); ddy += boundary_force * ((radius - edge_margin) * (p_top - radius) / pointnorm - (p_top - radius));
} }
//left bottom //left bottom
@ -178,8 +178,8 @@ void AircraftLabel::calculateForces(Aircraft *check_p) {
if((p_left - radius) * (p_left - radius) + (p_bottom - radius) * (p_bottom - radius) > ((radius - edge_margin) * (radius - edge_margin))) { if((p_left - radius) * (p_left - radius) + (p_bottom - radius) * (p_bottom - radius) > ((radius - edge_margin) * (radius - edge_margin))) {
float pointnorm = sqrt((p_left - radius) * (p_left - radius) + (p_bottom - radius) * (p_bottom - radius)); float pointnorm = sqrt((p_left - radius) * (p_left - radius) + (p_bottom - radius) * (p_bottom - radius));
ddx += boundary_force * (radius * (p_left - radius) / pointnorm - (p_left - radius)); ddx += boundary_force * ((radius - edge_margin) * (p_left - radius) / pointnorm - (p_left - radius));
ddy += boundary_force * (radius * (p_bottom - radius) / pointnorm - (p_bottom - radius)); ddy += boundary_force * ((radius - edge_margin) * (p_bottom - radius) / pointnorm - (p_bottom - radius));
} }
//right top //right top
@ -187,8 +187,8 @@ void AircraftLabel::calculateForces(Aircraft *check_p) {
if((p_right - radius) * (p_right - radius) + (p_top - radius) * (p_top - radius) > ((radius - edge_margin) * (radius - edge_margin))) { if((p_right - radius) * (p_right - radius) + (p_top - radius) * (p_top - radius) > ((radius - edge_margin) * (radius - edge_margin))) {
float pointnorm = sqrt((p_right - radius) * (p_right - radius) + (p_top - radius) * (p_top - radius)); float pointnorm = sqrt((p_right - radius) * (p_right - radius) + (p_top - radius) * (p_top - radius));
ddx += boundary_force * (radius * (p_right - radius) / pointnorm - (p_right - radius)); ddx += boundary_force * ((radius - edge_margin) * (p_right - radius) / pointnorm - (p_right - radius));
ddy += boundary_force * (radius * (p_top - radius) / pointnorm - (p_top - radius)); ddy += boundary_force * ((radius - edge_margin) * (p_top - radius) / pointnorm - (p_top - radius));
} }
//right bottom //right bottom
@ -196,8 +196,8 @@ void AircraftLabel::calculateForces(Aircraft *check_p) {
if((p_right - radius) * (p_right - radius) + (p_bottom - radius) * (p_bottom - radius) > ((radius - edge_margin) * (radius - edge_margin))) { if((p_right - radius) * (p_right - radius) + (p_bottom - radius) * (p_bottom - radius) > ((radius - edge_margin) * (radius - edge_margin))) {
float pointnorm = sqrt((p_right - radius) * (p_right - radius) + (p_bottom - radius) * (p_bottom - radius)); float pointnorm = sqrt((p_right - radius) * (p_right - radius) + (p_bottom - radius) * (p_bottom - radius));
ddx += boundary_force * (radius * (p_right - radius) / pointnorm - (p_right- radius)); ddx += boundary_force * ((radius - edge_margin) * (p_right - radius) / pointnorm - (p_right- radius));
ddy += boundary_force * (radius * (p_bottom - radius) / pointnorm - (p_bottom - radius)); ddy += boundary_force * ((radius - edge_margin) * (p_bottom - radius) / pointnorm - (p_bottom - radius));
} }
} else { } else {