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

Merge branch 'master' into coverity_scan

pull/2286/head
Kim Kulling 2017-05-26 09:19:13 +02:00
parent 1cded5a186 e93355c8b4
commit 342b572281
17 changed files with 189 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
code/ObjExporter.cpp
View File

@ -87,11 +87,16 @@ static const std::string MaterialExt = ".mtl";
ObjExporter::ObjExporter(const char* _filename, const aiScene* pScene)
: filename(_filename)
, pScene(pScene)
, endl("\n")
, vp()
, vn()
, vt()
, vc() {
, vc()
, vpMap()
, vnMap()
, vtMap()
, vcMap()
, meshes()
, endl("\n") {
// make sure that all formatting happens using the standard, C locale and not the user's current locale
const std::locale& l = std::locale("C");
mOutput.imbue(l);

3
code/ObjExporter.h
View File

@ -98,16 +98,13 @@ private:
void WriteHeader(std::ostringstream& out);
void WriteMaterialFile();
void WriteGeometryFile();
std::string GetMaterialName(unsigned int index);
void AddMesh(const aiString& name, const aiMesh* m, const aiMatrix4x4& mat);
void AddNode(const aiNode* nd, const aiMatrix4x4& mParent);
private:
std::string filename;
const aiScene* const pScene;
std::vector<aiVector3D> vp, vn, vt;
std::vector<aiColor4D> vc;

2
code/ObjFileMtlImporter.h
View File

@ -113,4 +113,4 @@ private:
} // Namespace Assimp
#endif
#endif // OBJFILEMTLIMPORTER_H_INC

37
code/ObjFileParser.cpp
View File

@ -57,8 +57,17 @@ namespace Assimp {
const std::string ObjFileParser::DEFAULT_MATERIAL = AI_DEFAULT_MATERIAL_NAME;
// -------------------------------------------------------------------
// Constructor with loaded data and directories.
ObjFileParser::ObjFileParser()
: m_DataIt()
, m_DataItEnd()
, m_pModel( NULL )
, m_uiLine( 0 )
, m_pIO( nullptr )
, m_progress( nullptr )
, m_originalObjFileName( "" ) {
// empty
}
ObjFileParser::ObjFileParser( IOStreamBuffer<char> &streamBuffer, const std::string &modelName,
IOSystem *io, ProgressHandler* progress,
const std::string &originalObjFileName) :
@ -86,18 +95,20 @@ ObjFileParser::ObjFileParser( IOStreamBuffer<char> &streamBuffer, const std::str
parseFile( streamBuffer );
}
// -------------------------------------------------------------------
// Destructor
ObjFileParser::~ObjFileParser() {
delete m_pModel;
m_pModel = NULL;
}
// -------------------------------------------------------------------
// Returns a pointer to the model instance.
void ObjFileParser::setBuffer( std::vector<char> &buffer ) {
m_DataIt = buffer.begin();
m_DataItEnd = buffer.end();
}
ObjFile::Model *ObjFileParser::GetModel() const {
return m_pModel;
}
void ignoreNewLines(IOStreamBuffer<char> &streamBuffer, std::vector<char> &buffer)
{
auto curPosition = buffer.begin();
@ -119,8 +130,7 @@ void ignoreNewLines(IOStreamBuffer<char> &streamBuffer, std::vector<char> &buffe
}
} while (*curPosition!='\n');
}
// -------------------------------------------------------------------
// File parsing method.
void ObjFileParser::parseFile( IOStreamBuffer<char> &streamBuffer ) {
// only update every 100KB or it'll be too slow
//const unsigned int updateProgressEveryBytes = 100 * 1024;
@ -144,7 +154,7 @@ void ObjFileParser::parseFile( IOStreamBuffer<char> &streamBuffer ) {
progressCounter++;
m_progress->UpdateFileRead( progressOffset + processed * 2, progressTotal );
}
ignoreNewLines(streamBuffer, buffer);
//ignoreNewLines(streamBuffer, buffer);
// parse line
switch (*m_DataIt) {
case 'v': // Parse a vertex texture coordinate
@ -243,11 +253,14 @@ pf_skip_line:
}
}
// -------------------------------------------------------------------
// Copy the next word in a temporary buffer
void ObjFileParser::copyNextWord(char *pBuffer, size_t length) {
size_t index = 0;
m_DataIt = getNextWord<DataArrayIt>(m_DataIt, m_DataItEnd);
if ( *m_DataIt == '\\' ) {
m_DataIt++;
m_DataIt++;
m_DataIt = getNextWord<DataArrayIt>( m_DataIt, m_DataItEnd );
}
while( m_DataIt != m_DataItEnd && !IsSpaceOrNewLine( *m_DataIt ) ) {
pBuffer[index] = *m_DataIt;
index++;
@ -300,8 +313,6 @@ void ObjFileParser::getVector( std::vector<aiVector3D> &point3d_array ) {
m_DataIt = skipLine<DataArrayIt>( m_DataIt, m_DataItEnd, m_uiLine );
}
// -------------------------------------------------------------------
// Get values for a new 3D vector instance
void ObjFileParser::getVector3( std::vector<aiVector3D> &point3d_array ) {
ai_real x, y, z;
copyNextWord(m_buffer, Buffersize);

16
code/ObjFileParser.h
View File

@ -65,7 +65,7 @@ class ProgressHandler;
/// \class ObjFileParser
/// \brief Parser for a obj waveform file
class ObjFileParser {
class ASSIMP_API ObjFileParser {
public:
static const size_t Buffersize = 4096;
typedef std::vector<char> DataArray;
@ -73,14 +73,18 @@ public:
typedef std::vector<char>::const_iterator ConstDataArrayIt;
public:
/// \brief Constructor with data array.
ObjFileParser( IOStreamBuffer<char> &streamBuffer, const std::string &strModelName, IOSystem* io, ProgressHandler* progress, const std::string &originalObjFileName);
/// \brief Destructor
/// @brief The default constructor.
ObjFileParser();
/// @brief Constructor with data array.
ObjFileParser( IOStreamBuffer<char> &streamBuffer, const std::string &modelName, IOSystem* io, ProgressHandler* progress, const std::string &originalObjFileName);
/// @brief Destructor
~ObjFileParser();
/// \brief Model getter.
/// @brief If you want to load in-core data.
void setBuffer( std::vector<char> &buffer );
/// @brief Model getter.
ObjFile::Model *GetModel() const;
private:
protected:
/// Parse the loaded file
void parseFile( IOStreamBuffer<char> &streamBuffer );
/// Method to copy the new delimited word in the current line.

4
code/ObjTools.h
View File

@ -79,8 +79,10 @@ inline Char_T getNextWord( Char_T pBuffer, Char_T pEnd )
{
while ( !isEndOfBuffer( pBuffer, pEnd ) )
{
if( !IsSpaceOrNewLine( *pBuffer ) || IsLineEnd( *pBuffer ) )
if ( !IsSpaceOrNewLine( *pBuffer ) || IsLineEnd( *pBuffer ) ) {
//if ( *pBuffer != '\\' )
break;
}
pBuffer++;
}
return pBuffer;

27
code/SIBImporter.cpp
View File

@ -66,7 +66,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <map>
using namespace Assimp;
static const aiImporterDesc desc = {
@ -80,25 +79,26 @@ static const aiImporterDesc desc = {
"sib"
};
struct SIBChunk
{
struct SIBChunk {
uint32_t Tag;
uint32_t Size;
} PACK_STRUCT;
enum { POS, NRM, UV, N };
enum {
POS,
NRM,
UV,
N
};
typedef std::pair<uint32_t, uint32_t> SIBPair;
static SIBPair makePair(uint32_t a, uint32_t b) { return (a<b) ? SIBPair(a, b) : SIBPair(b, a); }
struct SIBEdge
{
struct SIBEdge {
uint32_t faceA, faceB;
bool creased;
};
struct SIBMesh
{
struct SIBMesh {
aiMatrix4x4 axis;
uint32_t numPts;
std::vector<aiVector3D> pos, nrm, uv;
@ -109,15 +109,13 @@ struct SIBMesh
std::map<SIBPair, uint32_t> edgeMap;
};
struct SIBObject
{
struct SIBObject {
aiString name;
aiMatrix4x4 axis;
size_t meshIdx, meshCount;
};
struct SIB
{
struct SIB {
std::vector<aiMaterial*> mtls;
std::vector<aiMesh*> meshes;
std::vector<aiLight*> lights;
@ -125,8 +123,7 @@ struct SIB
};
// ------------------------------------------------------------------------------------------------
static SIBEdge& GetEdge(SIBMesh* mesh, uint32_t posA, uint32_t posB)
{
static SIBEdge& GetEdge(SIBMesh* mesh, uint32_t posA, uint32_t posB) {
SIBPair pair = (posA < posB) ? SIBPair(posA, posB) : SIBPair(posB, posA);
std::map<SIBPair, uint32_t>::iterator it = mesh->edgeMap.find(pair);
if (it != mesh->edgeMap.end())

10
code/glTFAsset.h
View File

@ -46,8 +46,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* KHR_binary_glTF: full
* KHR_materials_common: full
*/
#ifndef glTFAsset_H_INC
#define glTFAsset_H_INC
#ifndef GLTFASSET_H_INC
#define GLTFASSET_H_INC
#ifndef ASSIMP_BUILD_NO_GLTF_IMPORTER
#include <map>
#include <string>
@ -1187,4 +1189,6 @@ namespace glTF
// Include the implementation of the methods
#include "glTFAsset.inl"
#endif
#endif // ASSIMP_BUILD_NO_GLTF_IMPORTER
#endif // GLTFASSET_H_INC

10
code/glTFAssetWriter.h
View File

@ -46,8 +46,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* KHR_binary_glTF: full
* KHR_materials_common: full
*/
#ifndef glTFAssetWriter_H_INC
#define glTFAssetWriter_H_INC
#ifndef GLTFASSETWRITER_H_INC
#define GLTFASSETWRITER_H_INC
#ifndef ASSIMP_BUILD_NO_GLTF_IMPORTER
#include "glTFAsset.h"
@ -88,4 +90,6 @@ public:
// Include the implementation of the methods
#include "glTFAssetWriter.inl"
#endif
#endif // ASSIMP_BUILD_NO_GLTF_IMPORTER
#endif // GLTFASSETWRITER_H_INC

6
code/glTFExporter.h
View File

@ -45,6 +45,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AI_GLTFEXPORTER_H_INC
#define AI_GLTFEXPORTER_H_INC
#ifndef ASSIMP_BUILD_NO_GLTF_IMPORTER
#include <assimp/types.h>
#include <assimp/material.h>
@ -111,4 +113,6 @@ namespace Assimp
}
#endif
#endif // ASSIMP_BUILD_NO_GLTF_IMPORTER
#endif // AI_GLTFEXPORTER_H_INC

9
include/assimp/metadata.h
View File

@ -134,7 +134,6 @@ struct aiMetadata {
// empty
}
/**
* @brief The destructor.
*/
@ -199,6 +198,14 @@ struct aiMetadata {
return data;
}
/**
* @brief Deallocates property fields + keys.
*/
static inline
void Dealloc( aiMetadata *metadata ) {
delete metadata;
}
template<typename T>
inline void Add(const std::string& key, const T& value)
{

2
test/CMakeLists.txt
View File

@ -38,7 +38,6 @@
#----------------------------------------------------------------------
cmake_minimum_required( VERSION 2.6 )
#INCLUDE( AddGTest )
include( CTest )
enable_testing()
@ -106,6 +105,7 @@ SET( TEST_SRCS
unit/SceneDiffer.cpp
unit/utSIBImporter.cpp
unit/utObjImportExport.cpp
unit/utObjTools.cpp
unit/utOpenGEXImportExport.cpp
unit/utPretransformVertices.cpp
unit/utPLYImportExport.cpp

6
test/unit/utBlendImportMaterials.cpp
View File

@ -70,7 +70,7 @@ TEST_F(BlendImportMaterials, testImportMaterial)
ASSERT_TRUE(pTest != NULL);
ASSERT_TRUE(pTest->HasMaterials());
ASSERT_EQ(1, pTest->mNumMaterials);
ASSERT_EQ(1U, pTest->mNumMaterials);
auto alpha = pTest->mMaterials[0];
@ -86,8 +86,8 @@ TEST_F(BlendImportMaterials, testImportMaterial)
ASSERT_PROPERTY_EQ(aiColor3D(0.1f, 0.2f, 0.3f), "diffuse.color", diffuseColor);
ASSERT_PROPERTY_EQ(0.4f, "diffuse.intensity", diffuseIntensity);
ASSERT_PROPERTY_EQ(1, "diffuse.shader", diffuseShader);
ASSERT_PROPERTY_EQ(0, "diffuse.ramp", diffuseRamp);
ASSERT_PROPERTY_EQ(1U, "diffuse.shader", diffuseShader);
ASSERT_PROPERTY_EQ(0U, "diffuse.ramp", diffuseRamp);
ASSERT_PROPERTY_EQ(aiColor3D(0.5f, 0.6f, 0.7f), "specular.color", specularColor);
ASSERT_PROPERTY_EQ(0.8f, "specular.intensity", specularIntensity);

7
test/unit/utIOSystem.cpp
View File

@ -63,12 +63,13 @@ protected:
TEST_F( IOSystemTest, accessDirectoryStackTest ) {
EXPECT_FALSE( pImp->PopDirectory() );
EXPECT_EQ( 0, pImp->StackSize() );
EXPECT_EQ( 0U, pImp->StackSize() );
EXPECT_FALSE( pImp->PushDirectory( "" ) );
std::string path = "test/";
EXPECT_TRUE( pImp->PushDirectory( path ) );
EXPECT_EQ( 1, pImp->StackSize() );
EXPECT_EQ( 1U, pImp->StackSize() );
EXPECT_EQ( path, pImp->CurrentDirectory() );
EXPECT_TRUE( pImp->PopDirectory() );
EXPECT_EQ( 0, pImp->StackSize() );
EXPECT_EQ( 0U, pImp->StackSize() );
}

2
test/unit/utMetadata.cpp
View File

@ -55,7 +55,7 @@ protected:
}
virtual void TearDown() {
delete m_data;
aiMetadata::Dealloc( m_data );
}
};

93
test/unit/utObjTools.cpp 100644
View File

@ -0,0 +1,93 @@
/*
---------------------------------------------------------------------------
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
Copyright (c) 2006-2017, assimp team
All rights reserved.
Redistribution and use of this software in source and binary forms,
with or without modification, are permitted provided that the following
conditions are met:
* Redistributions of source code must retain the above
copyright notice, this list of conditions and the
following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the
following disclaimer in the documentation and/or other
materials provided with the distribution.
* Neither the name of the assimp team, nor the names of its
contributors may be used to endorse or promote products
derived from this software without specific prior
written permission of the assimp team.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------------
*/
#include "UnitTestPCH.h"
#include "ObjTools.h"
#include "ObjFileParser.h"
using namespace ::Assimp;
class utObjTools : public ::testing::Test {
// empty
};
class TestObjFileParser : public ObjFileParser {
public:
TestObjFileParser() : ObjFileParser(){}
~TestObjFileParser() {}
void testCopyNextWord( char *pBuffer, size_t length ) {
copyNextWord( pBuffer, length );
}
};
TEST_F( utObjTools, skipDataLine_OneLine_Success ) {
std::vector<char> buffer;
std::string data( "v -0.5 -0.5 0.5\nend" );
buffer.resize( data.size() );
::memcpy( &buffer[ 0 ], &data[ 0 ], data.size() );
std::vector<char>::iterator itBegin( buffer.begin() ), itEnd( buffer.end() );
unsigned int line = 0;
std::vector<char>::iterator current = skipLine<std::vector<char>::iterator>( itBegin, itEnd, line );
EXPECT_EQ( 'e', *current );
}
TEST_F( utObjTools, skipDataLine_TwoLines_Success ) {
TestObjFileParser test_parser;
std::string data( "vn -2.061493116917992e-15 -0.9009688496589661 \\n-0.4338837265968323" );
std::vector<char> buffer;
buffer.resize( data.size() );
::memcpy( &buffer[ 0 ], &data[ 0 ], data.size() );
test_parser.setBuffer( buffer );
static const size_t Size = 4096UL;
char data_buffer[ Size ];
test_parser.testCopyNextWord( data_buffer, Size );
EXPECT_EQ( 0, strncmp( data_buffer, "vn", 2 ) );
test_parser.testCopyNextWord( data_buffer, Size );
EXPECT_EQ( data_buffer[0], '-' );
test_parser.testCopyNextWord( data_buffer, Size );
EXPECT_EQ( data_buffer[0], '-' );
test_parser.testCopyNextWord( data_buffer, Size );
EXPECT_EQ( data_buffer[ 0 ], '-' );
}

1
test/unit/utOpenGEXImportExport.cpp
View File

@ -66,5 +66,6 @@ TEST_F( utOpenGEXImportExport, importLWSFromFileTest ) {
TEST_F( utOpenGEXImportExport, Importissue1262_NoCrash ) {
Assimp::Importer importer;
const aiScene *scene = importer.ReadFile( ASSIMP_TEST_MODELS_DIR "/OpenGEX/light_issue1262.ogex", 0 );
EXPECT_NE( nullptr, scene );
}