Changeset 3494 for trunk/packages


Ignore:
Timestamp:
Mar 13, 2013 10:27:08 AM (11 years ago)
Author:
ldelgass
Message:

Remove last uses of float Matrix4x4 class from vrmath library

Location:
trunk/packages/vizservers/nanovis/vrmath
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/packages/vizservers/nanovis/vrmath/BBox.cpp

    r3492 r3494  
    99
    1010#include <vrmath/BBox.h>
    11 #include <vrmath/Matrix4x4f.h>
     11#include <vrmath/Matrix4x4d.h>
    1212#include <vrmath/Vector3f.h>
    1313#include <vrmath/Vector4f.h>
    … …  
    9393}
    9494
    95 void BBox::transform(const BBox& box, const Matrix4x4f& mat)
     95void BBox::transform(const BBox& box, const Matrix4x4d& mat)
    9696{
    9797    float halfSizeX = (box.max.x - box.min.x) * 0.5f;

  • trunk/packages/vizservers/nanovis/vrmath/LineSegment.cpp

    r3492 r3494  
    77
    88#include <vrmath/LineSegment.h>
    9 #include <vrmath/Matrix4x4f.h>
     9#include <vrmath/Matrix4x4d.h>
    1010
    1111using namespace vrmath;
    … …  
    1616}
    1717
    18 void LineSegment::transform(const Matrix4x4f &mat, const LineSegment &seg)
     18void LineSegment::transform(const Matrix4x4d &mat, const LineSegment &seg)
    1919{
    2020    pos = mat.transform(seg.pos);

  • trunk/packages/vizservers/nanovis/vrmath/Plane.cpp

    r3492 r3494  
    77
    88#include <vrmath/Plane.h>
    9 #include <vrmath/Matrix4x4f.h>
     9#include <vrmath/Matrix4x4d.h>
    1010
    1111using namespace vrmath;
    1212
    13 void Plane::transform(Matrix4x4f& mat)
     13void Plane::transform(Matrix4x4d& mat)
    1414{
    1515    Vector4f v(normal.x, normal.y, normal.z, distance);
    16     float* m = mat.get();
     16    double* m = mat.get();
    1717
    1818    normal.set(m[0]*v.x + m[1]*v.y + m[2]*v.z + m[3]*v.w,

  • trunk/packages/vizservers/nanovis/vrmath/include/vrmath/BBox.h

    r3492 r3494  
    1212namespace vrmath {
    1313
    14 class Matrix4x4f;
     14class Matrix4x4d;
    1515
    1616class BBox
    … …  
    6565     * @brief transform a bounding box with an matrix and set the bounding box
    6666     */
    67     void transform(const BBox& box, const Matrix4x4f& mat);
     67    void transform(const BBox& box, const Matrix4x4d& mat);
    6868
    6969    /**

  • trunk/packages/vizservers/nanovis/vrmath/include/vrmath/LineSegment.h

    r3492 r3494  
    1414namespace vrmath {
    1515
    16 class Matrix4x4f;
     16class Matrix4x4d;
    1717
    1818class LineSegment
    … …  
    2525
    2626    /// Transfrom the line segment using mat
    27     void transform(const Matrix4x4f &transMat, const LineSegment &seg);
     27    void transform(const Matrix4x4d &transMat, const LineSegment &seg);
    2828
    2929    /// The position of the line segment

  • trunk/packages/vizservers/nanovis/vrmath/include/vrmath/Plane.h

    r3492 r3494  
    1414namespace vrmath {
    1515
    16 class Matrix4x4f;
     16class Matrix4x4d;
    1717
    1818class Plane
    … …  
    2121    bool intersect(const Vector3f& p1, const Vector3f& p2, Vector3f& intersectPoint) const;
    2222    bool intersect(const Vector3f& p1, const Vector3f& p2, Vector4f& intersectPoint) const;
    23     void transform(Matrix4x4f& mat);
     23    void transform(Matrix4x4d& mat);
    2424
    2525    /// normal vector
Note: See TracChangeset for help on using the changeset viewer.