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:
parent
48eb59eba8
commit
9f17722afd
|
|
@ -28,7 +28,7 @@ class NAZARA_API NzHashDigest
|
|||
|
||||
NzString ToHex() const;
|
||||
|
||||
nzUInt8 operator[](unsigned short pos) const;
|
||||
nzUInt8 operator[](unsigned int pos) const;
|
||||
|
||||
NzHashDigest& operator=(const NzHashDigest& rhs);
|
||||
NzHashDigest& operator=(NzHashDigest&& rhs) noexcept;
|
||||
|
|
@ -45,7 +45,7 @@ class NAZARA_API NzHashDigest
|
|||
private:
|
||||
NzString m_hashName;
|
||||
nzUInt8* m_digest;
|
||||
unsigned short m_digestLength;
|
||||
unsigned int m_digestLength;
|
||||
};
|
||||
|
||||
#endif // NAZARA_HASHDIGEST_HPP
|
||||
|
|
|
|||
|
|
@ -83,9 +83,9 @@ template<typename T>
|
|||
template<typename U>
|
||||
void NzEulerAngles<T>::Set(const NzEulerAngles<U>& angles)
|
||||
{
|
||||
pitch = static_cast<T>(angles.pitch);
|
||||
yaw = static_cast<T>(angles.yaw);
|
||||
roll = static_cast<T>(angles.roll);
|
||||
pitch = F(angles.pitch);
|
||||
yaw = F(angles.yaw);
|
||||
roll = F(angles.roll);
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ NzString NzHashDigest::ToHex() const
|
|||
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 (pos >= m_digestLength)
|
||||
|
|
|
|||
|
|
@ -17,6 +17,9 @@ namespace
|
|||
case nzPrimitiveType_Box:
|
||||
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:
|
||||
return new NzBoxGeom(physWorld, NzVector3f(primitive.plane.size.x, 0.01f, primitive.plane.size.y), primitive.matrix);
|
||||
///TODO: PlaneGeom?
|
||||
|
|
|
|||
Loading…
Reference in New Issue