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

Merge branch 'physics3d-material'

Browse Source
This commit is contained in:
Lynix
2018-02-17 12:50:46 +01:00
parent 39c89c52f4 cd526d6145
commit af75e2cc68
4 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/Nazara/Physics3D/PhysWorld3D.hpp
View File

@@ -35,13 +35,13 @@ namespace Nz
PhysWorld3D(PhysWorld3D&&) = delete; ///TODO
~PhysWorld3D();
int CreateMaterial(Nz::String name = Nz::String());
int CreateMaterial(String name = String());
void ForEachBodyInAABB(const Nz::Boxf& box, const BodyIterator& iterator);
void ForEachBodyInAABB(const Boxf& box, const BodyIterator& iterator);
Vector3f GetGravity() const;
NewtonWorld* GetHandle() const;
int GetMaterial(const Nz::String& name);
int GetMaterial(const String& name);
std::size_t GetMaxStepCount() const;
float GetStepSize() const;

4
include/Nazara/Physics3D/RigidBody3D.hpp
View File

@@ -59,7 +59,7 @@ namespace Nz
bool IsSimulationEnabled() const;
bool IsSleeping() const;
void SetAngularDamping(const Nz::Vector3f& angularDamping);
void SetAngularDamping(const Vector3f& angularDamping);
void SetAngularVelocity(const Vector3f& angularVelocity);
void SetGeom(Collider3DRef geom);
void SetGravityFactor(float gravityFactor);
@@ -67,7 +67,7 @@ namespace Nz
void SetLinearVelocity(const Vector3f& velocity);
void SetMass(float mass);
void SetMassCenter(const Vector3f& center);
void SetMaterial(const Nz::String& materialName);
void SetMaterial(const String& materialName);
void SetMaterial(int materialIndex);
void SetPosition(const Vector3f& position);
void SetRotation(const Quaternionf& rotation);