坐标

fctom1215

2020-07-28 bf24422d15a518c2af775d8e62765a16ab1686a9

坐标

 lib/src/main/cpp/test_items2/drive_straight.cpp

@@ -86,7 +86,7 @@
        distanceToStart = 0;
    }

    if (distanceToStart + distanceToStartSum > 150) {
    if (distanceToStart + distanceToStartSum > 105) {
        DEBUG("离开直线行驶区域");
        PlayTTS("直线行驶结束");
        return -1;

 lib/src/main/cpp/test_items2/road_exam.cpp

@@ -1508,7 +1508,7 @@
static trigger_line_t * EntryItem(int index, road_exam_map &RoadMap, const car_model *car, LIST_CAR_MODEL &CarModelList)
{
    for (int i = 0; i < RoadMap.triggerLines.size(); ++i) {
        /*if (RoadMap.triggerLines[i].road == RoadMap.roads[index].id)*/ {
        if (RoadMap.triggerLines[i].road == RoadMap.roads[index].id) {
            Line triggerLine;

            if (RoadMap.triggerLines[i].leftPoints.size() != RoadMap.triggerLines[i].points.size()) {
@@ -1517,12 +1517,17 @@
                for (int j = 0; j < RoadMap.triggerLines[i].points.size(); ++j) {
                    RoadMap.triggerLines[i].leftPoints.push_back(GetSELine(RoadMap.roads[index].leftEdge, RoadMap.triggerLines[i].points[j]));
                }

                for (int j = 0; j < RoadMap.triggerLines[i].points.size(); ++j) {
                    DEBUG("触发线补齐 road %d id %d type %d (%0.4f, %0.4f)-(%0.4f, %0.4f)", RoadMap.roads[index].id, RoadMap.triggerLines[i].id, RoadMap.triggerLines[i].active,
                          RoadMap.triggerLines[i].points[0].X, RoadMap.triggerLines[i].points[0].Y, RoadMap.triggerLines[i].leftPoints[0].X, RoadMap.triggerLines[i].leftPoints[0].Y);
                }
            }

            MakeLine(&triggerLine, &RoadMap.triggerLines[i].points[0], &RoadMap.triggerLines[i].leftPoints[0]);

            if (CrashTheLine(triggerLine, car, CarModelList)) {
                DEBUG("触发项目 %d %s", RoadMap.triggerLines[i].active, RoadMap.triggerLines[i].tts.c_str());
                DEBUG("触发项目 %d %s (%0.4f, %0.4f)-(%0.4f, %0.4f)", RoadMap.triggerLines[i].active, RoadMap.triggerLines[i].tts.c_str(), triggerLine.X1, triggerLine.Y1, triggerLine.X2, triggerLine.Y2);
                return &RoadMap.triggerLines[i];
            }
        }