From b2391042a6b976f2a2146dde2b442ac28af5fb65 Mon Sep 17 00:00:00 2001 From: masterdraco Date: Fri, 16 Oct 2026 04:41:55 +0200 Subject: [PATCH] =?UTF-8?q?tools:=20headerbay.py=20(sk=C3=A6rebord=20p?= =?UTF-8?q?=C3=A5=20transportvogn=20i=20b=C3=A5s,=20stift-legeme-drejning,?= =?UTF-8?q?=20Connect)=20+=20CR11=20i=20farm102new?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/ad-smooth/farm102new.py | 2 +- tools/ad-smooth/headerbay.py | 101 ++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 tools/ad-smooth/headerbay.py diff --git a/tools/ad-smooth/farm102new.py b/tools/ad-smooth/farm102new.py index 72a7fb4..5d30c88 100644 --- a/tools/ad-smooth/farm102new.py +++ b/tools/ad-smooth/farm102new.py @@ -23,7 +23,7 @@ REAR_GAP = 0.5 MOUNTED_GAP = 0.1 SKIP_FILES = {"cr11GoldEdition.xml", "tiger6S.xml", "fd250GoldEdition.xml", "rrXL9.xml", "FH16tanker.xml", "ctr30_app.xml", "r975i.xml", "bigBagPallet_fertilizer.xml", "silageAdditivePallet.xml"} -MOTOR_FILES = {"vario1000.xml", "series8.xml", "pickup2017.xml", "Special_Edition_Krone_BiggM.xml", "bigM450.xml"} +MOTOR_FILES = {"vario1000.xml", "series8.xml", "pickup2017.xml", "Special_Edition_Krone_BiggM.xml", "bigM450.xml", "cr11GoldEdition.xml"} MOUNTED_FILES = {"SP10MU.xml", "ns3030.xml", "ecoCultivator300.xml", "mega1200L.xml", "ga4731.xml", "alpinHit44.xml"} SIZE_OVERRIDE = {"SP10MU.xml": (6.0, 0.0), "flieglCargos9500.xml": (10.8, 0.9)} # plov: sammenklappet skøn NEW_NAME = {"pickup2017.xml": "Pickup 2017", "series8.xml": "Series 8 TTV", "edk650.xml": "EDK 650", diff --git a/tools/ad-smooth/headerbay.py b/tools/ad-smooth/headerbay.py new file mode 100644 index 0000000..6273357 --- /dev/null +++ b/tools/ad-smooth/headerbay.py @@ -0,0 +1,101 @@ +"""savegame8 16/10: nyt FD250-skærebord (transportvogn) i østkolonnens sidste bås ved Farm 102 + Connect til mejetærskeren. +Skærebordets 6 komponenter drejes som et stift legeme (Giants-rotation R = Rx·Ry·Rz), så trækstangen (komp. 5/6-enden) +peger ud mod gangen; bagerste ende (komp. 3) 1,0 m fra P. Connect = 1,0 + 15,6 m (målt på det parkerede FD250 ved Farm 130). +Højder fra nærmeste AD-vejpunkt (pladsen er hævet). Brug: headerbay.py +""" +import math, re, sys +import xml.etree.ElementTree as ET +sys.path.insert(0, "/var/home/masterdraco/fs25-adsmartpickup/tools/ad-smooth") +from adsmooth import read, write, apply_splits, dist +from PIL import Image + +SG = sys.argv[1].rstrip("/") + "/"; im = Image.open(sys.argv[2]); W = im.size[0]; PX = im.load() +SUF, SLOT = sys.argv[3], int(sys.argv[4]) +NAME = "FD250 Header 2"; GROUP = ".Farm Plot 102 Park"; BACK = 1.0; TO_CONNECT = 15.6 +def ground(x, z): + cx, cz = x + (W - 1) / 2, z + (W - 1) / 2; i0, j0 = int(cx), int(cz); fx, fz = cx - i0, cz - j0 + p = lambda i, j: PX[min(max(i, 0), W - 1), min(max(j, 0), W - 1)] / 65535 * 255 + return p(i0, j0) * (1 - fx) * (1 - fz) + p(i0 + 1, j0) * fx * (1 - fz) + p(i0, j0 + 1) * (1 - fx) * fz + p(i0 + 1, j0 + 1) * fx * fz + +def mat(rx, ry, rz): + a, b, c = (math.radians(t) for t in (rx, ry, rz)) + Rx = [[1, 0, 0], [0, math.cos(a), -math.sin(a)], [0, math.sin(a), math.cos(a)]] + Ry = [[math.cos(b), 0, math.sin(b)], [0, 1, 0], [-math.sin(b), 0, math.cos(b)]] + Rz = [[math.cos(c), -math.sin(c), 0], [math.sin(c), math.cos(c), 0], [0, 0, 1]] + mm = lambda A, B: [[sum(A[i][k] * B[k][j] for k in range(3)) for j in range(3)] for i in range(3)] + return mm(mm(Rx, Ry), Rz), mm +def euler(R): + ry = math.asin(max(-1, min(1, R[0][2]))) + if abs(R[0][2]) < 0.9999999: + rx = math.atan2(-R[1][2], R[2][2]); rz = math.atan2(-R[0][1], R[0][0]) + else: + rx = math.atan2(R[2][1], R[1][1]); rz = 0.0 + return tuple(math.degrees(t) for t in (rx, ry, rz)) +# selvtest: euler(mat(...)) giver samme matrix +for t in ((78.84, 89.27, 101.69), (-22.88, -3.82, 0.71), (120.53, -13.53, 101.36)): + R, _ = mat(*t); R2, _ = mat(*euler(R)); assert max(abs(R[i][j] - R2[i][j]) for i in range(3) for j in range(3)) < 1e-6, t + +doc = read(SG + "AutoDrive_config.xml"); N = doc["N"] +# terrænet ved parkeringspladsen er hævet af spilleren (savegame) — kortets dem.png er 8 m for lavt dér (in-game 16/10): +# højden tages fra nærmeste AD-vejpunkt (bakkesporet), ligesom farm102park.py +def ground(x, z): + return min(N.values(), key=lambda n: (n["x"] - x) ** 2 + (n["z"] - z) ** 2)["y"] +MK_RE = r"\s*([\d.]+)\s*([^<]*)\s*([^<]*)" +mk = {int(m.group(1)): dict(wp=int(float(m.group(2))), name=m.group(3), group=m.group(4)) for m in re.finditer(MK_RE, doc["s"])} +assert re.fullmatch(r"P Ledig \d+", mk[SLOT]["name"]) and mk[SLOT]["group"] == GROUP, mk[SLOT] +assert not any(m["name"] == "P " + NAME for m in mk.values()) +pw = mk[SLOT]["wp"]; P = N[pw] +def bay_axis(p_wp): + cur, prev = p_wp, None + for _ in range(6): + nb = [x for x in set(N[cur]["out"]) | set(N[cur]["inc"]) if x != prev] + if not nb: break + nxt = max(nb, key=lambda x: dist(N[x], P)); prev, cur = cur, nxt + return math.atan2(N[cur]["x"] - P["x"], N[cur]["z"] - P["z"]) +e = bay_axis(pw); ux, uz = math.sin(e), math.cos(e) # retning fra P ud mod gangen + +VT = ET.parse(SG + "vehicles.xml"); VR = VT.getroot() +v = [x for x in VR.iter("vehicle") if x.get("uniqueId", "").endswith(SUF)]; assert len(v) == 1; v = v[0] +cs = v.findall("component"); assert len(cs) == 6 +pos = [[float(t) for t in c.get("position").split()] for c in cs]; rot = [[float(t) for t in c.get("rotation").split()] for c in cs] +# trækstangsretning nu: fra komp. 3 (bagende) mod komp. 6 (trækstang); skal pege ud mod gangen (ux, uz) +bx, bz = pos[5][0] - pos[2][0], pos[5][2] - pos[2][2] +d = math.atan2(ux, uz) - math.atan2(bx, bz) # drejning om Y (vinkel målt som atan2(x, z)) +Ry, mm = mat(0, math.degrees(d), 0) +dealer_ground = min(q[1] for q in pos) - 0.4 # forhandlerens plads: laveste komponent ~0,4 m over jorden +anchor = pos[2]; tx, tz = P["x"] + BACK * ux, P["z"] + BACK * uz +for c, p, r in zip(cs, pos, rot): + rxo, rzo = p[0] - anchor[0], p[2] - anchor[2] + nx = tx + rxo * math.cos(d) + rzo * math.sin(d); nz = tz - rxo * math.sin(d) + rzo * math.cos(d) + off = p[1] - dealer_ground + c.set("position", "%.3f %.3f %.3f" % (nx, ground(nx, nz) + off, nz)) + R, _ = mat(*r); c.set("rotation", "%.2f %.2f %.2f" % euler(mm(Ry, R))) +newp = [[float(t) for t in c.get("position").split()] for c in cs] +print("trækstang efter drejning: (%.2f, %.2f) skal være (%.2f, %.2f)" % ( + (newp[5][0] - newp[2][0]) / 11.9, (newp[5][2] - newp[2][2]) / 11.9, ux, uz)) +ad = v.find("AutoDrive") +if ad is None: + last = list(v)[-1]; ad = ET.SubElement(v, "AutoDrive"); ad.tail = last.tail; last.tail = "\n " +ad.set("parkDestination", str(SLOT)) + +# Connect på bakkesporet BACK + TO_CONNECT fra P +def along_lat(x, z): + dx, dz = x - P["x"], z - P["z"]; return dx * ux + dz * uz, dx * uz - dz * ux +dd = BACK + TO_CONNECT; track = sorted((a, i) for i, n in N.items() for a, l in [along_lat(n["x"], n["z"])] if abs(l) < 0.35 and -0.1 < a < 30) +for (a1, i1), (a2, i2) in zip(track, track[1:]): + if (i2 in N[i1]["out"] or i1 in N[i2]["out"]) and a1 <= dd <= a2: + u, w = min(i1, i2), max(i1, i2); du = round(abs(dd - (a1 if u == i1 else a2)), 3); break +else: + raise SystemExit("fandt ikke sporet %.1f m fra P" % dd) +made = apply_splits(N, {(u, w): {du}}) +write(doc, SG + "AutoDrive_config.xml.new") +raw = open(SG + "AutoDrive_config.xml.new", "rb").read(); bom = raw.startswith(b"\xef\xbb\xbf"); s = raw.decode("utf-8-sig") +s, n = re.subn(r"(\s*[\d.]+\s*)[^<]*()" % SLOT, lambda m: m.group(1) + "P " + NAME + m.group(2), s); assert n == 1 +nxt = max(mk) + 1 +add = (" \r\n %d.000000\r\n Connect P %s\r\n" + " %s\r\n \r\n") % (nxt, made[(u, w, du)], NAME, GROUP, nxt) +i = s.rfind(" "); s = s[:i] + add + s[i:] +open(SG + "AutoDrive_config.xml.new", "wb").write((b"\xef\xbb\xbf" if bom else b"") + s.encode("utf-8")) +body = ET.tostring(VR, encoding="unicode").replace("\r\n", "\n").replace("\n", "\r\n") +open(SG + "vehicles.xml.new", "wb").write(b"\xef\xbb\xbf" + ('\r\n' + body + "\r\n").encode("utf-8")) +print("mm%d -> 'P %s', Connect mm%d %.1f m fra P; skærebord drejet %.0f°; skrevet .new" % (SLOT, NAME, nxt, dd, math.degrees(d)))