fixes
This commit is contained in:
parent
5ac51a6fa4
commit
a1776e015e
@ -21,10 +21,9 @@ void Camera::updateVectors(){
|
|||||||
}
|
}
|
||||||
|
|
||||||
void Camera::rotate(float x, float y, float z){
|
void Camera::rotate(float x, float y, float z){
|
||||||
rotation = glm::rotate(rotation, z, glm::vec3(0,0,1));
|
|
||||||
rotation = glm::rotate(rotation, y, glm::vec3(0,1,0));
|
rotation = glm::rotate(rotation, y, glm::vec3(0,1,0));
|
||||||
rotation = glm::rotate(rotation, x, glm::vec3(1,0,0));
|
rotation = glm::rotate(rotation, x, glm::vec3(1,0,0));
|
||||||
|
rotation = glm::rotate(rotation, z, glm::vec3(0,0,1));
|
||||||
updateVectors();
|
updateVectors();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -58,8 +58,8 @@ public:
|
|||||||
std::shared_ptr<T> tObj = std::make_shared<T>(args...);
|
std::shared_ptr<T> tObj = std::make_shared<T>(args...);
|
||||||
|
|
||||||
std::shared_ptr<Object> obj = std::dynamic_pointer_cast<Object, T>(tObj);
|
std::shared_ptr<Object> obj = std::dynamic_pointer_cast<Object, T>(tObj);
|
||||||
obj->objectUID = objects.size();
|
|
||||||
objects.push_back(obj);
|
objects.push_back(obj);
|
||||||
|
obj->objectUID = objects.size();
|
||||||
obj->spawned();
|
obj->spawned();
|
||||||
return tObj;
|
return tObj;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user