diff --git a/code/AMFImporter_Postprocess.cpp b/code/AMFImporter_Postprocess.cpp index 41b16035e..e21601c75 100644 --- a/code/AMFImporter_Postprocess.cpp +++ b/code/AMFImporter_Postprocess.cpp @@ -344,7 +344,7 @@ void AMFImporter::Postprocess_AddMetadata(const std::listmNumProperties = pMetadataList.size(); + pSceneNode.mMetaData->mNumProperties = static_cast(pMetadataList.size()); pSceneNode.mMetaData->mKeys = new aiString[pSceneNode.mMetaData->mNumProperties]; pSceneNode.mMetaData->mValues = new aiMetadataEntry[pSceneNode.mMetaData->mNumProperties]; @@ -352,7 +352,7 @@ void AMFImporter::Postprocess_AddMetadata(const std::listSet(meta_idx++, metadata.Type, metadata.Value.c_str()); + pSceneNode.mMetaData->Set(static_cast(meta_idx++), metadata.Type, metadata.Value.c_str()); } }// if(pMetadataList.size() > 0) } @@ -441,9 +441,9 @@ std::list mesh_idx; // create new face and store it. complex_face.Face.mNumIndices = 3; complex_face.Face.mIndices = new unsigned int[3]; - complex_face.Face.mIndices[0] = tri_al.V[0]; - complex_face.Face.mIndices[1] = tri_al.V[1]; - complex_face.Face.mIndices[2] = tri_al.V[2]; + complex_face.Face.mIndices[0] = static_cast(tri_al.V[0]); + complex_face.Face.mIndices[1] = static_cast(tri_al.V[1]); + complex_face.Face.mIndices[2] = static_cast(tri_al.V[2]); complex_faces_list.push_back(complex_face); } }// for(const CAMFImporter_NodeElement* ne_volume_child: ne_volume->Child) @@ -512,7 +512,7 @@ std::list mesh_idx; { for(size_t vi = 0; vi < face.Face.mNumIndices; vi++) { - if(face.Face.mIndices[vi] == pIdx_From) face.Face.mIndices[vi] = pIdx_To; + if(face.Face.mIndices[vi] == pIdx_From) face.Face.mIndices[vi] = static_cast(pIdx_To); } } };// auto VertexIndex_Replace = [](std::list& pFaceList, const size_t pIdx_From, const size_t pIdx_To) -> void @@ -567,7 +567,7 @@ std::list mesh_idx; // set geometry and colors (vertices) // // copy faces/triangles - tmesh->mNumFaces = face_list_cur.size(); + tmesh->mNumFaces = static_cast(face_list_cur.size()); tmesh->mFaces = new aiFace[tmesh->mNumFaces]; // Create vertices list and optimize indices. Optimisation mean following.In AMF all volumes use one big list of vertices. And one volume @@ -623,7 +623,7 @@ std::list mesh_idx; { vert_arr.push_back(vert_arr.at(face_cur.Face.mIndices[idx_ind])); col_arr.push_back(face_color); - face_cur.Face.mIndices[idx_ind] = vert_idx_new++; + face_cur.Face.mIndices[idx_ind] = static_cast(vert_idx_new++); } }// if(face_cur.Color != nullptr) }// for(const SComplexFace& face_cur: face_list_cur) @@ -643,10 +643,10 @@ std::list mesh_idx; for(size_t i = 0, i_e = VertexCount_Max * 2; i < i_e; i++) idx_vert_used[i] = false; // This ID's will be used when set materials ID in scene. - tmesh->mMaterialIndex = PostprocessHelper_GetTextureID_Or_Create(face_list_cur.front().TexMap->TextureID_R, + tmesh->mMaterialIndex = static_cast(PostprocessHelper_GetTextureID_Or_Create(face_list_cur.front().TexMap->TextureID_R, face_list_cur.front().TexMap->TextureID_G, face_list_cur.front().TexMap->TextureID_B, - face_list_cur.front().TexMap->TextureID_A); + face_list_cur.front().TexMap->TextureID_A)); texcoord_arr.resize(VertexCount_Max * 2); for(const SComplexFace& face_cur: face_list_cur) { @@ -666,7 +666,7 @@ std::list mesh_idx; vert_arr.push_back(vert_arr.at(idx_vert)); col_arr.push_back(col_arr.at(idx_vert)); texcoord_arr.at(idx_vert_new) = face_cur.TexMap->TextureCoordinate[idx_ind]; - face_cur.Face.mIndices[idx_ind] = idx_vert_new++; + face_cur.Face.mIndices[idx_ind] = static_cast(idx_vert_new++); } }// for(size_t idx_ind = 0; idx_ind < face_cur.Face.mNumIndices; idx_ind++) }// for(const SComplexFace& face_cur: face_list_cur) @@ -679,7 +679,7 @@ std::list mesh_idx; // // copy collected data to mesh // - tmesh->mNumVertices = vert_arr.size(); + tmesh->mNumVertices = static_cast(vert_arr.size()); tmesh->mVertices = new aiVector3D[tmesh->mNumVertices]; tmesh->mColors[0] = new aiColor4D[tmesh->mNumVertices]; tmesh->mFaces = new aiFace[face_list_cur.size()]; @@ -697,7 +697,7 @@ std::list mesh_idx; for(const SComplexFace& face_cur: face_list_cur) tmesh->mFaces[idx_face++] = face_cur.Face; // store new aiMesh - mesh_idx.push_back(pMeshList.size()); + mesh_idx.push_back(static_cast(pMeshList.size())); pMeshList.push_back(tmesh); }// for(const std::list& face_list_cur: complex_faces_toplist) }// if(ne_child->Type == CAMFImporter_NodeElement::ENET_Volume) @@ -708,7 +708,7 @@ std::list mesh_idx; { std::list::const_iterator mit = mesh_idx.begin(); - pSceneNode.mNumMeshes = mesh_idx.size(); + pSceneNode.mNumMeshes = static_cast(mesh_idx.size()); pSceneNode.mMeshes = new unsigned int[pSceneNode.mNumMeshes]; for(size_t i = 0; i < pSceneNode.mNumMeshes; i++) pSceneNode.mMeshes[i] = *mit++; }// if(mesh_idx.size() > 0) @@ -783,7 +783,7 @@ std::list ch_node; size_t ch_idx = 0; - con_node->mNumChildren = ch_node.size(); + con_node->mNumChildren = static_cast(ch_node.size()); con_node->mChildren = new aiNode*[con_node->mNumChildren]; for(aiNode* node: ch_node) con_node->mChildren[ch_idx++] = node; @@ -903,7 +903,7 @@ nl_clean_loop: { std::list::const_iterator nl_it = node_list.begin(); - pScene->mRootNode->mNumChildren = node_list.size(); + pScene->mRootNode->mNumChildren = static_cast(node_list.size()); pScene->mRootNode->mChildren = new aiNode*[pScene->mRootNode->mNumChildren]; for(size_t i = 0; i < pScene->mRootNode->mNumChildren; i++) { @@ -920,14 +920,14 @@ nl_clean_loop: { std::list::const_iterator ml_it = mesh_list.begin(); - pScene->mNumMeshes = mesh_list.size(); + pScene->mNumMeshes = static_cast(mesh_list.size()); pScene->mMeshes = new aiMesh*[pScene->mNumMeshes]; for(size_t i = 0; i < pScene->mNumMeshes; i++) pScene->mMeshes[i] = *ml_it++; }// if(mesh_list.size() > 0) // // Textures - pScene->mNumTextures = mTexture_Converted.size(); + pScene->mNumTextures = static_cast(mTexture_Converted.size()); if(pScene->mNumTextures > 0) { size_t idx; @@ -937,8 +937,8 @@ nl_clean_loop: for(const SPP_Texture& tex_convd: mTexture_Converted) { pScene->mTextures[idx] = new aiTexture; - pScene->mTextures[idx]->mWidth = tex_convd.Width; - pScene->mTextures[idx]->mHeight = tex_convd.Height; + pScene->mTextures[idx]->mWidth = static_cast(tex_convd.Width); + pScene->mTextures[idx]->mHeight = static_cast(tex_convd.Height); pScene->mTextures[idx]->pcData = (aiTexel*)tex_convd.Data; // texture format description. strcpy(pScene->mTextures[idx]->achFormatHint, tex_convd.FormatHint); @@ -947,7 +947,7 @@ nl_clean_loop: // Create materials for embedded textures. idx = 0; - pScene->mNumMaterials = mTexture_Converted.size(); + pScene->mNumMaterials = static_cast(mTexture_Converted.size()); pScene->mMaterials = new aiMaterial*[pScene->mNumMaterials]; for(const SPP_Texture& tex_convd: mTexture_Converted) {