Finalized first draft for the SceneGraph

- Refactored several files
- Implemented PositionInformation subclasses
- Added standard shaders in the shader directory
- Removed SceneGraphLoader, now integrated in the SceneGraph

- TODO: Further testing and improvements to the PowerScale coordinate
system
This commit is contained in:
Jonas Strandstedt
2014-03-13 11:21:30 -04:00
parent 9833c3c8d4
commit b1eab2cf03
29 changed files with 897 additions and 833 deletions
+1 -4
View File
@@ -8,11 +8,9 @@
namespace openspace {
Camera::Camera() {
//glm::vec3 EulerAngles(90, 45, 0);
scaling_ = glm::vec2(1.0,0.0);
glm::vec3 EulerAngles(0, 0, 0);
viewRotation_ = glm::quat(EulerAngles);
//printf("Camera: [%f, %f, %f, %f]\n", viewRotation_[0], viewRotation_[1], viewRotation_[2], viewRotation_[3]);
}
Camera::~Camera() {
@@ -20,7 +18,7 @@ Camera::~Camera() {
}
void Camera::setPosition(psc pos) {
position_ = pos;
position_ = pos;
}
const psc& Camera::getPosition() const {
@@ -72,7 +70,6 @@ const glm::vec3 & Camera::getViewDirection() const {
return viewDirection_;
}
const float & Camera::getMaxFov() const {
return maxFov_;
}