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

Ogre: Change OgreXmlSerializer::HasAttribute parameter from std::string to pointer 

It's immediately passed via string pointer and in most places
it's already a raw string constant.
pull/1753/head
Turo Lamminen 2018-01-30 19:42:58 +02:00
parent 87ce90665f
commit 12396d0ce3
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
code/OgreXmlSerializer.cpp
View File

@ -171,9 +171,9 @@ bool OgreXmlSerializer::ReadAttribute<bool>(const std::string &name) const
} }
} }
bool OgreXmlSerializer::HasAttribute(const std::string &name) const bool OgreXmlSerializer::HasAttribute(const char *name) const
{ {
return (m_reader->getAttributeValue(name.c_str()) != 0); return (m_reader->getAttributeValue(name) != 0);
} }
std::string &OgreXmlSerializer::NextNode() std::string &OgreXmlSerializer::NextNode()
@ -548,10 +548,10 @@ void OgreXmlSerializer::ReadSubMesh(MeshXml *mesh)
SubMeshXml* submesh = new SubMeshXml(); SubMeshXml* submesh = new SubMeshXml();
if (HasAttribute(anMaterial)) { if (HasAttribute(anMaterial.c_str())) {
submesh->materialRef = ReadAttribute<std::string>(anMaterial); submesh->materialRef = ReadAttribute<std::string>(anMaterial);
} }
if (HasAttribute(anUseSharedVertices)) { if (HasAttribute(anUseSharedVertices.c_str())) {
submesh->usesSharedVertexData = ReadAttribute<bool>(anUseSharedVertices); submesh->usesSharedVertexData = ReadAttribute<bool>(anUseSharedVertices);
} }
@ -587,7 +587,7 @@ void OgreXmlSerializer::ReadSubMesh(MeshXml *mesh)
face.mIndices[2] = ReadAttribute<uint32_t>(anV3); face.mIndices[2] = ReadAttribute<uint32_t>(anV3);
/// @todo Support quads if Ogre even supports them in XML (I'm not sure but I doubt it) /// @todo Support quads if Ogre even supports them in XML (I'm not sure but I doubt it)
if (!quadWarned && HasAttribute(anV4)) { if (!quadWarned && HasAttribute(anV4.c_str())) {
DefaultLogger::get()->warn("Submesh <face> has quads with <v4>, only triangles are supported at the moment!"); DefaultLogger::get()->warn("Submesh <face> has quads with <v4>, only triangles are supported at the moment!");
quadWarned = true; quadWarned = true;
} }
@ -968,11 +968,11 @@ void OgreXmlSerializer::ReadBones(Skeleton *skeleton)
} }
else else
{ {
if (HasAttribute(anX)) if (HasAttribute(anX.c_str()))
bone->scale.x = ReadAttribute<float>(anX); bone->scale.x = ReadAttribute<float>(anX);
if (HasAttribute(anY)) if (HasAttribute(anY.c_str()))
bone->scale.y = ReadAttribute<float>(anY); bone->scale.y = ReadAttribute<float>(anY);
if (HasAttribute(anZ)) if (HasAttribute(anZ.c_str()))
bone->scale.z = ReadAttribute<float>(anZ); bone->scale.z = ReadAttribute<float>(anZ);
} }
} }

2
code/OgreXmlSerializer.h
View File

@ -99,7 +99,7 @@ private:
template<typename T> template<typename T>
T ReadAttribute(const std::string &name) const; T ReadAttribute(const std::string &name) const;
bool HasAttribute(const std::string &name) const; bool HasAttribute(const char *name) const;
std::string &NextNode(); std::string &NextNode();
std::string &SkipCurrentNode(); std::string &SkipCurrentNode();