@adatechnology/game-urban 0.3.2 → 0.3.4

package/dist/index.global.js

@@ -9210,6 +9210,18 @@ var GameUrban = (() => {
       }
     );
   }
+  var WIPER_SWEEP = 1.5;
+  function tagWiper(params) {
+    var _a;
+    const tag = { arm: params.index, sweep: WIPER_SWEEP, spindle: [params.spindle.x, params.spindle.y, params.spindle.z], axis: [params.normal.x, params.normal.y, params.normal.z] };
+    (_a = params.context).wipers ?? (_a.wipers = []);
+    for (const part of params.parts) params.context.wipers.push({ part, tag });
+  }
+  function markSunroof(pane2, slide) {
+    pane2.name = "sunroof";
+    pane2.userData.sunroof = { slide };
+    return pane2;
+  }
   function installCarsExtra(fx) {
     const kit = fx.kit;
     const THREE = kit.THREE;
@@ -9706,7 +9718,7 @@ var GameUrban = (() => {
           off: 3e-3,
           nv: 4
         });
-        skin(c, Gd, o.refl || REFL, { u0: pu, u1: 1 - pu, yb, yt, off: 6e-3, nv: 4 });
+        const reflector = skin(c, Gd, o.refl || REFL, { u0: pu, u1: 1 - pu, yb, yt, off: 6e-3, nv: 4 });
         (o.proj || []).forEach(function(q) {
           const r = sh(q[0]), y = (r[0] + r[1]) / 2 + (q[1] || 0), s = Gd.at(q[0], y), rad = q[2] || Math.min(0.034, (r[1] - r[0]) * 0.4);
           const cup = onSurf(c.cylinder(rad * 1.35, rad * 1.2, 0.012, LH, 0, 0, 0), s, 8e-3);
@@ -9737,7 +9749,7 @@ var GameUrban = (() => {
         lens.push(ln);
         if (!inner2.length) inner2.push(ln);
         const cs = Gd.at(0.5, (rg[0] + rg[1]) / 2).p;
-        regLight(c, "headlight", o.label || (sd > 0 ? trl("labels.right_headlight") : trl("labels.left_headlight")), inner2, lens, cs);
+        Object.assign(regLight(c, "headlight", o.label || (sd > 0 ? trl("labels.right_headlight") : trl("labels.left_headlight")), inner2, lens, cs), { reflector: [reflector] });
         return Gd;
       };
       K.tail = function(sd, o) {
@@ -10123,12 +10135,18 @@ var GameUrban = (() => {
       (s.wiper === 1 ? [[0.12, 0.66, -0.5]] : [
         [-0.3, 0.42, -0.36],
         [0.2, 0.42, -0.36]
-      ]).forEach(function(q) {
+      ]).forEach(function(q, index) {
         const p0 = new V3(gh.fb, gh.belt, q[0]).addScaledVector(wd, 0.07).addScaledVector(wn, 0.035), p1 = p0.clone().addScaledVector(wd, q[1] * 0.42);
         p1.z += q[2];
-        c.rod(p0, p1, 9e-3, MT.trim);
-        c.cylinder(0.018, 0.018, 0.03, MT.trim, p0.x, p0.y, p0.z);
+        const blade = c.rod(p0, p1, 9e-3, MT.trim);
+        const cap = c.cylinder(0.018, 0.018, 0.03, MT.trim, p0.x, p0.y, p0.z);
+        tagWiper({ context: c, parts: [blade, cap], spindle: p0, normal: wn, index });
       });
+      if (s.sunroof) {
+        const sx = gh.rt + (gh.ft - gh.rt) * 0.62, sl = 0.62, sw = 2 * (halfAt(gh.Wg, T, gh.roof) - 0.24), sy = roofAt(gh, sx), tilt = Math.atan2(roofAt(gh, sx + 0.3) - roofAt(gh, sx - 0.3), 0.6);
+        c.roundBox(sl, 8e-3, sw, 0.01, PLASTIC, sx, sy + 4e-3, 0, { rot: [0, 0, tilt] }).castShadow = false;
+        markSunroof(c.roundBox(sl + 0.03, 0.012, sw + 0.03, 0.01, MT.tint, sx, sy + 0.013, 0, { rot: [0, 0, tilt] }), sl * 0.85);
+      }
       if (s.fin !== false)
         c.sphere(0.1, s.roofCol ? c.paint(s.roofCol) : GLOSS, gh.rt + 0.2, roofAt(gh, gh.rt + 0.2) + 0.045, 0, 1, 0.45, 0.28, {
           tl: PI / 2
@@ -11104,6 +11122,7 @@ var GameUrban = (() => {
       function(c) {
         const hex = "#8c2b2b";
         car(c, {
+          sunroof: fx.hasSunroof("turbo_hatch"),
           W: 1.751,
           col: hex,
           shelf: 0.42,
@@ -11381,6 +11400,7 @@ var GameUrban = (() => {
       function(c) {
         const hex = "#5a5f66";
         car(c, {
+          sunroof: fx.hasSunroof("fastback_sedan"),
           W: 1.799,
           col: hex,
           bottomY: 0.2,
@@ -11675,6 +11695,8 @@ var GameUrban = (() => {
     fx.register(
       {
         key: "classic_six_sedan",
+        // glass headlight lenses, as on cars of its time: they shatter (a modern car's are polycarbonate)
+        headlightLens: "glass",
         group: "cars",
         name: trl("vehicles.classic_six_sedan.name"),
         inspired: trl("vehicles.classic_six_sedan.inspired"),
@@ -13612,8 +13634,10 @@ var GameUrban = (() => {
         c.cylinder(0.36, 0.38, 0.1, plate, -1.3, 3.13, 0);
         c.cylinder(0.3, 0.3, 0.05, MT.steel, -1.3, 3.2, 0);
         c.roundBox(0.2, 0.08, 1.3, 0.03, MT.trim, bx0 - 0.25, 3.13, 0);
-        [-0.45, 0, 0.45].forEach(function(z) {
-          c.roundBox(0.14, 0.08, 0.3, 0.03, MT.amber, bx0 - 0.25, 3.2, z);
+        [-0.45, 0, 0.45].forEach(function(z, i) {
+          const lamp = c.roundBox(0.14, 0.08, 0.3, 0.03, MT.amber, bx0 - 0.25, 3.2, z);
+          lamp.userData.lamp = "beacon";
+          lamp.userData.beaconSide = i % 2;
         });
         c.rod(new V3(-2.5, 3.08, 0.6), new V3(-2.5, 3.6, 0.6), 8e-3, MT.trim);
         c.rod(new V3(-2.8, 3.08, -0.6), new V3(-2.8, 3.4, -0.6), 0.01, MT.trim);
@@ -19130,8 +19154,11 @@ var GameUrban = (() => {
           );
       });
       const wy = gh.belt + 0.06, wx = gh.fb - 0.03;
-      [-0.3, 0.2].forEach(function(z) {
-        c.rod(new V3(wx + 0.02, wy, z + 0.02), new V3(wx - 0.13, wy + 0.13, z - 0.36), 9e-3, MT.trim);
+      [-0.3, 0.2].forEach(function(z, index) {
+        const spindle = new V3(wx + 0.02, wy, z + 0.02);
+        const blade = c.rod(spindle, new V3(wx - 0.13, wy + 0.13, z - 0.36), 9e-3, MT.trim);
+        const along = new V3(gh.ft - gh.fb, gh.roof - gh.belt, 0).normalize();
+        tagWiper({ context: c, parts: [blade], spindle, normal: new V3(along.y, -along.x, 0), index });
       });
       if (s.fin !== false)
         c.sphere(0.1, s.roofCol ? c.paint(s.roofCol) : GLOSS, gh.rt + 0.2, roofAt(gh, gh.rt + 0.2) + 0.045, 0, 1, 0.45, 0.28, {
@@ -20652,6 +20679,10 @@ var GameUrban = (() => {
               }
             }
           });
+          beacon[1].userData.lamp = "beacon";
+          beacon[1].userData.beaconSide = 0;
+          beacon[2].userData.lamp = "beacon";
+          beacon[2].userData.beaconSide = 1;
           c2.meta.top = top + 0.15;
           c2.meta.roof.y = Math.max(c2.meta.roof.y, top + 0.15);
           const fx2 = I.fxB + 0.12, push = [];
@@ -21954,7 +21985,9 @@ var GameUrban = (() => {
           c.roundBox(0.5, 0.018, 6e-3, 2e-3, c.paint("#f2c21a"), -0.7, 0.825, z);
           c.text("PRF", 0.2, 0.08, -0.7, 0.73, z + s * 2e-3, f, { fg: "#1f3f8f", size: 0.85 });
           c.text(trl("texts.federal_highway_police"), 0.3, 0.035, 0.24, 1, s * 0.3, f, { fg: "#f4f2ea", w: 1024, h: 120, size: 0.8 });
-          c.roundBox(0.05, 0.05, 0.04, 0.012, s > 0 ? MT.blue : MT.tail, 0.62, 0.95, s * 0.3, { def: true });
+          const flasher = c.roundBox(0.05, 0.05, 0.04, 0.012, s > 0 ? MT.blue : MT.tail, 0.62, 0.95, s * 0.3, { def: true });
+          flasher.userData.lamp = "beacon";
+          flasher.userData.beaconSide = s > 0 ? 1 : 0;
         });
         c.cylinder(0.04, 0.045, 0.06, MT.trim, 0.66, 0.66, 0.36, "x");
       }
@@ -22207,6 +22240,8 @@ var GameUrban = (() => {
     fx.register(
       {
         key: "beetle",
+        // glass headlight lenses, as on cars of its time: they shatter (a modern car's are polycarbonate)
+        headlightLens: "glass",
         group: "cars",
         name: trl("vehicles.beetle.name"),
         inspired: trl("vehicles.beetle.inspired"),
@@ -28483,18 +28518,19 @@ var GameUrban = (() => {
             c2.roundBox(0.03, 0.12, 1.9, 0.01, rd, m.rear - 8e-3, 1.1, 0);
             const beaconBar = [c2.roundBox(0.3, 0.08, 1.5, 0.03, MT.trim, 0.6, m.top + 0.04, 0)];
             [-0.5, -0.17, 0.17, 0.5].forEach(function(z, i) {
-              beaconBar.push(
-                c2.roundBox(
-                  0.24,
-                  0.1,
-                  0.3,
-                  0.04,
-                  i % 2 ? MT.tail : CM("#f2f2f2", { emissive: new THREE.Color("#ffffff"), emissiveIntensity: 0.6 }),
-                  0.6,
-                  m.top + 0.13,
-                  z
-                )
+              const lamp = c2.roundBox(
+                0.24,
+                0.1,
+                0.3,
+                0.04,
+                i % 2 ? MT.tail : CM("#f2f2f2", { emissive: new THREE.Color("#ffffff"), emissiveIntensity: 0.6 }),
+                0.6,
+                m.top + 0.13,
+                z
               );
+              lamp.userData.lamp = "beacon";
+              lamp.userData.beaconSide = z < 0 ? 0 : 1;
+              beaconBar.push(lamp);
             });
             beaconBar.push(
               c2.roundBox(
@@ -31408,6 +31444,7 @@ var GameUrban = (() => {
       shared,
       t,
       label: (key) => ({ key, label: t("labels." + key) }),
+      hasSunroof: (key) => !!options.sunroofs?.includes(key),
       register(spec, build) {
         if (!groups.has(spec.group) || only && !only.has(spec.key) || skip.has(spec.key)) return;
         kit.register({ ...spec, seedKey: legacyVehicleSeeds[spec.key] }, build);