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

Commit forgotten files 

Former-commit-id: dd296ce0e7c4128c35b41cbe753ffb572858ba6c
This commit is contained in:
Lynix 2015-09-25 23:17:44 +02:00
parent eaf1bb3601
commit fe2e47478e
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/Nazara/Physics/Geom.hpp
View File

@ -190,22 +190,22 @@ namespace Nz
unsigned int m_vertexStride; unsigned int m_vertexStride;
}; };
class NzCylinderGeom; class CylinderGeom;
using NzCylinderGeomConstRef = ObjectRef<const NzCylinderGeom>; using CylinderGeomConstRef = ObjectRef<const CylinderGeom>;
using NzCylinderGeomRef = ObjectRef<NzCylinderGeom>; using CylinderGeomRef = ObjectRef<CylinderGeom>;
class NAZARA_PHYSICS_API NzCylinderGeom : public PhysGeom class NAZARA_PHYSICS_API CylinderGeom : public PhysGeom
{ {
public: public:
NzCylinderGeom(float length, float radius, const Matrix4f& transformMatrix = Matrix4f::Identity()); CylinderGeom(float length, float radius, const Matrix4f& transformMatrix = Matrix4f::Identity());
NzCylinderGeom(float length, float radius, const Vector3f& translation, const Quaternionf& rotation = Quaternionf::Identity()); CylinderGeom(float length, float radius, const Vector3f& translation, const Quaternionf& rotation = Quaternionf::Identity());
float GetLength() const; float GetLength() const;
float GetRadius() const; float GetRadius() const;
GeomType GetType() const override; GeomType GetType() const override;
template<typename... Args> static NzCylinderGeomRef New(Args&&... args); template<typename... Args> static CylinderGeomRef New(Args&&... args);
private: private:
NewtonCollision* CreateHandle(PhysWorld* world) const override; NewtonCollision* CreateHandle(PhysWorld* world) const override;

4
include/Nazara/Physics/Geom.inl
View File

@ -53,9 +53,9 @@ namespace Nz
} }
template<typename... Args> template<typename... Args>
NzCylinderGeomRef NzCylinderGeom::New(Args&&... args) CylinderGeomRef CylinderGeom::New(Args&&... args)
{ {
std::unique_ptr<NzCylinderGeom> object(new NzCylinderGeom(std::forward<Args>(args)...)); std::unique_ptr<CylinderGeom> object(new CylinderGeom(std::forward<Args>(args)...));
object->SetPersistent(false); object->SetPersistent(false);
return object.release(); return object.release();

6
include/Nazara/Renderer/RenderStates.inl
View File

@ -29,11 +29,11 @@ namespace Nz
Face& face = (i == 0) ? backFace : frontFace; Face& face = (i == 0) ? backFace : frontFace;
face.stencilCompare = RendererComparison_Always; face.stencilCompare = RendererComparison_Always;
face.stencilFail = nzStencilOperation_Keep; face.stencilFail = StencilOperation_Keep;
face.stencilMask = 0xFFFFFFFF; face.stencilMask = 0xFFFFFFFF;
face.stencilPass = nzStencilOperation_Keep; face.stencilPass = StencilOperation_Keep;
face.stencilReference = 0; face.stencilReference = 0;
face.stencilZFail = nzStencilOperation_Keep; face.stencilZFail = StencilOperation_Keep;
} }
} }