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

Address compiler warnings

pull/5628/head
Steve M 2024-07-11 19:28:35 -07:00
parent 67cfb40712
commit c0e769ecf0
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
code/AssetLib/USD/USDLoaderImplTinyusdz.cpp
View File

@ -210,7 +210,7 @@ void USDImporterImplTinyusdz::meshes(
aiScene *pScene, aiScene *pScene,
const std::string &nameWExt) { const std::string &nameWExt) {
stringstream ss; stringstream ss;
pScene->mNumMeshes = render_scene.meshes.size(); pScene->mNumMeshes = static_cast<unsigned int>(render_scene.meshes.size());
pScene->mMeshes = new aiMesh *[pScene->mNumMeshes](); pScene->mMeshes = new aiMesh *[pScene->mNumMeshes]();
ss.str(""); ss.str("");
ss << "meshes(): pScene->mNumMeshes: " << pScene->mNumMeshes; ss << "meshes(): pScene->mNumMeshes: " << pScene->mNumMeshes;
@ -249,7 +249,7 @@ void USDImporterImplTinyusdz::verticesForMesh(
size_t meshIdx, size_t meshIdx,
const std::string &nameWExt) { const std::string &nameWExt) {
UNUSED(nameWExt); UNUSED(nameWExt);
pScene->mMeshes[meshIdx]->mNumVertices = render_scene.meshes[meshIdx].points.size(); pScene->mMeshes[meshIdx]->mNumVertices = static_cast<unsigned int>(render_scene.meshes[meshIdx].points.size());
pScene->mMeshes[meshIdx]->mVertices = new aiVector3D[pScene->mMeshes[meshIdx]->mNumVertices]; pScene->mMeshes[meshIdx]->mVertices = new aiVector3D[pScene->mMeshes[meshIdx]->mNumVertices];
for (size_t j = 0; j < pScene->mMeshes[meshIdx]->mNumVertices; ++j) { for (size_t j = 0; j < pScene->mMeshes[meshIdx]->mNumVertices; ++j) {
pScene->mMeshes[meshIdx]->mVertices[j].x = render_scene.meshes[meshIdx].points[j][0]; pScene->mMeshes[meshIdx]->mVertices[j].x = render_scene.meshes[meshIdx].points[j][0];
@ -264,7 +264,7 @@ void USDImporterImplTinyusdz::facesForMesh(
size_t meshIdx, size_t meshIdx,
const std::string &nameWExt) { const std::string &nameWExt) {
UNUSED(nameWExt); UNUSED(nameWExt);
pScene->mMeshes[meshIdx]->mNumFaces = render_scene.meshes[meshIdx].faceVertexCounts().size(); pScene->mMeshes[meshIdx]->mNumFaces = static_cast<unsigned int>(render_scene.meshes[meshIdx].faceVertexCounts().size());
pScene->mMeshes[meshIdx]->mFaces = new aiFace[pScene->mMeshes[meshIdx]->mNumFaces](); pScene->mMeshes[meshIdx]->mFaces = new aiFace[pScene->mMeshes[meshIdx]->mNumFaces]();
size_t faceVertIdxOffset = 0; size_t faceVertIdxOffset = 0;
for (size_t faceIdx = 0; faceIdx < pScene->mMeshes[meshIdx]->mNumFaces; ++faceIdx) { for (size_t faceIdx = 0; faceIdx < pScene->mMeshes[meshIdx]->mNumFaces; ++faceIdx) {
@ -306,6 +306,7 @@ void USDImporterImplTinyusdz::uvsForMesh(
aiScene *pScene, aiScene *pScene,
size_t meshIdx, size_t meshIdx,
const std::string &nameWExt) { const std::string &nameWExt) {
UNUSED(nameWExt);
const size_t uvSlotsCount = render_scene.meshes[meshIdx].texcoords.size(); const size_t uvSlotsCount = render_scene.meshes[meshIdx].texcoords.size();
if (uvSlotsCount < 1) { if (uvSlotsCount < 1) {
return; return;
@ -359,6 +360,7 @@ static void assignTexture(
aiMaterial *mat, aiMaterial *mat,
const int textureId, const int textureId,
const int aiTextureType) { const int aiTextureType) {
UNUSED(material);
std::string name = nameForTextureWithId(render_scene, textureId); std::string name = nameForTextureWithId(render_scene, textureId);
aiString *texName = new aiString(); aiString *texName = new aiString();
texName->Set(name); texName->Set(name);
@ -468,16 +470,17 @@ void USDImporterImplTinyusdz::textures(
const tinyusdz::tydra::RenderScene &render_scene, const tinyusdz::tydra::RenderScene &render_scene,
aiScene *pScene, aiScene *pScene,
const std::string &nameWExt) { const std::string &nameWExt) {
UNUSED(pScene);
const size_t numTextures{render_scene.textures.size()}; const size_t numTextures{render_scene.textures.size()};
(void) numTextures; // Ignore unused variable when -Werror enabled UNUSED(numTextures); // Ignore unused variable when -Werror enabled
stringstream ss; stringstream ss;
ss.str(""); ss.str("");
ss << "textures(): model" << nameWExt << ", numTextures: " << numTextures; ss << "textures(): model" << nameWExt << ", numTextures: " << numTextures;
TINYUSDZLOGD(TAG, "%s", ss.str().c_str()); TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
size_t i{0}; size_t i{0};
(void) i; UNUSED(i);
for (const auto &texture : render_scene.textures) { for (const auto &texture : render_scene.textures) {
(void) texture; UNUSED(texture);
ss.str(""); ss.str("");
ss << " texture[" << i << "]: id: " << texture.texture_image_id << ", disp name: |" << texture.display_name << "|, varname_uv: " << ss << " texture[" << i << "]: id: " << texture.texture_image_id << ", disp name: |" << texture.display_name << "|, varname_uv: " <<
texture.varname_uv << ", prim_name: |" << texture.prim_name << "|, abs_path: |" << texture.abs_path << "|"; texture.varname_uv << ", prim_name: |" << texture.prim_name << "|, abs_path: |" << texture.abs_path << "|";
@ -498,6 +501,7 @@ static aiTexture *ownedEmbeddedTextureFor(
const tinyusdz::tydra::RenderScene &render_scene, const tinyusdz::tydra::RenderScene &render_scene,
const tinyusdz::tydra::TextureImage &image, const tinyusdz::tydra::TextureImage &image,
const std::string &nameWExt) { const std::string &nameWExt) {
UNUSED(nameWExt);
stringstream ss; stringstream ss;
aiTexture *tex = new aiTexture(); aiTexture *tex = new aiTexture();
size_t pos = image.asset_identifier.find_last_of('/'); size_t pos = image.asset_identifier.find_last_of('/');
@ -520,7 +524,7 @@ static aiTexture *ownedEmbeddedTextureFor(
ss.str(""); ss.str("");
ss << "ownedEmbeddedTextureFor(): manual fill..."; ss << "ownedEmbeddedTextureFor(): manual fill...";
TINYUSDZLOGD(TAG, "%s", ss.str().c_str()); TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
for (int i = 0, fpi = 0; i < imageTexelsCount; ++i, fpi += 4) { for (size_t i = 0, fpi = 0; i < imageTexelsCount; ++i, fpi += 4) {
tex->pcData[i].b = static_cast<uint8_t>(floatPtr[fpi] * 255); tex->pcData[i].b = static_cast<uint8_t>(floatPtr[fpi] * 255);
tex->pcData[i].g = static_cast<uint8_t>(floatPtr[fpi + 1] * 255); tex->pcData[i].g = static_cast<uint8_t>(floatPtr[fpi + 1] * 255);
tex->pcData[i].r = static_cast<uint8_t>(floatPtr[fpi + 2] * 255); tex->pcData[i].r = static_cast<uint8_t>(floatPtr[fpi + 2] * 255);
@ -539,7 +543,7 @@ void USDImporterImplTinyusdz::textureImages(
const std::string &nameWExt) { const std::string &nameWExt) {
stringstream ss; stringstream ss;
const size_t numTextureImages{render_scene.images.size()}; const size_t numTextureImages{render_scene.images.size()};
(void) numTextureImages; // Ignore unused variable when -Werror enabled UNUSED(numTextureImages); // Ignore unused variable when -Werror enabled
ss.str(""); ss.str("");
ss << "textureImages(): model" << nameWExt << ", numTextureImages: " << numTextureImages; ss << "textureImages(): model" << nameWExt << ", numTextureImages: " << numTextureImages;
TINYUSDZLOGD(TAG, "%s", ss.str().c_str()); TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
@ -552,7 +556,7 @@ void USDImporterImplTinyusdz::textureImages(
" buffers.size(): " << render_scene.buffers.size() << ", data empty? " << render_scene.buffers[image.buffer_id].data.empty(); " buffers.size(): " << render_scene.buffers.size() << ", data empty? " << render_scene.buffers[image.buffer_id].data.empty();
TINYUSDZLOGD(TAG, "%s", ss.str().c_str()); TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
if (image.buffer_id > -1 && if (image.buffer_id > -1 &&
image.buffer_id < render_scene.buffers.size() && image.buffer_id < static_cast<long int>(render_scene.buffers.size()) &&
!render_scene.buffers[image.buffer_id].data.empty()) { !render_scene.buffers[image.buffer_id].data.empty()) {
aiTexture *tex = ownedEmbeddedTextureFor( aiTexture *tex = ownedEmbeddedTextureFor(
render_scene, render_scene,
@ -578,7 +582,7 @@ void USDImporterImplTinyusdz::buffers(
aiScene *pScene, aiScene *pScene,
const std::string &nameWExt) { const std::string &nameWExt) {
const size_t numBuffers{render_scene.buffers.size()}; const size_t numBuffers{render_scene.buffers.size()};
(void) numBuffers; // Ignore unused variable when -Werror enabled UNUSED(pScene); UNUSED(numBuffers); // Ignore unused variable when -Werror enabled
stringstream ss; stringstream ss;
ss.str(""); ss.str("");
ss << "buffers(): model" << nameWExt << ", numBuffers: " << numBuffers; ss << "buffers(): model" << nameWExt << ", numBuffers: " << numBuffers;
@ -609,7 +613,7 @@ void USDImporterImplTinyusdz::setupNodes(
} }
TINYUSDZLOGD(TAG, "%s", ss.str().c_str()); TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
for (size_t meshIdx = 0; meshIdx < pScene->mNumMeshes; meshIdx++) { for (unsigned int meshIdx = 0; meshIdx < pScene->mNumMeshes; meshIdx++) {
pScene->mRootNode->mMeshes[meshIdx] = meshIdx; pScene->mRootNode->mMeshes[meshIdx] = meshIdx;
} }
@ -654,7 +658,7 @@ aiNode *USDImporterImplTinyusdz::nodesRecursive(
} }
TINYUSDZLOGD(TAG, "%s", ss.str().c_str()); TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
if (!node.children.empty()) { if (!node.children.empty()) {
cNode->mNumChildren = node.children.size(); cNode->mNumChildren = static_cast<unsigned int>(node.children.size());
cNode->mChildren = new aiNode *[cNode->mNumChildren]; cNode->mChildren = new aiNode *[cNode->mNumChildren];
} }
@ -699,9 +703,10 @@ void USDImporterImplTinyusdz::blendShapesForMesh(
aiScene *pScene, aiScene *pScene,
size_t meshIdx, size_t meshIdx,
const std::string &nameWExt) { const std::string &nameWExt) {
UNUSED(nameWExt);
stringstream ss; stringstream ss;
const size_t numBlendShapeTargets{render_scene.meshes[meshIdx].targets.size()}; const unsigned int numBlendShapeTargets{static_cast<unsigned int>(render_scene.meshes[meshIdx].targets.size())};
(void) numBlendShapeTargets; // Ignore unused variable when -Werror enabled UNUSED(numBlendShapeTargets); // Ignore unused variable when -Werror enabled
ss.str(""); ss.str("");
ss << " blendShapesForMesh(): mesh[" << meshIdx << "], numBlendShapeTargets: " << numBlendShapeTargets; ss << " blendShapesForMesh(): mesh[" << meshIdx << "], numBlendShapeTargets: " << numBlendShapeTargets;
TINYUSDZLOGD(TAG, "%s", ss.str().c_str()); TINYUSDZLOGD(TAG, "%s", ss.str().c_str());