Merge branch 'master' into static

code/AssetLib/3DS/3DSExporter.cpp

@@ -56,8 +56,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <memory>
 
-using namespace Assimp;
 namespace Assimp {
+
 using namespace D3DS;
 
 namespace {

code/AssetLib/3DS/3DSHelper.h

@@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/light.h>
 #include <assimp/material.h>
 #include <assimp/qnan.h>
-#include <stdio.h> //sprintf
+#include <cstdio> //sprintf
 
 namespace Assimp {
 namespace D3DS {

code/AssetLib/3DS/3DSLoader.h

@@ -46,11 +46,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef AI_3DSIMPORTER_H_INC
 #define AI_3DSIMPORTER_H_INC
+#ifndef ASSIMP_BUILD_NO_3DS_IMPORTER
 
 #include <assimp/BaseImporter.h>
 #include <assimp/types.h>
 
-#ifndef ASSIMP_BUILD_NO_3DS_IMPORTER
 
 #include "3DSHelper.h"
 #include <assimp/StreamReader.h>
@@ -75,29 +75,29 @@ class Discreet3DSImporter : public BaseImporter {
  * See BaseImporter::CanRead() for details.
  */
  bool CanRead( const std::string& pFile, IOSystem* pIOHandler,
- bool checkSig) const;
+ bool checkSig) const override;
 
  // -------------------------------------------------------------------
  /** Called prior to ReadFile().
  * The function is a request to the importer to update its configuration
  * basing on the Importer's configuration property list.
  */
- void SetupProperties(const Importer* pImp);
+ void SetupProperties(const Importer* pImp) override;
 
 protected:
 
  // -------------------------------------------------------------------
  /** Return importer meta information.
  * See #BaseImporter::GetInfo for the details
  */
- const aiImporterDesc* GetInfo () const;
+ const aiImporterDesc* GetInfo () const override;
 
  // -------------------------------------------------------------------
  /** Imports the given file into the given scene structure.
  * See BaseImporter::InternReadFile() for details
  */
  void InternReadFile( const std::string& pFile, aiScene* pScene,
- IOSystem* pIOHandler);
+ IOSystem* pIOHandler) override;
 
  // -------------------------------------------------------------------
  /** Converts a temporary material to the outer representation

code/AssetLib/3MF/D3MFExporter.h

@@ -40,6 +40,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #pragma once
 
+#ifndef ASSIMP_BUILD_NO_EXPORT
+#ifndef ASSIMP_BUILD_NO_3MF_EXPORTER
+
 #include <memory>
 #include <sstream>
 #include <vector>
@@ -58,8 +61,6 @@ class IOStream;
 
 namespace D3MF {
 
-#ifndef ASSIMP_BUILD_NO_EXPORT
-#ifndef ASSIMP_BUILD_NO_3MF_EXPORTER
 
 struct OpcPackageRelationship;
 

code/AssetLib/3MF/D3MFImporter.h

@@ -42,6 +42,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_D3MFLOADER_H_INCLUDED
 #define AI_D3MFLOADER_H_INCLUDED
 
+#ifndef ASSIMP_BUILD_NO_3MF_IMPORTER
+
 #include <assimp/BaseImporter.h>
 
 namespace Assimp {
@@ -84,4 +86,6 @@ class D3MFImporter : public BaseImporter {
 
 } // Namespace Assimp
 
+#endif // #ifndef ASSIMP_BUILD_NO_3MF_IMPORTER
+
 #endif // AI_D3MFLOADER_H_INCLUDED

code/AssetLib/3MF/D3MFOpcPackage.cpp

@@ -51,11 +51,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/IOSystem.hpp>
 #include <assimp/texture.h>
 #include "3MFXmlTags.h"
+
 #include <algorithm>
 #include <cassert>
 #include <cstdlib>
 #include <map>
-#include <memory>
 #include <vector>
 
 namespace Assimp {
@@ -186,7 +186,6 @@ D3MFOpcPackage::D3MFOpcPackage(IOSystem *pIOHandler, const std::string &rFile) :
 D3MFOpcPackage::~D3MFOpcPackage() {
  mZipArchive->Close(mRootStream);
  delete mZipArchive;
- mZipArchive = nullptr;
 }
 
 IOStream *D3MFOpcPackage::RootStream() const {

code/AssetLib/3MF/D3MFOpcPackage.h

@@ -42,9 +42,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef D3MFOPCPACKAGE_H
 #define D3MFOPCPACKAGE_H
 
+#include <assimp/IOSystem.hpp>
 #include <memory>
 #include <string>
-#include <assimp/IOSystem.hpp>
 
 struct aiTexture;
 

code/AssetLib/AC/ACLoader.h

@@ -63,7 +63,7 @@ namespace Assimp {
 class AC3DImporter : public BaseImporter {
 public:
  AC3DImporter();
- ~AC3DImporter();
+ ~AC3DImporter() override;
 
  // Represents an AC3D material
  struct Material {
@@ -185,25 +185,25 @@ class AC3DImporter : public BaseImporter {
  * See BaseImporter::CanRead() for details.
  */
  bool CanRead(const std::string &pFile, IOSystem *pIOHandler,
- bool checkSig) const;
+ bool checkSig) const override;
 
 protected:
  // -------------------------------------------------------------------
  /** Return importer meta information.
  * See #BaseImporter::GetInfo for the details */
- const aiImporterDesc *GetInfo() const;
+ const aiImporterDesc *GetInfo() const override;
 
  // -------------------------------------------------------------------
  /** Imports the given file into the given scene structure.
  * See BaseImporter::InternReadFile() for details*/
  void InternReadFile(const std::string &pFile, aiScene *pScene,
- IOSystem *pIOHandler);
+ IOSystem *pIOHandler) override;
 
  // -------------------------------------------------------------------
  /** Called prior to ReadFile().
  * The function is a request to the importer to update its configuration
  * basing on the Importer's configuration property list.*/
- void SetupProperties(const Importer *pImp);
+ void SetupProperties(const Importer *pImp) override;
 
 private:
  // -------------------------------------------------------------------

code/AssetLib/AMF/AMFImporter.hpp

@@ -267,7 +267,7 @@ class AMFImporter : public BaseImporter {
  AMFImporter() AI_NO_EXCEPT;
 
  /// Default destructor.
- ~AMFImporter();
+ ~AMFImporter() override;
 
  /// Parse AMF file and fill scene graph. The function has no return value. Result can be found by analyzing the generated graph.
  /// Also exception can be thrown if trouble will found.
@@ -276,9 +276,9 @@ class AMFImporter : public BaseImporter {
  void ParseFile(const std::string &pFile, IOSystem *pIOHandler);
  void ParseHelper_Node_Enter(AMFNodeElementBase *child);
  void ParseHelper_Node_Exit();
- bool CanRead(const std::string &pFile, IOSystem *pIOHandler, bool pCheckSig) const;
- void InternReadFile(const std::string &pFile, aiScene *pScene, IOSystem *pIOHandler);
- const aiImporterDesc *GetInfo() const;
+ bool CanRead(const std::string &pFile, IOSystem *pIOHandler, bool pCheckSig) const override;
+ void InternReadFile(const std::string &pFile, aiScene *pScene, IOSystem *pIOHandler) override;
+ const aiImporterDesc *GetInfo() const override;
  bool Find_NodeElement(const std::string &pID, const AMFNodeElementBase::EType pType, AMFNodeElementBase **pNodeElement) const;
  bool Find_ConvertedNode(const std::string &pID, NodeArray &nodeArray, aiNode **pNode) const;
  bool Find_ConvertedMaterial(const std::string &pID, const SPP_Material **pConvertedMaterial) const;

code/AssetLib/AMF/AMFImporter_Node.hpp

@@ -48,15 +48,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef INCLUDED_AI_AMF_IMPORTER_NODE_H
 #define INCLUDED_AI_AMF_IMPORTER_NODE_H
 
-// Header files, stdlib.
+// Header files, Assimp.
+#include <assimp/scene.h>
+#include <assimp/types.h>
+
 #include <list>
 #include <string>
 #include <vector>
 
-// Header files, Assimp.
-#include "assimp/scene.h"
-#include "assimp/types.h"
-
 /// \class CAMFImporter_NodeElement
 /// Base class for elements of nodes.
 class AMFNodeElementBase {

code/AssetLib/ASE/ASELoader.cpp

@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2021, assimp team
 
-
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,

code/AssetLib/ASE/ASELoader.h

@@ -62,42 +62,37 @@ namespace Assimp {
 class ASEImporter : public BaseImporter {
 public:
  ASEImporter();
- ~ASEImporter();
+ ~ASEImporter() override;
 
  // -------------------------------------------------------------------
  /** Returns whether the class can handle the format of the given file.
  * See BaseImporter::CanRead() for details.
  */
  bool CanRead( const std::string& pFile, IOSystem* pIOHandler,
- bool checkSig) const;
+ bool checkSig) const override;
 
 protected:
-
  // -------------------------------------------------------------------
  /** Return importer meta information.
  * See #BaseImporter::GetInfo for the details
  */
- const aiImporterDesc* GetInfo () const;
-
+ const aiImporterDesc* GetInfo () const override;
 
  // -------------------------------------------------------------------
  /** Imports the given file into the given scene structure.
  * See BaseImporter::InternReadFile() for details
  */
  void InternReadFile( const std::string& pFile, aiScene* pScene,
- IOSystem* pIOHandler);
-
+ IOSystem* pIOHandler) override;
 
  // -------------------------------------------------------------------
  /** Called prior to ReadFile().
  * The function is a request to the importer to update its configuration
  * basing on the Importer's configuration property list.
  */
- void SetupProperties(const Importer* pImp);
-
+ void SetupProperties(const Importer* pImp) override;
 
 private:
-
  // -------------------------------------------------------------------
  /** Generate normal vectors basing on smoothing groups
  * (in some cases the normal are already contained in the file)
@@ -106,7 +101,6 @@ class ASEImporter : public BaseImporter {
  */
  bool GenerateNormals(ASE::Mesh& mesh);
 
-
  // -------------------------------------------------------------------
  /** Create valid vertex/normal/UV/color/face lists.
  * All elements are unique, faces have only one set of indices
@@ -115,51 +109,43 @@ class ASEImporter : public BaseImporter {
  */
  void BuildUniqueRepresentation(ASE::Mesh& mesh);
 
-
  /** Create one-material-per-mesh meshes ;-)
  * \param mesh Mesh to work with
  * \param Receives the list of all created meshes
  */
  void ConvertMeshes(ASE::Mesh& mesh, std::vector<aiMesh*>& avOut);
 
-
  // -------------------------------------------------------------------
  /** Convert a material to a aiMaterial object
  * \param mat Input material
  */
  void ConvertMaterial(ASE::Material& mat);
 
-
  // -------------------------------------------------------------------
  /** Setup the final material indices for each mesh
  */
  void BuildMaterialIndices();
 
-
  // -------------------------------------------------------------------
  /** Build the node graph
  */
  void BuildNodes(std::vector<ASE::BaseNode*>& nodes);
 
-
  // -------------------------------------------------------------------
  /** Build output cameras
  */
  void BuildCameras();
 
-
  // -------------------------------------------------------------------
  /** Build output lights
  */
  void BuildLights();
 
-
  // -------------------------------------------------------------------
  /** Build output animations
  */
  void BuildAnimations(const std::vector<ASE::BaseNode*>& nodes);
 
-
  // -------------------------------------------------------------------
  /** Add sub nodes to a node
  * \param pcParent parent node to be filled
@@ -183,7 +169,6 @@ class ASEImporter : public BaseImporter {
  void GenerateDefaultMaterial();
 
 protected:
-
  /** Parser instance */
  ASE::Parser* mParser;
 

code/AssetLib/ASE/ASEParser.cpp

@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2021, assimp team
 
-
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,

code/AssetLib/Assbin/AssbinExporter.h

@@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2021, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -43,6 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file AssbinExporter.h
  * ASSBIN Exporter Main Header
  */
+#pragma once
 #ifndef AI_ASSBINEXPORTER_H_INC
 #define AI_ASSBINEXPORTER_H_INC
 

code/AssetLib/Assbin/AssbinLoader.h

@@ -5,7 +5,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2021, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -74,17 +73,11 @@ class AssbinImporter : public BaseImporter
  bool compressed;
 
 public:
- virtual bool CanRead(
- const std::string& pFile,
- IOSystem* pIOHandler,
- bool checkSig
- ) const;
- virtual const aiImporterDesc* GetInfo() const;
- virtual void InternReadFile(
- const std::string& pFile,
- aiScene* pScene,
- IOSystem* pIOHandler
- );
+ bool CanRead(const std::string& pFile,
+ IOSystem* pIOHandler, bool checkSig) const override;
+ const aiImporterDesc* GetInfo() const override;
+ void InternReadFile(
+ const std::string& pFile,aiScene* pScene,IOSystem* pIOHandler) override;
  void ReadHeader();
  void ReadBinaryScene( IOStream * stream, aiScene* pScene );
  void ReadBinaryNode( IOStream * stream, aiNode** mRootNode, aiNode* parent );