mirrors/bgfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
Бранимир Караџић 2019-02-04 21:40:03 -08:00
parent 623888fdb4
commit a91b4bb4c8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/29-debugdraw/debugdraw.cpp
View File

@ -844,7 +844,7 @@ public:
Cylinder cylinder = Cylinder cylinder =
{ {
{ -10.0f, 1.0f, 10.0f }, { -10.0f, 1.0f, 10.0f },
{ 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f },
1.0f 1.0f
}; };

4
examples/common/bounds.cpp
View File

@ -1029,7 +1029,7 @@ Vec3 closestPoint(const LineSegment& _line, const Vec3& _point)
const Vec3 axis = sub(_line.end, _line.pos); const Vec3 axis = sub(_line.end, _line.pos);
const float lengthSq = dot(axis, axis); const float lengthSq = dot(axis, axis);
const float tt = clamp(projectToAxis(axis, sub(_point, _line.pos) ) / lengthSq, 0.0f, 1.0f); const float tt = clamp(projectToAxis(axis, sub(_point, _line.pos) ) / lengthSq, 0.0f, 1.0f);
return mad(axis, { tt, tt, tt }, _line.pos); return mad(axis, tt, _line.pos);
} }
Vec3 closestPoint(const Plane& _plane, const Vec3& _point) Vec3 closestPoint(const Plane& _plane, const Vec3& _point)
@ -1065,7 +1065,7 @@ Vec3 closestPoint(const Triangle& _triangle, const Vec3& _point)
const Vec3 pos = closestPoint(plane, _point); const Vec3 pos = closestPoint(plane, _point);
const Vec3 uvw = barycentric(_triangle, pos); const Vec3 uvw = barycentric(_triangle, pos);
return cartesian(_triangle, clamp(uvw, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}) ); return cartesian(_triangle, clamp<Vec3>(uvw, 0.0f, 1.0f) );
} }
bool overlap(const Sphere& _sphere, const Vec3& _pos) bool overlap(const Sphere& _sphere, const Vec3& _pos)