faerbit/Saxum
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 2 Wiki Activity

Changed rotation from three to two vertices.

Browse Source
This commit is contained in:
Fabian Klemp 2014-11-14 18:31:26 +01:00
parent 8bdfda2e00
commit 13beac44e0
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
camera.cc
View File

@ -1,12 +1,12 @@
#include "camera.hh"
Camera::Camera(glm::vec3 rotation, float distance) {
Camera::Camera(glm::vec2 rotation, float distance) {
this->rotation = rotation;
this->distance = distance;
}
Camera::Camera() {
rotation = glm::vec3(0.0f, 0.0f, 0.0f);
rotation = glm::vec2(0.0f, 0.0f);
distance = 1.0f;
}
@ -21,14 +21,14 @@ void Camera::setDistance(float distance) {
this->distance = distance;
}
glm::vec3 Camera::getRotation() {
glm::vec2 Camera::getRotation() {
return rotation;
}
void Camera::setRotation(glm::vec3 rotation) {
void Camera::setRotation(glm::vec2 rotation) {
this->rotation = rotation;
}
void Camera::updateRotation(glm::vec3 rotation) {
void Camera::updateRotation(glm::vec2 rotation) {
this->rotation += rotation;;
}

10
camera.hh
View File

@ -5,17 +5,17 @@
class Camera {
public:
Camera(glm::vec3 rotation, float distance);
Camera(glm::vec2 rotation, float distance);
Camera();
~Camera();
float getDistance();
void setDistance(float distance);
glm::vec3 getRotation();
void setRotation(glm::vec3 rotation);
void updateRotation(glm::vec3 rotation); //adds to current rotation
glm::vec2 getRotation();
void setRotation(glm::vec2 rotation);
void updateRotation(glm::vec2 rotation); //adds to current rotation
private:
float distance;
glm::vec3 rotation;
glm::vec2 rotation;
};
#endif