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

Merge pull request #7572 from BastiaanOlij/fix_math 

Some changes in the header so Godot3 compiles again on Windows.
This commit is contained in:
Rémi Verschelde 2017-01-18 15:48:39 +01:00 committed by GitHub
parent 430b008b0d d11a4c1120
commit ca14dd296a
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/math/math_funcs.cpp
View File

@ -27,12 +27,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/ /*************************************************************************/
#include "math_funcs.h" #include "math_funcs.h"
#include "core/os/os.h" #include "core/os/os.h"
#include "float.h"
#include "pcg.h"
pcg32_random_t Math::default_pcg = {1, PCG_DEFAULT_INC_64}; pcg32_random_t Math::default_pcg = {1, PCG_DEFAULT_INC_64};
#define PHI 0x9e3779b9 #define PHI 0x9e3779b9

5
core/math/math_funcs.h
View File

@ -33,10 +33,9 @@
#include "math_defs.h" #include "math_defs.h"
#include "pcg.h" #include "pcg.h"
#ifndef NO_MATH_H
#include <math.h> #include <math.h>
#endif #include <float.h>
#define Math_PI 3.14159265358979323846 #define Math_PI 3.14159265358979323846
#define Math_SQRT12 0.7071067811865475244008443621048490 #define Math_SQRT12 0.7071067811865475244008443621048490