Merge branch 'physics3d-material'

This commit is contained in:
Lynix
2018-02-17 12:50:46 +01:00
4 changed files with 19 additions and 19 deletions

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;