Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 21:12:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

cleaned up some Orientation formtting

Browse source
This commit is contained in:
Jeffrey Ventrella 2013-04-11 15:37:15 -07:00
parent 661d5fdb3e
commit bd09084031
1 changed files with 13 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
interface/src/Orientation.cpp
View file

@ -1,33 +1,28 @@
#include "Orientation.h" #include "Orientation.h"
#include "Util.h" #include "Util.h"
//------------------------ Orientation::Orientation() {
Orientation::Orientation()
{
right = glm::vec3( 1.0, 0.0, 0.0 ); right = glm::vec3( 1.0, 0.0, 0.0 );
up = glm::vec3( 0.0, 1.0, 0.0 ); up = glm::vec3( 0.0, 1.0, 0.0 );
front = glm::vec3( 0.0, 0.0, 1.0 ); front = glm::vec3( 0.0, 0.0, 1.0 );
} }
//-------------------------------
void Orientation::setToIdentity() void Orientation::setToIdentity() {
{
right = glm::vec3( 1.0, 0.0, 0.0 ); right = glm::vec3( 1.0, 0.0, 0.0 );
up = glm::vec3( 0.0, 1.0, 0.0 ); up = glm::vec3( 0.0, 1.0, 0.0 );
front = glm::vec3( 0.0, 0.0, 1.0 ); front = glm::vec3( 0.0, 0.0, 1.0 );
} }
//------------------------------------
void Orientation::set( Orientation o ) void Orientation::set( Orientation o ) {
{
right = o.getRight(); right = o.getRight();
up = o.getUp(); up = o.getUp();
front = o.getFront(); front = o.getFront();
} }
//---------------------------------------
void Orientation::yaw( float angle ) void Orientation::yaw( float angle ) {
{
float r = angle * PI_OVER_180; float r = angle * PI_OVER_180;
float s = sin( r ); float s = sin( r );
float c = cos( r ); float c = cos( r );
@ -41,9 +36,8 @@ void Orientation::yaw( float angle )
right = cosineRight - sineFront; right = cosineRight - sineFront;
} }
//---------------------------------------
void Orientation::pitch( float angle ) void Orientation::pitch( float angle ) {
{
float r = angle * PI_OVER_180; float r = angle * PI_OVER_180;
float s = sin( r ); float s = sin( r );
float c = cos( r ); float c = cos( r );
@ -57,9 +51,8 @@ void Orientation::pitch( float angle )
front = cosineFront - sineUp; front = cosineFront - sineUp;
} }
//---------------------------------------
void Orientation::roll( float angle ) void Orientation::roll( float angle ) {
{
double r = angle * PI_OVER_180; double r = angle * PI_OVER_180;
double s = sin( r ); double s = sin( r );
double c = cos( r ); double c = cos( r );
@ -73,9 +66,8 @@ void Orientation::roll( float angle )
right = cosineRight - sineUp; right = cosineRight - sineUp;
} }
//---------------------------------------------------------------------------------------------
void Orientation::setRightUpFront( const glm::vec3 &r, const glm::vec3 &u, const glm::vec3 &f ) void Orientation::setRightUpFront( const glm::vec3 &r, const glm::vec3 &u, const glm::vec3 &f ) {
{
right = r; right = r;
up = u; up = u;
front = f; front = f;