swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-09-12 22:45:02 -04:00
Code Issues Projects Releases Wiki Activity

this is a more "clean" conversion to 64 bit than the type-fixups branch, which does borrow some elements from it but has far less find and replace...it is about 98-99% done, notes to follow later

Browse Source
This commit is contained in:
DarthArgus
2017-01-24 03:35:59 +00:00
parent 42b949c3dc
commit 36686348e9
458 changed files with 2282 additions and 2367 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/shared/library/sharedMath/src/shared/IndexedTriangleList.cpp
+4 -4
View File
@@ -354,7 +354,7 @@ bool IndexedTriangleList::collide(Vector const & start, Vector const & end, std:
{
bool found = false;
Vector shortenedEnd(end);
Vector int16_tenedEnd(end);
Vector const direction(end - start);
Vector normal;
@@ -381,13 +381,13 @@ bool IndexedTriangleList::collide(Vector const & start, Vector const & end, std:
plane.set(normal, v0);
//-- See if the end points intersect the plane the polygon lies on, lies within the polygon, and is closer to start than the previous point
if ((plane.findDirectedIntersection(start, shortenedEnd, intersection)) &&
(start.magnitudeBetweenSquared(intersection) < start.magnitudeBetweenSquared(shortenedEnd)) &&
if ((plane.findDirectedIntersection(start, int16_tenedEnd, intersection)) &&
(start.magnitudeBetweenSquared(intersection) < start.magnitudeBetweenSquared(int16_tenedEnd)) &&
(intersection.inPolygon(v0, v1, v2)))
{
found = true;
result = intersection;
shortenedEnd = intersection;
int16_tenedEnd = intersection;
}
}
}
engine/shared/library/sharedMath/src/shared/Quaternion.cpp
+1 -1
View File
@@ -247,7 +247,7 @@ void Quaternion::normalize(void)
*/
const Quaternion Quaternion::slerp(const Quaternion & otherOriginal, float fractionOfOther) const
{
// rls - check ensure interpolation using the shortest path around the "hypersphere."
// rls - check ensure interpolation using the int16_test path around the "hypersphere."
float const dotOriginal = dot(otherOriginal);
Quaternion const otherClosest(dotOriginal < 0.0f ? -otherOriginal : otherOriginal);