diff options
Diffstat (limited to 'src/3rdparty/assimp/code/ColladaParser.h')
| -rw-r--r-- | src/3rdparty/assimp/code/ColladaParser.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/3rdparty/assimp/code/ColladaParser.h b/src/3rdparty/assimp/code/ColladaParser.h index 9193e2027..941ab8414 100644 --- a/src/3rdparty/assimp/code/ColladaParser.h +++ b/src/3rdparty/assimp/code/ColladaParser.h @@ -2,7 +2,8 @@ Open Asset Import Library (assimp) ---------------------------------------------------------------------- - Copyright (c) 2006-2016, assimp team + Copyright (c) 2006-2017, assimp team + All rights reserved. Redistribution and use of this software in source and binary forms, @@ -49,7 +50,6 @@ #include "ColladaHelper.h" #include <assimp/ai_assert.h> #include "TinyFormatter.h" -#include <memory> namespace Assimp { @@ -77,7 +77,7 @@ namespace Assimp /** Reads the structure of the file */ void ReadStructure(); - /** Reads asset informations such as coordinate system informations and legal blah */ + /** Reads asset information such as coordinate system information and legal blah */ void ReadAssetInfo(); /** Reads the animation library */ @@ -147,7 +147,7 @@ namespace Assimp void ReadEffectColor( aiColor4D& pColor, Collada::Sampler& pSampler); /** Reads an effect entry containing a float */ - void ReadEffectFloat( float& pFloat); + void ReadEffectFloat( ai_real& pFloat); /** Reads an effect parameter specification of any kind */ void ReadEffectParam( Collada::EffectParam& pParam); @@ -259,7 +259,7 @@ namespace Assimp bool ReadBoolFromTextContent(); /** Reads a single float from current text content */ - float ReadFloatFromTextContent(); + ai_real ReadFloatFromTextContent(); /** Calculates the resulting transformation from all the given transform steps */ aiMatrix4x4 CalculateResultTransform( const std::vector<Collada::Transform>& pTransforms) const; @@ -268,8 +268,7 @@ namespace Assimp Collada::InputType GetTypeForSemantic( const std::string& pSemantic); /** Finds the item in the given library by its reference, throws if not found */ - template <typename Type> const Type& ResolveLibraryReference( - const std::map<std::string, Type>& pLibrary, const std::string& pURL) const; + template <typename Type> const Type& ResolveLibraryReference( const std::map<std::string, Type>& pLibrary, const std::string& pURL) const; protected: /** Filename, for a verbose error message */ @@ -335,7 +334,7 @@ namespace Assimp Collada::Animation mAnims; /** Size unit: how large compared to a meter */ - float mUnitSize; + ai_real mUnitSize; /** Which is the up vector */ enum { UP_X, UP_Y, UP_Z } mUpDirection; |