added scale to frame

src/gfx/include/gfx/control.hpp

@@ -31,7 +31,7 @@ public:
     virtual glm::vec3 getFrontVec() { return frontVec; }
     virtual glm::vec3 getUpVec() { return upVec; }
     virtual void setFrontVec() = 0;
-    //void setUpVec(); // TO DO
+    // void setUpVec(); // TO DO
 
     void setStep(float dt);
     void setSpeed(float new_speed);

src/gfx/include/gfx/frame.hpp

@@ -13,7 +13,7 @@ class Frame
 {
     glm::vec3 positionVec = glm::vec3(0.0f, 0.0f, 0.0f);
     glm::quat rotationQuat = glm::quat(1.0f, 0.0f, 0.0f, 0.0f);
-    // TO DO: scale
+    glm::vec3 scale = glm::vec3(1.0f, 1.0f, 1.0f);
 
 public:
     Frame(glm::vec3 position, glm::vec3 rotation = glm::vec3(0, 0, 0))
@@ -24,6 +24,7 @@ public:
 
     glm::vec3 getPosition() { return positionVec; }
     glm::quat getRotation() { return rotationQuat; }
+    glm::vec3 getScale() { return scale; }
 
     // Normalize?
     glm::vec3 getRotationAxisX() { return glm::vec3(glm::axis(rotationQuat).x, 0, 0); }
@@ -32,14 +33,16 @@ public:
 
     glm::mat4 getTranslationMat() { return glm::translate(glm::mat4(1.0f), positionVec); }
     glm::mat4 getRotationMat() { return glm::toMat4(rotationQuat); }
+    glm::mat4 getScaleMat() { return glm::scale(glm::mat4(1.0f), scale); }
 
-    glm::mat4 getModelMat() { return getTranslationMat() * getRotationMat(); }
+    glm::mat4 getModelMat() { return getTranslationMat() * getRotationMat() * getScaleMat(); }
     glm::mat4 getViewMat() { return glm::inverse(getModelMat()); }
-    
+
     void setPosVec(glm::vec3 new_position) { positionVec = new_position; }
     void translatePosVec(glm::vec3 direction) { positionVec += direction; }
     void setRotationQuat(glm::vec3 new_rotation) { rotationQuat = glm::tquat(glm::radians(new_rotation)); }
     void rotateRotationQuat(glm::vec3 rotation) { rotationQuat *= glm::tquat(glm::radians(rotation)); }
+    void setScale(glm::vec3 _scale) { scale = _scale; }
 };
 
 #endif
\ No newline at end of file

src/gfx/src/object.cpp

@@ -17,7 +17,6 @@ bool Object::buffer_object()
     _VBO_vertex.Bind();
     _VBO_vertex.SendData(getVertices());
     _VAO.LinkVBO(0);
-    //_VBO_vertex.Unbind();
     // Normals
     _VBO_normal.Bind();
     _VBO_normal.SendData(getNormals());
@@ -26,7 +25,6 @@ bool Object::buffer_object()
     _EBO.Bind();
     _EBO.SendData(getIndices());
     
-    // Either unbind all three or none, otherwise no cube
     // _VAO.Unbind();
     // _VBO.Unbind();
     // _EBO.Unbind();

src/studio/include/studio/simulator.hpp

@@ -49,6 +49,7 @@ struct Simulator : public osi::Simulator
     std::vector<frame_ptr> obj_frames;
     std::vector<obj_control_ptr> obj_controls;
 
+    // TO DO: std::map for "basic" : shader
     std::vector<shader_ptr> myShaders;
 };
 

src/studio/src/simulator.cpp

@@ -127,8 +127,9 @@ Simulator::Simulator()
                    std::make_shared<ObjectController>(*obj_frames[1])}
 {
     objects[1]->setToLight(true);
+    obj_frames[1]->setScale(glm::vec3(0.1f, 0.1f, 0.1f));
     camera.setWindowSize(window().size()); 
-    //obj_control.rotate(glm::vec3(0.0f, 50.0f, 0.0f));
+    // obj_controls[0]->rotate(glm::vec3(0.0f, 50.0f, 0.0f));
 }
 
 Simulator::~Simulator() {}
@@ -139,7 +140,7 @@ void Simulator::update()
     
     process_input();
     process_mouse(); 
-    // obj_control.rotate(glm::vec3(1.0f, 0.0f, 0.0f)); // Rotation around x-axis demo
+    // obj_controls[0]->rotate(glm::vec3(1.0f, 0.0f, 0.0f)); // Rotation around x-axis demo
 }
 
 void Simulator::present()