Kaynağa Gözat

ModelDiffer: update material testser + create material for unittests.

Kim Kulling 9 yıl önce
ebeveyn
işleme
68d33a99a1
2 değiştirilmiş dosya ile 9 ekleme ve 0 silme
  1. 8 0
      test/unit/ModelDiffer.cpp
  2. 1 0
      test/unit/utObjImportExport.cpp

+ 8 - 0
test/unit/ModelDiffer.cpp

@@ -94,6 +94,14 @@ bool ModelDiffer::isEqual( const aiScene *expected, const aiScene *toCompare ) {
         addDiff( stream.str() );
         return false;
     }
+    
+    if ( expected->mNumMaterials > 0 ) {
+        if ( nullptr == expected->mMaterials || nullptr == toCompare->mMaterials ) {
+            addDiff( "Number of materials > 0 and mat pointer is nullptr" );
+            return false;
+        }
+    }
+    
     for ( unsigned int i = 0; i < expected->mNumMaterials; i++ ) {
         aiMaterial *expectedMat( expected->mMaterials[ i ] );
         aiMaterial *toCompareMat( expected->mMaterials[ i ] );

+ 1 - 0
test/unit/utObjImportExport.cpp

@@ -124,6 +124,7 @@ protected:
         expScene->mMeshes[ 0 ] = mesh;
 
         expScene->mNumMaterials = 1;
+        expScene->mMaterials = new aiMaterial*[ expScene->mNumMaterials ];
 
         return expScene;
     }