TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-29 08:15:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update squish library to 1.11

Browse source
This commit is contained in:
thecelloman 2013-03-04 14:37:50 -05:00
parent 31036c4031
commit 8de0b7cbb1
14 changed files with 99 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Engine/lib/squish/maths.h
View file

@ -26,7 +26,8 @@
#ifndef SQUISH_MATHS_H
#define SQUISH_MATHS_H
#include "squishMath.h"
#include <cmath>
#include <algorithm>
#include "config.h"
namespace squish {
@ -162,27 +163,27 @@ public:
friend Vec3 Min( Arg left, Arg right )
{
return Vec3(
SquishMath::min( left.m_x, right.m_x ),
SquishMath::min( left.m_y, right.m_y ),
SquishMath::min( left.m_z, right.m_z )
std::min( left.m_x, right.m_x ),
std::min( left.m_y, right.m_y ),
std::min( left.m_z, right.m_z )
);
}
friend Vec3 Max( Arg left, Arg right )
{
return Vec3(
SquishMath::max( left.m_x, right.m_x ),
SquishMath::max( left.m_y, right.m_y ),
SquishMath::max( left.m_z, right.m_z )
std::max( left.m_x, right.m_x ),
std::max( left.m_y, right.m_y ),
std::max( left.m_z, right.m_z )
);
}
friend Vec3 Truncate( Arg v )
{
return Vec3(
v.m_x > 0.0f ? SquishMath::floor( v.m_x ) : SquishMath::ceil( v.m_x ),
v.m_y > 0.0f ? SquishMath::floor( v.m_y ) : SquishMath::ceil( v.m_y ),
v.m_z > 0.0f ? SquishMath::floor( v.m_z ) : SquishMath::ceil( v.m_z )
v.m_x > 0.0f ? std::floor( v.m_x ) : std::ceil( v.m_x ),
v.m_y > 0.0f ? std::floor( v.m_y ) : std::ceil( v.m_y ),
v.m_z > 0.0f ? std::floor( v.m_z ) : std::ceil( v.m_z )
);
}