瀏覽代碼

Update glTF2Importer.cpp

- fix compiler error: invalid == operator
- Fix compiler warning: conversion from double to ai_real
Kim Kulling 5 年之前
父節點
當前提交
9b8f2970c8
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      code/glTF2/glTF2Importer.cpp

+ 3 - 3
code/glTF2/glTF2Importer.cpp

@@ -179,8 +179,8 @@ inline void SetMaterialTextureProperty(std::vector<int> &embeddedTexIdxs, Asset
 			// coordinate of the actual meshes during import.
 			const ai_real rcos(cos(-transform.mRotation));
 			const ai_real rsin(sin(-transform.mRotation));
-			transform.mTranslation.x = (0.5 * transform.mScaling.x) * (-rcos + rsin + 1) + prop.TextureTransformExt_t.offset[0];
-			transform.mTranslation.y = ((0.5 * transform.mScaling.y) * (rsin + rcos - 1)) + 1 - transform.mScaling.y - prop.TextureTransformExt_t.offset[1];;
+			transform.mTranslation.x = (static_cast<ai_real>( 0.5 ) * transform.mScaling.x) * (-rcos + rsin + 1) + prop.TextureTransformExt_t.offset[0];
+			transform.mTranslation.y = ((static_cast<ai_real>( 0.5 ) * transform.mScaling.y) * (rsin + rcos - 1)) + 1 - transform.mScaling.y - prop.TextureTransformExt_t.offset[1];;
 
 			mat->AddProperty(&transform, 1, _AI_MATKEY_UVTRANSFORM_BASE, texType, texSlot);
 		}
@@ -641,7 +641,7 @@ void glTF2Importer::ImportMeshes(glTF2::Asset &r) {
 				ai_assert(CheckValidFacesIndices(faces, static_cast<unsigned>(nFaces), aim->mNumVertices));
 			}
 
-			if (nullptr != prim.material) {
+			if (prim.material) {
 				aim->mMaterialIndex = prim.material.GetIndex();
 			} else {
 				aim->mMaterialIndex = mScene->mNumMaterials - 1;