postponing implementing CompoundShapes
This commit is contained in:
@@ -1,3 +1,6 @@
|
||||
#include <glm/glm.hpp>
|
||||
#include <glm/gtc/matrix_transform.hpp>
|
||||
|
||||
#include "CompoundShape.hpp"
|
||||
|
||||
// constructors
|
||||
@@ -16,9 +19,12 @@ CompoundShape::CompoundShape(const std::vector<Shape> shapes)
|
||||
void CompoundShape::draw() {
|
||||
for (auto& shape : this->shapes) {
|
||||
glm::mat4 orig_transform { shape.transform };
|
||||
shape.transform *= shape.transform;
|
||||
shape.transform = glm::rotate(shape.transform, glm::radians(90.0f), glm::vec3 { 0.0f, 0.0f, 1.0f });
|
||||
shape.draw();
|
||||
shape.transform = orig_transform;
|
||||
}
|
||||
}
|
||||
|
||||
void CompoundShape::rotate(const float rotation_rad, const glm::vec3& axis) {
|
||||
this->transform = glm::rotate(this->transform, rotation_rad, axis);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user