Rotation added to model (whole system is currently dirty)

src/Model.cpp

@@ -29,6 +29,9 @@ void Model::resize(glm::vec3 scale) {
   // set model transform
   this->model = glm::scale(transMatrix, glm::vec3(this->scale));
 }
+void Model::rotate(float angle, glm::vec3 axis) {
+  this->model = glm::rotate(this->model, angle, axis);
+}
 
 void Model::loadModel(std::string path) {
   // Attempt to import model data using assimp

src/Model.h

@@ -25,6 +25,8 @@ private:
   glm::vec4 position = glm::vec4(0.0f, 0.0f, 0.0f, 1.0f);
   // Scale
   glm::vec3 scale = glm::vec3(1.0f, 1.0f, 1.0f);
+  // Rotation
+  glm::vec3 rotation = glm::vec3(0.0f, 0.0f, 0.0f);
 
   // Load in models using assimp
   void loadModel(std::string path);
@@ -56,6 +58,8 @@ public:
   void translate(glm::vec3 translation);
   // Scale the model
   void resize(glm::vec3 scale);
+  // Scale the model
+  void rotate(float angle, glm::vec3 axis);
 
   ~Model();
 };

src/main.cpp

@@ -77,6 +77,7 @@ int main(int argc, char **argv) {
   backpack.translate(glm::vec3(-3.0f, 0.0f, 0.0f));
   gun.translate(glm::vec3(0.0f, 1.0f, 0.0f));
   gun.resize(glm::vec3(0.02f, 0.02f, 0.02f));
+  gun.rotate(glm::radians(-90.0f), glm::vec3(0.0f, 1.0f, 0.0f));
 
   // Create player camera object
   PlayerCamera camera;