16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-21 13:39:18 +02:00

tmj merge

This commit is contained in:
milek7
2017-10-30 16:30:04 +01:00
73 changed files with 9521 additions and 7735 deletions

View File

@@ -348,6 +348,13 @@ sound& sound::position(glm::vec3 p)
return *this;
}
glm::vec3 sound::location()
{
if (mode == global)
throw std::runtime_error("sound: bad state, no position");
return pos;
}
sound& sound::position(Math3D::vector3 const &pos)
{
position((glm::vec3)glm::make_vec3(&pos.x));