From bf24422d15a518c2af775d8e62765a16ab1686a9 Mon Sep 17 00:00:00 2001
From: fctom1215 <fctom1215@outlook.com>
Date: 星期二, 28 七月 2020 20:23:56 +0800
Subject: [PATCH] 坐标
---
lib/src/main/cpp/test_items2/drive_straight.cpp | 2 +-
lib/src/main/cpp/test_items2/road_exam.cpp | 9 +++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/lib/src/main/cpp/test_items2/drive_straight.cpp b/lib/src/main/cpp/test_items2/drive_straight.cpp
index 13b489e..817d957 100644
--- a/lib/src/main/cpp/test_items2/drive_straight.cpp
+++ b/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;
diff --git a/lib/src/main/cpp/test_items2/road_exam.cpp b/lib/src/main/cpp/test_items2/road_exam.cpp
index 8d403a5..e28d9af 100644
--- a/lib/src/main/cpp/test_items2/road_exam.cpp
+++ b/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];
}
}
--
Gitblit v1.8.0