FieldDriver derived the shield ellipsoid from its own transform.localScale; ShieldManager derived it independently from the Shield prefab instance's transform, doing the same normalise-and-project by hand against a different object. Add ShieldEnvelope as the one reader of a transform's centre, radii, surface projection, and true outward normal (derived, not authored, per R6 -- no second copy of numbers the physical MeshCollider already owns), and switch both consumers onto it, deleting their hand-rolled projections. Radii read the attached collider mesh's own bounds.extents per axis rather than assuming a flat 0.5 or 1.0: Shield.prefab's Icosphere collider measures (0.0095106, 0.01, 0.01), not a uniform round number, and the cubesphere's collider measures exactly (1,1,1) -- confirmed by a throwaway batchmode probe against the actual mesh assets, not guessed. SurfaceNormal is not normalize(p): a non-uniform ellipsoid's true normal is the gradient of the implicit surface, transformed by rotation and the INVERSE of lossyScale (a normal is a covector). The first implementation used TransformDirection (rotation and forward scale) and the batchmode probe's finite-difference gradient check caught it immediately -- exactly the plausible-looking-wrong-answer failure mode the cut map called out by name. Both original consumers keep normalize(p)-equivalent behaviour via the new SurfaceDirection method, since they only ever wanted a direction. FieldDriver falls back to its pre-cut formulas (logged once) when no ShieldEnvelope is present, since it has no guaranteed carrier yet. ShieldManager does not: every object that carries it gets an envelope in this cut, so a missing one logs an error and degrades to a fixed direction rather than recomputing a second projection. No prefab or scene file is touched here (Q5: the operator rigs prefabs and scenes by hand); ShieldPanelCut2Verify's batchmode probe instead builds synthetic transforms carrying Longinus's and Djinni's actual override values plus the real Icosphere mesh, and proves ProjectToSurface lands exactly on the ellipsoid and SurfaceNormal matches a finite-difference gradient to 1e-3. mutation_tests_shield_panel_cut2.py mutates SurfaceNormal three ways (back to normalize(p), back to TransformDirection, and a flattened 0.5 extents factor) and confirms the probe goes red for each, naming the reason. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
113 lines
4.6 KiB
C#
113 lines
4.6 KiB
C#
using System;
|
|
using System.Collections;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using CultMath;
|
|
using CultMath.UnityBridge;
|
|
using static CultMath.math;
|
|
using UnityEngine;
|
|
|
|
public class ShieldManager : MonoBehaviour
|
|
{
|
|
public Prototype ShieldPrototype;
|
|
public float CollisionHitDuration = 3;
|
|
|
|
public Entity Entity { get; set; }
|
|
|
|
private ShieldEnvelope _envelope;
|
|
private bool _loggedMissingEnvelope;
|
|
|
|
void Awake()
|
|
{
|
|
_envelope = GetComponent<ShieldEnvelope>();
|
|
}
|
|
|
|
private void OnCollisionEnter(Collision other)
|
|
{
|
|
var otherShield = other.collider.GetComponent<ShieldManager>();
|
|
if (!otherShield)
|
|
{
|
|
var gridObject = other.collider.GetComponent<GridObject>();
|
|
if (gridObject)
|
|
{
|
|
var itemPickup = other.collider.GetComponent<ItemPickup>();
|
|
var mine = other.collider.GetComponent<Mine>();
|
|
if (itemPickup)
|
|
{
|
|
if (Entity.CargoBays.Any(c => c.TryStore(itemPickup.Item)))
|
|
{
|
|
// TODO: Pickup notification!
|
|
Destroy(itemPickup.gameObject);
|
|
}
|
|
else
|
|
{
|
|
// TODO: Pickup failed notification!
|
|
var cp = other.GetContact(0);
|
|
gridObject.Velocity += cp.normal * 25;
|
|
Debug.Log("Attempted item pickup, but no space in cargo bay!");
|
|
}
|
|
}
|
|
else if (mine)
|
|
{
|
|
mine.Explode();
|
|
}
|
|
else
|
|
{
|
|
Debug.Log("Shield collision occurred with grid object, but other collider isn't a mine or an item pickup!");
|
|
}
|
|
}
|
|
else
|
|
Debug.Log("Shield collision occurred, but other collider isn't a shield or a grid object!");
|
|
return;
|
|
}
|
|
var contact = other.GetContact(0);
|
|
var normal = normalize(float2(contact.normal.x, contact.normal.z));
|
|
var tangent = normal.Rotate(ItemRotation.CounterClockwise);
|
|
var v1n = dot(normal, Entity.Velocity);
|
|
var v1t = dot(tangent, Entity.Velocity);
|
|
var v2n = dot(normal, otherShield.Entity.Velocity);
|
|
//var v2t = dot(tangent, otherShield.Entity.Velocity);
|
|
|
|
var v1np = PostCollisionVelocity(v1n, Entity.Mass, v2n, otherShield.Entity.Mass);
|
|
Entity.Velocity = tangent * v1t + normal * v1np;
|
|
if(Entity.Shield != null && Entity.Shield.Item.Active.Value) ShowHit(contact.point, CollisionHitDuration);
|
|
}
|
|
|
|
private float PostCollisionVelocity(float v1, float m1, float v2, float m2)
|
|
{
|
|
return (v1 * (m1 - m2) + m2 * v2) / (m1 + m2);
|
|
}
|
|
|
|
public void ShowHit(Vector3 point, float duration)
|
|
{
|
|
var shield = ShieldPrototype.Instantiate<ShieldAnimation>();
|
|
// Cut 2 of docs/shield-panel-cut.md: this used to compute
|
|
// normalize(shield.transform.InverseTransformPoint(point)) itself, duplicating
|
|
// FieldDriver's projection against a different transform (Authority B vs A in the map's
|
|
// §1). shield.transform sits at the same place as this ShieldManager's own transform (the
|
|
// Shield prefab instance's pooled visual is parented under it with an identity local
|
|
// offset), so this ShieldManager's ShieldEnvelope is the same envelope. Direction is a pick
|
|
// of direction, not the true surface normal -- ShieldAnimation.Direction keeps its existing
|
|
// meaning (R6's note that both existing consumers get away with normalize(p) because they
|
|
// want a direction, not a normal).
|
|
// Unlike FieldDriver (a compatibility path is explicit in the map for that consumer),
|
|
// ShieldManager has no legitimate reason to be missing its envelope -- Cut 2 adds
|
|
// ShieldEnvelope to every "Shield" object that carries a ShieldManager. Recomputing the
|
|
// projection here "just in case" would recreate the exact duplicate authority this cut
|
|
// removes, so a missing envelope logs loudly and degrades to a fixed direction instead.
|
|
if (_envelope == null)
|
|
{
|
|
if (!_loggedMissingEnvelope)
|
|
{
|
|
Debug.LogError("ShieldManager has no ShieldEnvelope; the shield hit direction cannot be computed.", this);
|
|
_loggedMissingEnvelope = true;
|
|
}
|
|
shield.Direction = Vector3.forward;
|
|
}
|
|
else
|
|
{
|
|
shield.Direction = _envelope.SurfaceDirection(point);
|
|
}
|
|
shield.Duration = duration;
|
|
}
|
|
}
|