| 188,26 → 188,66 |
|---|
| bike = bikes[r]; |
| for(j = 0; j < bike->linePoints.count() - 1; j++) |
| { |
| if(!(bike->linePoints[j].x() == bike->linePoints[j+1].x() && linePoints[i].x() == linePoints[i-1].x()) && !(bike->linePoints[j].y() == bike->linePoints[j+1].y() && linePoints[i].y() == linePoints[i-1].y())) |
| int jx = bike->linePoints[j].x(); |
| int j1x = bike->linePoints[j+1].x(); |
| int jy = bike->linePoints[j].y(); |
| int j1y = bike->linePoints[j+1].y(); |
| int ix = linePoints[i-1].x(); |
| int i1x = linePoints[i].x(); |
| int iy = linePoints[i-1].y(); |
| int i1y = linePoints[i].y(); |
| if(jx > j1x){ |
| jx += 1; |
| j1x -= 1; |
| } |
| else if(j1x > jx){ |
| jx -= 1; |
| j1x += 1; |
| } |
| if(jy > j1y){ |
| jy += 1; |
| j1y -= 1; |
| } |
| else if(j1y > jy){ |
| jy += 1; |
| j1y -= 1; |
| } |
| if(angle == 0){ |
| iy += 1; |
| i1y -= 1; |
| } |
| if(angle == 90){ |
| ix -= 1; |
| i1x += 1; |
| } |
| if(angle == 180){ |
| iy -= 1; |
| i1y += 1; |
| } |
| if(angle == 270){ |
| ix += 1; |
| i1x -= 1; |
| } |
| if(!(jx == j1x && i1x == ix) && !(jy == j1y && i1y == iy)) |
| { |
| |
| // If not parallel |
| if(bike->linePoints[j].x() == bike->linePoints[j+1].x()) |
| if(jx == j1x) |
| { |
| // x equal |
| |
| if(linePoints[i-1].x() > bike->linePoints[j].x() && linePoints[i].x() < bike->linePoints[j].x() || linePoints[i-1].x() < bike->linePoints[j].x() && linePoints[i].x() > bike->linePoints[j].x()) |
| if(ix > jx && i1x < jx || ix < jx && i1x > jx) |
| { |
| if((sign(linePoints[i-1].y() - bike->linePoints[j].y()) != sign(linePoints[i-1].y() - bike->linePoints[j+1].y()))) |
| if((sign(iy - jy) != sign(iy - j1y))) |
| return true; |
| } |
| } |
| if(bike->linePoints[j].y() == bike->linePoints[j+1].y()) |
| if(jy == j1y) |
| { |
| |
| if(linePoints[i-1].y() > bike->linePoints[j].y() && linePoints[i].y() < bike->linePoints[j].y() || linePoints[i-1].y() < bike->linePoints[j].y() && linePoints[i].y() > bike->linePoints[j].y()) |
| if(iy > jy && i1y < jy || iy < jy && i1y > jy) |
| { |
| if((sign(linePoints[i-1].x() - bike->linePoints[j].x()) != sign(linePoints[i-1].x() - bike->linePoints[j+1].x()))) |
| if((sign(ix - jx) != sign(ix - j1x))) |
| return true; |
| } |
| } |
| 289,6 → 329,11 |
|---|
| if(abpool > 0){ |
| velocity += 0.1; |
| abpool -= 0.5; |
| } else { |
| if(velocity < 5) |
| velocity += 0.5; |
| else if(velocity > 5) |
| velocity -= 0.5; |
| } |
| hadGo = true; |
| } |
| 298,6 → 343,12 |
|---|
| velocity -= 0.2; |
| abpool -= 0.5; |
| } |
| else { |
| if(velocity < 5) |
| velocity += 0.5; |
| else if(velocity > 5) |
| velocity -= 0.5; |
| } |
| hadGo = true; |
| } |
| else if (line == "N") |