Changeset 211 in pacpusframework for trunk/src


Ignore:
Timestamp:
11/06/13 11:38:40 (11 years ago)
Author:
Marek Kurdej
Message:

Geodesie: minor fixes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/PacpusTools/src/geodesie.cpp

    r210 r211  
    413413}
    414414
    415 QMatrix4x4 Geodesy::yprenuToMatrix(QVector3D angle, QVector3D position)
    416 {
    417     float c1 = cos(angle.x());
    418     float c2 = cos(angle.y());
    419     float c3 = cos(angle.z());
    420 
    421     float s1 = sin(angle.x());
    422     float s2 = sin(angle.y());
    423     float s3 = sin(angle.z());
    424 
    425     // Source : https://en.wikipedia.org/wiki/Euler_angles
    426     return QMatrix4x4(c1 * c2, c1 * s2 * s3 - c3 * s1, s1 * s3 + c1 * c3 * s2, position.x(),
    427                       c2 * s1, c1 * c3 + s1 * s2 * s3, c3 * s1 * s2 - c1 * s3, position.y(),
    428                       -s2, c2 * s3, c2 * c3, position.z(),
    429                       0, 0, 0, 1);
    430 }
     415//QMatrix4x4 Geodesy::yprenuToMatrix(QVector3D angle, QVector3D position)
     416//{
     417//    float c1 = cos(angle.x());
     418//    float c2 = cos(angle.y());
     419//    float c3 = cos(angle.z());
     420//
     421//    float s1 = sin(angle.x());
     422//    float s2 = sin(angle.y());
     423//    float s3 = sin(angle.z());
     424//
     425//    // Source : https://en.wikipedia.org/wiki/Euler_angles
     426//    return QMatrix4x4(c1 * c2, c1 * s2 * s3 - c3 * s1, s1 * s3 + c1 * c3 * s2, position.x(),
     427//                      c2 * s1, c1 * c3 + s1 * s2 * s3, c3 * s1 * s2 - c1 * s3, position.y(),
     428//                      -s2, c2 * s3, c2 * c3, position.z(),
     429//                      0, 0, 0, 1);
     430//}
Note: See TracChangeset for help on using the changeset viewer.