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

Merge pull request #27 from Gawaboumga/master

Browse Source 
Merging Gawaboumga pull request (#27), fixes are coming

Former-commit-id: 81079fd052538e15b7e919aea106cfb5a88a87a6
This commit is contained in:
Lynix
2014-07-08 16:24:46 +02:00
parent b3c0168e6a 60d045e139
commit 7103c28d49
14 changed files with 467 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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));
}
nzUInt8 NzHashDigest::operator[](unsigned short pos) const
nzUInt8 NzHashDigest::operator[](unsigned int pos) const
{
#if NAZARA_CORE_SAFE
if (pos >= m_digestLength)

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

@@ -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?