Merge branch 'master' into issue_1693

2018-01-10 12:04:17 -08:00
parent 735eb33a2b de8cc09a09
commit d1ed5db84d
1 changed files with 3 additions and 0 deletions
--- a/code/glTF2Importer.cpp
+++ b/code/glTF2Importer.cpp
@@ -517,6 +517,9 @@ void glTF2Importer::ImportCameras(glTF2::Asset& r)

        aiCamera* aicam = mScene->mCameras[i] = new aiCamera();

+        // cameras point in -Z by default, rest is specified in node transform
+        aicam->mLookAt = aiVector3D(0.f,0.f,-1.f);
+
        if (cam.type == Camera::Perspective) {

            aicam->mAspect        = cam.cameraProperties.perspective.aspectRatio;