From 81531352f0af10ef357e82595098fa596795f000 Mon Sep 17 00:00:00 2001
From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Fri, 13 Feb 2015 10:04:39 +0100
Subject: [PATCH] rename model -> controller

---
 src/app.hpp                       |  4 ++--
 src/camera.cpp                    |  4 ++--
 src/camera.hpp                    |  4 ++--
 src/{model.cpp => controller.cpp} | 10 +++++-----
 src/{model.hpp => controller.hpp} | 10 +++++-----
 5 files changed, 16 insertions(+), 16 deletions(-)
 rename src/{model.cpp => controller.cpp} (64%)
 rename src/{model.hpp => controller.hpp} (84%)

diff --git a/src/app.hpp b/src/app.hpp
index c5a5098..d949567 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -5,8 +5,8 @@
 #include <glm/gtc/matrix_transform.hpp>
 
 #include "camera.hpp"
+#include "controller.hpp"
 #include "init.hpp"
-#include "model.hpp"
 #include "shader.hpp"
 
 
@@ -42,7 +42,7 @@ private:
 	float yaw_sensitivity;
 
 	Camera cam;
-	Model model;
+	FPSController model;
 
 	GLuint vtx_buf;
 	GLuint mvp_handle;
diff --git a/src/camera.cpp b/src/camera.cpp
index 239ddb2..8a3a8a1 100644
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -7,7 +7,7 @@
 namespace blank {
 
 Camera::Camera()
-: Model()
+: FPSController()
 , fov(45.0f)
 , aspect(1.0f)
 , near_clip(0.1f)
@@ -53,7 +53,7 @@ void Camera::Clip(float near, float far) {
 
 
 void Camera::Update(int dt) {
-	Model::Update(dt);
+	FPSController::Update(dt);
 	vp = projection * glm::inverse(Transform());
 }
 
diff --git a/src/camera.hpp b/src/camera.hpp
index 1ab086a..33c69d3 100644
--- a/src/camera.hpp
+++ b/src/camera.hpp
@@ -3,13 +3,13 @@
 
 #include <glm/glm.hpp>
 
-#include "model.hpp"
+#include "controller.hpp"
 
 
 namespace blank {
 
 class Camera
-: public Model {
+: public FPSController {
 
 public:
 	Camera();
diff --git a/src/model.cpp b/src/controller.cpp
similarity index 64%
rename from src/model.cpp
rename to src/controller.cpp
index 7335ed9..19adf1b 100644
--- a/src/model.cpp
+++ b/src/controller.cpp
@@ -1,4 +1,4 @@
-#include "model.hpp"
+#include "controller.hpp"
 
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtx/euler_angles.hpp>
@@ -7,7 +7,7 @@
 
 namespace blank {
 
-Model::Model()
+FPSController::FPSController()
 : velocity(0, 0, 0)
 , position(0, 0, 0)
 , pitch(0)
@@ -15,17 +15,17 @@ Model::Model()
 
 }
 
-Model::~Model() {
+FPSController::~FPSController() {
 
 }
 
 
-glm::mat4 Model::Transform() const {
+glm::mat4 FPSController::Transform() const {
 	return glm::translate(position) * glm::eulerAngleYX(yaw, pitch);
 }
 
 
-void Model::Update(int dt) {
+void FPSController::Update(int dt) {
 	position += velocity * float(dt);
 }
 
diff --git a/src/model.hpp b/src/controller.hpp
similarity index 84%
rename from src/model.hpp
rename to src/controller.hpp
index b2a6e21..8b2cd4e 100644
--- a/src/model.hpp
+++ b/src/controller.hpp
@@ -1,16 +1,16 @@
-#ifndef BLANK_MODEL_HPP_
-#define BLANK_MODEL_HPP_
+#ifndef BLANK_CONTROLLER_HPP_
+#define BLANK_CONTROLLER_HPP_
 
 #include <glm/glm.hpp>
 
 
 namespace blank {
 
-class Model {
+class FPSController {
 
 public:
-	Model();
-	~Model();
+	FPSController();
+	~FPSController();
 
 	glm::mat4 Transform() const;
 
-- 
2.39.2