godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #34955 from sketchyfun/camera_project_fix 

Fixed camera project_position function returning the wrong x & y values
This commit is contained in:
Rémi Verschelde 2020-01-09 15:53:15 +01:00 committed by GitHub
parent 9fa8d42dd5 fdd7cfa820
commit a0ce88f953
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scene/3d/camera.cpp
View File

@ -398,9 +398,9 @@ Vector3 Camera::project_position(const Point2 &p_point, float p_z_depth) const {
CameraMatrix cm; CameraMatrix cm;
if (mode == PROJECTION_ORTHOGONAL) if (mode == PROJECTION_ORTHOGONAL)
cm.set_orthogonal(size, viewport_size.aspect(), near, far, keep_aspect == KEEP_WIDTH); cm.set_orthogonal(size, viewport_size.aspect(), p_z_depth, far, keep_aspect == KEEP_WIDTH);
else else
cm.set_perspective(fov, viewport_size.aspect(), near, far, keep_aspect == KEEP_WIDTH); cm.set_perspective(fov, viewport_size.aspect(), p_z_depth, far, keep_aspect == KEEP_WIDTH);
Size2 vp_size; Size2 vp_size;
cm.get_viewport_size(vp_size.x, vp_size.y); cm.get_viewport_size(vp_size.x, vp_size.y);