Browse Source

very small changes

- FIND_PACKAGE(DirectX) is already used in the samples and assimp tool cmake files - so is not needed in the main cmake fil
- other small changes
iamAdrianIusca 5 years ago
parent
commit
5c99d6a864
3 changed files with 10 additions and 15 deletions
  1. 0 4
      CMakeLists.txt
  2. 8 9
      code/Obj/ObjFileParser.cpp
  3. 2 2
      code/Obj/ObjFileParser.h

+ 0 - 4
CMakeLists.txt

@@ -437,10 +437,6 @@ ELSE(HUNTER_ENABLED)
     DESTINATION "${ASSIMP_LIB_INSTALL_DIR}/cmake/assimp-${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MINOR}" COMPONENT ${LIBASSIMP-DEV_COMPONENT})
     DESTINATION "${ASSIMP_LIB_INSTALL_DIR}/cmake/assimp-${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MINOR}" COMPONENT ${LIBASSIMP-DEV_COMPONENT})
 ENDIF(HUNTER_ENABLED)
 ENDIF(HUNTER_ENABLED)
 
 
-if (ASSIMP_BUILD_SAMPLES OR ASSIMP_BUILD_SAMPLES)
-  FIND_PACKAGE(DirectX)
-endif(ASSIMP_BUILD_SAMPLES OR ASSIMP_BUILD_SAMPLES)
-
 IF( BUILD_DOCS )
 IF( BUILD_DOCS )
   ADD_SUBDIRECTORY(doc)
   ADD_SUBDIRECTORY(doc)
 ENDIF( BUILD_DOCS )
 ENDIF( BUILD_DOCS )

+ 8 - 9
code/Obj/ObjFileParser.cpp

@@ -53,6 +53,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/material.h>
 #include <assimp/material.h>
 #include <assimp/Importer.hpp>
 #include <assimp/Importer.hpp>
 #include <cstdlib>
 #include <cstdlib>
+#include <memory>
+#include <utility>
 
 
 namespace Assimp {
 namespace Assimp {
 
 
@@ -71,19 +73,19 @@ ObjFileParser::ObjFileParser()
 
 
 ObjFileParser::ObjFileParser( IOStreamBuffer<char> &streamBuffer, const std::string &modelName,
 ObjFileParser::ObjFileParser( IOStreamBuffer<char> &streamBuffer, const std::string &modelName,
                               IOSystem *io, ProgressHandler* progress,
                               IOSystem *io, ProgressHandler* progress,
-                              const std::string &originalObjFileName) :
+                              std::string originalObjFileName) :
     m_DataIt(),
     m_DataIt(),
     m_DataItEnd(),
     m_DataItEnd(),
     m_pModel(nullptr),
     m_pModel(nullptr),
     m_uiLine(0),
     m_uiLine(0),
-    m_pIO( io ),
+    m_pIO(io),
     m_progress(progress),
     m_progress(progress),
-    m_originalObjFileName(originalObjFileName)
+    m_originalObjFileName(std::move(originalObjFileName))
 {
 {
-    std::fill_n(m_buffer,Buffersize,0);
+    std::fill_n(m_buffer, Buffersize,0);
 
 
     // Create the model instance to store all the data
     // Create the model instance to store all the data
-    m_pModel.reset(new ObjFile::Model());
+    m_pModel = std::make_unique<ObjFile::Model>();
     m_pModel->m_ModelName = modelName;
     m_pModel->m_ModelName = modelName;
 
 
     // create default material and store it
     // create default material and store it
@@ -96,9 +98,6 @@ ObjFileParser::ObjFileParser( IOStreamBuffer<char> &streamBuffer, const std::str
     parseFile( streamBuffer );
     parseFile( streamBuffer );
 }
 }
 
 
-ObjFileParser::~ObjFileParser() {
-}
-
 void ObjFileParser::setBuffer( std::vector<char> &buffer ) {
 void ObjFileParser::setBuffer( std::vector<char> &buffer ) {
     m_DataIt = buffer.begin();
     m_DataIt = buffer.begin();
     m_DataItEnd = buffer.end();
     m_DataItEnd = buffer.end();
@@ -128,7 +127,7 @@ void ObjFileParser::parseFile( IOStreamBuffer<char> &streamBuffer ) {
             processed = static_cast<unsigned int>(filePos);
             processed = static_cast<unsigned int>(filePos);
             lastFilePos = filePos;
             lastFilePos = filePos;
             progressCounter++;
             progressCounter++;
-            m_progress->UpdateFileRead( processed, progressTotal );
+            m_progress->UpdateFileRead(processed, progressTotal);
         }
         }
 
 
         // parse line
         // parse line

+ 2 - 2
code/Obj/ObjFileParser.h

@@ -78,9 +78,9 @@ public:
     /// @brief  The default constructor.
     /// @brief  The default constructor.
     ObjFileParser();
     ObjFileParser();
     /// @brief  Constructor with data array.
     /// @brief  Constructor with data array.
-    ObjFileParser( IOStreamBuffer<char> &streamBuffer, const std::string &modelName, IOSystem* io, ProgressHandler* progress, const std::string &originalObjFileName);
+    ObjFileParser(IOStreamBuffer<char> &streamBuffer, const std::string &modelName, IOSystem* io, ProgressHandler* progress, std::string originalObjFileName);
     /// @brief  Destructor
     /// @brief  Destructor
-    ~ObjFileParser();
+    ~ObjFileParser() = default;
     /// @brief  If you want to load in-core data.
     /// @brief  If you want to load in-core data.
     void setBuffer( std::vector<char> &buffer );
     void setBuffer( std::vector<char> &buffer );
     /// @brief  Model getter.
     /// @brief  Model getter.