atria-soft/etk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEBUG] MacOs build fix

Browse Source
This commit is contained in:
Edouard DUPIN 2015-02-12 21:20:03 +01:00
parent 2441e2c31a
commit 1a81769f15
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etk/math/Vector2D.cpp
View File

@ -87,8 +87,13 @@ std::ostream& etk::operator <<(std::ostream& _os, const std::vector<bvec2 >& _ob
vec2 vec2rotate(const vec2& _val, const vec2& _point, float _angle) { vec2 vec2rotate(const vec2& _val, const vec2& _point, float _angle) {
vec2 out = _val; vec2 out = _val;
#ifdef __TARGET_OS__MacOs
float sinAngle = sin(_angle);
float cosAngle = cos(_angle);
#else
float sinAngle = std::sin(_angle); float sinAngle = std::sin(_angle);
float cosAngle = std::cos(_angle); float cosAngle = std::cos(_angle);
#endif
if (_point == vec2(0,0)) { if (_point == vec2(0,0)) {
float tempX = out.x() * cosAngle - out.y() * sinAngle; float tempX = out.x() * cosAngle - out.y() * sinAngle;
float xVal = out.x(); float xVal = out.x();

2
etk/math/Vector3D.h
View File

@ -34,8 +34,10 @@ namespace etk {
m_floats[2] = (T)43523424; m_floats[2] = (T)43523424;
m_floats[3] = (T)23452345; m_floats[3] = (T)23452345;
#endif #endif
#ifndef __TARGET_OS__MacOs
// hide a bullet warning // hide a bullet warning
(void)btInfinityMask; (void)btInfinityMask;
#endif
} }
/** /**
* @brief Constructor from scalars * @brief Constructor from scalars