Moved gcd and lcm implemetation
parent
cc0fce8568
commit
51c80ecb80
|
@ -56,8 +56,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
#include "StandardShapes.h"
|
#include "StandardShapes.h"
|
||||||
#include "Importer.h"
|
#include "Importer.h"
|
||||||
|
|
||||||
// We need boost::common_factor to compute the lcm/gcd of a number
|
// We need Math.h to compute the lcm/gcd of a number
|
||||||
#include <boost/math/common_factor_rt.hpp>
|
#include "Math.h"
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include "../include/assimp/DefaultLogger.hpp"
|
#include "../include/assimp/DefaultLogger.hpp"
|
||||||
#include "../include/assimp/mesh.h"
|
#include "../include/assimp/mesh.h"
|
||||||
|
@ -402,13 +402,13 @@ void IRRImporter::ComputeAnimations(Node* root, aiNode* real, std::vector<aiNode
|
||||||
int lcm = 360;
|
int lcm = 360;
|
||||||
|
|
||||||
if (angles[0])
|
if (angles[0])
|
||||||
lcm = boost::math::lcm(lcm,angles[0]);
|
lcm = Math::lcm(lcm,angles[0]);
|
||||||
|
|
||||||
if (angles[1])
|
if (angles[1])
|
||||||
lcm = boost::math::lcm(lcm,angles[1]);
|
lcm = Math::lcm(lcm,angles[1]);
|
||||||
|
|
||||||
if (angles[2])
|
if (angles[2])
|
||||||
lcm = boost::math::lcm(lcm,angles[2]);
|
lcm = Math::lcm(lcm,angles[2]);
|
||||||
|
|
||||||
if (360 == lcm)
|
if (360 == lcm)
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -0,0 +1,77 @@
|
||||||
|
/*
|
||||||
|
---------------------------------------------------------------------------
|
||||||
|
Open Asset Import Library (assimp)
|
||||||
|
---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Copyright (c) 2006-2016, assimp team
|
||||||
|
|
||||||
|
All rights reserved.
|
||||||
|
|
||||||
|
Redistribution and use of this software in source and binary forms,
|
||||||
|
with or without modification, are permitted provided that the following
|
||||||
|
conditions are met:
|
||||||
|
|
||||||
|
* Redistributions of source code must retain the above
|
||||||
|
copyright notice, this list of conditions and the
|
||||||
|
following disclaimer.
|
||||||
|
|
||||||
|
* Redistributions in binary form must reproduce the above
|
||||||
|
copyright notice, this list of conditions and the
|
||||||
|
following disclaimer in the documentation and/or other
|
||||||
|
materials provided with the distribution.
|
||||||
|
|
||||||
|
* Neither the name of the assimp team, nor the names of its
|
||||||
|
contributors may be used to endorse or promote products
|
||||||
|
derived from this software without specific prior
|
||||||
|
written permission of the assimp team.
|
||||||
|
|
||||||
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
|
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||||
|
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||||
|
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||||
|
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||||
|
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||||
|
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
---------------------------------------------------------------------------
|
||||||
|
*/
|
||||||
|
|
||||||
|
/** @file Math.h
|
||||||
|
* @brief Implementation of the math functions (gcd and lcm)
|
||||||
|
*
|
||||||
|
* Copied from BoostWorkaround/math
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Assimp {
|
||||||
|
namespace Math {
|
||||||
|
|
||||||
|
// TODO: use binary GCD for unsigned integers ....
|
||||||
|
template < typename IntegerType >
|
||||||
|
IntegerType gcd( IntegerType a, IntegerType b )
|
||||||
|
{
|
||||||
|
const IntegerType zero = (IntegerType)0;
|
||||||
|
while ( true )
|
||||||
|
{
|
||||||
|
if ( a == zero )
|
||||||
|
return b;
|
||||||
|
b %= a;
|
||||||
|
|
||||||
|
if ( b == zero )
|
||||||
|
return a;
|
||||||
|
a %= b;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
template < typename IntegerType >
|
||||||
|
IntegerType lcm( IntegerType a, IntegerType b )
|
||||||
|
{
|
||||||
|
const IntegerType t = gcd (a,b);
|
||||||
|
if (!t)return t;
|
||||||
|
return a / t * b;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue