v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-cmake-override-output-path3

pull/3363/head
Kim Kulling 2020-08-08 10:42:36 +02:00 committed by GitHub
parent 11daed69d3 65265594ba
commit b3f85613fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -685,7 +685,8 @@ if(WIN32)
ENDIF() ENDIF()
IF(MSVC_TOOLSET_VERSION) IF(MSVC_TOOLSET_VERSION)
set(MSVC_PREFIX "vc${MSVC_TOOLSET_VERSION}") SET(MSVC_PREFIX "vc${MSVC_TOOLSET_VERSION}")
SET(ASSIMP_MSVC_VERSION ${MCVS_PREFIX})
ELSE() ELSE()
IF(MSVC12) IF(MSVC12)
SET(ASSIMP_MSVC_VERSION "vc120") SET(ASSIMP_MSVC_VERSION "vc120")

16
include/assimp/BaseImporter.h
View File

@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
Copyright (c) 2006-2020, assimp team Copyright (c) 2006-2020, assimp team
All rights reserved. All rights reserved.
Redistribution and use of this software in source and binary forms, Redistribution and use of this software in source and binary forms,
@ -40,7 +39,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------- ----------------------------------------------------------------------
*/ */
/** @file Definition of the base class for all importer worker classes. */ /// @file Definition of the base class for all importer worker classes.
#pragma once #pragma once
#ifndef INCLUDED_AI_BASEIMPORTER_H #ifndef INCLUDED_AI_BASEIMPORTER_H
#define INCLUDED_AI_BASEIMPORTER_H #define INCLUDED_AI_BASEIMPORTER_H
@ -87,10 +87,6 @@ class IOStream;
class ASSIMP_API BaseImporter { class ASSIMP_API BaseImporter {
friend class Importer; friend class Importer;
private:
/* Pushes state into importer for the importer scale */
virtual void UpdateImporterScale(Importer *pImp);
public: public:
/** Constructor to be privately used by #Importer */ /** Constructor to be privately used by #Importer */
BaseImporter() AI_NO_EXCEPT; BaseImporter() AI_NO_EXCEPT;
@ -399,7 +395,7 @@ public: // static utilities
* @param numOut The output count of elements copied. */ * @param numOut The output count of elements copied. */
template <typename T> template <typename T>
AI_FORCE_INLINE static void CopyVector( AI_FORCE_INLINE static void CopyVector(
std::vector<std::unique_ptr<T>> &vec, std::vector<std::unique_ptr<T> > &vec,
T **&out, T **&out,
unsigned int &outLength) { unsigned int &outLength) {
outLength = unsigned(vec.size()); outLength = unsigned(vec.size());
@ -410,7 +406,11 @@ public: // static utilities
} }
} }
protected: private:
/* Pushes state into importer for the importer scale */
virtual void UpdateImporterScale(Importer *pImp);
protected:
/// Error description in case there was one. /// Error description in case there was one.
std::string m_ErrorText; std::string m_ErrorText;
/// Currently set progress handler. /// Currently set progress handler.