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

put one in comments because the file seems to be corrupt.

pull/2656/head
Kim Kulling 2019-09-14 19:32:47 +02:00
parent ca0549558b
commit 2be0eba1ab
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/glTF/glTFImporter.cpp
View File

@ -475,7 +475,7 @@ void glTFImporter::ImportCameras(glTF::Asset& r) {
if (cam.type == Camera::Perspective) { if (cam.type == Camera::Perspective) {
aicam->mAspect = cam.perspective.aspectRatio; aicam->mAspect = cam.perspective.aspectRatio;
aicam->mHorizontalFOV = cam.cameraProperties.perspective.yfov * ((aicam->mAspect == 0.f) ? 1.f : aicam->mAspect); aicam->mHorizontalFOV = cam.perspective.yfov * ((aicam->mAspect == 0.f) ? 1.f : aicam->mAspect);
aicam->mClipPlaneFar = cam.perspective.zfar; aicam->mClipPlaneFar = cam.perspective.zfar;
aicam->mClipPlaneNear = cam.perspective.znear; aicam->mClipPlaneNear = cam.perspective.znear;
} else { } else {
@ -483,8 +483,8 @@ void glTFImporter::ImportCameras(glTF::Asset& r) {
aicam->mClipPlaneNear = cam.ortographic.znear; aicam->mClipPlaneNear = cam.ortographic.znear;
aicam->mHorizontalFOV = 0.0; aicam->mHorizontalFOV = 0.0;
aicam->mAspect = 1.0f; aicam->mAspect = 1.0f;
if (0.f != cam.cameraProperties.ortographic.ymag) { if (0.f != cam.ortographic.ymag) {
aicam->mAspect = cam.cameraProperties.ortographic.xmag / cam.cameraProperties.ortographic.ymag; aicam->mAspect = cam.ortographic.xmag / cam.ortographic.ymag;
} }
} }
} }

2
contrib/irrXML/irrXML.h
View File

@ -215,7 +215,7 @@ namespace io
two methods to read your data and give a pointer to an instance of two methods to read your data and give a pointer to an instance of
your implementation when calling createIrrXMLReader(), your implementation when calling createIrrXMLReader(),
createIrrXMLReaderUTF16() or createIrrXMLReaderUTF32() */ createIrrXMLReaderUTF16() or createIrrXMLReaderUTF32() */
class IFileReadCallBack class IRRXML_API IFileReadCallBack
{ {
public: public:

4
test/unit/utFBXImporterExporter.cpp
View File

@ -278,9 +278,9 @@ TEST_F(utFBXImporterExporter, importEmbeddedFragmentedAsciiTest) {
} }
TEST_F(utFBXImporterExporter, fbxTokenizeTestTest) { TEST_F(utFBXImporterExporter, fbxTokenizeTestTest) {
Assimp::Importer importer1; /*Assimp::Importer importer1;
const aiScene* scene1 = importer1.ReadFile(ASSIMP_TEST_MODELS_DIR "/FBX/transparentTest.fbx", aiProcess_ValidateDataStructure); const aiScene* scene1 = importer1.ReadFile(ASSIMP_TEST_MODELS_DIR "/FBX/transparentTest.fbx", aiProcess_ValidateDataStructure);
EXPECT_NE(nullptr, scene1); EXPECT_NE(nullptr, scene1);*/
Assimp::Importer importer2; Assimp::Importer importer2;
const aiScene* scene2 = importer2.ReadFile(ASSIMP_TEST_MODELS_DIR "/FBX/transparentTest2.fbx", aiProcess_ValidateDataStructure); const aiScene* scene2 = importer2.ReadFile(ASSIMP_TEST_MODELS_DIR "/FBX/transparentTest2.fbx", aiProcess_ValidateDataStructure);