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

Merge branch 'master' into master

pull/3413/head
Optimizer0 2020-10-06 15:48:11 +05:30 committed by GitHub
parent 152343b186 95d0443a5d
commit 1d3f8bd871
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 234 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/assimp/cimport.h
View File

@ -5,8 +5,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,
@ -52,15 +50,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#pragma GCC system_header #pragma GCC system_header
#endif #endif
#include <assimp/types.h>
#include <assimp/importerdesc.h> #include <assimp/importerdesc.h>
#include <assimp/types.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
struct aiScene; // aiScene.h struct aiScene;
struct aiFileIO; // aiFileIO.h struct aiFileIO;
typedef void (*aiLogStreamCallback)(const char * /* message */, char * /* user */); typedef void (*aiLogStreamCallback)(const char * /* message */, char * /* user */);
// -------------------------------------------------------------------------------- // --------------------------------------------------------------------------------
@ -70,8 +69,7 @@ typedef void (*aiLogStreamCallback)(const char* /* message */, char* /* user */)
* @see aiAttachLogStream * @see aiAttachLogStream
* @see aiDetachLogStream */ * @see aiDetachLogStream */
// -------------------------------------------------------------------------------- // --------------------------------------------------------------------------------
struct aiLogStream struct aiLogStream {
{
/** callback to be called */ /** callback to be called */
aiLogStreamCallback callback; aiLogStreamCallback callback;
@ -79,7 +77,6 @@ struct aiLogStream
char *user; char *user;
}; };
// -------------------------------------------------------------------------------- // --------------------------------------------------------------------------------
/** C-API: Represents an opaque set of settings to be used during importing. /** C-API: Represents an opaque set of settings to be used during importing.
* @see aiCreatePropertyStore * @see aiCreatePropertyStore
@ -91,7 +88,9 @@ struct aiLogStream
* @see aiSetPropertyMatrix * @see aiSetPropertyMatrix
*/ */
// -------------------------------------------------------------------------------- // --------------------------------------------------------------------------------
struct aiPropertyStore { char sentinel; }; struct aiPropertyStore {
char sentinel;
};
/** Our own C boolean type */ /** Our own C boolean type */
typedef int aiBool; typedef int aiBool;
@ -374,8 +373,6 @@ ASSIMP_API void aiGetMemoryRequirements(
const C_STRUCT aiScene *pIn, const C_STRUCT aiScene *pIn,
C_STRUCT aiMemoryInfo *in); C_STRUCT aiMemoryInfo *in);
// -------------------------------------------------------------------------------- // --------------------------------------------------------------------------------
/** Create an empty property store. Property stores are used to collect import /** Create an empty property store. Property stores are used to collect import
* settings. * settings.

4
include/assimp/importerdesc.h
View File

@ -5,8 +5,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,
@ -52,6 +50,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# pragma GCC system_header # pragma GCC system_header
#endif #endif
#include <assimp/types.h>
/** Mixed set of flags for #aiImporterDesc, indicating some features /** Mixed set of flags for #aiImporterDesc, indicating some features
* common to many importers*/ * common to many importers*/
enum aiImporterFlags { enum aiImporterFlags {

17
test/unit/AssimpAPITest.cpp
View File

@ -5,8 +5,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,
@ -46,14 +44,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
using namespace Assimp; using namespace Assimp;
class AssimpAPITest : public ::testing::Test { class AssimpAPITest : public ::testing::Test {
// empty
}; };
TEST_F( AssimpAPITest, aiGetImporterDescTest ) { TEST_F( AssimpAPITest, aiGetImporterDescTest ) {
const aiImporterDesc *desc( NULL ); const aiImporterDesc *desc( nullptr );
desc = aiGetImporterDesc( NULL ); desc = aiGetImporterDesc(nullptr);
EXPECT_EQ( NULL, desc ); EXPECT_EQ(nullptr, desc);
desc = aiGetImporterDesc( "obj" ); desc = aiGetImporterDesc( "obj" );
EXPECT_TRUE( NULL != desc ); EXPECT_TRUE(nullptr != desc);
}
TEST_F( AssimpAPITest, aiGetLastErrorTest ) {
const char *error = aiGetErrorString();
EXPECT_NE(nullptr, error);
} }