Coherence update

Audio: GetListenerDirection was using ALfloat and GetListenerRotation
not.
ByteArray: Two return *this, hazh is perturbing, is it intended ?
String: Same ?
Camera: Adds of security (don't think it's usefull)
Parser: size() = 0 -> empty()
Utility: update 13 to 14 was forgotten
VertexDeclaration: same

Former-commit-id: f6db5cd15e5a4dc5ac2af12366b18d1f6922b0e0
This commit is contained in:
Gawaboumga 2014-07-13 16:03:15 +02:00
parent 7a6195991c
commit e9554ad498
7 changed files with 32 additions and 12 deletions

View File

@ -62,7 +62,7 @@ NzVector3f NzAudio::GetListenerPosition()
NzQuaternionf NzAudio::GetListenerRotation()
{
float orientation[6];
ALfloat orientation[6];
alGetListenerfv(AL_ORIENTATION, orientation);
NzVector3f forward(orientation[0], orientation[1], orientation[2]);

View File

@ -169,8 +169,6 @@ NzByteArray& NzByteArray::Insert(int pos, const void* buffer, unsigned int size)
}
return *this;
return *this;
}
NzByteArray& NzByteArray::Insert(int pos, const NzByteArray& array)
@ -464,9 +462,9 @@ void NzByteArray::EnsureOwnership()
}
}
bool NzByteArray::FillHash(NzAbstractHash* hazh) const
bool NzByteArray::FillHash(NzAbstractHash* hash) const
{
hazh->Append(m_sharedArray->buffer, m_sharedArray->size);
hash->Append(m_sharedArray->buffer, m_sharedArray->size);
return true;
}

View File

@ -4351,9 +4351,9 @@ void NzString::EnsureOwnership(bool discardContent)
}
}
bool NzString::FillHash(NzAbstractHash* hazh) const
bool NzString::FillHash(NzAbstractHash* hash) const
{
hazh->Append(reinterpret_cast<const nzUInt8*>(m_sharedString->string), m_sharedString->size);
hash->Append(reinterpret_cast<const nzUInt8*>(m_sharedString->string), m_sharedString->size);
return true;
}

View File

@ -134,6 +134,13 @@ float NzCamera::GetZNear() const
void NzCamera::SetFOV(float fov)
{
#if NAZARA_GRAPHICS_SAFE
if (NzNumberEquals(fov, 0.f))
{
NazaraError("Fov is null.");
return;
}
#endif
m_fov = fov;
m_frustumUpdated = false;
@ -183,6 +190,13 @@ void NzCamera::SetViewport(const NzRecti& viewport)
void NzCamera::SetZFar(float zFar)
{
#if NAZARA_GRAPHICS_SAFE
if (m_zNear > zFar)
{
NazaraError("zNear is greater than zFar.");
return;
}
#endif
m_zFar = zFar;
m_frustumUpdated = false;
@ -191,6 +205,13 @@ void NzCamera::SetZFar(float zFar)
void NzCamera::SetZNear(float zNear)
{
#if NAZARA_GRAPHICS_SAFE
if (zNear < 0.f || NzNumberEquals(zNear, 0.f))
{
NazaraError("zNear is less than/equals 0.");
return;
}
#endif
m_zNear = zNear;
m_frustumUpdated = false;

View File

@ -632,19 +632,19 @@ bool NzMD5MeshParser::ParseMesh()
}
}
if (m_meshes[m_meshIndex].triangles.size() == 0)
if (m_meshes[m_meshIndex].triangles.empty())
{
NazaraError("Mesh has no triangles");
return false;
}
if (m_meshes[m_meshIndex].vertices.size() == 0)
if (m_meshes[m_meshIndex].vertices.empty())
{
NazaraError("Mesh has no vertices");
return false;
}
if (m_meshes[m_meshIndex].weights.size() == 0)
if (m_meshes[m_meshIndex].weights.empty())
{
NazaraError("Mesh has no weights");
return false;

View File

@ -143,7 +143,7 @@ unsigned int NzUtility::ComponentCount[nzComponentType_Max+1] =
4 // nzComponentType_Int4
};
static_assert(nzComponentType_Max+1 == 13, "Component count array is incomplete");
static_assert(nzComponentType_Max+1 == 14, "Component count array is incomplete");
unsigned int NzUtility::ComponentStride[nzComponentType_Max+1] =
{
@ -162,6 +162,6 @@ unsigned int NzUtility::ComponentStride[nzComponentType_Max+1] =
4*sizeof(nzUInt32) // nzComponentType_Int4
};
static_assert(nzComponentType_Max+1 == 13, "Component stride array is incomplete");
static_assert(nzComponentType_Max+1 == 14, "Component stride array is incomplete");
unsigned int NzUtility::s_moduleReferenceCounter = 0;

View File

@ -167,6 +167,7 @@ bool NzVertexDeclaration::IsTypeSupported(nzComponentType type)
case nzComponentType_Int2:
case nzComponentType_Int3:
case nzComponentType_Int4:
case nzComponentType_Quaternion:
return true;
}