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

Little corrections 

HashDigest: Simultaneous use of int and short
EulerAngles: Use of the macro
Geom: cone was missing

Former-commit-id: ecc3a586732a6711b57ce3e79c5450ef7327bb5b
This commit is contained in:
Gawaboumga 2014-06-27 19:11:45 +02:00
parent 48eb59eba8
commit 9f17722afd
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/Nazara/Core/HashDigest.hpp
View File

@ -28,7 +28,7 @@ class NAZARA_API NzHashDigest
NzString ToHex() const; NzString ToHex() const;
nzUInt8 operator[](unsigned short pos) const; nzUInt8 operator[](unsigned int pos) const;
NzHashDigest& operator=(const NzHashDigest& rhs); NzHashDigest& operator=(const NzHashDigest& rhs);
NzHashDigest& operator=(NzHashDigest&& rhs) noexcept; NzHashDigest& operator=(NzHashDigest&& rhs) noexcept;
@ -45,7 +45,7 @@ class NAZARA_API NzHashDigest
private: private:
NzString m_hashName; NzString m_hashName;
nzUInt8* m_digest; nzUInt8* m_digest;
unsigned short m_digestLength; unsigned int m_digestLength;
}; };
#endif // NAZARA_HASHDIGEST_HPP #endif // NAZARA_HASHDIGEST_HPP

6
include/Nazara/Math/EulerAngles.inl
View File

@ -83,9 +83,9 @@ template<typename T>
template<typename U> template<typename U>
void NzEulerAngles<T>::Set(const NzEulerAngles<U>& angles) void NzEulerAngles<T>::Set(const NzEulerAngles<U>& angles)
{ {
pitch = static_cast<T>(angles.pitch); pitch = F(angles.pitch);
yaw = static_cast<T>(angles.yaw); yaw = F(angles.yaw);
roll = static_cast<T>(angles.roll); roll = F(angles.roll);
} }
template<typename T> template<typename T>

2
src/Nazara/Core/HashDigest.cpp
View File

@ -89,7 +89,7 @@ NzString NzHashDigest::ToHex() const
return NzString(new NzString::SharedString(1, length, length, hexOutput)); return NzString(new NzString::SharedString(1, length, length, hexOutput));
} }
nzUInt8 NzHashDigest::operator[](unsigned short pos) const nzUInt8 NzHashDigest::operator[](unsigned int pos) const
{ {
#if NAZARA_CORE_SAFE #if NAZARA_CORE_SAFE
if (pos >= m_digestLength) if (pos >= m_digestLength)

3
src/Nazara/Physics/Geom.cpp
View File

@ -17,6 +17,9 @@ namespace
case nzPrimitiveType_Box: case nzPrimitiveType_Box:
return new NzBoxGeom(physWorld, primitive.box.lengths, primitive.matrix); return new NzBoxGeom(physWorld, primitive.box.lengths, primitive.matrix);
case nzPrimitiveType_Cone:
return new NzConeGeom(physWorld, primitive.cone.length, primitive.cone.radius, primitive.matrix);
case nzPrimitiveType_Plane: case nzPrimitiveType_Plane:
return new NzBoxGeom(physWorld, NzVector3f(primitive.plane.size.x, 0.01f, primitive.plane.size.y), primitive.matrix); return new NzBoxGeom(physWorld, NzVector3f(primitive.plane.size.x, 0.01f, primitive.plane.size.y), primitive.matrix);
///TODO: PlaneGeom? ///TODO: PlaneGeom?