diff --git a/code/AssetLib/3DS/3DSLoader.cpp b/code/AssetLib/3DS/3DSLoader.cpp index 5d0a4e028..3dabf9da1 100644 --- a/code/AssetLib/3DS/3DSLoader.cpp +++ b/code/AssetLib/3DS/3DSLoader.cpp @@ -324,7 +324,7 @@ void Discreet3DSImporter::ParseObjectChunk() { case Discreet3DS::CHUNK_MAT_MATERIAL: // Add a new material to the list - mScene->mMaterials.push_back(D3DS::Material(std::string("UNNAMED_" + to_string(mScene->mMaterials.size())))); + mScene->mMaterials.push_back(D3DS::Material(std::string("UNNAMED_" + ai_to_string(mScene->mMaterials.size())))); ParseMaterialChunk(); break; diff --git a/code/AssetLib/3MF/D3MFExporter.cpp b/code/AssetLib/3MF/D3MFExporter.cpp index 7fc46a698..4a16a0ad3 100644 --- a/code/AssetLib/3MF/D3MFExporter.cpp +++ b/code/AssetLib/3MF/D3MFExporter.cpp @@ -237,7 +237,7 @@ void D3MFExporter::writeBaseMaterials() { aiMaterial *mat = mScene->mMaterials[i]; aiString name; if (mat->Get(AI_MATKEY_NAME, name) != aiReturn_SUCCESS) { - strName = "basemat_" + to_string(i); + strName = "basemat_" + ai_to_string(i); } else { strName = name.C_Str(); } @@ -248,7 +248,7 @@ void D3MFExporter::writeBaseMaterials() { // rgbs % if (color.r <= 1 && color.g <= 1 && color.b <= 1 && color.a <= 1) { - hexDiffuseColor = Rgba2Hex( + hexDiffuseColor = ai_rgba2hex( (int)((ai_real)color.r) * 255, (int)((ai_real)color.g) * 255, (int)((ai_real)color.b) * 255, @@ -257,13 +257,13 @@ void D3MFExporter::writeBaseMaterials() { } else { hexDiffuseColor = "#"; - tmp = DecimalToHexa((ai_real)color.r); + tmp = ai_decimal_to_hexa((ai_real)color.r); hexDiffuseColor += tmp; - tmp = DecimalToHexa((ai_real)color.g); + tmp = ai_decimal_to_hexa((ai_real)color.g); hexDiffuseColor += tmp; - tmp = DecimalToHexa((ai_real)color.b); + tmp = ai_decimal_to_hexa((ai_real)color.b); hexDiffuseColor += tmp; - tmp = DecimalToHexa((ai_real)color.a); + tmp = ai_decimal_to_hexa((ai_real)color.a); hexDiffuseColor += tmp; } } else { @@ -339,7 +339,7 @@ void D3MFExporter::writeFaces(aiMesh *mesh, unsigned int matIdx) { aiFace ¤tFace = mesh->mFaces[i]; mModelOutput << "<" << XmlTag::triangle << " v1=\"" << currentFace.mIndices[0] << "\" v2=\"" << currentFace.mIndices[1] << "\" v3=\"" << currentFace.mIndices[2] - << "\" pid=\"1\" p1=\"" + to_string(matIdx) + "\" />"; + << "\" pid=\"1\" p1=\"" + ai_to_string(matIdx) + "\" />"; mModelOutput << std::endl; } mModelOutput << ""; diff --git a/code/AssetLib/3MF/D3MFImporter.cpp b/code/AssetLib/3MF/D3MFImporter.cpp index ae0856f79..f4ddb6054 100644 --- a/code/AssetLib/3MF/D3MFImporter.cpp +++ b/code/AssetLib/3MF/D3MFImporter.cpp @@ -116,7 +116,7 @@ public: Object(int id) : Resource(id), - mName (std::string("Object_") + to_string(id)){} + mName(std::string("Object_") + ai_to_string(id)) {} virtual ResourceType getType() { return ResourceType::RT_Object; @@ -321,7 +321,7 @@ private: bool hasPid = getNodeAttribute(node, D3MF::XmlTag::pid, pid); bool hasPindex = getNodeAttribute(node, D3MF::XmlTag::pindex, pindex); - std::string idStr = to_string(id); + std::string idStr = ai_to_string(id); if (!hasId) { return; @@ -531,7 +531,7 @@ private: bool hasName = getNodeAttribute(node, D3MF::XmlTag::basematerials_name, name); std::string stdMaterialName; - std::string strId(to_string(basematerialsId)); + std::string strId(ai_to_string(basematerialsId)); stdMaterialName += "id"; stdMaterialName += strId; stdMaterialName += "_"; @@ -539,7 +539,7 @@ private: stdMaterialName += std::string(name); } else { stdMaterialName += "basemat_"; - stdMaterialName += to_string(mMaterialCount - basematerialsId); + stdMaterialName += ai_to_string(mMaterialCount - basematerialsId); } aiString assimpMaterialName(stdMaterialName); diff --git a/code/AssetLib/AMF/AMFImporter.cpp b/code/AssetLib/AMF/AMFImporter.cpp index 54841f84a..7d6ef2fd0 100644 --- a/code/AssetLib/AMF/AMFImporter.cpp +++ b/code/AssetLib/AMF/AMFImporter.cpp @@ -52,6 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include +#include // Header files, stdlib. #include @@ -306,7 +307,8 @@ void AMFImporter::ParseNode_Root() { throw DeadlyImportError("Root node \"amf\" not found."); } XmlNode node = *root; - mUnit = node.attribute("unit").as_string(); + mUnit = ai_str_tolower(std::string(node.attribute("unit").as_string())); + mVersion = node.attribute("version").as_string(); // Read attributes for node . diff --git a/code/AssetLib/AMF/AMFImporter_Postprocess.cpp b/code/AssetLib/AMF/AMFImporter_Postprocess.cpp index 382ec6421..9bbfc3249 100644 --- a/code/AssetLib/AMF/AMFImporter_Postprocess.cpp +++ b/code/AssetLib/AMF/AMFImporter_Postprocess.cpp @@ -873,7 +873,7 @@ nl_clean_loop: pScene->mNumMaterials = static_cast(mTexture_Converted.size()); pScene->mMaterials = new aiMaterial *[pScene->mNumMaterials]; for (const SPP_Texture &tex_convd : mTexture_Converted) { - const aiString texture_id(AI_EMBEDDED_TEXNAME_PREFIX + to_string(idx)); + const aiString texture_id(AI_EMBEDDED_TEXNAME_PREFIX + ai_to_string(idx)); const int mode = aiTextureOp_Multiply; const int repeat = tex_convd.Tiled ? 1 : 0; diff --git a/code/AssetLib/Collada/ColladaExporter.cpp b/code/AssetLib/Collada/ColladaExporter.cpp index 9b165c812..2b2064ef5 100644 --- a/code/AssetLib/Collada/ColladaExporter.cpp +++ b/code/AssetLib/Collada/ColladaExporter.cpp @@ -129,7 +129,7 @@ inline std::string MakeUniqueId(const std::unordered_set &idSet, co // Select a number to append size_t idnum = 1; do { - result = idPrefix + '_' + to_string(idnum) + postfix; + result = idPrefix + '_' + ai_to_string(idnum) + postfix; ++idnum; } while (!IsUniqueId(idSet, result)); } @@ -1017,7 +1017,7 @@ void ColladaExporter::WriteGeometry(size_t pIndex) { // texture coords for (size_t a = 0; a < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++a) { if (mesh->HasTextureCoords(static_cast(a))) { - WriteFloatArray(geometryId + "-tex" + to_string(a), mesh->mNumUVComponents[a] == 3 ? FloatType_TexCoord3 : FloatType_TexCoord2, + WriteFloatArray(geometryId + "-tex" + ai_to_string(a), mesh->mNumUVComponents[a] == 3 ? FloatType_TexCoord3 : FloatType_TexCoord2, (ai_real *)mesh->mTextureCoords[a], mesh->mNumVertices); } } @@ -1025,7 +1025,7 @@ void ColladaExporter::WriteGeometry(size_t pIndex) { // vertex colors for (size_t a = 0; a < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++a) { if (mesh->HasVertexColors(static_cast(a))) - WriteFloatArray(geometryId + "-color" + to_string(a), FloatType_Color, (ai_real *)mesh->mColors[a], mesh->mNumVertices); + WriteFloatArray(geometryId + "-color" + ai_to_string(a), FloatType_Color, (ai_real *)mesh->mColors[a], mesh->mNumVertices); } // assemble vertex structure @@ -1724,7 +1724,7 @@ ColladaExporter::NameIdPair ColladaExporter::AddObjectIndexToMaps(AiObjectType t case AiObjectType::Camera: idStr = std::string("camera_"); break; case AiObjectType::Count: throw std::logic_error("ColladaExporter::AiObjectType::Count is not an object type"); } - idStr.append(to_string(index)); + idStr.append(ai_to_string(index)); } else { idStr = XMLIDEncode(name); } diff --git a/code/AssetLib/Collada/ColladaHelper.cpp b/code/AssetLib/Collada/ColladaHelper.cpp index 3b1e135de..0677a41f7 100644 --- a/code/AssetLib/Collada/ColladaHelper.cpp +++ b/code/AssetLib/Collada/ColladaHelper.cpp @@ -80,16 +80,16 @@ void ToCamelCase(std::string &text) { return; // Capitalise first character auto it = text.begin(); - (*it) = ToUpper(*it); + (*it) = ai_toupper(*it); ++it; for (/*started above*/; it != text.end(); /*iterated below*/) { if ((*it) == '_') { it = text.erase(it); if (it != text.end()) - (*it) = ToUpper(*it); + (*it) = ai_toupper(*it); } else { // Make lower case - (*it) = ToLower(*it); + (*it) = ai_tolower(*it); ++it; } } diff --git a/code/AssetLib/Collada/ColladaParser.cpp b/code/AssetLib/Collada/ColladaParser.cpp index 59a012325..42166fdd4 100644 --- a/code/AssetLib/Collada/ColladaParser.cpp +++ b/code/AssetLib/Collada/ColladaParser.cpp @@ -372,7 +372,7 @@ void ColladaParser::ReadMetaDataItem(XmlNode &node, StringMetaData &metadata) { return; } - trim(v); + v = ai_trim(v); aiString aistr; aistr.Set(v); @@ -397,7 +397,7 @@ void ColladaParser::ReadAnimationClipLibrary(XmlNode &node) { std::string animName; if (!XmlParser::getStdStrAttribute(node, "name", animName)) { if (!XmlParser::getStdStrAttribute( node, "id", animName )) { - animName = std::string("animation_") + to_string(mAnimationClipLibrary.size()); + animName = std::string("animation_") + ai_to_string(mAnimationClipLibrary.size()); } } @@ -1415,7 +1415,7 @@ void ColladaParser::ReadDataArray(XmlNode &node) { XmlParser::getUIntAttribute(node, "count", count); std::string v; XmlParser::getValueAsString(node, v); - trim(v); + v = ai_trim(v); const char *content = v.c_str(); // read values and store inside an array in the data library diff --git a/code/AssetLib/FBX/FBXBinaryTokenizer.cpp b/code/AssetLib/FBX/FBXBinaryTokenizer.cpp index 45bbb54d0..800d0014d 100644 --- a/code/AssetLib/FBX/FBXBinaryTokenizer.cpp +++ b/code/AssetLib/FBX/FBXBinaryTokenizer.cpp @@ -473,7 +473,7 @@ void TokenizeBinary(TokenList& output_tokens, const char* input, size_t length) catch (const DeadlyImportError& e) { if (!is64bits && (length > std::numeric_limits::max())) { - throw DeadlyImportError("The FBX file is invalid. This may be because the content is too big for this older version (", to_string(version), ") of the FBX format. (", e.what(), ")"); + throw DeadlyImportError("The FBX file is invalid. This may be because the content is too big for this older version (", ai_to_string(version), ") of the FBX format. (", e.what(), ")"); } throw; } diff --git a/code/AssetLib/FBX/FBXConverter.cpp b/code/AssetLib/FBX/FBXConverter.cpp index 7a0db8431..cb033a651 100644 --- a/code/AssetLib/FBX/FBXConverter.cpp +++ b/code/AssetLib/FBX/FBXConverter.cpp @@ -3440,7 +3440,7 @@ void FBXConverter::ConvertGlobalSettings() { mSceneOut->mMetaData->Set(12, "TimeSpanStart", doc.GlobalSettings().TimeSpanStart()); mSceneOut->mMetaData->Set(13, "TimeSpanStop", doc.GlobalSettings().TimeSpanStop()); mSceneOut->mMetaData->Set(14, "CustomFrameRate", doc.GlobalSettings().CustomFrameRate()); - mSceneOut->mMetaData->Set(15, AI_METADATA_SOURCE_FORMAT_VERSION, aiString(to_string(doc.FBXVersion()))); + mSceneOut->mMetaData->Set(15, AI_METADATA_SOURCE_FORMAT_VERSION, aiString(ai_to_string(doc.FBXVersion()))); if (hasGenerator) { mSceneOut->mMetaData->Set(16, AI_METADATA_SOURCE_GENERATOR, aiString(doc.Creator())); } @@ -3454,42 +3454,42 @@ void FBXConverter::TransferDataToScene() { // many C++ users seem to know this, so pointing it out to avoid // confusion why this code works. - if (mMeshes.size()) { + if (!mMeshes.empty()) { mSceneOut->mMeshes = new aiMesh *[mMeshes.size()](); mSceneOut->mNumMeshes = static_cast(mMeshes.size()); std::swap_ranges(mMeshes.begin(), mMeshes.end(), mSceneOut->mMeshes); } - if (materials.size()) { + if (!materials.empty()) { mSceneOut->mMaterials = new aiMaterial *[materials.size()](); mSceneOut->mNumMaterials = static_cast(materials.size()); std::swap_ranges(materials.begin(), materials.end(), mSceneOut->mMaterials); } - if (animations.size()) { + if (!animations.empty()) { mSceneOut->mAnimations = new aiAnimation *[animations.size()](); mSceneOut->mNumAnimations = static_cast(animations.size()); std::swap_ranges(animations.begin(), animations.end(), mSceneOut->mAnimations); } - if (lights.size()) { + if (!lights.empty()) { mSceneOut->mLights = new aiLight *[lights.size()](); mSceneOut->mNumLights = static_cast(lights.size()); std::swap_ranges(lights.begin(), lights.end(), mSceneOut->mLights); } - if (cameras.size()) { + if (!cameras.empty()) { mSceneOut->mCameras = new aiCamera *[cameras.size()](); mSceneOut->mNumCameras = static_cast(cameras.size()); std::swap_ranges(cameras.begin(), cameras.end(), mSceneOut->mCameras); } - if (textures.size()) { + if (!textures.empty()) { mSceneOut->mTextures = new aiTexture *[textures.size()](); mSceneOut->mNumTextures = static_cast(textures.size()); diff --git a/code/AssetLib/FBX/FBXExportNode.cpp b/code/AssetLib/FBX/FBXExportNode.cpp index cea7e740b..91e421420 100644 --- a/code/AssetLib/FBX/FBXExportNode.cpp +++ b/code/AssetLib/FBX/FBXExportNode.cpp @@ -426,7 +426,7 @@ void FBX::Node::WritePropertyNodeAscii( char buffer[32]; FBX::Node node(name); node.Begin(s, false, indent); - std::string vsize = to_string(v.size()); + std::string vsize = ai_to_string(v.size()); // * { s.PutChar('*'); s.PutString(vsize); s.PutString(" {\n"); // indent + 1 @@ -462,7 +462,7 @@ void FBX::Node::WritePropertyNodeAscii( char buffer[32]; FBX::Node node(name); node.Begin(s, false, indent); - std::string vsize = to_string(v.size()); + std::string vsize = ai_to_string(v.size()); // * { s.PutChar('*'); s.PutString(vsize); s.PutString(" {\n"); // indent + 1 diff --git a/code/AssetLib/MMD/MMDPmxParser.cpp b/code/AssetLib/MMD/MMDPmxParser.cpp index b0f07d151..320182c3d 100644 --- a/code/AssetLib/MMD/MMDPmxParser.cpp +++ b/code/AssetLib/MMD/MMDPmxParser.cpp @@ -524,7 +524,7 @@ namespace pmx if (version != 2.0f && version != 2.1f) { std::cerr << "this is not ver2.0 or ver2.1 but " << version << "." << std::endl; - throw DeadlyImportError("MMD: this is not ver2.0 or ver2.1 but ", to_string(version)); + throw DeadlyImportError("MMD: this is not ver2.0 or ver2.1 but ", ai_to_string(version)); } this->setting.Read(stream); diff --git a/code/AssetLib/Ogre/OgreMaterial.cpp b/code/AssetLib/Ogre/OgreMaterial.cpp index 084e59108..35a9bf4c5 100644 --- a/code/AssetLib/Ogre/OgreMaterial.cpp +++ b/code/AssetLib/Ogre/OgreMaterial.cpp @@ -40,45 +40,38 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ---------------------------------------------------------------------- */ - - #ifndef ASSIMP_BUILD_NO_OGRE_IMPORTER #include "OgreImporter.h" +#include #include +#include #include #include #include -#include -#include -#include #include +#include +#include using namespace std; -namespace Assimp -{ -namespace Ogre -{ +namespace Assimp { +namespace Ogre { -static const string partComment = "//"; +static const string partComment = "//"; static const string partBlockStart = "{"; -static const string partBlockEnd = "}"; +static const string partBlockEnd = "}"; -void OgreImporter::ReadMaterials(const std::string &pFile, Assimp::IOSystem *pIOHandler, aiScene *pScene, Mesh *mesh) -{ - std::vector materials; +void OgreImporter::ReadMaterials(const std::string &pFile, Assimp::IOSystem *pIOHandler, aiScene *pScene, Mesh *mesh) { + std::vector materials; // Create materials that can be found and parsed via the IOSystem. - for (size_t i=0, len=mesh->NumSubMeshes(); iNumSubMeshes(); i < len; ++i) { SubMesh *submesh = mesh->GetSubMesh(i); - if (submesh && !submesh->materialRef.empty()) - { + if (submesh && !submesh->materialRef.empty()) { aiMaterial *material = ReadMaterial(pFile, pIOHandler, submesh->materialRef); - if (material) - { + if (material) { submesh->materialIndex = static_cast(materials.size()); materials.push_back(material); } @@ -88,19 +81,15 @@ void OgreImporter::ReadMaterials(const std::string &pFile, Assimp::IOSystem *pIO AssignMaterials(pScene, materials); } -void OgreImporter::ReadMaterials(const std::string &pFile, Assimp::IOSystem *pIOHandler, aiScene *pScene, MeshXml *mesh) -{ - std::vector materials; +void OgreImporter::ReadMaterials(const std::string &pFile, Assimp::IOSystem *pIOHandler, aiScene *pScene, MeshXml *mesh) { + std::vector materials; // Create materials that can be found and parsed via the IOSystem. - for (size_t i=0, len=mesh->NumSubMeshes(); iGetSubMesh( static_cast(i)); - if (submesh && !submesh->materialRef.empty()) - { + for (size_t i = 0, len = mesh->NumSubMeshes(); i < len; ++i) { + SubMeshXml *submesh = mesh->GetSubMesh(static_cast(i)); + if (submesh && !submesh->materialRef.empty()) { aiMaterial *material = ReadMaterial(pFile, pIOHandler, submesh->materialRef); - if (material) - { + if (material) { submesh->materialIndex = static_cast(materials.size()); materials.push_back(material); } @@ -110,20 +99,17 @@ void OgreImporter::ReadMaterials(const std::string &pFile, Assimp::IOSystem *pIO AssignMaterials(pScene, materials); } -void OgreImporter::AssignMaterials(aiScene *pScene, std::vector &materials) -{ +void OgreImporter::AssignMaterials(aiScene *pScene, std::vector &materials) { pScene->mNumMaterials = static_cast(materials.size()); - if (pScene->mNumMaterials > 0) - { - pScene->mMaterials = new aiMaterial*[pScene->mNumMaterials]; - for(size_t i=0;imNumMaterials; ++i) { + if (pScene->mNumMaterials > 0) { + pScene->mMaterials = new aiMaterial *[pScene->mNumMaterials]; + for (size_t i = 0; i < pScene->mNumMaterials; ++i) { pScene->mMaterials[i] = materials[i]; } } } -aiMaterial* OgreImporter::ReadMaterial(const std::string &pFile, Assimp::IOSystem *pIOHandler, const std::string &materialName) -{ +aiMaterial *OgreImporter::ReadMaterial(const std::string &pFile, Assimp::IOSystem *pIOHandler, const std::string &materialName) { if (materialName.empty()) { return 0; } @@ -169,24 +155,21 @@ aiMaterial* OgreImporter::ReadMaterial(const std::string &pFile, Assimp::IOSyste potentialFiles.push_back(m_userDefinedMaterialLibFile); IOStream *materialFile = 0; - for(size_t i=0; iOpen(potentialFiles[i]); if (materialFile) { break; } - ASSIMP_LOG_VERBOSE_DEBUG_F( "Source file for material '", materialName, "' ", potentialFiles[i], " does not exist"); + ASSIMP_LOG_VERBOSE_DEBUG_F("Source file for material '", materialName, "' ", potentialFiles[i], " does not exist"); } - if (!materialFile) - { - ASSIMP_LOG_ERROR_F( "Failed to find source file for material '", materialName, "'"); + if (!materialFile) { + ASSIMP_LOG_ERROR_F("Failed to find source file for material '", materialName, "'"); return 0; } std::unique_ptr stream(materialFile); - if (stream->FileSize() == 0) - { - ASSIMP_LOG_WARN_F( "Source file for material '", materialName, "' is empty (size is 0 bytes)"); + if (stream->FileSize() == 0) { + ASSIMP_LOG_WARN_F("Source file for material '", materialName, "' is empty (size is 0 bytes)"); return 0; } @@ -214,48 +197,41 @@ aiMaterial* OgreImporter::ReadMaterial(const std::string &pFile, Assimp::IOSyste string linePart; ss >> linePart; - const string partMaterial = "material"; - const string partTechnique = "technique"; + const string partMaterial = "material"; + const string partTechnique = "technique"; - while(!ss.eof()) - { + while (!ss.eof()) { // Skip commented lines - if (linePart == partComment) - { + if (linePart == partComment) { NextAfterNewLine(ss, linePart); continue; } - if (linePart != partMaterial) - { + if (linePart != partMaterial) { ss >> linePart; continue; } ss >> linePart; - if (linePart != materialName) - { + if (linePart != materialName) { ss >> linePart; continue; } NextAfterNewLine(ss, linePart); - if (linePart != partBlockStart) - { - ASSIMP_LOG_ERROR_F( "Invalid material: block start missing near index ", ss.tellg()); + if (linePart != partBlockStart) { + ASSIMP_LOG_ERROR_F("Invalid material: block start missing near index ", ss.tellg()); return material; } ASSIMP_LOG_VERBOSE_DEBUG_F("material '", materialName, "'"); - while(linePart != partBlockEnd) - { + while (linePart != partBlockEnd) { // Proceed to the first technique ss >> linePart; - if (linePart == partTechnique) - { - string techniqueName = SkipLine(ss); - ReadTechnique(Trim(techniqueName), ss, material); + if (linePart == partTechnique) { + std::string techniqueName = SkipLine(ss); + ReadTechnique(ai_trim(techniqueName), ss, material); } // Read information from a custom material @@ -264,71 +240,51 @@ aiMaterial* OgreImporter::ReadMaterial(const std::string &pFile, Assimp::IOSyste parent texture unit name in your cloned material. This is not yet supported and below code is probably some hack from the original author of this Ogre importer. Should be removed? */ - if (linePart=="set") - { + if (linePart == "set") { ss >> linePart; - if (linePart=="$specular")//todo load this values: - { - } - else if (linePart=="$diffuse") - { - } - else if (linePart=="$ambient") - { - } - else if (linePart=="$colormap") + if (linePart == "$specular") //todo load this values: { + } else if (linePart == "$diffuse") { + } else if (linePart == "$ambient") { + } else if (linePart == "$colormap") { ss >> linePart; aiString cm(linePart); material->AddProperty(&cm, AI_MATKEY_TEXTURE(aiTextureType_DIFFUSE, 0)); - } - else if (linePart=="$normalmap") - { + } else if (linePart == "$normalmap") { ss >> linePart; aiString nm(linePart); material->AddProperty(&nm, AI_MATKEY_TEXTURE(aiTextureType_NORMALS, 0)); - } - else if (linePart=="$shininess_strength") - { + } else if (linePart == "$shininess_strength") { ss >> linePart; float Shininess = fast_atof(linePart.c_str()); material->AddProperty(&Shininess, 1, AI_MATKEY_SHININESS_STRENGTH); - } - else if (linePart=="$shininess_exponent") - { + } else if (linePart == "$shininess_exponent") { ss >> linePart; float Shininess = fast_atof(linePart.c_str()); material->AddProperty(&Shininess, 1, AI_MATKEY_SHININESS); } //Properties from Venetica: - else if (linePart=="$diffuse_map") - { + else if (linePart == "$diffuse_map") { ss >> linePart; - if (linePart[0] == '"')// "file" -> file - linePart = linePart.substr(1, linePart.size()-2); + if (linePart[0] == '"') // "file" -> file + linePart = linePart.substr(1, linePart.size() - 2); aiString ts(linePart); material->AddProperty(&ts, AI_MATKEY_TEXTURE(aiTextureType_DIFFUSE, 0)); - } - else if (linePart=="$specular_map") - { + } else if (linePart == "$specular_map") { ss >> linePart; - if (linePart[0] == '"')// "file" -> file - linePart = linePart.substr(1, linePart.size()-2); + if (linePart[0] == '"') // "file" -> file + linePart = linePart.substr(1, linePart.size() - 2); aiString ts(linePart); material->AddProperty(&ts, AI_MATKEY_TEXTURE(aiTextureType_SHININESS, 0)); - } - else if (linePart=="$normal_map") - { + } else if (linePart == "$normal_map") { ss >> linePart; - if (linePart[0]=='"')// "file" -> file - linePart = linePart.substr(1, linePart.size()-2); + if (linePart[0] == '"') // "file" -> file + linePart = linePart.substr(1, linePart.size() - 2); aiString ts(linePart); material->AddProperty(&ts, AI_MATKEY_TEXTURE(aiTextureType_NORMALS, 0)); - } - else if (linePart=="$light_map") - { + } else if (linePart == "$light_map") { ss >> linePart; - if (linePart[0]=='"') { + if (linePart[0] == '"') { linePart = linePart.substr(1, linePart.size() - 2); } aiString ts(linePart); @@ -342,216 +298,166 @@ aiMaterial* OgreImporter::ReadMaterial(const std::string &pFile, Assimp::IOSyste return material; } -bool OgreImporter::ReadTechnique(const std::string &techniqueName, stringstream &ss, aiMaterial *material) -{ +bool OgreImporter::ReadTechnique(const std::string &techniqueName, stringstream &ss, aiMaterial *material) { string linePart; ss >> linePart; - if (linePart != partBlockStart) - { - ASSIMP_LOG_ERROR_F( "Invalid material: Technique block start missing near index ", ss.tellg()); + if (linePart != partBlockStart) { + ASSIMP_LOG_ERROR_F("Invalid material: Technique block start missing near index ", ss.tellg()); return false; } ASSIMP_LOG_VERBOSE_DEBUG_F(" technique '", techniqueName, "'"); - const string partPass = "pass"; + const string partPass = "pass"; - while(linePart != partBlockEnd) - { + while (linePart != partBlockEnd) { ss >> linePart; // Skip commented lines - if (linePart == partComment) - { + if (linePart == partComment) { SkipLine(ss); continue; } /// @todo Techniques have other attributes than just passes. - if (linePart == partPass) - { + if (linePart == partPass) { string passName = SkipLine(ss); - ReadPass(Trim(passName), ss, material); + ReadPass(ai_trim(passName), ss, material); } } return true; } -bool OgreImporter::ReadPass(const std::string &passName, stringstream &ss, aiMaterial *material) -{ +bool OgreImporter::ReadPass(const std::string &passName, stringstream &ss, aiMaterial *material) { string linePart; ss >> linePart; - if (linePart != partBlockStart) - { - ASSIMP_LOG_ERROR_F( "Invalid material: Pass block start missing near index ", ss.tellg()); + if (linePart != partBlockStart) { + ASSIMP_LOG_ERROR_F("Invalid material: Pass block start missing near index ", ss.tellg()); return false; } ASSIMP_LOG_VERBOSE_DEBUG_F(" pass '", passName, "'"); - const string partAmbient = "ambient"; - const string partDiffuse = "diffuse"; - const string partSpecular = "specular"; - const string partEmissive = "emissive"; + const string partAmbient = "ambient"; + const string partDiffuse = "diffuse"; + const string partSpecular = "specular"; + const string partEmissive = "emissive"; const string partTextureUnit = "texture_unit"; - while(linePart != partBlockEnd) - { + while (linePart != partBlockEnd) { ss >> linePart; // Skip commented lines - if (linePart == partComment) - { + if (linePart == partComment) { SkipLine(ss); continue; } // Colors /// @todo Support alpha via aiColor4D. - if (linePart == partAmbient || linePart == partDiffuse || linePart == partSpecular || linePart == partEmissive) - { + if (linePart == partAmbient || linePart == partDiffuse || linePart == partSpecular || linePart == partEmissive) { float r, g, b; ss >> r >> g >> b; const aiColor3D color(r, g, b); - ASSIMP_LOG_VERBOSE_DEBUG_F( " ", linePart, " ", r, " ", g, " ", b); + ASSIMP_LOG_VERBOSE_DEBUG_F(" ", linePart, " ", r, " ", g, " ", b); - if (linePart == partAmbient) - { + if (linePart == partAmbient) { material->AddProperty(&color, 1, AI_MATKEY_COLOR_AMBIENT); - } - else if (linePart == partDiffuse) - { + } else if (linePart == partDiffuse) { material->AddProperty(&color, 1, AI_MATKEY_COLOR_DIFFUSE); - } - else if (linePart == partSpecular) - { + } else if (linePart == partSpecular) { material->AddProperty(&color, 1, AI_MATKEY_COLOR_SPECULAR); - } - else if (linePart == partEmissive) - { + } else if (linePart == partEmissive) { material->AddProperty(&color, 1, AI_MATKEY_COLOR_EMISSIVE); } - } - else if (linePart == partTextureUnit) - { + } else if (linePart == partTextureUnit) { string textureUnitName = SkipLine(ss); - ReadTextureUnit(Trim(textureUnitName), ss, material); + ReadTextureUnit(ai_trim(textureUnitName), ss, material); } } return true; } -bool OgreImporter::ReadTextureUnit(const std::string &textureUnitName, stringstream &ss, aiMaterial *material) -{ +bool OgreImporter::ReadTextureUnit(const std::string &textureUnitName, stringstream &ss, aiMaterial *material) { string linePart; ss >> linePart; - if (linePart != partBlockStart) - { - ASSIMP_LOG_ERROR_F( "Invalid material: Texture unit block start missing near index ", ss.tellg()); + if (linePart != partBlockStart) { + ASSIMP_LOG_ERROR_F("Invalid material: Texture unit block start missing near index ", ss.tellg()); return false; } ASSIMP_LOG_VERBOSE_DEBUG_F(" texture_unit '", textureUnitName, "'"); - const string partTexture = "texture"; + const string partTexture = "texture"; const string partTextCoordSet = "tex_coord_set"; - const string partColorOp = "colour_op"; + const string partColorOp = "colour_op"; aiTextureType textureType = aiTextureType_NONE; std::string textureRef; int uvCoord = 0; - while(linePart != partBlockEnd) - { + while (linePart != partBlockEnd) { ss >> linePart; // Skip commented lines - if (linePart == partComment) - { + if (linePart == partComment) { SkipLine(ss); continue; } - if (linePart == partTexture) - { + if (linePart == partTexture) { ss >> linePart; textureRef = linePart; // User defined Assimp config property to detect texture type from filename. - if (m_detectTextureTypeFromFilename) - { + if (m_detectTextureTypeFromFilename) { size_t posSuffix = textureRef.find_last_of("."); size_t posUnderscore = textureRef.find_last_of("_"); - if (posSuffix != string::npos && posUnderscore != string::npos && posSuffix > posUnderscore) - { - string identifier = Ogre::ToLower(textureRef.substr(posUnderscore, posSuffix - posUnderscore)); - ASSIMP_LOG_VERBOSE_DEBUG_F( "Detecting texture type from filename postfix '", identifier, "'"); + if (posSuffix != string::npos && posUnderscore != string::npos && posSuffix > posUnderscore) { + string identifier = ai_str_tolower(textureRef.substr(posUnderscore, posSuffix - posUnderscore)); + ASSIMP_LOG_VERBOSE_DEBUG_F("Detecting texture type from filename postfix '", identifier, "'"); - if (identifier == "_n" || identifier == "_nrm" || identifier == "_nrml" || identifier == "_normal" || identifier == "_normals" || identifier == "_normalmap") - { + if (identifier == "_n" || identifier == "_nrm" || identifier == "_nrml" || identifier == "_normal" || identifier == "_normals" || identifier == "_normalmap") { textureType = aiTextureType_NORMALS; - } - else if (identifier == "_s" || identifier == "_spec" || identifier == "_specular" || identifier == "_specularmap") - { + } else if (identifier == "_s" || identifier == "_spec" || identifier == "_specular" || identifier == "_specularmap") { textureType = aiTextureType_SPECULAR; - } - else if (identifier == "_l" || identifier == "_light" || identifier == "_lightmap" || identifier == "_occ" || identifier == "_occlusion") - { + } else if (identifier == "_l" || identifier == "_light" || identifier == "_lightmap" || identifier == "_occ" || identifier == "_occlusion") { textureType = aiTextureType_LIGHTMAP; - } - else if (identifier == "_disp" || identifier == "_displacement") - { + } else if (identifier == "_disp" || identifier == "_displacement") { textureType = aiTextureType_DISPLACEMENT; - } - else - { + } else { textureType = aiTextureType_DIFFUSE; } - } - else - { + } else { textureType = aiTextureType_DIFFUSE; } } // Detect from texture unit name. This cannot be too broad as // authors might give names like "LightSaber" or "NormalNinja". - else - { - string unitNameLower = Ogre::ToLower(textureUnitName); - if (unitNameLower.find("normalmap") != string::npos) - { + else { + string unitNameLower = ai_str_tolower(textureUnitName); + if (unitNameLower.find("normalmap") != string::npos) { textureType = aiTextureType_NORMALS; - } - else if (unitNameLower.find("specularmap") != string::npos) - { + } else if (unitNameLower.find("specularmap") != string::npos) { textureType = aiTextureType_SPECULAR; - } - else if (unitNameLower.find("lightmap") != string::npos) - { + } else if (unitNameLower.find("lightmap") != string::npos) { textureType = aiTextureType_LIGHTMAP; - } - else if (unitNameLower.find("displacementmap") != string::npos) - { + } else if (unitNameLower.find("displacementmap") != string::npos) { textureType = aiTextureType_DISPLACEMENT; - } - else - { + } else { textureType = aiTextureType_DIFFUSE; } } - } - else if (linePart == partTextCoordSet) - { + } else if (linePart == partTextCoordSet) { ss >> uvCoord; } /// @todo Implement - else if(linePart == partColorOp) - { + else if (linePart == partColorOp) { /* ss >> linePart; if("replace"==linePart)//I don't think, assimp has something for this... @@ -566,22 +472,20 @@ bool OgreImporter::ReadTextureUnit(const std::string &textureUnitName, stringstr } } - if (textureRef.empty()) - { + if (textureRef.empty()) { ASSIMP_LOG_WARN("Texture reference is empty, ignoring texture_unit."); return false; } - if (textureType == aiTextureType_NONE) - { - ASSIMP_LOG_WARN("Failed to detect texture type for '" + textureRef + "', ignoring texture_unit."); + if (textureType == aiTextureType_NONE) { + ASSIMP_LOG_WARN("Failed to detect texture type for '" + textureRef + "', ignoring texture_unit."); return false; } unsigned int textureTypeIndex = m_textures[textureType]; m_textures[textureType]++; - ASSIMP_LOG_VERBOSE_DEBUG_F( " texture '", textureRef, "' type ", textureType, - " index ", textureTypeIndex, " UV ", uvCoord); + ASSIMP_LOG_VERBOSE_DEBUG_F(" texture '", textureRef, "' type ", textureType, + " index ", textureTypeIndex, " UV ", uvCoord); aiString assimpTextureRef(textureRef); material->AddProperty(&assimpTextureRef, AI_MATKEY_TEXTURE(textureType, textureTypeIndex)); @@ -590,7 +494,7 @@ bool OgreImporter::ReadTextureUnit(const std::string &textureUnitName, stringstr return true; } -} // Ogre -} // Assimp +} // namespace Ogre +} // namespace Assimp #endif // ASSIMP_BUILD_NO_OGRE_IMPORTER diff --git a/code/AssetLib/Ogre/OgreParsingUtils.h b/code/AssetLib/Ogre/OgreParsingUtils.h index 732d48ea3..70797a237 100644 --- a/code/AssetLib/Ogre/OgreParsingUtils.h +++ b/code/AssetLib/Ogre/OgreParsingUtils.h @@ -4,7 +4,6 @@ Open Asset Import Library (assimp) Copyright (c) 2006-2021, assimp team - All rights reserved. Redistribution and use of this software in source and binary forms, @@ -46,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_OGRE_IMPORTER #include -#include +#include #include #include #include @@ -55,16 +54,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. namespace Assimp { namespace Ogre { -/// Returns a lower cased copy of @s. -static AI_FORCE_INLINE std::string ToLower(const std::string &s) { - std::string lower(s); - std::transform(lower.begin(), lower.end(), lower.begin(), Assimp::ToLower); - - return lower; -} /// Returns if @c s ends with @c suffix. If @c caseSensitive is false, both strings will be lower cased before matching. -static AI_FORCE_INLINE bool EndsWith( const std::string &s, const std::string &suffix, bool caseSensitive = true) { +static inline bool EndsWith(const std::string &s, const std::string &suffix, bool caseSensitive = true) { if (s.empty() || suffix.empty()) { return false; } else if (s.length() < suffix.length()) { @@ -72,7 +64,7 @@ static AI_FORCE_INLINE bool EndsWith( const std::string &s, const std::string &s } if (!caseSensitive) { - return EndsWith(ToLower(s), ToLower(suffix), true); + return EndsWith(ai_str_tolower(s), ai_str_tolower(suffix), true); } size_t len = suffix.length(); @@ -81,53 +73,16 @@ static AI_FORCE_INLINE bool EndsWith( const std::string &s, const std::string &s return (ASSIMP_stricmp(sSuffix, suffix) == 0); } -// Below trim functions adapted from http://stackoverflow.com/questions/216823/whats-the-best-way-to-trim-stdstring - -/// Trim from start -static AI_FORCE_INLINE - std::string & - TrimLeft(std::string &s, bool newlines = true) { - if (!newlines) { - s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](char c) { return !Assimp::IsSpace(c); })); - } else { - s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](char c) { return !Assimp::IsSpaceOrNewLine(c); })); - } - return s; -} - -/// Trim from end -static AI_FORCE_INLINE - std::string & - TrimRight(std::string &s, bool newlines = true) { - if (!newlines) { - s.erase(std::find_if(s.rbegin(), s.rend(), [](char c) { return !Assimp::IsSpace(c); }).base(), s.end()); - } else { - s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](char c) { return !Assimp::IsSpaceOrNewLine(c); })); - } - return s; -} - -/// Trim from both ends -static AI_FORCE_INLINE - std::string & - Trim(std::string &s, bool newlines = true) { - return TrimLeft(TrimRight(s, newlines), newlines); -} - -/// Skips a line from current @ss position until a newline. Returns the skipped part. -static AI_FORCE_INLINE - std::string - SkipLine(std::stringstream &ss) { +// Skips a line from current @ss position until a newline. Returns the skipped part. +static inline std::string SkipLine(std::stringstream &ss) { std::string skipped; getline(ss, skipped); return skipped; } -/// Skips a line and reads next element from @c ss to @c nextElement. +// Skips a line and reads next element from @c ss to @c nextElement. /** @return Skipped line content until newline. */ -static AI_FORCE_INLINE - std::string - NextAfterNewLine(std::stringstream &ss, std::string &nextElement) { +static inline std::string NextAfterNewLine(std::stringstream &ss, std::string &nextElement) { std::string skipped = SkipLine(ss); ss >> nextElement; return skipped; diff --git a/code/AssetLib/Ogre/OgreXmlSerializer.cpp b/code/AssetLib/Ogre/OgreXmlSerializer.cpp index c1a1f2d5b..99c05a522 100644 --- a/code/AssetLib/Ogre/OgreXmlSerializer.cpp +++ b/code/AssetLib/Ogre/OgreXmlSerializer.cpp @@ -120,7 +120,7 @@ std::string OgreXmlSerializer::ReadAttribute(XmlNode &xmlNode, cons template <> bool OgreXmlSerializer::ReadAttribute(XmlNode &xmlNode, const char *name) const { - std::string value = Ogre::ToLower(ReadAttribute(xmlNode, name)); + std::string value = ai_str_tolower(ReadAttribute(xmlNode, name)); if (ASSIMP_stricmp(value, "true") == 0) { return true; } else if (ASSIMP_stricmp(value, "false") == 0) { @@ -529,7 +529,7 @@ XmlParserPtr OgreXmlSerializer::OpenXmlParser(Assimp::IOSystem *pIOHandler, cons throw DeadlyImportError("Failed to open skeleton file ", filename); } - XmlParserPtr xmlParser = XmlParserPtr(new XmlParser); + XmlParserPtr xmlParser = std::make_shared(); if (!xmlParser->parse(file.get())) { throw DeadlyImportError("Failed to create XML reader for skeleton file " + filename); } @@ -545,7 +545,7 @@ void OgreXmlSerializer::ReadSkeleton(XmlNode &node, Skeleton *skeleton) { // Optional blend mode from root node if (XmlParser::hasAttribute(node, "blendmode")) { - skeleton->blendMode = (ToLower(ReadAttribute(node, "blendmode")) == "cumulative" ? Skeleton::ANIMBLEND_CUMULATIVE : Skeleton::ANIMBLEND_AVERAGE); + skeleton->blendMode = (ai_str_tolower(ReadAttribute(node, "blendmode")) == "cumulative" ? Skeleton::ANIMBLEND_CUMULATIVE : Skeleton::ANIMBLEND_AVERAGE); } for (XmlNode ¤tNode : node.children()) { diff --git a/code/AssetLib/STEPParser/STEPFileReader.cpp b/code/AssetLib/STEPParser/STEPFileReader.cpp index 2afcaec6e..113b8dd6a 100644 --- a/code/AssetLib/STEPParser/STEPFileReader.cpp +++ b/code/AssetLib/STEPParser/STEPFileReader.cpp @@ -270,11 +270,15 @@ void STEP::ReadFile(DB& db,const EXPRESS::ConversionSchema& scheme, } std::string::size_type ns = n0; - do ++ns; while( IsSpace(s.at(ns))); + do { + ++ns; + } while (IsSpace(s.at(ns))); std::string::size_type ne = n1; - do --ne; while( IsSpace(s.at(ne))); - std::string type = s.substr(ns,ne-ns+1); - std::transform( type.begin(), type.end(), type.begin(), &Assimp::ToLower ); + do { + --ne; + } while (IsSpace(s.at(ne))); + std::string type = s.substr(ns, ne - ns + 1); + type = ai_str_tolower(type); const char* sz = scheme.GetStaticStringForToken(type); if(sz) { const std::string::size_type szLen = n2-n1+1; @@ -317,7 +321,7 @@ std::shared_ptr EXPRESS::DataType::Parse(const char*& i } for(--t;IsSpace(*t);--t); std::string s(cur,static_cast(t-cur+1)); - std::transform(s.begin(),s.end(),s.begin(),&ToLower ); + std::transform(s.begin(),s.end(),s.begin(),&ai_tolower ); if (schema->IsKnownToken(s)) { for(cur = t+1;*cur++ != '(';); const std::shared_ptr dt = Parse(cur); diff --git a/code/AssetLib/X/XFileParser.cpp b/code/AssetLib/X/XFileParser.cpp index abcce0bc8..c5ce426ae 100644 --- a/code/AssetLib/X/XFileParser.cpp +++ b/code/AssetLib/X/XFileParser.cpp @@ -693,7 +693,7 @@ void XFileParser::ParseDataObjectMaterial(Material *pMaterial) { std::string matName; readHeadOfDataObject(&matName); if (matName.empty()) - matName = std::string("material") + to_string(mLineNumber); + matName = std::string("material") + ai_to_string(mLineNumber); pMaterial->mName = matName; pMaterial->mIsReference = false; diff --git a/code/AssetLib/glTF/glTFAsset.inl b/code/AssetLib/glTF/glTFAsset.inl index 8cc00f2ec..6e1e60846 100644 --- a/code/AssetLib/glTF/glTFAsset.inl +++ b/code/AssetLib/glTF/glTFAsset.inl @@ -318,13 +318,13 @@ inline void Buffer::Read(Value &obj, Asset &r) { this->mData.reset(data, std::default_delete()); if (statedLength > 0 && this->byteLength != statedLength) { - throw DeadlyImportError("GLTF: buffer \"", id, "\", expected ", to_string(statedLength), - " bytes, but found ", to_string(dataURI.dataLength)); + throw DeadlyImportError("GLTF: buffer \"", id, "\", expected ", ai_to_string(statedLength), + " bytes, but found ", ai_to_string(dataURI.dataLength)); } } else { // assume raw data if (statedLength != dataURI.dataLength) { - throw DeadlyImportError("GLTF: buffer \"", id, "\", expected ", to_string(statedLength), - " bytes, but found ", to_string(dataURI.dataLength)); + throw DeadlyImportError("GLTF: buffer \"", id, "\", expected ", ai_to_string(statedLength), + " bytes, but found ", ai_to_string(dataURI.dataLength)); } this->mData.reset(new uint8_t[dataURI.dataLength], std::default_delete()); @@ -927,24 +927,24 @@ inline void Mesh::Decode_O3DGC(const SCompression_Open3DGC &pCompression_Open3DG size_t size_coordindex = ifs.GetNCoordIndex() * 3; // See float attributes note. if (primitives[0].indices->count != size_coordindex) - throw DeadlyImportError("GLTF: Open3DGC. Compressed indices count (", to_string(size_coordindex), - ") not equal to uncompressed (", to_string(primitives[0].indices->count), ")."); + throw DeadlyImportError("GLTF: Open3DGC. Compressed indices count (", ai_to_string(size_coordindex), + ") not equal to uncompressed (", ai_to_string(primitives[0].indices->count), ")."); size_coordindex *= sizeof(IndicesType); // Coordinates size_t size_coord = ifs.GetNCoord(); // See float attributes note. if (primitives[0].attributes.position[0]->count != size_coord) - throw DeadlyImportError("GLTF: Open3DGC. Compressed positions count (", to_string(size_coord), - ") not equal to uncompressed (", to_string(primitives[0].attributes.position[0]->count), ")."); + throw DeadlyImportError("GLTF: Open3DGC. Compressed positions count (", ai_to_string(size_coord), + ") not equal to uncompressed (", ai_to_string(primitives[0].attributes.position[0]->count), ")."); size_coord *= 3 * sizeof(float); // Normals size_t size_normal = ifs.GetNNormal(); // See float attributes note. if (primitives[0].attributes.normal[0]->count != size_normal) - throw DeadlyImportError("GLTF: Open3DGC. Compressed normals count (", to_string(size_normal), - ") not equal to uncompressed (", to_string(primitives[0].attributes.normal[0]->count), ")."); + throw DeadlyImportError("GLTF: Open3DGC. Compressed normals count (", ai_to_string(size_normal), + ") not equal to uncompressed (", ai_to_string(primitives[0].attributes.normal[0]->count), ")."); size_normal *= 3 * sizeof(float); // Additional attributes. @@ -965,8 +965,8 @@ inline void Mesh::Decode_O3DGC(const SCompression_Open3DGC &pCompression_Open3DG // Check situation when encoded data contain texture coordinates but primitive not. if (idx_texcoord < primitives[0].attributes.texcoord.size()) { if (primitives[0].attributes.texcoord[idx]->count != tval) - throw DeadlyImportError("GLTF: Open3DGC. Compressed texture coordinates count (", to_string(tval), - ") not equal to uncompressed (", to_string(primitives[0].attributes.texcoord[idx]->count), ")."); + throw DeadlyImportError("GLTF: Open3DGC. Compressed texture coordinates count (", ai_to_string(tval), + ") not equal to uncompressed (", ai_to_string(primitives[0].attributes.texcoord[idx]->count), ")."); idx_texcoord++; } else { @@ -975,7 +975,7 @@ inline void Mesh::Decode_O3DGC(const SCompression_Open3DGC &pCompression_Open3DG break; default: - throw DeadlyImportError("GLTF: Open3DGC. Unsupported type of float attribute: ", to_string(ifs.GetFloatAttributeType(static_cast(idx)))); + throw DeadlyImportError("GLTF: Open3DGC. Unsupported type of float attribute: ", ai_to_string(ifs.GetFloatAttributeType(static_cast(idx)))); } tval *= ifs.GetFloatAttributeDim(static_cast(idx)) * sizeof(o3dgc::Real); // After checking count of objects we can get size of array. @@ -994,7 +994,7 @@ inline void Mesh::Decode_O3DGC(const SCompression_Open3DGC &pCompression_Open3DG break; default: - throw DeadlyImportError("GLTF: Open3DGC. Unsupported type of int attribute: ", to_string(ifs.GetIntAttributeType(static_cast(idx)))); + throw DeadlyImportError("GLTF: Open3DGC. Unsupported type of int attribute: ", ai_to_string(ifs.GetIntAttributeType(static_cast(idx)))); } tval *= ifs.GetIntAttributeDim(static_cast(idx)) * sizeof(long); // See float attributes note. @@ -1029,7 +1029,7 @@ inline void Mesh::Decode_O3DGC(const SCompression_Open3DGC &pCompression_Open3DG break; default: - throw DeadlyImportError("GLTF: Open3DGC. Unsupported type of float attribute: ", to_string(ifs.GetFloatAttributeType(static_cast(idx)))); + throw DeadlyImportError("GLTF: Open3DGC. Unsupported type of float attribute: ", ai_to_string(ifs.GetFloatAttributeType(static_cast(idx)))); } } @@ -1043,7 +1043,7 @@ inline void Mesh::Decode_O3DGC(const SCompression_Open3DGC &pCompression_Open3DG // ifs.SetIntAttribute(idx, (long* const)(decoded_data + get_buf_offset(primitives[0].attributes.joint))); default: - throw DeadlyImportError("GLTF: Open3DGC. Unsupported type of int attribute: ", to_string(ifs.GetIntAttributeType(static_cast(idx)))); + throw DeadlyImportError("GLTF: Open3DGC. Unsupported type of int attribute: ", ai_to_string(ifs.GetIntAttributeType(static_cast(idx)))); } } @@ -1254,7 +1254,7 @@ inline void Asset::ReadBinaryHeader(IOStream &stream) { } AI_SWAP4(header.version); - asset.version = to_string(header.version); + asset.version = ai_to_string(header.version); if (header.version != 1) { throw DeadlyImportError("GLTF: Unsupported binary glTF version"); } diff --git a/code/AssetLib/glTF/glTFExporter.cpp b/code/AssetLib/glTF/glTFExporter.cpp index f4451789d..0d644be8b 100644 --- a/code/AssetLib/glTF/glTFExporter.cpp +++ b/code/AssetLib/glTF/glTFExporter.cpp @@ -1003,7 +1003,7 @@ void glTFExporter::ExportAnimations() // It appears that assimp stores this type of animation as multiple animations. // where each aiNodeAnim in mChannels animates a specific node. - std::string name = nameAnim + "_" + to_string(channelIndex); + std::string name = nameAnim + "_" + ai_to_string(channelIndex); name = mAsset->FindUniqueID(name, "animation"); Ref animRef = mAsset->animations.Create(name); diff --git a/code/AssetLib/glTF/glTFImporter.cpp b/code/AssetLib/glTF/glTFImporter.cpp index c53a85a0f..3335fc109 100644 --- a/code/AssetLib/glTF/glTFImporter.cpp +++ b/code/AssetLib/glTF/glTFImporter.cpp @@ -234,7 +234,7 @@ void glTFImporter::ImportMeshes(glTF::Asset &r) { buf->EncodedRegion_SetCurrent(mesh.id); } else { - throw DeadlyImportError("GLTF: Can not import mesh: unknown mesh extension (code: \"", to_string(cur_ext->Type), + throw DeadlyImportError("GLTF: Can not import mesh: unknown mesh extension (code: \"", ai_to_string(cur_ext->Type), "\"), only Open3DGC is supported."); } } diff --git a/code/AssetLib/glTF2/glTF2Asset.h b/code/AssetLib/glTF2/glTF2Asset.h index f944e02c1..d75251cb2 100644 --- a/code/AssetLib/glTF2/glTF2Asset.h +++ b/code/AssetLib/glTF2/glTF2Asset.h @@ -197,7 +197,7 @@ inline unsigned int ComponentTypeSize(ComponentType t) { case ComponentType_UNSIGNED_BYTE: return 1; default: - throw DeadlyImportError("GLTF: Unsupported Component Type ", to_string(t)); + throw DeadlyImportError("GLTF: Unsupported Component Type ", ai_to_string(t)); } } diff --git a/code/AssetLib/glTF2/glTF2Asset.inl b/code/AssetLib/glTF2/glTF2Asset.inl index 5c819b8de..389a05199 100644 --- a/code/AssetLib/glTF2/glTF2Asset.inl +++ b/code/AssetLib/glTF2/glTF2Asset.inl @@ -446,7 +446,7 @@ Ref LazyDict::Retrieve(unsigned int i) { // Unique ptr prevents memory leak in case of Read throws an exception auto inst = std::unique_ptr(new T()); // Try to make this human readable so it can be used in error messages. - inst->id = std::string(mDictId) + "[" + to_string(i) + "]"; + inst->id = std::string(mDictId) + "[" + ai_to_string(i) + "]"; inst->oIndex = i; ReadMember(obj, "name", inst->name); inst->Read(obj, mAsset); @@ -538,13 +538,13 @@ inline void Buffer::Read(Value &obj, Asset &r) { this->mData.reset(data, std::default_delete()); if (statedLength > 0 && this->byteLength != statedLength) { - throw DeadlyImportError("GLTF: buffer \"", id, "\", expected ", to_string(statedLength), - " bytes, but found ", to_string(dataURI.dataLength)); + throw DeadlyImportError("GLTF: buffer \"", id, "\", expected ", ai_to_string(statedLength), + " bytes, but found ", ai_to_string(dataURI.dataLength)); } } else { // assume raw data if (statedLength != dataURI.dataLength) { - throw DeadlyImportError("GLTF: buffer \"", id, "\", expected ", to_string(statedLength), - " bytes, but found ", to_string(dataURI.dataLength)); + throw DeadlyImportError("GLTF: buffer \"", id, "\", expected ", ai_to_string(statedLength), + " bytes, but found ", ai_to_string(dataURI.dataLength)); } this->mData.reset(new uint8_t[dataURI.dataLength], std::default_delete()); @@ -1800,7 +1800,7 @@ inline void Asset::ReadBinaryHeader(IOStream &stream, std::vector &sceneDa } AI_SWAP4(header.version); - asset.version = to_string(header.version); + asset.version = ai_to_string(header.version); if (header.version != 2) { throw DeadlyImportError("GLTF: Unsupported binary glTF version"); } diff --git a/code/AssetLib/glTF2/glTF2Exporter.cpp b/code/AssetLib/glTF2/glTF2Exporter.cpp index 3ba4ae1f1..aa89e96da 100644 --- a/code/AssetLib/glTF2/glTF2Exporter.cpp +++ b/code/AssetLib/glTF2/glTF2Exporter.cpp @@ -602,7 +602,7 @@ void glTF2Exporter::ExportMaterials() for (unsigned int i = 0; i < mScene->mNumMaterials; ++i) { const aiMaterial* mat = mScene->mMaterials[i]; - std::string id = "material_" + to_string(i); + std::string id = "material_" + ai_to_string(i); Ref m = mAsset->materials.Create(id); @@ -1393,7 +1393,7 @@ void glTF2Exporter::ExportAnimations() for (unsigned int channelIndex = 0; channelIndex < anim->mNumChannels; ++channelIndex) { const aiNodeAnim* nodeChannel = anim->mChannels[channelIndex]; - std::string name = nameAnim + "_" + to_string(channelIndex); + std::string name = nameAnim + "_" + ai_to_string(channelIndex); name = mAsset->FindUniqueID(name, "animation"); Ref animNode = mAsset->nodes.Get(nodeChannel->mNodeName.C_Str()); diff --git a/code/Common/BaseImporter.cpp b/code/Common/BaseImporter.cpp index d7b59ffef..cbecbf075 100644 --- a/code/Common/BaseImporter.cpp +++ b/code/Common/BaseImporter.cpp @@ -276,7 +276,7 @@ std::string BaseImporter::GetExtension(const std::string &file) { // thanks to Andy Maloney for the hint std::string ret = file.substr(pos + 1); - std::transform(ret.begin(), ret.end(), ret.begin(), ToLower); + ret = ai_str_tolower(ret); return ret; } diff --git a/code/Common/Importer.cpp b/code/Common/Importer.cpp index 7581ef1f9..34953074c 100644 --- a/code/Common/Importer.cpp +++ b/code/Common/Importer.cpp @@ -975,15 +975,14 @@ size_t Importer::GetImporterIndex (const char* szExtension) const { ASSIMP_BEGIN_EXCEPTION_REGION(); - // skip over wildcard and dot characters at string head -- + // skip over wild-card and dot characters at string head -- for ( ; *szExtension == '*' || *szExtension == '.'; ++szExtension ); std::string ext(szExtension); if (ext.empty()) { return static_cast(-1); } - std::transform( ext.begin(), ext.end(), ext.begin(), ToLower ); - + ext = ai_str_tolower(ext); std::set str; for (std::vector::const_iterator i = pimpl->mImporter.begin();i != pimpl->mImporter.end();++i) { str.clear(); diff --git a/code/PostProcessing/EmbedTexturesProcess.cpp b/code/PostProcessing/EmbedTexturesProcess.cpp index 58f16fb94..b7aadcb23 100644 --- a/code/PostProcessing/EmbedTexturesProcess.cpp +++ b/code/PostProcessing/EmbedTexturesProcess.cpp @@ -137,7 +137,7 @@ bool EmbedTexturesProcess::addTexture(aiScene* pScene, std::string path) const { pTexture->pcData = imageContent; auto extension = path.substr(path.find_last_of('.') + 1u); - std::transform(extension.begin(), extension.end(), extension.begin(), ToLower ); + extension = ai_str_tolower(extension); if (extension == "jpeg") { extension = "jpg"; } diff --git a/include/assimp/ParsingUtils.h b/include/assimp/ParsingUtils.h index 542ba8c00..b52b0610e 100644 --- a/include/assimp/ParsingUtils.h +++ b/include/assimp/ParsingUtils.h @@ -53,7 +53,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include + #include +#include namespace Assimp { @@ -68,17 +70,6 @@ namespace Assimp { static const unsigned int BufferSize = 4096; -// --------------------------------------------------------------------------------- -template -AI_FORCE_INLINE char_t ToLower(char_t in) { - return (in >= (char_t)'A' && in <= (char_t)'Z') ? (char_t)(in + 0x20) : in; -} - -// --------------------------------------------------------------------------------- -template -AI_FORCE_INLINE char_t ToUpper(char_t in) { - return (in >= (char_t)'a' && in <= (char_t)'z') ? (char_t)(in - 0x20) : in; -} // --------------------------------------------------------------------------------- template diff --git a/include/assimp/StringComparison.h b/include/assimp/StringComparison.h index ff2cab74f..6dad01294 100644 --- a/include/assimp/StringComparison.h +++ b/include/assimp/StringComparison.h @@ -61,8 +61,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include -#include +#include +#include #include namespace Assimp { @@ -78,8 +78,7 @@ namespace Assimp { * @param number Number to be written * @return Length of the output string, excluding the '\0' */ -AI_FORCE_INLINE -unsigned int ASSIMP_itoa10(char *out, unsigned int max, int32_t number) { +inline unsigned int ASSIMP_itoa10(char *out, unsigned int max, int32_t number) { ai_assert(nullptr != out); // write the unary minus to indicate we have a negative number @@ -97,7 +96,7 @@ unsigned int ASSIMP_itoa10(char *out, unsigned int max, int32_t number) { const unsigned int digit = number / cur; if (mustPrint || digit > 0 || 1 == cur) { - // print all future zeroe's from now + // print all future zero's from now mustPrint = true; *out++ = '0' + static_cast(digit); @@ -122,7 +121,7 @@ unsigned int ASSIMP_itoa10(char *out, unsigned int max, int32_t number) { * size of the array automatically. */ template -AI_FORCE_INLINE unsigned int ASSIMP_itoa10(char (&out)[length], int32_t number) { +inline unsigned int ASSIMP_itoa10(char (&out)[length], int32_t number) { return ASSIMP_itoa10(out, length, number); } @@ -137,8 +136,7 @@ AI_FORCE_INLINE unsigned int ASSIMP_itoa10(char (&out)[length], int32_t number) * @param s2 Second input string * @return 0 if the given strings are identical */ -AI_FORCE_INLINE -int ASSIMP_stricmp(const char *s1, const char *s2) { +inline int ASSIMP_stricmp(const char *s1, const char *s2) { ai_assert(nullptr != s1); ai_assert(nullptr != s2); @@ -162,8 +160,7 @@ int ASSIMP_stricmp(const char *s1, const char *s2) { * @param b Second string * @return 0 if a == b */ -AI_FORCE_INLINE -int ASSIMP_stricmp(const std::string &a, const std::string &b) { +inline int ASSIMP_stricmp(const std::string &a, const std::string &b) { int i = (int)b.length() - (int)a.length(); return (i ? i : ASSIMP_stricmp(a.c_str(), b.c_str())); } @@ -177,11 +174,10 @@ int ASSIMP_stricmp(const std::string &a, const std::string &b) { * * @param s1 First input string * @param s2 Second input string - * @param n Macimum number of characters to compare + * @param n Maximum number of characters to compare * @return 0 if the given strings are identical */ -AI_FORCE_INLINE -int ASSIMP_strincmp(const char *s1, const char *s2, unsigned int n) { +inline int ASSIMP_strincmp(const char *s1, const char *s2, unsigned int n) { ai_assert(nullptr != s1); ai_assert(nullptr != s2); if (!n) { @@ -214,8 +210,7 @@ int ASSIMP_strincmp(const char *s1, const char *s2, unsigned int n) { * * todo: move somewhere where it fits better in than here */ -AI_FORCE_INLINE -unsigned int integer_pow(unsigned int base, unsigned int power) { +inline unsigned int integer_pow(unsigned int base, unsigned int power) { unsigned int res = 1; for (unsigned int i = 0; i < power; ++i) { res *= base; diff --git a/include/assimp/StringUtils.h b/include/assimp/StringUtils.h index ccd21a91d..b612a84cc 100644 --- a/include/assimp/StringUtils.h +++ b/include/assimp/StringUtils.h @@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include -#include +#include #include #include #include @@ -62,17 +62,20 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_SIZEFMT "%zu" #endif +// --------------------------------------------------------------------------------- /// @fn ai_snprintf -/// @brief The portable version of the function snprintf ( C99 standard ), which works on visual studio compilers 2013 and earlier. +/// @brief The portable version of the function snprintf ( C99 standard ), which +/// works on visual studio compilers 2013 and earlier. /// @param outBuf The buffer to write in /// @param size The buffer size /// @param format The format string /// @param ap The additional arguments. -/// @return The number of written characters if the buffer size was big enough. If an encoding error occurs, a negative number is returned. +/// @return The number of written characters if the buffer size was big enough. +/// If an encoding error occurs, a negative number is returned. +// --------------------------------------------------------------------------------- #if defined(_MSC_VER) && _MSC_VER < 1900 -AI_FORCE_INLINE -int c99_ai_vsnprintf(char *outBuf, size_t size, const char *format, va_list ap) { +inline int c99_ai_vsnprintf(char *outBuf, size_t size, const char *format, va_list ap) { int count(-1); if (0 != size) { count = _vsnprintf_s(outBuf, size, _TRUNCATE, format, ap); @@ -84,8 +87,7 @@ int c99_ai_vsnprintf(char *outBuf, size_t size, const char *format, va_list ap) return count; } -AI_FORCE_INLINE -int ai_snprintf(char *outBuf, size_t size, const char *format, ...) { +inline int ai_snprintf(char *outBuf, size_t size, const char *format, ...) { int count; va_list ap; @@ -102,23 +104,28 @@ int ai_snprintf(char *outBuf, size_t size, const char *format, ...) { #define ai_snprintf snprintf #endif +// --------------------------------------------------------------------------------- /// @fn to_string -/// @brief The portable version of to_string ( some gcc-versions on embedded devices are not supporting this). +/// @brief The portable version of to_string ( some gcc-versions on embedded +/// devices are not supporting this). /// @param value The value to write into the std::string. /// @return The value as a std::string +// --------------------------------------------------------------------------------- template -AI_FORCE_INLINE std::string to_string(T value) { +AI_FORCE_INLINE std::string ai_to_string(T value) { std::ostringstream os; os << value; return os.str(); } +// --------------------------------------------------------------------------------- /// @fn ai_strtof /// @brief The portable version of strtof. /// @param begin The first character of the string. /// @param end The last character -/// @return The float value, 0.0f in cas of an error. +/// @return The float value, 0.0f in case of an error. +// --------------------------------------------------------------------------------- AI_FORCE_INLINE float ai_strtof(const char *begin, const char *end) { if (nullptr == begin) { @@ -136,12 +143,14 @@ float ai_strtof(const char *begin, const char *end) { return val; } +// --------------------------------------------------------------------------------- /// @fn DecimalToHexa /// @brief The portable to convert a decimal value into a hexadecimal string. /// @param toConvert Value to convert /// @return The hexadecimal string, is empty in case of an error. +// --------------------------------------------------------------------------------- template -AI_FORCE_INLINE std::string DecimalToHexa(T toConvert) { +AI_FORCE_INLINE std::string ai_decimal_to_hexa(T toConvert) { std::string result; std::stringstream ss; ss << std::hex << toConvert; @@ -154,6 +163,7 @@ AI_FORCE_INLINE std::string DecimalToHexa(T toConvert) { return result; } +// --------------------------------------------------------------------------------- /// @brief translate RGBA to String /// @param r aiColor.r /// @param g aiColor.g @@ -161,7 +171,8 @@ AI_FORCE_INLINE std::string DecimalToHexa(T toConvert) { /// @param a aiColor.a /// @param with_head # /// @return The hexadecimal string, is empty in case of an error. -AI_FORCE_INLINE std::string Rgba2Hex(int r, int g, int b, int a, bool with_head) { +// --------------------------------------------------------------------------------- +AI_FORCE_INLINE std::string ai_rgba2hex(int r, int g, int b, int a, bool with_head) { std::stringstream ss; if (with_head) { ss << "#"; @@ -171,25 +182,71 @@ AI_FORCE_INLINE std::string Rgba2Hex(int r, int g, int b, int a, bool with_head) return ss.str(); } -// trim from start (in place) -AI_FORCE_INLINE void ltrim(std::string &s) { +// --------------------------------------------------------------------------------- +/// @brief Performs a trim from start (in place) +/// @param s string to trim. +AI_FORCE_INLINE void ai_trim_left(std::string &s) { s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](unsigned char ch) { return !std::isspace(ch); })); } -// trim from end (in place) -AI_FORCE_INLINE void rtrim(std::string &s) { +// --------------------------------------------------------------------------------- +/// @brief Performs a trim from end (in place). +/// @param s string to trim. +// --------------------------------------------------------------------------------- +// --------------------------------------------------------------------------------- +AI_FORCE_INLINE void ai_trim_right(std::string &s) { s.erase(std::find_if(s.rbegin(), s.rend(), [](unsigned char ch) { return !std::isspace(ch); - }).base(), - s.end()); + }).base(), s.end()); } -// trim from both ends (in place) -AI_FORCE_INLINE void trim(std::string &s) { - ltrim(s); - rtrim(s); +// --------------------------------------------------------------------------------- +/// @brief Performs a trim from both ends (in place). +/// @param s string to trim. +// --------------------------------------------------------------------------------- +AI_FORCE_INLINE std::string ai_trim(std::string &s) { + std::string out(s); + ai_trim_left(out); + ai_trim_right(out); + + return out; } -#endif // INCLUDED_AI_STRINGUTILS_H +// --------------------------------------------------------------------------------- +template +AI_FORCE_INLINE char_t ai_tolower(char_t in) { + return (in >= (char_t)'A' && in <= (char_t)'Z') ? (char_t)(in + 0x20) : in; +} + +// --------------------------------------------------------------------------------- +/// @brief Performs a ToLower-operation and return the lower-case string. +/// @param in The incoming string. +/// @return The string as lowercase. +// --------------------------------------------------------------------------------- +AI_FORCE_INLINE std::string ai_str_tolower(const std::string &in) { + std::string out(in); + ai_trim_left(out); + ai_trim_right(out); + std::transform(out.begin(), out.end(), out.begin(), [](unsigned char c) { return ai_tolower(c); }); + return out; +} + +// --------------------------------------------------------------------------------- +template +AI_FORCE_INLINE char_t ai_toupper(char_t in) { + return (in >= (char_t)'a' && in <= (char_t)'z') ? (char_t)(in - 0x20) : in; +} + +// --------------------------------------------------------------------------------- +/// @brief Performs a ToLower-operation and return the upper-case string. +/// @param in The incoming string. +/// @return The string as uppercase. +AI_FORCE_INLINE std::string ai_str_toupper(const std::string &in) { + std::string out(in); + std::transform(out.begin(), out.end(), out.begin(), [](char c) { return ai_toupper(c); }); + return out; +} + +#endif diff --git a/test/unit/utStringUtils.cpp b/test/unit/utStringUtils.cpp index d638324ca..6a10cba24 100644 --- a/test/unit/utStringUtils.cpp +++ b/test/unit/utStringUtils.cpp @@ -45,10 +45,10 @@ class utStringUtils : public ::testing::Test { }; TEST_F( utStringUtils, to_string_Test ) { - std::string res = to_string( 1 ); + std::string res = ai_to_string( 1 ); EXPECT_EQ( res, "1" ); - res = to_string( 1.0f ); + res = ai_to_string( 1.0f ); EXPECT_EQ( res, "1" ); } diff --git a/tools/assimp_cmd/Export.cpp b/tools/assimp_cmd/Export.cpp index ffcaf9f77..1e2f10541 100644 --- a/tools/assimp_cmd/Export.cpp +++ b/tools/assimp_cmd/Export.cpp @@ -45,6 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "Main.h" #include +#include #ifndef ASSIMP_BUILD_NO_EXPORT @@ -107,7 +108,7 @@ int Assimp_Export(const char *const *params, unsigned int num) { } } - std::transform(outf.begin(), outf.end(), outf.begin(), Assimp::ToLower); + std::transform(outf.begin(), outf.end(), outf.begin(), ai_tolower); // convert the output format to a format id size_t outfi = GetMatchingFormat(outf); diff --git a/tools/assimp_cmd/ImageExtractor.cpp b/tools/assimp_cmd/ImageExtractor.cpp index fc5e4b002..58aa42fa8 100644 --- a/tools/assimp_cmd/ImageExtractor.cpp +++ b/tools/assimp_cmd/ImageExtractor.cpp @@ -266,7 +266,7 @@ int Assimp_Extract(const char *const *params, unsigned int num) { #endif } - std::transform(extension.begin(), extension.end(), extension.begin(), Assimp::ToLower); + std::transform(extension.begin(), extension.end(), extension.begin(), ai_tolower); if (out[0] == '-') { // take file name from input file