Merge pull request #7572 from BastiaanOlij/fix_math
Some changes in the header so Godot3 compiles again on Windows.
This commit is contained in:
commit
ca14dd296a
|
@ -27,12 +27,8 @@
|
|||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
#include "math_funcs.h"
|
||||
|
||||
#include "core/os/os.h"
|
||||
|
||||
#include "float.h"
|
||||
#include "pcg.h"
|
||||
|
||||
pcg32_random_t Math::default_pcg = {1, PCG_DEFAULT_INC_64};
|
||||
|
||||
#define PHI 0x9e3779b9
|
||||
|
|
|
@ -33,10 +33,9 @@
|
|||
#include "math_defs.h"
|
||||
#include "pcg.h"
|
||||
|
||||
#ifndef NO_MATH_H
|
||||
#include <math.h>
|
||||
#endif
|
||||
|
||||
#include <float.h>
|
||||
|
||||
#define Math_PI 3.14159265358979323846
|
||||
#define Math_SQRT12 0.7071067811865475244008443621048490
|
||||
|
||||
|
|
Loading…
Reference in New Issue