[EDIT] code style guide finished

This commit is contained in:
Menno
2021-05-18 12:43:22 +02:00
parent 41e02b0c39
commit 438b219d0a
17 changed files with 83 additions and 86 deletions

View File

@@ -1,7 +1,7 @@
#pragma once
#include <glm/gtc/matrix_transform.hpp>
#include "../models/Model.h"
#include "../models/model.h"
namespace entities
{
@@ -16,16 +16,16 @@ namespace entities
public:
Entity(const models::TexturedModel& model, const glm::vec3& position, const glm::vec3& rotation, float scale);
void increasePosition(const glm::vec3& distance);
void increaseRotation(const glm::vec3& rotation);
void IncreasePosition(const glm::vec3& distance);
void IncreaseRotation(const glm::vec3& rotation);
inline models::TexturedModel getModel() const{return model;}
inline void set_model(const ::models::TexturedModel& model) { this->model = model; }
inline glm::vec3 getPosition() const { return position; }
inline void set_position(const ::glm::vec3& position) { this->position = position; }
inline glm::vec3 getRotation() const { return rotation; }
inline void set_rotation(const ::glm::vec3& rotation) { this->rotation = rotation; }
inline float getScale() const { return scale; }
inline void set_scale(const float scale) { this->scale = scale; }
inline models::TexturedModel GetModel() const{return model;}
inline void SetModel(const ::models::TexturedModel& model) { this->model = model; }
inline glm::vec3 GetPosition() const { return position; }
inline void SetPosition(const ::glm::vec3& position) { this->position = position; }
inline glm::vec3 GetRotation() const { return rotation; }
inline void SetRotation(const ::glm::vec3& rotation) { this->rotation = rotation; }
inline float GetScale() const { return scale; }
inline void SetScale(const float scale) { this->scale = scale; }
};
}