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

Fixed build warnings on MSVC14 x64 in the SIB format sources.

pull/1083/head
Jared Mulconry 2016-11-20 14:06:56 +11:00
parent 655a470fc9
commit 439b4861c8
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
code/SIBImporter.cpp
View File

@ -131,7 +131,7 @@ static SIBEdge& GetEdge(SIBMesh* mesh, uint32_t posA, uint32_t posB)
SIBEdge edge; SIBEdge edge;
edge.creased = false; edge.creased = false;
edge.faceA = edge.faceB = 0xffffffff; edge.faceA = edge.faceB = 0xffffffff;
mesh->edgeMap[pair] = mesh->edges.size(); mesh->edgeMap[pair] = static_cast<uint32_t>(mesh->edges.size());
mesh->edges.push_back(edge); mesh->edges.push_back(edge);
return mesh->edges.back(); return mesh->edges.back();
} }
@ -244,7 +244,7 @@ static void ReadFaces(SIBMesh* mesh, StreamReaderLE* stream)
mesh->idx[pos-1] = numPoints; mesh->idx[pos-1] = numPoints;
uint32_t *idx = &mesh->idx[pos]; uint32_t *idx = &mesh->idx[pos];
mesh->faceStart.push_back(pos-1); mesh->faceStart.push_back(static_cast<uint32_t>(pos-1));
mesh->mtls.push_back(0); mesh->mtls.push_back(0);
// Read all the position data. // Read all the position data.
@ -385,9 +385,9 @@ static void ConnectFaces(SIBMesh* mesh)
// This gives potentially undesirable normals when used // This gives potentially undesirable normals when used
// with non-2-manifold surfaces, but then so does Silo to begin with. // with non-2-manifold surfaces, but then so does Silo to begin with.
if (edge.faceA == 0xffffffff) if (edge.faceA == 0xffffffff)
edge.faceA = faceIdx; edge.faceA = static_cast<uint32_t>(faceIdx);
else else
edge.faceB = faceIdx; edge.faceB = static_cast<uint32_t>(faceIdx);
prev = next; prev = next;
} }
@ -496,7 +496,7 @@ static void CalculateNormals(SIBMesh* mesh)
{ {
uint32_t pos = idx[i*N+POS]; uint32_t pos = idx[i*N+POS];
uint32_t nrm = idx[i*N+NRM]; uint32_t nrm = idx[i*N+NRM];
aiVector3D vtxNorm = CalculateVertexNormal(mesh, faceIdx, pos, faceNormals); aiVector3D vtxNorm = CalculateVertexNormal(mesh, static_cast<uint32_t>(faceIdx), pos, faceNormals);
mesh->nrm[nrm] = vtxNorm; mesh->nrm[nrm] = vtxNorm;
} }
} }
@ -586,7 +586,7 @@ static void ReadShape(SIB* sib, StreamReaderLE* stream)
for (unsigned pt=0;pt<face.mNumIndices;pt++,idx+=N) for (unsigned pt=0;pt<face.mNumIndices;pt++,idx+=N)
{ {
size_t vtxIdx = dest.vtx.size(); size_t vtxIdx = dest.vtx.size();
face.mIndices[pt] = vtxIdx; face.mIndices[pt] = static_cast<unsigned int>(vtxIdx);
// De-index it. We don't need to validate here as // De-index it. We don't need to validate here as
// we did it when creating the data. // we did it when creating the data.
@ -621,14 +621,14 @@ static void ReadShape(SIB* sib, StreamReaderLE* stream)
aiMesh* mesh = new aiMesh; aiMesh* mesh = new aiMesh;
mesh->mName = name; mesh->mName = name;
mesh->mNumFaces = src.faces.size(); mesh->mNumFaces = static_cast<unsigned int>(src.faces.size());
mesh->mFaces = new aiFace[mesh->mNumFaces]; mesh->mFaces = new aiFace[mesh->mNumFaces];
mesh->mNumVertices = src.vtx.size(); mesh->mNumVertices = static_cast<unsigned int>(src.vtx.size());
mesh->mVertices = new aiVector3D[mesh->mNumVertices]; mesh->mVertices = new aiVector3D[mesh->mNumVertices];
mesh->mNormals = new aiVector3D[mesh->mNumVertices]; mesh->mNormals = new aiVector3D[mesh->mNumVertices];
mesh->mTextureCoords[0] = new aiVector3D[mesh->mNumVertices]; mesh->mTextureCoords[0] = new aiVector3D[mesh->mNumVertices];
mesh->mNumUVComponents[0] = 2; mesh->mNumUVComponents[0] = 2;
mesh->mMaterialIndex = n; mesh->mMaterialIndex = static_cast<unsigned int>(n);
for (unsigned i=0;i<mesh->mNumVertices;i++) for (unsigned i=0;i<mesh->mNumVertices;i++)
{ {
@ -862,9 +862,9 @@ void SIBImporter::InternReadFile(const std::string& pFile,
sib.insts.clear(); sib.insts.clear();
// Transfer to the aiScene. // Transfer to the aiScene.
pScene->mNumMaterials = sib.mtls.size(); pScene->mNumMaterials = static_cast<unsigned int>(sib.mtls.size());
pScene->mNumMeshes = sib.meshes.size(); pScene->mNumMeshes = static_cast<unsigned int>(sib.meshes.size());
pScene->mNumLights = sib.lights.size(); pScene->mNumLights = static_cast<unsigned int>(sib.lights.size());
pScene->mMaterials = pScene->mNumMaterials ? new aiMaterial*[pScene->mNumMaterials] : NULL; pScene->mMaterials = pScene->mNumMaterials ? new aiMaterial*[pScene->mNumMaterials] : NULL;
pScene->mMeshes = pScene->mNumMeshes ? new aiMesh*[pScene->mNumMeshes] : NULL; pScene->mMeshes = pScene->mNumMeshes ? new aiMesh*[pScene->mNumMeshes] : NULL;
pScene->mLights = pScene->mNumLights ? new aiLight*[pScene->mNumLights] : NULL; pScene->mLights = pScene->mNumLights ? new aiLight*[pScene->mNumLights] : NULL;
@ -879,7 +879,7 @@ void SIBImporter::InternReadFile(const std::string& pFile,
size_t childIdx = 0; size_t childIdx = 0;
aiNode *root = new aiNode(); aiNode *root = new aiNode();
root->mName.Set("<SIBRoot>"); root->mName.Set("<SIBRoot>");
root->mNumChildren = sib.objs.size() + sib.lights.size(); root->mNumChildren = static_cast<unsigned int>(sib.objs.size() + sib.lights.size());
root->mChildren = root->mNumChildren ? new aiNode*[root->mNumChildren] : NULL; root->mChildren = root->mNumChildren ? new aiNode*[root->mNumChildren] : NULL;
pScene->mRootNode = root; pScene->mRootNode = root;
@ -893,10 +893,10 @@ void SIBImporter::InternReadFile(const std::string& pFile,
node->mParent = root; node->mParent = root;
node->mTransformation = obj.axis; node->mTransformation = obj.axis;
node->mNumMeshes = obj.meshCount; node->mNumMeshes = static_cast<unsigned int>(obj.meshCount);
node->mMeshes = node->mNumMeshes ? new unsigned[node->mNumMeshes] : NULL; node->mMeshes = node->mNumMeshes ? new unsigned[node->mNumMeshes] : NULL;
for (unsigned i=0;i<node->mNumMeshes;i++) for (unsigned i=0;i<node->mNumMeshes;i++)
node->mMeshes[i] = obj.meshIdx + i; node->mMeshes[i] = static_cast<unsigned int>(obj.meshIdx + i);
// Mark instanced objects as being so. // Mark instanced objects as being so.
if (n >= firstInst) if (n >= firstInst)