Merge branch 'master' into jc3-spam-killa

2021-05-10 22:21:13 +02:00
parent b30cbcf117 cdc0bd00ce
commit cb7d3ac598
12 changed files with 53 additions and 13 deletions
--- a/code/AssetLib/MDC/MDCLoader.cpp
+++ b/code/AssetLib/MDC/MDCLoader.cpp
@@ -458,6 +458,13 @@ void MDCImporter::InternReadFile(
            pcMat->AddProperty(&path, AI_MATKEY_TEXTURE_DIFFUSE(0));
        }
    }
+
+    // Now rotate the whole scene 90 degrees around the x axis to convert to internal coordinate system
+    pScene->mRootNode->mTransformation = aiMatrix4x4(
+            1.f, 0.f, 0.f, 0.f,
+            0.f, 0.f, 1.f, 0.f,
+            0.f, -1.f, 0.f, 0.f,
+            0.f, 0.f, 0.f, 1.f);
 }

 #endif // !! ASSIMP_BUILD_NO_MDC_IMPORTER