CTurt/dsgmLib
1
Fork 0
mirror of https://github.com/CTurt/dsgmLib.git synced 2025-06-19 07:05:37 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

doubles are actually needed

Browse Source
This commit is contained in:
CTurt 2015-02-03 18:30:46 +00:00
parent 27e4aebf4d
commit 4877ed1162
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/DSGM_misc.h
View File

@ -19,4 +19,4 @@ void DSGM_Delay(unsigned int time);
size_t DSGM_GetWordLength(char *text);
bool DSGM_Intersection(int Ax, int Ay, int Bx, int By, int Cx, int Cy, int Dx, int Dy);
bool DSGM_Intersection(double Ax, double Ay, double Bx, double By, double Cx, double Cy, double Dx, double Dy);

8
source/DSGM_misc.c
View File

@ -126,8 +126,8 @@ unsigned int DSGM_GetWordLength(char *text) {
}
// Taken from: http://alienryderflex.com/intersect/
bool DSGM_Intersection(int Ax, int Ay, int Bx, int By, int Cx, int Cy, int Dx, int Dy) {
int distAB, theCos, theSin, newX, ABpos;
bool DSGM_Intersection(double Ax, double Ay, double Bx, double By, double Cx, double Cy, double Dx, double Dy) {
double distAB, theCos, theSin, newX, ABpos;
// Fail if either line segment is zero-length
if((Ax == Bx && Ay == By) || (Cx == Dx && Cy == Dy)) return false;
@ -152,13 +152,13 @@ bool DSGM_Intersection(int Ax, int Ay, int Bx, int By, int Cx, int Cy, int Dx, i
Dy = Dy * theCos - Dx * theSin; Dx = newX;
// Fail if segment C-D doesn't cross line A-B
if((Cy < 0 && Dy < 0) || (Cy >= 0 && Dy >= 0)) return false;
if((Cy < 0. && Dy < 0.) || (Cy >= 0. && Dy >= 0.)) return false;
// Discover the position of the intersection point along line A-B
ABpos = Dx + (Cx - Dx) * Dy / (Dy - Cy);
// Fail if segment C-D crosses line A-B outside of segment A-B
if(ABpos < 0 || ABpos > distAB) return false;
if(ABpos < 0. || ABpos > distAB) return false;
// Apply the discovered position to line A-B in the original coordinate system
// *X = Ax + ABpos * theCos;