Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Security_Engine: Camera Field of View - cone shape calculation fix #3101

Merged
merged 2 commits into from
Jul 5, 2023
Merged

Security_Engine: Camera Field of View - cone shape calculation fix #3101

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c7e884
Update ViewCone.cs
michal-pekacki Jul 4, 2023
0268ef1
update after comments
michal-pekacki Jul 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Security_Engine/Query/ViewCone.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ public static PolyCurve ViewCone(this CameraDevice cameraDevice)

Point cameraLocation = cameraDevice.EyePosition;
Point targetLocation = cameraDevice.TargetPosition;
double radius = targetLocation.Distance(cameraLocation);
double horizontal = cameraDevice.HorizontalFieldOfView;
double angle = Math.Atan(horizontal / radius);
double coneRadius = targetLocation.Distance(cameraLocation);
double coneArcLength = cameraDevice.HorizontalFieldOfView;
double coneAngle = Math.Asin(coneArcLength / (2 * coneRadius)) * 2;

Vector direction = BH.Engine.Geometry.Create.Vector(cameraLocation, cameraDevice.TargetPosition);
Vector startPointDir = direction.Rotate(-angle / 2, Vector.ZAxis);
Vector endPointDir = direction.Rotate(angle / 2, Vector.ZAxis);
Vector viewDirection = BH.Engine.Geometry.Create.Vector(cameraLocation, cameraDevice.TargetPosition);
Vector startPointDir = viewDirection.Rotate(-coneAngle / 2, Vector.ZAxis);
Vector endPointDir = viewDirection.Rotate(coneAngle / 2, Vector.ZAxis);
Point startPoint = cameraLocation + startPointDir;
Point endPoint = cameraLocation + endPointDir;

Expand Down