Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MAke noexcept compiler-specific.

Browse Source
This commit is contained in:
kimkulling
2018-09-21 16:25:27 +02:00
parent bf1c002b5d
commit f75bf6d99c
48 changed files with 109 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/3DSHelper.h
View File

@@ -66,7 +66,7 @@ namespace D3DS {
*/
class Discreet3DS {
private:
Discreet3DS() noexcept {
Discreet3DS() AI_NO_EXCEPT {
// empty
}
@@ -330,7 +330,7 @@ struct Face : public FaceWithSmoothingGroup
/** Helper structure representing a texture */
struct Texture {
//! Default constructor
Texture() noexcept
Texture() AI_NO_EXCEPT
: mOffsetU (0.0)
, mOffsetV (0.0)
, mScaleU (1.0)
@@ -392,7 +392,7 @@ struct Material
//! Move constructor. This is explicitly written because MSVC doesn't support defaulting it
Material(Material &&other) noexcept
Material(Material &&other) AI_NO_EXCEPT
: mName(std::move(other.mName))
, mDiffuse(std::move(other.mDiffuse))
, mSpecularExponent(std::move(other.mSpecularExponent))
@@ -416,7 +416,7 @@ struct Material
}
Material &operator=(Material &&other) noexcept {
Material &operator=(Material &&other) AI_NO_EXCEPT {
if (this == &other) {
return *this;
}

2
code/AMFImporter.hpp
View File

@@ -392,7 +392,7 @@ private:
public:
/// Default constructor.
AMFImporter() noexcept
AMFImporter() AI_NO_EXCEPT
: mNodeElement_Cur(nullptr)
, mReader(nullptr) {
// empty

14
code/ASEParser.h
View File

@@ -85,7 +85,7 @@ struct Material : public D3DS::Material
//! Move constructor. This is explicitly written because MSVC doesn't support defaulting it
Material(Material &&other) noexcept
Material(Material &&other) AI_NO_EXCEPT
: D3DS::Material(std::move(other))
, avSubMaterials(std::move(other.avSubMaterials))
, pcInstance(std::move(other.pcInstance))
@@ -95,7 +95,7 @@ struct Material : public D3DS::Material
}
Material &operator=(Material &&other) noexcept {
Material &operator=(Material &&other) AI_NO_EXCEPT {
if (this == &other) {
return *this;
}
@@ -129,7 +129,7 @@ struct Material : public D3DS::Material
/** Helper structure to represent an ASE file face */
struct Face : public FaceWithSmoothingGroup {
//! Default constructor. Initializes everything with 0
Face() noexcept
Face() AI_NO_EXCEPT
: amUVIndices{0}
, mColorIndices{0}
, iMaterial(DEFAULT_MATINDEX)
@@ -197,7 +197,7 @@ struct Animation
TCB = 0x2
} mRotationType, mScalingType, mPositionType;
Animation() noexcept
Animation() AI_NO_EXCEPT
: mRotationType (TRACK)
, mScalingType (TRACK)
, mPositionType (TRACK)
@@ -218,7 +218,7 @@ struct Animation
/** Helper structure to represent the inheritance information of an ASE node */
struct InheritanceInfo {
//! Default constructor
InheritanceInfo() noexcept
InheritanceInfo() AI_NO_EXCEPT
: abInheritPosition{true}
, abInheritRotation{true}
, abInheritScaling{true} {
@@ -389,7 +389,7 @@ struct Camera : public BaseNode
/** Helper structure to represent an ASE helper object (dummy) */
struct Dummy : public BaseNode {
//! Constructor
Dummy() noexcept
Dummy() AI_NO_EXCEPT
: BaseNode (BaseNode::Dummy, "DUMMY") {
// empty
}
@@ -408,7 +408,7 @@ struct Dummy : public BaseNode {
*/
class Parser {
private:
Parser() noexcept {
Parser() AI_NO_EXCEPT {
// empty
}

2
code/BaseImporter.cpp
View File

@@ -65,7 +65,7 @@ using namespace Assimp;
// ------------------------------------------------------------------------------------------------
// Constructor to be privately used by Importer
BaseImporter::BaseImporter() noexcept
BaseImporter::BaseImporter() AI_NO_EXCEPT
: m_progress() {
// nothing to do here
}

2
code/BaseProcess.cpp
View File

@@ -53,7 +53,7 @@ using namespace Assimp;
// ------------------------------------------------------------------------------------------------
// Constructor to be privately used by Importer
BaseProcess::BaseProcess() noexcept
BaseProcess::BaseProcess() AI_NO_EXCEPT
: shared()
, progress()
{

2
code/BaseProcess.h
View File

@@ -216,7 +216,7 @@ class ASSIMP_API_WINONLY BaseProcess {
public:
/** Constructor to be privately used by Importer */
BaseProcess() noexcept;
BaseProcess() AI_NO_EXCEPT;
/** Destructor, private as well */
virtual ~BaseProcess();

4
code/Importer.h
View File

@@ -120,11 +120,11 @@ public:
SharedPostProcessInfo* mPPShared;
/// The default class constructor.
ImporterPimpl() noexcept;
ImporterPimpl() AI_NO_EXCEPT;
};
inline
ImporterPimpl::ImporterPimpl() noexcept
ImporterPimpl::ImporterPimpl() AI_NO_EXCEPT
: mIOHandler( nullptr )
, mIsDefaultHandler( false )
, mProgressHandler( nullptr )

4
code/LWOAnimation.h
View File

@@ -114,7 +114,7 @@ enum PrePostBehaviour
/** \brief Data structure for a LWO animation keyframe
*/
struct Key {
Key() noexcept
Key() AI_NO_EXCEPT
: time()
, value()
, inter(IT_LINE)
@@ -145,7 +145,7 @@ struct Key {
/** \brief Data structure for a LWO animation envelope
*/
struct Envelope {
Envelope() noexcept
Envelope() AI_NO_EXCEPT
: index()
, type(EnvelopeType_Unknown)
, pre(PrePostBehaviour_Constant)

2
code/LWOFileData.h
View File

@@ -263,7 +263,7 @@ namespace LWO {
*/
struct Face : public aiFace {
//! Default construction
Face() noexcept
Face() AI_NO_EXCEPT
: surfaceIndex( 0 )
, smoothGroup( 0 )
, type( AI_LWO_FACE ) {

2
code/LimitBoneWeightsProcess.h
View File

@@ -120,7 +120,7 @@ public:
{
unsigned int mBone; ///< Index of the bone
float mWeight; ///< Weight of that bone on this vertex
Weight() noexcept
Weight() AI_NO_EXCEPT
: mBone(0)
, mWeight(0.0f)
{ }

4
code/MD3Loader.h
View File

@@ -125,7 +125,7 @@ enum AlphaTestFunc
*/
struct ShaderMapBlock
{
ShaderMapBlock() noexcept
ShaderMapBlock() AI_NO_EXCEPT
: blend_src (BLEND_NONE)
, blend_dest (BLEND_NONE)
, alpha_test (AT_NONE)
@@ -150,7 +150,7 @@ struct ShaderMapBlock
*/
struct ShaderDataBlock
{
ShaderDataBlock() noexcept
ShaderDataBlock() AI_NO_EXCEPT
: cull (CULL_CW)
{}

2
code/MD5Parser.h
View File

@@ -193,7 +193,7 @@ typedef std::vector< FrameDesc > FrameList;
/** Represents a vertex descriptor in a MD5 file
*/
struct VertexDesc {
VertexDesc() noexcept
VertexDesc() AI_NO_EXCEPT
: mFirstWeight(0)
, mNumWeights(0) {
// empty

2
code/MDCFileData.h
View File

@@ -118,7 +118,7 @@ struct Surface
uint32_t ulOffsetFrameBaseFrames ;
uint32_t ulOffsetFrameCompFrames ;
uint32_t ulOffsetEnd;
Surface() noexcept
Surface() AI_NO_EXCEPT
: ulIdent()
, ucName{ 0 }
, ulFlags()

12
code/MDLFileData.h
View File

@@ -717,7 +717,7 @@ struct GroupFrame
*/
struct IntFace_MDL7 {
// provide a constructor for our own convenience
IntFace_MDL7() noexcept
IntFace_MDL7() AI_NO_EXCEPT
: mIndices { 0 }
, iMatIndex{ 0 } {
// empty
@@ -738,7 +738,7 @@ struct IntFace_MDL7 {
*/
struct IntMaterial_MDL7 {
// provide a constructor for our own convenience
IntMaterial_MDL7() noexcept
IntMaterial_MDL7() AI_NO_EXCEPT
: pcMat( nullptr )
, iOldMatIndices{ 0 } {
// empty
@@ -759,7 +759,7 @@ struct IntMaterial_MDL7 {
struct IntBone_MDL7 : aiBone
{
//! Default constructor
IntBone_MDL7() noexcept : iParent (0xffff)
IntBone_MDL7() AI_NO_EXCEPT : iParent (0xffff)
{
pkeyPositions.reserve(30);
pkeyScalings.reserve(30);
@@ -804,7 +804,7 @@ struct IntFrameInfo_MDL7
struct IntGroupInfo_MDL7
{
//! Default constructor
IntGroupInfo_MDL7() noexcept
IntGroupInfo_MDL7() AI_NO_EXCEPT
: iIndex(0)
, pcGroup(nullptr)
, pcGroupUVs(nullptr)
@@ -841,7 +841,7 @@ struct IntGroupInfo_MDL7
//! Holds the data that belongs to a MDL7 mesh group
struct IntGroupData_MDL7
{
IntGroupData_MDL7() noexcept
IntGroupData_MDL7() AI_NO_EXCEPT
: bNeed2UV(false)
{}
@@ -872,7 +872,7 @@ struct IntGroupData_MDL7
//! Holds data from an MDL7 file that is shared by all mesh groups
struct IntSharedData_MDL7 {
//! Default constructor
IntSharedData_MDL7() noexcept
IntSharedData_MDL7() AI_NO_EXCEPT
: apcOutBones(),
iNum()
{

2
code/OptimizeMeshes.h
View File

@@ -77,7 +77,7 @@ public:
/** @brief Internal utility to store additional mesh info
*/
struct MeshInfo {
MeshInfo() noexcept
MeshInfo() AI_NO_EXCEPT
: instance_cnt(0)
, vertex_format(0)
, output_id(0xffffffff) {

12
code/PlyParser.h
View File

@@ -209,7 +209,7 @@ enum EElementSemantic {
class Property {
public:
//! Default constructor
Property() noexcept
Property() AI_NO_EXCEPT
: eType (EDT_Int)
, Semantic()
, bIsList(false)
@@ -257,7 +257,7 @@ public:
class Element {
public:
//! Default constructor
Element() noexcept
Element() AI_NO_EXCEPT
: eSemantic (EEST_INVALID)
, NumOccur(0) {
// empty
@@ -297,7 +297,7 @@ class PropertyInstance
public:
//! Default constructor
PropertyInstance() noexcept {
PropertyInstance() AI_NO_EXCEPT {
// empty
}
@@ -360,7 +360,7 @@ public:
class ElementInstance {
public:
//! Default constructor
ElementInstance() noexcept
ElementInstance() AI_NO_EXCEPT
: alProperties() {
// empty
}
@@ -387,7 +387,7 @@ class ElementInstanceList
public:
//! Default constructor
ElementInstanceList() noexcept
ElementInstanceList() AI_NO_EXCEPT
: alInstances() {
// empty
}
@@ -414,7 +414,7 @@ class DOM
public:
//! Default constructor
DOM() noexcept
DOM() AI_NO_EXCEPT
: alElements()
, alElementData() {

8
code/SMDLoader.h
View File

@@ -69,7 +69,7 @@ namespace SMD {
/** Data structure for a vertex in a SMD file
*/
struct Vertex {
Vertex() noexcept
Vertex() AI_NO_EXCEPT
: iParentNode(UINT_MAX) {
// empty
}
@@ -91,7 +91,7 @@ struct Vertex {
/** Data structure for a face in a SMD file
*/
struct Face {
Face() noexcept
Face() AI_NO_EXCEPT
: iTexture(0x0)
, avVertices{} {
// empty
@@ -109,7 +109,7 @@ struct Face {
*/
struct Bone {
//! Default constructor
Bone() noexcept
Bone() AI_NO_EXCEPT
: iParent(UINT_MAX)
, bIsUsed(false) {
// empty
@@ -129,7 +129,7 @@ struct Bone {
//! Animation of the bone
struct Animation {
//! Public default constructor
Animation() noexcept
Animation() AI_NO_EXCEPT
: iFirstTimeKey() {
asKeys.reserve(20);
}

4
code/ScenePrivate.h
View File

@@ -56,7 +56,7 @@ class Importer;
struct ScenePrivateData {
// The struct constructor.
ScenePrivateData() noexcept;
ScenePrivateData() AI_NO_EXCEPT;
// Importer that originally loaded the scene though the C-API
// If set, this object is owned by this private data instance.
@@ -74,7 +74,7 @@ struct ScenePrivateData {
};
inline
ScenePrivateData::ScenePrivateData() noexcept
ScenePrivateData::ScenePrivateData() AI_NO_EXCEPT
: mOrigImporter( nullptr )
, mPPStepsApplied( 0 )
, mIsCopy( false ) {

4
code/TextureTransform.h
View File

@@ -66,7 +66,7 @@ namespace Assimp {
* to be able to update some values quickly.
*/
struct TTUpdateInfo {
TTUpdateInfo() noexcept
TTUpdateInfo() AI_NO_EXCEPT
: directShortcut(nullptr)
, mat(nullptr)
, semantic(0)
@@ -89,7 +89,7 @@ struct TTUpdateInfo {
/** Helper class representing texture coordinate transformations
*/
struct STransformVecInfo : public aiUVTransform {
STransformVecInfo() noexcept
STransformVecInfo() AI_NO_EXCEPT
: uvIndex(0)
, mapU(aiTextureMapMode_Wrap)
, mapV(aiTextureMapMode_Wrap)

10
code/XFileHelper.h
View File

@@ -68,7 +68,7 @@ struct TexEntry {
std::string mName;
bool mIsNormalMap; // true if the texname was specified in a NormalmapFilename tag
TexEntry() noexcept
TexEntry() AI_NO_EXCEPT
: mName()
, mIsNormalMap(false) {
// empty
@@ -91,7 +91,7 @@ struct Material {
std::vector<TexEntry> mTextures;
size_t sceneIndex; ///< the index under which it was stored in the scene's material list
Material() noexcept
Material() AI_NO_EXCEPT
: mIsReference(false)
, mSpecularExponent()
, sceneIndex(SIZE_MAX) {
@@ -130,7 +130,7 @@ struct Mesh {
std::vector<Bone> mBones;
explicit Mesh(const std::string &pName = "") noexcept
explicit Mesh(const std::string &pName = "") AI_NO_EXCEPT
: mName( pName )
, mPositions()
, mPosFaces()
@@ -155,7 +155,7 @@ struct Node {
std::vector<Node*> mChildren;
std::vector<Mesh*> mMeshes;
Node() noexcept
Node() AI_NO_EXCEPT
: mName()
, mTrafoMatrix()
, mParent(nullptr)
@@ -220,7 +220,7 @@ struct Scene
std::vector<Animation*> mAnims;
unsigned int mAnimTicksPerSecond;
Scene() noexcept
Scene() AI_NO_EXCEPT
: mRootNode(nullptr)
, mGlobalMeshes()
, mGlobalMaterials()