Fix Rocketship wall damage flash misinterpreted as model scaling
This commit is contained in:
1 parent
b5ef5b8b64
commit
62e908e26d
13 files changed
+255
-21
No files matched your search
@@ -3,6 +3,13 @@
|
|||||||
Compilation, native runtime, original behavior and full feature completion are
|
Compilation, native runtime, original behavior and full feature completion are
|
||||||
separate evidence categories. **The game is not fully reconstructed/playable yet.**
|
separate evidence categories. **The game is not fully reconstructed/playable yet.**
|
||||||
|
|
||||||
|
Rocketship impact follow-up: corrected first-material red-flash RGBA previously
|
||||||
|
misapplied to ship scale.13 managed groups include actual wall contact plus130
|
||||||
|
frames of unchanged geometry, correct ship-only tint, recovery and repeated
|
||||||
|
renders. Source guards independently verify material allocation and DLL diffuse
|
||||||
|
consumption; old numeric probe labels were insufficient semantic evidence.
|
||||||
|
See gameplay/rocketship-impact-render.md for REA and package/runtime checks.
|
||||||
|
|
||||||
VR02 Rocketship (2026-11-03): live aircraft/static support and callbacks, original
|
VR02 Rocketship (2026-11-03): live aircraft/static support and callbacks, original
|
||||||
input/facing/maneuvers/camera, owned rider/Goddard/fire and engine lifecycle.
|
input/facing/maneuvers/camera, owned rider/Goddard/fire and engine lifecycle.
|
||||||
14 flight/12 final integration groups;96 isolated original component observations.
|
14 flight/12 final integration groups;96 isolated original component observations.
|
||||||
|
|||||||
@@ -257,3 +257,10 @@
|
|||||||
invented boost or direct vertical-velocity substitute.96 isolated component
|
invented boost or direct vertical-velocity substitute.96 isolated component
|
||||||
observations support contracts; live SDL/Vulkan replay verifies the port,
|
observations support contracts; live SDL/Vulkan replay verifies the port,
|
||||||
not whole-original or native Windows fidelity. See gameplay/rocketship-live.md.
|
not whole-original or native Windows fidelity. See gameplay/rocketship-live.md.
|
||||||
|
44. **Identify field consumers before assigning render semantics.** Rocketship's
|
||||||
|
four impact writes are first-material diffuse RGBA, not shape scale. The
|
||||||
|
copied suffix probe validated numeric values but its synthetic buffer and
|
||||||
|
historical `scale` label did not establish their meaning. Constructor and
|
||||||
|
actual DLL renderer consumers now guard the contract. Use a ship-only red
|
||||||
|
material flash with unit geometry; regress vertex positions as well as values.
|
||||||
|
See gameplay/rocketship-impact-render.md.
|
||||||
@@ -0,0 +1,98 @@
|
|||||||
|
# Rocketship wall-impact render correction
|
||||||
|
|
||||||
|
2026-11-03, user-reported wall-hit distortion. **Recovered fact: the four
|
||||||
|
impact values are material diffuse RGBA, not geometry scale.** The earlier
|
||||||
|
Rocketship lifecycle report, source-projection naming and supplied friend's
|
||||||
|
`C3DRocketShip.md` called these values scale; that semantic interpretation was
|
||||||
|
wrong. The copied-original numeric observations remain valid.
|
||||||
|
|
||||||
|
## Ownership and source chain
|
||||||
|
|
||||||
|
Authoritative EXE SHA256:
|
||||||
|
`f5281076e1a2492f2d61f87aae3f4544b6d0f535ebe33f9fbb6f78710fe1aea8`.
|
||||||
|
Authoritative OMT2.dll SHA256:
|
||||||
|
`3ec41ead011adf56387a6dbd4580e5b5a9721b5f8020c8a56420f42824354943`.
|
||||||
|
The friend's different DLL is not used. Analysis reads generated copies only.
|
||||||
|
|
||||||
|
1. EXE40DCA0 allocates0x8C bytes;40DCC0 calls IAT48D18C, whose imported name
|
||||||
|
is `OMedia3DMaterial::OMedia3DMaterial()`.40DCCA stores this pointer in
|
||||||
|
`complete+5C0+textureIndex*4`.40DCD1/40DCD4 initialize its blend fields30/34.
|
||||||
|
This is the inherited indexed material array, not an object transform.
|
||||||
|
2. Rocket43E76E loads `game-interface+500`, equal to `complete+5C0`, material0.
|
||||||
|
43E780 adds4C. Stores43E78B,43E795,43E7A4,43E7A7 write offsets4C,50,54,58
|
||||||
|
respectively as `(1,pulse,pulse,1)`. No passenger, Goddard or flame pointer
|
||||||
|
is traversed by these writes.
|
||||||
|
3. DLL exported `OMedia3DMaterial::set_color` at10001320 writes the three RGB
|
||||||
|
components into offsets4C/50/54 (among its other material colors), proving
|
||||||
|
the fields belong to a color. Its name comes from our DLL export table.
|
||||||
|
4. DLL exported `OMediaDXRenderPort::draw_shape` at100374B0 consumes the same
|
||||||
|
material fields.100376A6 passes material+4C to render-port set_material
|
||||||
|
as its diffuse color. The unlit branch1003787C..100378F6 reads+58 first,
|
||||||
|
then+4C,+50,+54, multiplies components by255 and packs ARGB diffuse.
|
||||||
|
Thus offsets4C/50/54 are RGB and58 is alpha. Geometric vertices are not
|
||||||
|
scaled by this code.
|
||||||
|
5. Existing REA40E4A0 independently writes `(1,1,1,alpha)` at these same
|
||||||
|
material offsets while changing blend state. Existing Shrink Ray and
|
||||||
|
Invisible evidence already identified this as opacity rather than scale.
|
||||||
|
|
||||||
|
EXE text raw offsets above are VA−400000; the cited DLL code ranges have raw
|
||||||
|
offsets VA−10000000. Full bytes/hash guards are retained in
|
||||||
|
`artifacts/rocket-impact-render/material-byte-guards.json`:
|
||||||
|
|
||||||
|
| Source range, exclusive end | Raw start | SHA256 |
|
||||||
|
| --- | --- | --- |
|
||||||
|
| EXE43E76E..43E7AA |3E76E|52fb46c6a2271fd06691be976a277a53350aaf6dd2b7083a623ffa797eb8819f|
|
||||||
|
| EXE40DCA0..40DCF6 |DCA0|fd3810ec3db075e35a81025c0ebec5bd0c2504072306dafac78e5a818c817aff|
|
||||||
|
| DLL10001320..1000139B |1320|071ee5efa77f876b08994ddc3750a4b8e6f2581b741f1e4c8202285b12ff6a65|
|
||||||
|
| DLL10037694..100376B3 |37694|d9784e68b81bf68a5ef9df686fc4535675915f21643898bcda0dc1ade43562d5|
|
||||||
|
| DLL10037874..100378FA |37874|32a2fea66ca6438d44061ba85730509d8c7509ac045001688273c65042619ae4|
|
||||||
|
|
||||||
|
## REA evidence and probe interpretation
|
||||||
|
|
||||||
|
New local REA/Ghidra queries of the generated authoritative DLL copy succeeded;
|
||||||
|
complete replies, export bundle and closed snapshot are under
|
||||||
|
`artifacts/rocket-impact-render/rea-material/`:
|
||||||
|
|
||||||
|
- 10001320 set_color: `ev_71e12ebb8e6f6994553fe33606a358b7cd5a0277e50f8190b022e28216ced8ef`.
|
||||||
|
- 10036F70 DX set_material: `ev_991aa57164839ac125a6cfd9ea309896ef8e525037debed8aeb7f413da71c72c`.
|
||||||
|
- 100619C0 pipeline set_material: `ev_50a751ce5c2dae8b884f31c0f4da52b6f792054c9d30b74fa64739c84ffa1a76`.
|
||||||
|
|
||||||
|
Prior40E4A0 evidence:
|
||||||
|
`ev_615030aa60b2346083853c40aa719ebc466e9f393fd870ea9722536a4f64cfac`,
|
||||||
|
`artifacts/invisible/rea-invisible-ipc/01.json`. The DX set_material decompiler
|
||||||
|
loses stack-copy detail; exact draw_shape disassembly supplies the downstream
|
||||||
|
packed-color ordering. This is static shipped-artifact evidence, not observed
|
||||||
|
original gameplay.
|
||||||
|
|
||||||
|
The eight earlier impact-tail probes stubbed the material object and printed
|
||||||
|
the four writes under the misleading output label `scale`. They measured
|
||||||
|
values, timing, strict expiry and impulses; they did not execute a renderer
|
||||||
|
and therefore never established scaling. Preserve the old raw fixture field
|
||||||
|
for provenance, but interpret the observations as color.
|
||||||
|
|
||||||
|
## Implementation implication and verification boundary
|
||||||
|
|
||||||
|
Apply `(1,pulse,pulse,1)` only to the ship's diffuse tint, retain unit geometric
|
||||||
|
scale, and restore white when the source impact interval expires. Keep the
|
||||||
|
existing source pulse and strict timer comparison. The result is a red/white
|
||||||
|
damage flash with opaque alpha, not a squash/stretch animation. Passenger,
|
||||||
|
Goddard and fire transforms/tints remain independent.
|
||||||
|
|
||||||
|
The binary investigation performs no target execution. Primary integrated
|
||||||
|
ImpactColor(Vector4), ship-only vertex RGB/opaque alpha and unit model geometry.
|
||||||
|
Python projections now name the field color; future probes print rgba while
|
||||||
|
retained raw observations keep their old label. Three independent byte spans
|
||||||
|
guard the writer, material constructor and DLL diffuse consumer in regression.
|
||||||
|
|
||||||
|
The13-group managed suite passes. Its new regression drives a real static-wall
|
||||||
|
callback twice, samples all four original resource layers over130 frames, checks
|
||||||
|
every vertex against unit geometry, checks ship-only red tint and verifies
|
||||||
|
re-rendering does not accumulate color. It also verifies expiry and reset restore
|
||||||
|
white.12 lifecycle Python groups pass, including all eight numeric references.
|
||||||
|
Main .NET build passes. The existing1920×1080 ten-phase headless flight replay
|
||||||
|
passes with validation enabled and zero Vulkan errors; that replay has no wall
|
||||||
|
impact and is not a GPU wall-hit comparison. All539 original hashes verify.
|
||||||
|
Logs: artifacts/rocket-impact-render/{managed.log,python-material.log,build.log,
|
||||||
|
replay.log,originals.log}. Package verification is recorded below after rebuild.
|
||||||
|
Full original wall-hit rendering and native Windows comparison remain separate
|
||||||
|
evidence categories.
|
||||||
@@ -47,7 +47,14 @@ Sound197 is ordinary wall hit. All three are PCM in the existing sound bank.
|
|||||||
|
|
||||||
Ordinary wall impact starts duration1 and E84, ED0=false.43E6E8 adds dt and tests
|
Ordinary wall impact starts duration1 and E84, ED0=false.43E6E8 adds dt and tests
|
||||||
the unrounded sum **strictly greater** than duration. Equality still pulses;
|
the unrounded sum **strictly greater** than duration. Equality still pulses;
|
||||||
expiry restores DRIVE/scale1. Shape-only scale is(1,s,s), s=(sin(time*20)+1)/2.
|
expiry restores DRIVE and white material. The first material RGBA is(1,s,s,1),
|
||||||
|
s=(sin(time*20)+1)/2: a red damage flash. The initial port/report misidentified
|
||||||
|
this as shape scaling; corrected after the user's wall-impact bug report.
|
||||||
|
EXE43E76E selects material interface+500;43E78B..43E7A7 writes+4C..58.
|
||||||
|
OurDLL1003787C..100378F6 consumes those fields as ARGB diffuse. See
|
||||||
|
[impact-render proof and regression](rocketship-impact-render.md). Original
|
||||||
|
probe fixture/log retains its historical `scale` field label for provenance;
|
||||||
|
the numeric values are valid but do not establish geometry deformation.
|
||||||
Strong ED0 queuesY−700; EC0 burst separately queues−750, excluded from ordinary
|
Strong ED0 queuesY−700; EC0 burst separately queues−750, excluded from ordinary
|
||||||
VR02. Eight copied-original suffix cases in impact-probe/wine.log verify strict
|
VR02. Eight copied-original suffix cases in impact-probe/wine.log verify strict
|
||||||
expiry/pulse/queued impulses, including a float-store equality whose unrounded
|
expiry/pulse/queued impulses, including a float-store equality whose unrounded
|
||||||
|
|||||||
@@ -22,6 +22,12 @@ component-probe provenance are in [body](rocketship-body.md),
|
|||||||
and the earlier [component report](rocketship-component.md). EXE text file offsets
|
and the earlier [component report](rocketship-component.md). EXE text file offsets
|
||||||
are VA−400000. Original executable/DLL hashes are guarded by the analysis tools.
|
are VA−400000. Original executable/DLL hashes are guarded by the analysis tools.
|
||||||
|
|
||||||
|
Follow-up: [wall-impact material correction](rocketship-impact-render.md) fixes
|
||||||
|
an initial port bug that treated a red damage flash as ship geometry scaling.
|
||||||
|
Impact now changes only first-material RGB; ship/passengers/fire retain unit
|
||||||
|
model scale. The13-group regression includes two actual wall callbacks and
|
||||||
|
per-vertex geometry/color checks over130 frames, including expiry/re-rendering.
|
||||||
|
|
||||||
| Original contract | Current implementation and evidence | Remaining boundary |
|
| Original contract | Current implementation and evidence | Remaining boundary |
|
||||||
| --- | --- | --- |
|
| --- | --- | --- |
|
||||||
| Jimmy-owned reusable3ROC, ID reuse and mount/cleanup | Rocketship binds the sole authoredVR02 actor; PlayerSceneBinding transfers ownership, seeds root/Euler/shared eye, preserves remount motion and stops engine/fire on release | General retained helper registry across levels |
|
| Jimmy-owned reusable3ROC, ID reuse and mount/cleanup | Rocketship binds the sole authoredVR02 actor; PlayerSceneBinding transfers ownership, seeds root/Euler/shared eye, preserves remount motion and stops engine/fire on release | General retained helper registry across levels |
|
||||||
|
|||||||
@@ -1,5 +1,20 @@
|
|||||||
# Progress — 2026-11-03
|
# Progress — 2026-11-03
|
||||||
|
|
||||||
|
## Rocketship wall-impact correction
|
||||||
|
|
||||||
|
User Windows testing exposed wild ship scaling on wall hits. The initial port
|
||||||
|
misread first-material RGBA writes as geometry scale. EXE43E76E selects material
|
||||||
|
interface+500;43E78B..43E7A7 writes(1,pulse,pulse,1), and ourDLL10037874..100378FA
|
||||||
|
consumes+4C/+50/+54/+58 as diffuse RGB/alpha. Rocketship now stores ImpactColor;
|
||||||
|
visuals keep unit geometry and tint only the ship material. Driver/Goddard/fire
|
||||||
|
positions, scale and color are independent. Expiry/reset restore white.
|
||||||
|
13 managed groups pass, including two actual static-wall callbacks and per-vertex
|
||||||
|
geometry/color checks over130 frames with repeated renders/expiry. Copied-original
|
||||||
|
numeric fixtures retain their historical raw `scale` label with corrected meaning;
|
||||||
|
Python projections use color and guard the EXE writer/material constructor/DLL
|
||||||
|
consumer. Main build and targeted source/render checks pass. Details, REA evidence
|
||||||
|
and final package verification: [impact report](gameplay/rocketship-impact-render.md).
|
||||||
|
|
||||||
## Live VR02 Rocketship
|
## Live VR02 Rocketship
|
||||||
|
|
||||||
Implemented owned/reused3ROC flight in VR02: source ceiling/wall/support profile,
|
Implemented owned/reused3ROC flight in VR02: source ceiling/wall/support profile,
|
||||||
|
|||||||
@@ -46,6 +46,10 @@ compile, runtime and original-fidelity verification are separate.
|
|||||||
|
|
||||||
## Immediate continuation
|
## Immediate continuation
|
||||||
|
|
||||||
|
- [x] Correct user-reported Rocketship wall scaling: recover material RGBA
|
||||||
|
consumer, replace geometry deformation with red damage flash, regress actual
|
||||||
|
wall contact/per-vertex geometry/color through repeated impacts and expiry.
|
||||||
|
|
||||||
- [x] Live boundedVR02 Rocketship: source aircraft callbacks/support, owned actor
|
- [x] Live boundedVR02 Rocketship: source aircraft callbacks/support, owned actor
|
||||||
control, fresh/retained input order, maneuvers/camera, exact passenger/fire art,
|
control, fresh/retained input order, maneuvers/camera, exact passenger/fire art,
|
||||||
engine audio, F1, cutscene/force-control/reset/noclip and distinct pickup/LOAD callers.
|
engine audio, F1, cutscene/force-control/reset/noclip and distinct pickup/LOAD callers.
|
||||||
|
|||||||
@@ -35,7 +35,12 @@ public sealed class RocketshipVisuals
|
|||||||
public void Update(Mesh mesh,Rocketship vehicle,double time,PlayerAppearance appearance)
|
public void Update(Mesh mesh,Rocketship vehicle,double time,PlayerAppearance appearance)
|
||||||
{
|
{
|
||||||
var ordinary=RocketOrientation.Model(vehicle.Rotation,vehicle.Root,Vector3.One);
|
var ordinary=RocketOrientation.Model(vehicle.Rotation,vehicle.Root,Vector3.One);
|
||||||
Draw(ship,RocketOrientation.Model(vehicle.Rotation,vehicle.Root,vehicle.ShapeScale),vehicle.Mounted);
|
Draw(ship,ordinary,vehicle.Mounted);
|
||||||
|
//Original material RGBA pulses red on impact; geometry keeps unit scale.
|
||||||
|
var impact=vehicle.ImpactColor;
|
||||||
|
ship.Draw.Opacity=impact.W;
|
||||||
|
for(var i=0;i<ship.Animation.Base.Vertices.Length;i++)
|
||||||
|
mesh.Vertices[ship.Offset+i].Color*=new Vector3(impact.X,impact.Y,impact.Z);
|
||||||
Draw(rider,ordinary,vehicle.Mounted);
|
Draw(rider,ordinary,vehicle.Mounted);
|
||||||
Draw(dog,RocketOrientation.Model(vehicle.Rotation,vehicle.CompanionRoot,Vector3.One),vehicle.Mounted);
|
Draw(dog,RocketOrientation.Model(vehicle.Rotation,vehicle.CompanionRoot,Vector3.One),vehicle.Mounted);
|
||||||
Draw(fire,ordinary,vehicle.Mounted&&vehicle.FireVisible);
|
Draw(fire,ordinary,vehicle.Mounted&&vehicle.FireVisible);
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ public sealed class Rocketship
|
|||||||
public Vector3 CameraTarget { get; private set; }
|
public Vector3 CameraTarget { get; private set; }
|
||||||
public Vector3 CompanionRoot=>Root+RocketOrientation.Rotate(new(0,10,-25),Rotation);
|
public Vector3 CompanionRoot=>Root+RocketOrientation.Rotate(new(0,10,-25),Rotation);
|
||||||
public bool FireVisible { get; private set; }
|
public bool FireVisible { get; private set; }
|
||||||
public Vector3 ShapeScale { get; private set; }=Vector3.One;
|
public Vector4 ImpactColor { get; private set; }=Vector4.One;
|
||||||
public bool ImpactActive { get; private set; }
|
public bool ImpactActive { get; private set; }
|
||||||
public float ImpactTime { get; private set; }
|
public float ImpactTime { get; private set; }
|
||||||
public int Contacts { get; private set; }
|
public int Contacts { get; private set; }
|
||||||
@@ -65,7 +65,7 @@ public sealed class Rocketship
|
|||||||
body=new(Actor.SourceGam!.Position,Vector3.Zero,Vector3.Zero,Vector3.Zero);
|
body=new(Actor.SourceGam!.Position,Vector3.Zero,Vector3.Zero,Vector3.Zero);
|
||||||
Rotation=Actor.SourceGam.Rotation;destination=Rotation;
|
Rotation=Actor.SourceGam.Rotation;destination=Rotation;
|
||||||
Steering=default;Maneuver=default;verticalCommand=previousBank=ImpactTime=0;
|
Steering=default;Maneuver=default;verticalCommand=previousBank=ImpactTime=0;
|
||||||
ShapeScale=Vector3.One;Contacts=BodySteps=FrameSteps=InputSteps=0;
|
ImpactColor=Vector4.One;Contacts=BodySteps=FrameSteps=InputSteps=0;
|
||||||
Actor.BodyEnabled=Actor.Visible=false;
|
Actor.BodyEnabled=Actor.Visible=false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -113,8 +113,9 @@ public sealed class Rocketship
|
|||||||
{
|
{
|
||||||
double time=(double)ImpactTime+seconds;
|
double time=(double)ImpactTime+seconds;
|
||||||
ImpactTime=(float)time;
|
ImpactTime=(float)time;
|
||||||
if(time>1){ImpactActive=false;ShapeScale=Vector3.One;}
|
//43E78B..43E7A7 writes material+4C..58 RGBA, not model scale.
|
||||||
else {float pulse=(float)((Math.Sin(time*20)+1)*.5);ShapeScale=new(1,pulse,pulse);}
|
if(time>1){ImpactActive=false;ImpactColor=Vector4.One;}
|
||||||
|
else {float pulse=(float)((Math.Sin(time*20)+1)*.5);ImpactColor=new(1,pulse,pulse,1);}
|
||||||
}
|
}
|
||||||
SyncActor();
|
SyncActor();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ var tests=new(string,Action)[]{
|
|||||||
("Rocket wall374 does not inherit horizontal reflection",Wall),
|
("Rocket wall374 does not inherit horizontal reflection",Wall),
|
||||||
("actual passenger can activate RETURN while ship owns control",Return),
|
("actual passenger can activate RETURN while ship owns control",Return),
|
||||||
("exact four resource families and additive fire visibility",Visuals),
|
("exact four resource families and additive fire visibility",Visuals),
|
||||||
|
("wall impact pulses material color without deforming any owned geometry",ImpactVisuals),
|
||||||
};
|
};
|
||||||
foreach(var(name,check)in tests){check();Console.WriteLine("PASS "+name);}
|
foreach(var(name,check)in tests){check();Console.WriteLine("PASS "+name);}
|
||||||
Console.WriteLine($"Rocketship integration: {tests.Length} groups passed; bounded static VR02, not original whole-game verification.");
|
Console.WriteLine($"Rocketship integration: {tests.Length} groups passed; bounded static VR02, not original whole-game verification.");
|
||||||
@@ -130,6 +131,56 @@ static void Visuals()
|
|||||||
f.Interactions.Inventory.SelectGadget(-1);visuals.Update(visuals.Mesh,f.Ship,.2,f.Player.Appearance);
|
f.Interactions.Inventory.SelectGadget(-1);visuals.Update(visuals.Mesh,f.Ship,.2,f.Player.Appearance);
|
||||||
Check(visuals.Mesh.Draws.TakeLast(4).All(d=>!d.Visible),"cleanup hides every owned layer");
|
Check(visuals.Mesh.Draws.TakeLast(4).All(d=>!d.Visible),"cleanup hides every owned layer");
|
||||||
}
|
}
|
||||||
|
static void ImpactVisuals()
|
||||||
|
{
|
||||||
|
using var f=new Fixture();
|
||||||
|
var points=new Vector3[]{new(0,-1000,-1000),new(0,1000,-1000),new(0,1000,1000)};
|
||||||
|
var wall=new Mesh(points.Select(p=>new MeshVertex(p,Vector2.Zero,Vector3.One)).ToArray(),[0,1,2])
|
||||||
|
{HasCollisionMaterialIds=true,CollisionPolygons=[new(0,0,-Vector3.UnitX,"wall","wall",0)]};
|
||||||
|
var ship=new Rocketship(f.Ship.Actor,wall,"VR02");
|
||||||
|
var visuals=new RocketshipVisuals(f.World,Path.GetFullPath("artifacts/extracted"));
|
||||||
|
var clips=new[]{"strato","jimdrive","godrocket","firestrato"}
|
||||||
|
.Select(name=>new MorphAnimation($"artifacts/extracted/rocketship/{name}/animation.json")).ToArray();
|
||||||
|
var offsets=new int[4];offsets[0]=f.World.Vertices.Length;
|
||||||
|
for(int i=1;i<4;i++)offsets[i]=offsets[i-1]+clips[i-1].Base.Vertices.Length;
|
||||||
|
var tinted=false;
|
||||||
|
for(int frame=0;frame<130;frame++)
|
||||||
|
{
|
||||||
|
if(frame is 0 or 65)
|
||||||
|
{
|
||||||
|
ship.Mount(new(-51,300,0),new(0,270,0),f.Player.CameraEye);
|
||||||
|
ship.StepInput(new(true,false,false,false,false),FixedStepClock.Step);
|
||||||
|
ship.StepFrame(default,FixedStepClock.Step);
|
||||||
|
ship.StepBody(FixedStepClock.Step);
|
||||||
|
Check(ship.ImpactActive&&ship.Contacts==(frame==0?1:2),"actual wall374 starts each impact");
|
||||||
|
}
|
||||||
|
ship.StepFrame(default,FixedStepClock.Step);
|
||||||
|
double time=frame/60d;
|
||||||
|
visuals.Update(visuals.Mesh,ship,time,f.Player.Appearance);
|
||||||
|
var color=ship.ImpactColor;
|
||||||
|
Check(color.X==1&&color.W==1&&color.Y==color.Z&&color.Y>=0&&color.Y<=1,"red flash RGBA bounds");
|
||||||
|
tinted|=color.Y<.1f;
|
||||||
|
for(int layer=0;layer<4;layer++)
|
||||||
|
{
|
||||||
|
var expected=new MeshVertex[clips[layer].Base.Vertices.Length];
|
||||||
|
var root=layer==2?ship.CompanionRoot:ship.Root;
|
||||||
|
clips[layer].Sample(time,expected,RocketOrientation.Model(ship.Rotation,root,Vector3.One));
|
||||||
|
for(int i=0;i<expected.Length;i++)
|
||||||
|
{
|
||||||
|
var actual=visuals.Mesh.Vertices[offsets[layer]+i];
|
||||||
|
Near(actual.Position,expected[i].Position,$"impact preserves layer{layer} vertex{i}");
|
||||||
|
var tint=layer==0?new Vector3(color.X,color.Y,color.Z):Vector3.One;
|
||||||
|
Near(actual.Color,expected[i].Color*tint,$"material tint only on ship layer{layer} vertex{i}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//A second render without a simulation step must not accumulate tint.
|
||||||
|
var sample=visuals.Mesh.Vertices[offsets[0]];
|
||||||
|
visuals.Update(visuals.Mesh,ship,time,f.Player.Appearance);
|
||||||
|
Near(visuals.Mesh.Vertices[offsets[0]].Color,sample.Color,"render does not multiply prior-frame tint");
|
||||||
|
}
|
||||||
|
Check(tinted&&!ship.ImpactActive&&ship.ImpactColor==Vector4.One,"repeated impacts expire to untinted unit geometry");
|
||||||
|
ship.Reset();Check(ship.ImpactColor==Vector4.One,"reset clears impact color");
|
||||||
|
}
|
||||||
static void Check(bool ok,string message){if(!ok)throw new Exception(message);}
|
static void Check(bool ok,string message){if(!ok)throw new Exception(message);}
|
||||||
static void Near(Vector3 actual,Vector3 expected,string message)=>Check(float.IsFinite(actual.X+actual.Y+actual.Z)&&Vector3.Distance(actual,expected)<.002f,$"{message}: {actual} != {expected}");
|
static void Near(Vector3 actual,Vector3 expected,string message)=>Check(float.IsFinite(actual.X+actual.Y+actual.Z)&&Vector3.Distance(actual,expected)<.002f,$"{message}: {actual} != {expected}");
|
||||||
|
|
||||||
|
|||||||
+1
@@ -4,6 +4,7 @@
|
|||||||
"executable_sha256": "82c610faabee6c1278bfe733f63d67ac5095ad2b8ff30a823d946711d1004098",
|
"executable_sha256": "82c610faabee6c1278bfe733f63d67ac5095ad2b8ff30a823d946711d1004098",
|
||||||
"log_sha256": "8f286bd1c44c6cee8c2138bd3e77f4f89f241beec9b8773f7d361cfba034dcd4",
|
"log_sha256": "8f286bd1c44c6cee8c2138bd3e77f4f89f241beec9b8773f7d361cfba034dcd4",
|
||||||
"scope": "Copied43E6E8..43E7DB impact suffix; synthetic rider/render/queued-impulse; no original game entrypoint",
|
"scope": "Copied43E6E8..43E7DB impact suffix; synthetic rider/render/queued-impulse; no original game entrypoint",
|
||||||
|
"field_interpretation": "Historical observed.scale label preserves raw probe output; these four values are first-material RGBA at +4C/+50/+54/+58, not geometry scale. See docs/gameplay/rocketship-impact-render.md.",
|
||||||
"cases": [
|
"cases": [
|
||||||
{
|
{
|
||||||
"name": "inactive",
|
"name": "inactive",
|
||||||
|
|||||||
@@ -7,10 +7,16 @@ import unittest
|
|||||||
ROOT=Path(__file__).resolve().parents[1]
|
ROOT=Path(__file__).resolve().parents[1]
|
||||||
sys.path.insert(0,str(ROOT/'tools/binary'))
|
sys.path.insert(0,str(ROOT/'tools/binary'))
|
||||||
from rocketship_lifecycle import (ROCKET_ID,collect,engine_input,engine_transition,
|
from rocketship_lifecycle import (ROCKET_ID,collect,engine_input,engine_transition,
|
||||||
impact_tail,resolve_reused)
|
impact_tail,material_color_contract,resolve_reused)
|
||||||
|
|
||||||
|
|
||||||
class RocketLifecycleTests(unittest.TestCase):
|
class RocketLifecycleTests(unittest.TestCase):
|
||||||
|
def test_impact_fields_belong_to_material_rgba_and_renderer_diffuse(self):
|
||||||
|
contract=material_color_contract(ROOT.parent/'Original')
|
||||||
|
self.assertEqual(len(contract['spans']),3)
|
||||||
|
self.assertEqual(contract['fields'],dict(red=0x4c,green=0x50,blue=0x54,alpha=0x58))
|
||||||
|
self.assertFalse(contract['geometry_scale'])
|
||||||
|
|
||||||
def test_eight_copied_original_impact_suffix_cases(self):
|
def test_eight_copied_original_impact_suffix_cases(self):
|
||||||
reference=json.loads((ROOT/'tests/fixtures/rocket-impact-reference.json').read_text())
|
reference=json.loads((ROOT/'tests/fixtures/rocket-impact-reference.json').read_text())
|
||||||
self.assertEqual(len(reference['cases']),8)
|
self.assertEqual(len(reference['cases']),8)
|
||||||
@@ -22,8 +28,9 @@ class RocketLifecycleTests(unittest.TestCase):
|
|||||||
self.assertEqual(actual['select_drive'],bool(observed['drive']))
|
self.assertEqual(actual['select_drive'],bool(observed['drive']))
|
||||||
self.assertAlmostEqual(actual['timer'],observed['timer'],places=5)
|
self.assertAlmostEqual(actual['timer'],observed['timer'],places=5)
|
||||||
self.assertEqual(actual['queued_y'],observed['impulses'][:int(observed['count'])])
|
self.assertEqual(actual['queued_y'],observed['impulses'][:int(observed['count'])])
|
||||||
if actual['scale'] is not None:
|
#Retained probe's historical 'scale' label is material RGBA.
|
||||||
for a,b in zip(actual['scale'],observed['scale'],strict=True):self.assertAlmostEqual(a,b,places=5)
|
if actual['color'] is not None:
|
||||||
|
for a,b in zip(actual['color'],observed['scale'],strict=True):self.assertAlmostEqual(a,b,places=5)
|
||||||
|
|
||||||
def test_source_identity_bindings_and_pointer_bases(self):
|
def test_source_identity_bindings_and_pointer_bases(self):
|
||||||
report=collect(ROOT.parent/'Original')
|
report=collect(ROOT.parent/'Original')
|
||||||
@@ -56,12 +63,12 @@ class RocketLifecycleTests(unittest.TestCase):
|
|||||||
self.assertEqual(engine_transition(2,False,2),dict(stop=False,start=None,mode=2))
|
self.assertEqual(engine_transition(2,False,2),dict(stop=False,start=None,mode=2))
|
||||||
self.assertEqual(engine_transition(0,False,1),dict(stop=False,start=195,mode=1))
|
self.assertEqual(engine_transition(0,False,1),dict(stop=False,start=195,mode=1))
|
||||||
|
|
||||||
def test_exact_duration_remains_active_and_preserves_scale_axes(self):
|
def test_exact_duration_remains_active_and_preserves_red_and_alpha(self):
|
||||||
result=impact_tail(True,.5,1,False,.5)
|
result=impact_tail(True,.5,1,False,.5)
|
||||||
self.assertTrue(result['active'])
|
self.assertTrue(result['active'])
|
||||||
self.assertFalse(result['select_drive'])
|
self.assertFalse(result['select_drive'])
|
||||||
self.assertEqual((result['scale'][0],result['scale'][3]),(1.,1.))
|
self.assertEqual((result['color'][0],result['color'][3]),(1.,1.))
|
||||||
self.assertEqual(result['scale'][1],result['scale'][2])
|
self.assertEqual(result['color'][1],result['color'][2])
|
||||||
self.assertEqual(result['queued_y'],[])
|
self.assertEqual(result['queued_y'],[])
|
||||||
|
|
||||||
def test_expiry_keeps_pre_expiry_impulse_order_then_drive_burst(self):
|
def test_expiry_keeps_pre_expiry_impulse_order_then_drive_burst(self):
|
||||||
@@ -69,12 +76,12 @@ class RocketLifecycleTests(unittest.TestCase):
|
|||||||
self.assertFalse(result['active'])
|
self.assertFalse(result['active'])
|
||||||
self.assertFalse(result['impulse_flag'])
|
self.assertFalse(result['impulse_flag'])
|
||||||
self.assertTrue(result['select_drive'])
|
self.assertTrue(result['select_drive'])
|
||||||
self.assertEqual(result['scale'],(1.,1.,1.,1.))
|
self.assertEqual(result['color'],(1.,1.,1.,1.))
|
||||||
self.assertEqual(result['queued_y'],[-700.,-750.])
|
self.assertEqual(result['queued_y'],[-700.,-750.])
|
||||||
|
|
||||||
def test_inactive_tail_retains_scale_and_timer(self):
|
def test_inactive_tail_retains_color_and_timer(self):
|
||||||
result=impact_tail(False,.75,1,False,.1)
|
result=impact_tail(False,.75,1,False,.1)
|
||||||
self.assertIsNone(result['scale'])
|
self.assertIsNone(result['color'])
|
||||||
self.assertEqual(result['timer'],.75)
|
self.assertEqual(result['timer'],.75)
|
||||||
|
|
||||||
def test_invalid_projection_states_rejected(self):
|
def test_invalid_projection_states_rejected(self):
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ import struct
|
|||||||
|
|
||||||
from checkpoint_script_state import EXE_SHA256, find_case, read_va
|
from checkpoint_script_state import EXE_SHA256, find_case, read_va
|
||||||
from pe_inspect import PE
|
from pe_inspect import PE
|
||||||
|
from shrink_heading import DLL_SHA256
|
||||||
|
|
||||||
ROCKET_ID = 0x33524f43
|
ROCKET_ID = 0x33524f43
|
||||||
BODIES = (
|
BODIES = (
|
||||||
@@ -39,6 +40,30 @@ def f32(value):
|
|||||||
return struct.unpack('<f',struct.pack('<f',value))[0]
|
return struct.unpack('<f',struct.pack('<f',value))[0]
|
||||||
|
|
||||||
|
|
||||||
|
def material_color_contract(original: Path | str):
|
||||||
|
"""Guard the impact writer, material allocation and actual diffuse consumer.
|
||||||
|
|
||||||
|
The four floats are RGBA. Historical probe labels did not identify their
|
||||||
|
meaning; the constructor and DLL renderer establish it independently.
|
||||||
|
"""
|
||||||
|
spans=[]
|
||||||
|
for name,identity,ranges in (
|
||||||
|
('Neutron.exe',EXE_SHA256,(
|
||||||
|
(0x43e76e,0x43e7aa,'52fb46c6a2271fd06691be976a277a53350aaf6dd2b7083a623ffa797eb8819f'),
|
||||||
|
(0x40dca0,0x40dcf6,'fd3810ec3db075e35a81025c0ebec5bd0c2504072306dafac78e5a818c817aff'))),
|
||||||
|
('OMT2.dll',DLL_SHA256,(
|
||||||
|
(0x10037874,0x100378fa,'32a2fea66ca6438d44061ba85730509d8c7509ac045001688273c65042619ae4'),)),
|
||||||
|
):
|
||||||
|
pe=PE(find_case(Path(original),name))
|
||||||
|
if hashlib.sha256(pe.data).hexdigest()!=identity:raise ValueError(f'Unexpected {name} identity')
|
||||||
|
for start,end,expected in ranges:
|
||||||
|
if hashlib.sha256(read_va(pe,start,end-start)).hexdigest()!=expected:
|
||||||
|
raise ValueError(f'Changed material color span at {start:x}')
|
||||||
|
spans.append(dict(image=name,va=hex(start),end_va=hex(end),file_offset=hex(pe.offset(start-pe.base)),sha256=expected))
|
||||||
|
return dict(spans=spans,fields={'red':0x4c,'green':0x50,'blue':0x54,'alpha':0x58},
|
||||||
|
target='first material at Rocketship interface+500',geometry_scale=False)
|
||||||
|
|
||||||
|
|
||||||
def collect(original: Path | str):
|
def collect(original: Path | str):
|
||||||
pe=PE(find_case(Path(original),'Neutron.exe'))
|
pe=PE(find_case(Path(original),'Neutron.exe'))
|
||||||
if hashlib.sha256(pe.data).hexdigest()!=EXE_SHA256:
|
if hashlib.sha256(pe.data).hexdigest()!=EXE_SHA256:
|
||||||
@@ -60,7 +85,7 @@ def collect(original: Path | str):
|
|||||||
if read_va(pe,va,len(text)+1)!=text+b'\0':raise ValueError('Changed animation binding')
|
if read_va(pe,va,len(text)+1)!=text+b'\0':raise ValueError('Changed animation binding')
|
||||||
for va,fmt,value in [(0x495324,'f',20.),(0x492a58,'d',1.),(0x48e5d0,'d',.5)]:
|
for va,fmt,value in [(0x495324,'f',20.),(0x492a58,'d',1.),(0x48e5d0,'d',.5)]:
|
||||||
if struct.unpack('<'+fmt,read_va(pe,va,struct.calcsize(fmt)))[0]!=value:
|
if struct.unpack('<'+fmt,read_va(pe,va,struct.calcsize(fmt)))[0]!=value:
|
||||||
raise ValueError('Changed impact scale constant')
|
raise ValueError('Changed impact color constant')
|
||||||
return dict(sha256=EXE_SHA256,bodies=bodies,virtuals=[dict(table=hex(t),slot=hex(s),target=hex(v)) for t,s,v in tables],
|
return dict(sha256=EXE_SHA256,bodies=bodies,virtuals=[dict(table=hex(t),slot=hex(s),target=hex(v)) for t,s,v in tables],
|
||||||
owned_pointer='Jimmy complete+AB0',rider_pointer='rocket complete+740/interface+680',
|
owned_pointer='Jimmy complete+AB0',rider_pointer='rocket complete+740/interface+680',
|
||||||
reuse_id=ROCKET_ID,reuse_flag='interface+9',retained_flag='interface+11/+139=0',
|
reuse_id=ROCKET_ID,reuse_flag='interface+9',retained_flag='interface+11/+139=0',
|
||||||
@@ -95,7 +120,7 @@ def impact_tail(active,timer,duration,impulse_flag,seconds,drive_burst=False):
|
|||||||
if not all(math.isfinite(v) for v in (timer,duration,seconds)) or timer<0 or duration<0 or not 0<=seconds<1:
|
if not all(math.isfinite(v) for v in (timer,duration,seconds)) or timer<0 or duration<0 or not 0<=seconds<1:
|
||||||
raise ValueError('Unsupported impact input')
|
raise ValueError('Unsupported impact input')
|
||||||
impulses=[]
|
impulses=[]
|
||||||
scale=None
|
color=None
|
||||||
drive=False
|
drive=False
|
||||||
if active:
|
if active:
|
||||||
if impulse_flag:impulses.append(-700.)
|
if impulse_flag:impulses.append(-700.)
|
||||||
@@ -105,13 +130,13 @@ def impact_tail(active,timer,duration,impulse_flag,seconds,drive_burst=False):
|
|||||||
timer=f32(source_time)
|
timer=f32(source_time)
|
||||||
if source_time>duration:
|
if source_time>duration:
|
||||||
active=impulse_flag=False
|
active=impulse_flag=False
|
||||||
scale=(1.,1.,1.,1.)
|
color=(1.,1.,1.,1.)
|
||||||
drive=True
|
drive=True
|
||||||
else:
|
else:
|
||||||
pulse=f32((math.sin(source_time*20.)+1.)*.5)
|
pulse=f32((math.sin(source_time*20.)+1.)*.5)
|
||||||
scale=(1.,pulse,pulse,1.)
|
color=(1.,pulse,pulse,1.)
|
||||||
if drive_burst:impulses.append(-750.)
|
if drive_burst:impulses.append(-750.)
|
||||||
return dict(active=active,timer=timer,impulse_flag=impulse_flag,scale=scale,
|
return dict(active=active,timer=timer,impulse_flag=impulse_flag,color=color,
|
||||||
select_drive=drive,queued_y=impulses)
|
select_drive=drive,queued_y=impulses)
|
||||||
|
|
||||||
|
|
||||||
@@ -165,7 +190,7 @@ static void run(const char*name,int active,float timer,float duration,int strong
|
|||||||
F(g,0xe88)=timer;F(g,0xec4)=duration;g[0xe84]=active;g[0xed0]=strong;g[0xec0]=burst;
|
F(g,0xe88)=timer;F(g,0xec4)=duration;g[0xe84]=active;g[0xed0]=strong;g[0xec0]=burst;
|
||||||
for(int i=0;i<4;i++)F(render,0x4c+i*4)=1.25f;
|
for(int i=0;i<4;i++)F(render,0x4c+i*4)=1.25f;
|
||||||
selected=impulse_count=0;memset(impulses,0,sizeof(impulses));((void(TC*)(void*,float))thunk)(g,dt);
|
selected=impulse_count=0;memset(impulses,0,sizeof(impulses));((void(TC*)(void*,float))thunk)(g,dt);
|
||||||
printf("CASE %s active=%u timer=%.9g strong=%u scale=%.9g,%.9g,%.9g,%.9g drive=%d count=%d impulses=%.9g,%.9g\n",name,g[0xe84],F(g,0xe88),g[0xed0],F(render,0x4c),F(render,0x50),F(render,0x54),F(render,0x58),selected,impulse_count,impulses[0],impulses[1]);
|
printf("CASE %s active=%u timer=%.9g strong=%u rgba=%.9g,%.9g,%.9g,%.9g drive=%d count=%d impulses=%.9g,%.9g\n",name,g[0xe84],F(g,0xe88),g[0xed0],F(render,0x4c),F(render,0x50),F(render,0x54),F(render,0x58),selected,impulse_count,impulses[0],impulses[1]);
|
||||||
}
|
}
|
||||||
int main(void){map_copy();
|
int main(void){map_copy();
|
||||||
run("inactive",0,.75f,1,0,.1f,0);
|
run("inactive",0,.75f,1,0,.1f,0);
|
||||||
|
|||||||
Reference in new issue
Block a user