diff --git a/code/glTF2Asset.h b/code/glTF2Asset.h index 416c9e7bc..52bc18268 100644 --- a/code/glTF2Asset.h +++ b/code/glTF2Asset.h @@ -1080,7 +1080,7 @@ namespace glTF2 AssetMetadata() : premultipliedAlpha(false) - , version(0.) + , version(0) { } }; diff --git a/code/glTF2Asset.inl b/code/glTF2Asset.inl index 915e4e11c..44a1cce00 100644 --- a/code/glTF2Asset.inl +++ b/code/glTF2Asset.inl @@ -1229,7 +1229,7 @@ inline void Scene::Read(Value& obj, Asset& r) inline void AssetMetadata::Read(Document& doc) { // read the version, etc. - float statedVersion = 0.; + float statedVersion = 0; if (Value* obj = FindObject(doc, "asset")) { ReadMember(*obj, "copyright", copyright); ReadMember(*obj, "generator", generator); @@ -1245,12 +1245,12 @@ inline void AssetMetadata::Read(Document& doc) version = std::max(statedVersion, version); - if (version == 0.) { + if (version == 0) { // if missing version, we'll assume version 1.0... - version = 1.; + version = 1; } - if (version != 1.) { + if (version != 1) { char msg[128]; ai_snprintf(msg, 128, "GLTF: Unsupported glTF version: %.1f", version); throw DeadlyImportError(msg); diff --git a/code/glTF2AssetWriter.inl b/code/glTF2AssetWriter.inl index 250f425c8..ed8ee80ea 100644 --- a/code/glTF2AssetWriter.inl +++ b/code/glTF2AssetWriter.inl @@ -574,7 +574,7 @@ namespace glTF2 { GLB_Header header; memcpy(header.magic, AI_GLB_MAGIC_NUMBER, sizeof(header.magic)); - header.version = 2.; + header.version = 2; AI_SWAP4(header.version); header.length = uint32_t(sizeof(header) + sceneLength + bodyLength); diff --git a/code/glTF2Exporter.cpp b/code/glTF2Exporter.cpp index 8f968f952..11694a89d 100644 --- a/code/glTF2Exporter.cpp +++ b/code/glTF2Exporter.cpp @@ -466,8 +466,8 @@ void ExportSkin(Asset& mAsset, const aiMesh* aimesh, Ref& meshRef, RefmWeights[idx_weights].mWeight; // A vertex can only have at most four joint weights. Ignore all others. - if (jointsPerVertex[vertexId] > 3) { - continue; + if (jointsPerVertex[vertexId] > 3) { + continue; } vertexJointData[vertexId][jointsPerVertex[vertexId]] = jointNamesIndex; @@ -845,7 +845,7 @@ void glTF2Exporter::ExportScene() void glTF2Exporter::ExportMetadata() { AssetMetadata& asset = mAsset->asset; - asset.version = 2.; + asset.version = 2; char buffer[256]; ai_snprintf(buffer, 256, "Open Asset Import Library (assimp v%d.%d.%d)", diff --git a/code/glTFAsset.inl b/code/glTFAsset.inl index 48aeaf855..91d36c59b 100644 --- a/code/glTFAsset.inl +++ b/code/glTFAsset.inl @@ -1228,7 +1228,7 @@ inline void Scene::Read(Value& obj, Asset& r) inline void AssetMetadata::Read(Document& doc) { // read the version, etc. - float statedVersion = 0.; + float statedVersion = 0; if (Value* obj = FindObject(doc, "asset")) { ReadMember(*obj, "copyright", copyright); ReadMember(*obj, "generator", generator); @@ -1243,12 +1243,12 @@ inline void AssetMetadata::Read(Document& doc) } version = std::max(statedVersion, version); - if (version == 0.) { + if (version == 0) { // if missing version, we'll assume version 1... version = 1; } - if (version != 1.) { + if (version != 1) { char msg[128]; ai_snprintf(msg, 128, "GLTF: Unsupported glTF version: %.0f", version); throw DeadlyImportError(msg); diff --git a/code/glTFAssetWriter.inl b/code/glTFAssetWriter.inl index 95fc87791..166b84fd1 100644 --- a/code/glTFAssetWriter.inl +++ b/code/glTFAssetWriter.inl @@ -582,7 +582,7 @@ namespace glTF { GLB_Header header; memcpy(header.magic, AI_GLB_MAGIC_NUMBER, sizeof(header.magic)); - header.version = 1.; + header.version = 1; AI_SWAP4(header.version); header.length = uint32_t(sizeof(header) + sceneLength + bodyLength); diff --git a/code/glTFExporter.cpp b/code/glTFExporter.cpp index 0de843d75..f3fa5e526 100644 --- a/code/glTFExporter.cpp +++ b/code/glTFExporter.cpp @@ -469,8 +469,8 @@ void ExportSkin(Asset& mAsset, const aiMesh* aimesh, Ref& meshRef, RefmWeights[idx_weights].mWeight; // A vertex can only have at most four joint weights. Ignore all others. - if (jointsPerVertex[vertexId] > 3) { - continue; + if (jointsPerVertex[vertexId] > 3) { + continue; } vertexJointData[vertexId][jointsPerVertex[vertexId]] = jointNamesIndex; @@ -834,7 +834,7 @@ void glTFExporter::ExportScene() void glTFExporter::ExportMetadata() { glTF::AssetMetadata& asset = mAsset->asset; - asset.version = 1.; + asset.version = 1; char buffer[256]; ai_snprintf(buffer, 256, "Open Asset Import Library (assimp v%d.%d.%d)",