aboutsummaryrefslogtreecommitdiff
path: root/dep/g3dlite/source/Line.cpp
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2014-08-22 16:58:23 +0200
committerjackpoz <giacomopoz@gmail.com>2014-08-22 21:00:56 +0200
commit5e8277e923c5545a15bae7c740ab6afaa597a59f (patch)
tree4cf5212c080588a7e868ee60134fc7fff51e400a /dep/g3dlite/source/Line.cpp
parenta63aa858dcb400eafb97eed1f590e34c27d934a4 (diff)
Core/Dependencies: Update G3D to v9.0 r4036
Diffstat (limited to 'dep/g3dlite/source/Line.cpp')
-rw-r--r--dep/g3dlite/source/Line.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/dep/g3dlite/source/Line.cpp b/dep/g3dlite/source/Line.cpp
index 195ae7197f2..2ced4a78bd8 100644
--- a/dep/g3dlite/source/Line.cpp
+++ b/dep/g3dlite/source/Line.cpp
@@ -33,19 +33,19 @@ Vector3 Line::intersection(const Plane& plane) const {
Line::Line(class BinaryInput& b) {
- deserialize(b);
+ deserialize(b);
}
void Line::serialize(class BinaryOutput& b) const {
- _point.serialize(b);
- _direction.serialize(b);
+ _point.serialize(b);
+ _direction.serialize(b);
}
void Line::deserialize(class BinaryInput& b) {
- _point.deserialize(b);
- _direction.deserialize(b);
+ _point.deserialize(b);
+ _direction.deserialize(b);
}
@@ -80,7 +80,7 @@ Vector3 Line::closestPoint(const Line& B, float& minDist) const {
float t1 = R.dot(U2);
- minDist = abs(P21.dot(M)) / sqrt(m2);
+ minDist = (float)abs(P21.dot(M)) / sqrt(m2);
return P1 + t1 * U1;
}