sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Utility/Formats: Fix MD5 loading 

Former-commit-id: 6eb5e2bc69277e0bd87284a66ed73f6fa7e5101c
This commit is contained in:
Lynix 2016-05-03 12:42:52 +02:00
parent d253e22c8f
commit 1fa545da73
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Nazara/Core/String.cpp
View File

@ -4240,7 +4240,7 @@ namespace Nz
utf8::unchecked::iterator<const char*> it(m_sharedString->string.get()); utf8::unchecked::iterator<const char*> it(m_sharedString->string.get());
do do
{ {
if ((Unicode::GetCategory(*it) & Unicode::Category_Separator) == 0) if (*it != '\t' && (Unicode::GetCategory(*it) & Unicode::Category_Separator) == 0)
break; break;
} }
while (*++it); while (*++it);
@ -4255,7 +4255,7 @@ namespace Nz
utf8::unchecked::iterator<const char*> it(&m_sharedString->string[m_sharedString->size]); utf8::unchecked::iterator<const char*> it(&m_sharedString->string[m_sharedString->size]);
while ((it--).base() != m_sharedString->string.get()) while ((it--).base() != m_sharedString->string.get())
{ {
if ((Unicode::GetCategory(*it) & Unicode::Category_Separator) == 0) if (*it != '\t' && (Unicode::GetCategory(*it) & Unicode::Category_Separator) == 0)
break; break;
} }
@ -4271,7 +4271,8 @@ namespace Nz
{ {
for (; startPos < m_sharedString->size; ++startPos) for (; startPos < m_sharedString->size; ++startPos)
{ {
if ((Unicode::GetCategory(m_sharedString->string[startPos]) & Unicode::Category_Separator) == 0) char c = m_sharedString->string[startPos];
if (c != '\t' && (Unicode::GetCategory(c) & Unicode::Category_Separator) == 0)
break; break;
} }
} }
@ -4281,7 +4282,8 @@ namespace Nz
{ {
for (; endPos > 0; --endPos) for (; endPos > 0; --endPos)
{ {
if ((Unicode::GetCategory(m_sharedString->string[endPos]) & Unicode::Category_Separator) == 0) char c = m_sharedString->string[endPos];
if (c != '\t' && (Unicode::GetCategory(c) & Unicode::Category_Separator) == 0)
break; break;
} }
} }

2
src/Nazara/Utility/Formats/MD5MeshLoader.cpp
View File

@ -42,7 +42,7 @@ namespace Nz
// Pour que le squelette soit correctement aligné, il faut appliquer un quaternion "de correction" aux joints à la base du squelette // Pour que le squelette soit correctement aligné, il faut appliquer un quaternion "de correction" aux joints à la base du squelette
Quaternionf rotationQuat = Quaternionf::RotationBetween(Vector3f::UnitX(), Vector3f::Forward()) * Quaternionf rotationQuat = Quaternionf::RotationBetween(Vector3f::UnitX(), Vector3f::Forward()) *
Quaternionf::RotationBetween(Vector3f::UnitZ(), Vector3f::Up()); Quaternionf::RotationBetween(Vector3f::UnitZ(), Vector3f::Up());
String baseDir = stream.GetDirectory(); String baseDir = stream.GetDirectory();

1
src/Nazara/Utility/Formats/MD5MeshParser.cpp
View File

@ -194,6 +194,7 @@ namespace Nz
m_currentLine = m_stream.ReadLine(); m_currentLine = m_stream.ReadLine();
m_currentLine = m_currentLine.SubStringTo("//"); // On ignore les commentaires m_currentLine = m_currentLine.SubStringTo("//"); // On ignore les commentaires
m_currentLine.Simplify(); // Pour un traitement plus simple m_currentLine.Simplify(); // Pour un traitement plus simple
m_currentLine.Trim();
} }
while (m_currentLine.IsEmpty()); while (m_currentLine.IsEmpty());
} }