Changeset 3494 for trunk/packages/vizservers
- Timestamp:
- Mar 13, 2013, 10:27:08 AM (12 years ago)
- Location:
- trunk/packages/vizservers/nanovis/vrmath
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/packages/vizservers/nanovis/vrmath/BBox.cpp
r3492 r3494 9 9 10 10 #include <vrmath/BBox.h> 11 #include <vrmath/Matrix4x4 f.h>11 #include <vrmath/Matrix4x4d.h> 12 12 #include <vrmath/Vector3f.h> 13 13 #include <vrmath/Vector4f.h> … … 93 93 } 94 94 95 void BBox::transform(const BBox& box, const Matrix4x4 f& mat)95 void BBox::transform(const BBox& box, const Matrix4x4d& mat) 96 96 { 97 97 float halfSizeX = (box.max.x - box.min.x) * 0.5f; -
trunk/packages/vizservers/nanovis/vrmath/LineSegment.cpp
r3492 r3494 7 7 8 8 #include <vrmath/LineSegment.h> 9 #include <vrmath/Matrix4x4 f.h>9 #include <vrmath/Matrix4x4d.h> 10 10 11 11 using namespace vrmath; … … 16 16 } 17 17 18 void LineSegment::transform(const Matrix4x4 f&mat, const LineSegment &seg)18 void LineSegment::transform(const Matrix4x4d &mat, const LineSegment &seg) 19 19 { 20 20 pos = mat.transform(seg.pos); -
trunk/packages/vizservers/nanovis/vrmath/Plane.cpp
r3492 r3494 7 7 8 8 #include <vrmath/Plane.h> 9 #include <vrmath/Matrix4x4 f.h>9 #include <vrmath/Matrix4x4d.h> 10 10 11 11 using namespace vrmath; 12 12 13 void Plane::transform(Matrix4x4 f& mat)13 void Plane::transform(Matrix4x4d& mat) 14 14 { 15 15 Vector4f v(normal.x, normal.y, normal.z, distance); 16 float* m = mat.get();16 double* m = mat.get(); 17 17 18 18 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 12 12 namespace vrmath { 13 13 14 class Matrix4x4 f;14 class Matrix4x4d; 15 15 16 16 class BBox … … 65 65 * @brief transform a bounding box with an matrix and set the bounding box 66 66 */ 67 void transform(const BBox& box, const Matrix4x4 f& mat);67 void transform(const BBox& box, const Matrix4x4d& mat); 68 68 69 69 /** -
trunk/packages/vizservers/nanovis/vrmath/include/vrmath/LineSegment.h
r3492 r3494 14 14 namespace vrmath { 15 15 16 class Matrix4x4 f;16 class Matrix4x4d; 17 17 18 18 class LineSegment … … 25 25 26 26 /// Transfrom the line segment using mat 27 void transform(const Matrix4x4 f&transMat, const LineSegment &seg);27 void transform(const Matrix4x4d &transMat, const LineSegment &seg); 28 28 29 29 /// The position of the line segment -
trunk/packages/vizservers/nanovis/vrmath/include/vrmath/Plane.h
r3492 r3494 14 14 namespace vrmath { 15 15 16 class Matrix4x4 f;16 class Matrix4x4d; 17 17 18 18 class Plane … … 21 21 bool intersect(const Vector3f& p1, const Vector3f& p2, Vector3f& intersectPoint) const; 22 22 bool intersect(const Vector3f& p1, const Vector3f& p2, Vector4f& intersectPoint) const; 23 void transform(Matrix4x4 f& mat);23 void transform(Matrix4x4d& mat); 24 24 25 25 /// normal vector
Note: See TracChangeset
for help on using the changeset viewer.