fix: genkend markmaskinens mark efter genindlæsning med margen og husket waypoint (v1.62.51)
This commit is contained in:
@@ -70,13 +70,42 @@ end
|
||||
|
||||
-- Efter genindlæsning: marken en CP-maskine står på, hvis markens aktuelle trin er maskinens rolle (ellers nil).
|
||||
-- fields = {{id, stage, verts = {{x, z}}}}
|
||||
function ADFieldJobs.resumeField(x, z, role, fields)
|
||||
-- Afstand fra (x, z) til omridsets kant.
|
||||
function ADFieldJobs.distanceToPolygon(x, z, verts)
|
||||
local best, j = math.huge, #verts
|
||||
for i = 1, #verts do
|
||||
local a, b = verts[j], verts[i]
|
||||
local dx, dz = b.x - a.x, b.z - a.z
|
||||
local len2 = dx * dx + dz * dz
|
||||
local t = len2 > 0 and math.max(0, math.min(1, ((x - a.x) * dx + (z - a.z) * dz) / len2)) or 0
|
||||
best = math.min(best, math.sqrt((a.x + t * dx - x) ^ 2 + (a.z + t * dz - z) ^ 2))
|
||||
j = i
|
||||
end
|
||||
return best
|
||||
end
|
||||
|
||||
-- Det skannede omrids er grovt (4-6 hjørner), og en læssevogn på forageren står ofte lige uden for det
|
||||
-- (in-game 6/10: 6230 TTV 3+4 på F7 blev ikke genkendt efter genindlæsning, og F7 fik en 3. læssevogn).
|
||||
-- Derfor: maskinen ELLER dens huskede CP-waypoint (extra) inde på marken, ellers nærmeste mark inden for margen.
|
||||
ADFieldJobs.RESUME_FIELD_MARGIN_M = 40
|
||||
function ADFieldJobs.resumeField(x, z, role, fields, extra)
|
||||
local points = {{x = x, z = z}}
|
||||
for _, p in ipairs(extra or {}) do table.insert(points, p) end
|
||||
local candidates = {}
|
||||
for _, field in ipairs(fields or {}) do
|
||||
if #(field.verts or {}) >= 3 and ADFieldModel.roleFor(field.stage) == role and ADFieldJobs.insidePolygon(x, z, field.verts) then
|
||||
return field.id
|
||||
if #(field.verts or {}) >= 3 and ADFieldModel.roleFor(field.stage) == role then table.insert(candidates, field) end
|
||||
end
|
||||
for _, p in ipairs(points) do
|
||||
for _, field in ipairs(candidates) do
|
||||
if ADFieldJobs.insidePolygon(p.x, p.z, field.verts) then return field.id end
|
||||
end
|
||||
end
|
||||
return nil
|
||||
local best, bestDistance = nil, ADFieldJobs.RESUME_FIELD_MARGIN_M
|
||||
for _, field in ipairs(candidates) do
|
||||
local d = ADFieldJobs.distanceToPolygon(x, z, field.verts)
|
||||
if d <= bestDistance then best, bestDistance = field.id, d end
|
||||
end
|
||||
return best
|
||||
end
|
||||
|
||||
-- Hvor Courseplay skal starte i kurset: "last" (eget kursus + husket waypoint = fortsæt præcis), "nearest"
|
||||
|
||||
@@ -1317,13 +1317,17 @@ function ADFieldWork.resumeAfterLoad(adEnv)
|
||||
if toStart ~= nil then wasWorking = startSet[rig.id] == true end
|
||||
handled[rig.id] = true
|
||||
local fieldId, distance = nil, nil
|
||||
if wasWorking and toStart ~= nil then
|
||||
fieldId = ADFieldJobs.resumeField(rig.x, rig.z, rig.role, fields)
|
||||
elseif wasWorking then
|
||||
fieldId = ADFieldJobs.resumeField(rig.x, rig.z, rig.role, fields)
|
||||
local course = ADCpBridge.getCourse(vehicle)
|
||||
local okWp, wp = pcall(function() return course ~= nil and course:getWaypoint(vehicle:getCpLastRememberedWaypointIx()) or nil end)
|
||||
if okWp and wp ~= nil and wp.x ~= nil then distance = math.sqrt((wp.x - rig.x) ^ 2 + (wp.z - rig.z) ^ 2) end
|
||||
if wasWorking then
|
||||
local extra = {}
|
||||
local okWp, wp = pcall(function()
|
||||
local course = ADCpBridge.getCourse(vehicle)
|
||||
return course ~= nil and course:getWaypoint(vehicle:getCpLastRememberedWaypointIx()) or nil
|
||||
end)
|
||||
if okWp and type(wp) == "table" and wp.x ~= nil then
|
||||
table.insert(extra, {x = wp.x, z = wp.z})
|
||||
distance = math.sqrt((wp.x - rig.x) ^ 2 + (wp.z - rig.z) ^ 2)
|
||||
end
|
||||
fieldId = ADFieldJobs.resumeField(rig.x, rig.z, rig.role, fields, extra)
|
||||
end
|
||||
if wasWorking and toStart == nil and not rig.busy and not rig.controlled and not ADFieldJobs.shouldResume({fieldId = fieldId, distance = distance}) then
|
||||
Logging.info(ADFieldJobs.LOG_PREFIX .. "'%s' genstartes ikke: husket waypoint fra et gammelt job (%s væk, ikke på en mark i gang)",
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
||||
<modDesc descVersion="107">
|
||||
<author>masterdraco</author>
|
||||
<version>1.62.50.0</version>
|
||||
<version>1.62.51.0</version>
|
||||
<title>
|
||||
<en>AD Smart Pickup</en>
|
||||
</title>
|
||||
|
||||
Reference in New Issue
Block a user