|
@@ -215,7 +215,7 @@ void IRRImporter::BuildSkybox(std::vector<aiMesh*>& meshes, std::vector<aiMateri
|
|
SkyboxVertex( l,-l,-l, 0, 0, 1, 0.0,1.0),
|
|
SkyboxVertex( l,-l,-l, 0, 0, 1, 0.0,1.0),
|
|
SkyboxVertex( l, l,-l, 0, 0, 1, 0.0,0.0),
|
|
SkyboxVertex( l, l,-l, 0, 0, 1, 0.0,0.0),
|
|
SkyboxVertex(-l, l,-l, 0, 0, 1, 1.0,0.0)) );
|
|
SkyboxVertex(-l, l,-l, 0, 0, 1, 1.0,0.0)) );
|
|
- meshes.back()->mMaterialIndex = materials.size()-6u;
|
|
|
|
|
|
+ meshes.back()->mMaterialIndex = static_cast<unsigned int>(materials.size()-6u);
|
|
|
|
|
|
// LEFT SIDE
|
|
// LEFT SIDE
|
|
meshes.push_back( BuildSingleQuadMesh(
|
|
meshes.push_back( BuildSingleQuadMesh(
|
|
@@ -223,7 +223,7 @@ void IRRImporter::BuildSkybox(std::vector<aiMesh*>& meshes, std::vector<aiMateri
|
|
SkyboxVertex( l,-l, l, -1, 0, 0, 0.0,1.0),
|
|
SkyboxVertex( l,-l, l, -1, 0, 0, 0.0,1.0),
|
|
SkyboxVertex( l, l, l, -1, 0, 0, 0.0,0.0),
|
|
SkyboxVertex( l, l, l, -1, 0, 0, 0.0,0.0),
|
|
SkyboxVertex( l, l,-l, -1, 0, 0, 1.0,0.0)) );
|
|
SkyboxVertex( l, l,-l, -1, 0, 0, 1.0,0.0)) );
|
|
- meshes.back()->mMaterialIndex = materials.size()-5u;
|
|
|
|
|
|
+ meshes.back()->mMaterialIndex = static_cast<unsigned int>(materials.size()-5u);
|
|
|
|
|
|
// BACK SIDE
|
|
// BACK SIDE
|
|
meshes.push_back( BuildSingleQuadMesh(
|
|
meshes.push_back( BuildSingleQuadMesh(
|
|
@@ -231,7 +231,7 @@ void IRRImporter::BuildSkybox(std::vector<aiMesh*>& meshes, std::vector<aiMateri
|
|
SkyboxVertex(-l,-l, l, 0, 0, -1, 0.0,1.0),
|
|
SkyboxVertex(-l,-l, l, 0, 0, -1, 0.0,1.0),
|
|
SkyboxVertex(-l, l, l, 0, 0, -1, 0.0,0.0),
|
|
SkyboxVertex(-l, l, l, 0, 0, -1, 0.0,0.0),
|
|
SkyboxVertex( l, l, l, 0, 0, -1, 1.0,0.0)) );
|
|
SkyboxVertex( l, l, l, 0, 0, -1, 1.0,0.0)) );
|
|
- meshes.back()->mMaterialIndex = materials.size()-4u;
|
|
|
|
|
|
+ meshes.back()->mMaterialIndex = static_cast<unsigned int>(materials.size()-4u);
|
|
|
|
|
|
// RIGHT SIDE
|
|
// RIGHT SIDE
|
|
meshes.push_back( BuildSingleQuadMesh(
|
|
meshes.push_back( BuildSingleQuadMesh(
|
|
@@ -239,7 +239,7 @@ void IRRImporter::BuildSkybox(std::vector<aiMesh*>& meshes, std::vector<aiMateri
|
|
SkyboxVertex(-l,-l,-l, 1, 0, 0, 0.0,1.0),
|
|
SkyboxVertex(-l,-l,-l, 1, 0, 0, 0.0,1.0),
|
|
SkyboxVertex(-l, l,-l, 1, 0, 0, 0.0,0.0),
|
|
SkyboxVertex(-l, l,-l, 1, 0, 0, 0.0,0.0),
|
|
SkyboxVertex(-l, l, l, 1, 0, 0, 1.0,0.0)) );
|
|
SkyboxVertex(-l, l, l, 1, 0, 0, 1.0,0.0)) );
|
|
- meshes.back()->mMaterialIndex = materials.size()-3u;
|
|
|
|
|
|
+ meshes.back()->mMaterialIndex = static_cast<unsigned int>(materials.size()-3u);
|
|
|
|
|
|
// TOP SIDE
|
|
// TOP SIDE
|
|
meshes.push_back( BuildSingleQuadMesh(
|
|
meshes.push_back( BuildSingleQuadMesh(
|
|
@@ -247,7 +247,7 @@ void IRRImporter::BuildSkybox(std::vector<aiMesh*>& meshes, std::vector<aiMateri
|
|
SkyboxVertex( l, l, l, 0, -1, 0, 0.0,1.0),
|
|
SkyboxVertex( l, l, l, 0, -1, 0, 0.0,1.0),
|
|
SkyboxVertex(-l, l, l, 0, -1, 0, 0.0,0.0),
|
|
SkyboxVertex(-l, l, l, 0, -1, 0, 0.0,0.0),
|
|
SkyboxVertex(-l, l,-l, 0, -1, 0, 1.0,0.0)) );
|
|
SkyboxVertex(-l, l,-l, 0, -1, 0, 1.0,0.0)) );
|
|
- meshes.back()->mMaterialIndex = materials.size()-2u;
|
|
|
|
|
|
+ meshes.back()->mMaterialIndex = static_cast<unsigned int>(materials.size()-2u);
|
|
|
|
|
|
// BOTTOM SIDE
|
|
// BOTTOM SIDE
|
|
meshes.push_back( BuildSingleQuadMesh(
|
|
meshes.push_back( BuildSingleQuadMesh(
|
|
@@ -255,7 +255,7 @@ void IRRImporter::BuildSkybox(std::vector<aiMesh*>& meshes, std::vector<aiMateri
|
|
SkyboxVertex( l,-l,-l, 0, 1, 0, 1.0,0.0),
|
|
SkyboxVertex( l,-l,-l, 0, 1, 0, 1.0,0.0),
|
|
SkyboxVertex(-l,-l,-l, 0, 1, 0, 1.0,1.0),
|
|
SkyboxVertex(-l,-l,-l, 0, 1, 0, 1.0,1.0),
|
|
SkyboxVertex(-l,-l, l, 0, 1, 0, 0.0,1.0)) );
|
|
SkyboxVertex(-l,-l, l, 0, 1, 0, 0.0,1.0)) );
|
|
- meshes.back()->mMaterialIndex = materials.size()-1u;
|
|
|
|
|
|
+ meshes.back()->mMaterialIndex = static_cast<unsigned int>(materials.size()-1u);
|
|
}
|
|
}
|
|
|
|
|
|
// ------------------------------------------------------------------------------------------------
|
|
// ------------------------------------------------------------------------------------------------
|
|
@@ -641,7 +641,7 @@ void SetupMapping (aiMaterial* mat, aiTextureMapping mode, const aiVector3D& axi
|
|
delete[] mat->mProperties;
|
|
delete[] mat->mProperties;
|
|
mat->mProperties = new aiMaterialProperty*[p.size()*2];
|
|
mat->mProperties = new aiMaterialProperty*[p.size()*2];
|
|
|
|
|
|
- mat->mNumAllocated = p.size()*2;
|
|
|
|
|
|
+ mat->mNumAllocated = static_cast<unsigned int>(p.size()*2);
|
|
}
|
|
}
|
|
mat->mNumProperties = (unsigned int)p.size();
|
|
mat->mNumProperties = (unsigned int)p.size();
|
|
::memcpy(mat->mProperties,&p[0],sizeof(void*)*mat->mNumProperties);
|
|
::memcpy(mat->mProperties,&p[0],sizeof(void*)*mat->mNumProperties);
|