faerbit/Saxum
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 2 Wiki Activity

Protecting all member functions of entity class with the mutex.

Browse Source
This commit is contained in:
Faerbit 2015-03-24 19:12:33 +01:00
parent 5546abd24a
commit 2b2e05f009
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
game/entity.cc
View File

@ -47,23 +47,28 @@ Entity::~Entity(){
} }
glm::vec3 Entity::getPosition() { glm::vec3 Entity::getPosition() {
std::lock_guard<std::mutex> lock(mutex);
return position; return position;
} }
glm::mat4 Entity::getRotation() { glm::mat4 Entity::getRotation() {
std::lock_guard<std::mutex> lock(mutex);
return rotation; return rotation;
} }
void Entity::setPosition(glm::vec3 position) { void Entity::setPosition(glm::vec3 position) {
std::lock_guard<std::mutex> lock(mutex);
this->position = position; this->position = position;
} }
void Entity::setRotation(glm::vec3 rotation) { void Entity::setRotation(glm::vec3 rotation) {
std::lock_guard<std::mutex> lock(mutex);
this->rotation = glm::rotate(rotation.x, glm::vec3(1.0f, 0.0f, 0.0f)) this->rotation = glm::rotate(rotation.x, glm::vec3(1.0f, 0.0f, 0.0f))
* glm::rotate(rotation.y, glm::vec3(0.0f, 1.0f, 0.0f)) * glm::rotate(rotation.y, glm::vec3(0.0f, 1.0f, 0.0f))
* glm::rotate(rotation.z, glm::vec3(0.0f, 0.0f, 1.0f)); * glm::rotate(rotation.z, glm::vec3(0.0f, 0.0f, 1.0f));
} }
void Entity::setRotation(glm::mat4 rotation) { void Entity::setRotation(glm::mat4 rotation) {
std::lock_guard<std::mutex> lock(mutex);
this->rotation = rotation; this->rotation = rotation;
} }