Sara.Sync
/
godot-cpp
mirror of https://github.com/godotengine/godot-cpp
0
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #504 from HrishikeshP-01/better-use-of-Math 

Replaced static math functions in CameraMatrix by Math usage
pull/502/head
Marc 2021-02-03 20:16:51 +00:00 committed by GitHub
parent 6d3b8f44f4 09df1fc9b5
commit 9598fd5c8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/core/CameraMatrix.hpp
View File

@ -5,6 +5,7 @@
#include "Plane.hpp" #include "Plane.hpp"
#include "Rect2.hpp" #include "Rect2.hpp"
#include "Transform.hpp" #include "Transform.hpp"
#include "Math.hpp"
#include <vector> #include <vector>
@ -39,15 +40,9 @@ struct CameraMatrix {
static real_t get_fovy(real_t p_fovx, real_t p_aspect) { static real_t get_fovy(real_t p_fovx, real_t p_aspect) {
return rad2deg(atan(p_aspect * tan(deg2rad(p_fovx) * 0.5)) * 2.0); return Math::rad2deg(atan(p_aspect * tan(Math::deg2rad(p_fovx) * 0.5)) * 2.0);
} }
static inline double deg2rad(double p_y) { return p_y * Math_PI / 180.0; }
static inline float deg2rad(float p_y) { return p_y * Math_PI / 180.0; }
static inline double rad2deg(double p_y) { return p_y * 180.0 / Math_PI; }
static inline float rad2deg(float p_y) { return p_y * 180.0 / Math_PI; }
static inline double absd(double g) { static inline double absd(double g) {
union { union {

4
src/core/CameraMatrix.cpp
View File

@ -585,7 +585,7 @@ real_t CameraMatrix::get_fov() const {
right_plane.normalize(); right_plane.normalize();
if ((matrix[8] == 0) && (matrix[9] == 0)) { if ((matrix[8] == 0) && (matrix[9] == 0)) {
return rad2deg(acos(abs(right_plane.normal.x))) * 2.0; return Math::rad2deg(acos(abs(right_plane.normal.x))) * 2.0;
} else { } else {
// our frustum is asymmetrical need to calculate the left planes angle separately.. // our frustum is asymmetrical need to calculate the left planes angle separately..
Plane left_plane = Plane(matrix[3] + matrix[0], Plane left_plane = Plane(matrix[3] + matrix[0],
@ -594,7 +594,7 @@ real_t CameraMatrix::get_fov() const {
matrix[15] + matrix[12]); matrix[15] + matrix[12]);
left_plane.normalize(); left_plane.normalize();
return rad2deg(acos(abs(left_plane.normal.x))) + rad2deg(acos(abs(right_plane.normal.x))); return Math::rad2deg(acos(abs(left_plane.normal.x))) + Math::rad2deg(acos(abs(right_plane.normal.x)));
} }
} }