|
@@ -146,7 +146,7 @@ AI_WONT_RETURN void B3DImporter::Oops(){
|
|
// ------------------------------------------------------------------------------------------------
|
|
// ------------------------------------------------------------------------------------------------
|
|
AI_WONT_RETURN void B3DImporter::Fail( string str ){
|
|
AI_WONT_RETURN void B3DImporter::Fail( string str ){
|
|
#ifdef DEBUG_B3D
|
|
#ifdef DEBUG_B3D
|
|
- ASSIMP_LOG_ERROR_F("Error in B3D file data: %s", str.c_str());
|
|
|
|
|
|
+ ASSIMP_LOG_ERROR_F("Error in B3D file data: ", str);
|
|
#endif
|
|
#endif
|
|
throw DeadlyImportError( "B3D Importer - error in B3D file data: "+str );
|
|
throw DeadlyImportError( "B3D Importer - error in B3D file data: "+str );
|
|
}
|
|
}
|
|
@@ -226,7 +226,7 @@ string B3DImporter::ReadChunk(){
|
|
tag+=char( ReadByte() );
|
|
tag+=char( ReadByte() );
|
|
}
|
|
}
|
|
#ifdef DEBUG_B3D
|
|
#ifdef DEBUG_B3D
|
|
- ASSIMP_LOG_DEBUG_F("ReadChunk: %s", tag.c_str());
|
|
|
|
|
|
+ ASSIMP_LOG_DEBUG_F("ReadChunk: ", tag);
|
|
#endif
|
|
#endif
|
|
unsigned sz=(unsigned)ReadInt();
|
|
unsigned sz=(unsigned)ReadInt();
|
|
_stack.push_back( _pos+sz );
|
|
_stack.push_back( _pos+sz );
|
|
@@ -386,7 +386,7 @@ void B3DImporter::ReadTRIS(int v0) {
|
|
matid = 0;
|
|
matid = 0;
|
|
} else if (matid < 0 || matid >= (int)_materials.size()) {
|
|
} else if (matid < 0 || matid >= (int)_materials.size()) {
|
|
#ifdef DEBUG_B3D
|
|
#ifdef DEBUG_B3D
|
|
- ASSIMP_LOG_ERROR_F("material id=%d", matid);
|
|
|
|
|
|
+ ASSIMP_LOG_ERROR_F("material id=", matid);
|
|
#endif
|
|
#endif
|
|
Fail("Bad material id");
|
|
Fail("Bad material id");
|
|
}
|
|
}
|
|
@@ -406,7 +406,7 @@ void B3DImporter::ReadTRIS(int v0) {
|
|
int i2 = ReadInt() + v0;
|
|
int i2 = ReadInt() + v0;
|
|
if (i0 < 0 || i0 >= (int)_vertices.size() || i1 < 0 || i1 >= (int)_vertices.size() || i2 < 0 || i2 >= (int)_vertices.size()) {
|
|
if (i0 < 0 || i0 >= (int)_vertices.size() || i1 < 0 || i1 >= (int)_vertices.size() || i2 < 0 || i2 >= (int)_vertices.size()) {
|
|
#ifdef DEBUG_B3D
|
|
#ifdef DEBUG_B3D
|
|
- ASSIMP_LOG_ERROR_F("Bad triangle index: i0=%d, i1=%d, i2=%d", i0, i1, i2);
|
|
|
|
|
|
+ ASSIMP_LOG_ERROR_F("Bad triangle index: i0=", i0, ", i1=", i1, ", i2=", i2);
|
|
#endif
|
|
#endif
|
|
Fail("Bad triangle index");
|
|
Fail("Bad triangle index");
|
|
continue;
|
|
continue;
|