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

Minor fixes

This commit is contained in:
SirLynix 2022-04-18 19:07:34 +02:00
parent c209552f81
commit 7fccfbb63e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Core/SparsePtr.inl
View File

@ -165,7 +165,7 @@ namespace Nz
template<typename U> template<typename U>
void SparsePtr<T>::Reset(const SparsePtr<U>& ptr) void SparsePtr<T>::Reset(const SparsePtr<U>& ptr)
{ {
static_assert(std::is_convertible<U*, T*>::value, "Source type pointer cannot be implicitely converted to target type pointer"); static_assert(std::is_convertible<U*, T*>::value, "Source type pointer cannot be implicitly converted to target type pointer");
SetPtr(static_cast<T*>(ptr.GetPtr())); SetPtr(static_cast<T*>(ptr.GetPtr()));
SetStride(ptr.GetStride()); SetStride(ptr.GetStride());

2
src/Nazara/Physics3D/PhysWorld3D.cpp
View File

@ -13,7 +13,7 @@ namespace Nz
PhysWorld3D::PhysWorld3D() : PhysWorld3D::PhysWorld3D() :
m_maxStepCount(50), m_maxStepCount(50),
m_gravity(Vector3f::Zero()), m_gravity(Vector3f::Zero()),
m_stepSize(0.005f), m_stepSize(1.f / 120.f),
m_timestepAccumulator(0.f) m_timestepAccumulator(0.f)
{ {
m_world = NewtonCreate(); m_world = NewtonCreate();

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

@ -312,9 +312,6 @@ namespace Nz
break; break;
} }
if (shader.front() == '"')
shader.remove_prefix(1);
if (shader.empty()) if (shader.empty())
{ {
#if NAZARA_UTILITY_STRICT_RESOURCE_PARSING #if NAZARA_UTILITY_STRICT_RESOURCE_PARSING
@ -323,8 +320,11 @@ namespace Nz
break; break;
} }
if (shader.back() == '"') if (shader.front() == '"' && shader.back() == '"')
{
shader.remove_prefix(1);
shader.remove_suffix(1); shader.remove_suffix(1);
}
m_meshes[m_meshIndex].shader = shader; m_meshes[m_meshIndex].shader = shader;
break; break;