Implement source-backed Scooter vehicle in tutorial and outside
This commit is contained in:
1 parent
8df5e81070
commit
62c07a3d59
44 files changed
+3135
-174
No files matched your search
@@ -0,0 +1,155 @@
|
||||
using System.Numerics;
|
||||
using System.Text.Json;
|
||||
using GamePort.Assets;
|
||||
using GamePort.Game;
|
||||
using GamePort.Application;
|
||||
|
||||
var tests=new(string,Action)[]{("copied-original drive/input/facing/terrain observations",Original),
|
||||
("selection summons at Goddard, strict contact mounts",Mount),
|
||||
("outside normal tile drives, steers, brakes and jumps",Outside),
|
||||
("actual wheel supports and source offsets",Wheels),
|
||||
("front-door impact owns throttle for four seconds then recovers",Wall),
|
||||
("unmount raises40, restores Goddard and stops engine",Release),
|
||||
("camera uses new-eye aim, distance gains and sphere delegate",Camera),
|
||||
("cutscene/noclip/reset release control and sound",Lifecycle),
|
||||
("actual tutorial RETURN accepts the passenger and cleans vehicle",Return),
|
||||
("original vehicle/wheel/rider geometry stays unit scale",Visuals),
|
||||
("outside companion follows, freezes while summoned, and returns near Jimmy",Companion),
|
||||
};
|
||||
foreach(var(name,test)in tests){test();Console.WriteLine("PASS "+name);}Console.WriteLine($"Scooter integration: {tests.Length} groups passed.");
|
||||
static void Original()
|
||||
{
|
||||
using var doc=JsonDocument.Parse(File.ReadAllText(Path.Combine(AppContext.BaseDirectory,"original-motion-reference.json")));
|
||||
int count=0;
|
||||
foreach(var c in doc.RootElement.GetProperty("cases").EnumerateArray())
|
||||
{
|
||||
var p=c.GetProperty("input").EnumerateArray().Select(v=>v.GetSingle()).ToArray();
|
||||
var o=c.GetProperty("observed").EnumerateArray().Select(v=>v.GetSingle()).ToArray();var name=c.GetProperty("name").GetString()!;
|
||||
switch(c.GetProperty("kind").GetString())
|
||||
{
|
||||
case "DRIVE":
|
||||
var d=ScooterMotion.Apply(new(p[0],p[6],Reverse:p[12]!=0,Braking:p[11]!=0,Throttle:p[10]!=0,BrakeTime:p[13]),new(p[1],p[2],p[3]),new(p[4],p[5],0),p[9]!=0,(int)p[7],(int)p[8],p[14],.8f);
|
||||
Near(d.Steering.Speed,o[0],name+" scalar");NearV(d.Velocity,new(o[1],o[2],o[3]),name+" velocity");
|
||||
Near(d.Rotation.Y,o[4],name+" yaw");Near(d.Steering.YawRate,o[5],name+" rate");Near(d.Steering.Blend,o[6],name+" blend");Near(d.Steering.BrakeTime,o[7],name+" timer");break;
|
||||
case "INPUT":
|
||||
var s=ScooterMotion.Input(new(p[0],p[1],p[2]!=0,p[3]!=0,p[4]!=0),new(p[5]!=0,p[6]!=0,p[7]!=0,p[8]!=0,false),(int)p[9],p[10]);
|
||||
Near(s.Speed,o[0],name);Near(s.Angle,o[1],name);Check(s.KeyboardTurn==(o[2]!=0)&&s.Reverse==(o[3]!=0)&&s.Braking==(o[4]!=0)&&s.Throttle==(o[5]!=0),name+" flags");break;
|
||||
case "NORMAL":
|
||||
var normal=ScooterWheels.TerrainTarget(new(p[0],p[1],p[2]),p[3]);Near(normal.X,o[0],name+" pitch");Near(normal.Z,o[2],name+" roll");break;
|
||||
case "FACE":NearV(ScooterWheels.Face(new(p[0],p[1],p[2]),new(p[3],p[4],p[5]),p[6],p[7]),new(o[0],o[1],o[2]),name);break;
|
||||
case "WALL":
|
||||
var contact=ScooterMotion.Contact(p[0],new(p[1],p[2],p[3]),Vector3.Zero,new(p[4],p[5],p[6]),new(3,4,5),p[7]!=0,p[8]!=0,p[9]);
|
||||
Near(contact.Speed,o[0],name+" speed");NearV(new(p[1],p[2],p[3]),new(o[1],o[2],o[3]),name+" no bounce");
|
||||
NearV(contact.Acceleration,new(o[4],o[5],o[6]),name+" acceleration");Check(contact.Impact==(o[7]!=0),name+" impact");break;
|
||||
case "CRASH":
|
||||
var impact=ScooterMotion.Impact(new(120,100,-60),new(10,20,30),p[0],p[1]);
|
||||
NearV(impact.Velocity,new(o[0],o[1],o[2]),name+" velocity");NearV(impact.AngularVelocity,new(o[3],o[4],o[5]),name+" angular");
|
||||
Near(impact.Time,o[6],name+" timer");Check(impact.Active==(o[7]!=0),name+" expiry");break;
|
||||
}count++;
|
||||
}
|
||||
Check(count==53,"native numeric coverage");Console.WriteLine($"Compared {count} original numeric observations.");
|
||||
}
|
||||
static void Mount(){using var f=new Fixture("VR05");f.Summon();Check(f.S.Spawned&&!f.S.Mounted&&f.P.GadgetMode==4,"summon does not mount");f.Mount();Check(f.S.Mounted&&f.D.AuthoredControlledTag==f.S.Actor.Tag&&f.Binding.InventoryControlled,"contact owns control/menu");}
|
||||
static void Outside()
|
||||
{
|
||||
using var f=new Fixture("LEV1");f.I.Inventory.SetState(0,4,1);
|
||||
var menu=new GadgetScreen(f.I.Inventory,()=>f.P.GadgetMode);
|
||||
Check(menu.Toggle(f.Binding.InventoryControlled),"outside gadget panel opens");
|
||||
menu.Point(GadgetScreen.Positions[4]+new Vector2(50),"LEV1",0);
|
||||
Check(menu.Hovered==4&&menu.Activate("LEV1",0)&&f.S.Spawned&&!menu.Open,"ordinary owned tile summons outside");
|
||||
f.Mount();var root=f.S.Root;
|
||||
for(int i=0;i<100;i++)f.Frame(new(true,false,false,false,false));
|
||||
Check(f.S.Steering.Speed>200&&Vector3.Distance(root,f.S.Root)>100,"outside ordinary driving");
|
||||
float yaw=f.S.Rotation.Y;for(int i=0;i<20;i++)f.Frame(new(true,false,true,false,false));
|
||||
Check(f.S.Rotation.Y!=yaw&&f.S.Steering.Angle>0,"outside steering");
|
||||
float speed=f.S.Steering.Speed;for(int i=0;i<10;i++)f.Frame(new(false,true,false,false,false));
|
||||
Check(f.S.Steering.Speed<speed,"brake");
|
||||
for(int i=0;i<120&&!f.S.Supported;i++)f.Frame(default);
|
||||
if(f.S.Supported){int jumps=f.S.Jumps;f.Frame(new(false,false,false,false,true));Check(f.S.Jumps==jumps+1&&f.S.PendingImpulse.Y==700,"supported jump queues impulse");}
|
||||
Check(f.P.Energy==20,"no invented gadget energy debit");
|
||||
}
|
||||
static void Wheels(){using var f=new Fixture("VR05");f.Summon();for(int i=0;i<100;i++)f.Frame(default);Check(f.S.FrontSupports+f.S.RearSupports>=2,"real support query accepts wheels");Check(ScooterWheels.Offsets.SequenceEqual(new Vector3[]{new(-3,1,73),new(3,1,73),new(-3,1,-30),new(3,1,-30)}),"four exact narrow offsets");}
|
||||
static void Wall()
|
||||
{
|
||||
using var f=new Fixture("LEV1","frontdoor");f.Summon();f.Mount();
|
||||
for(int i=0;i<180&&!f.S.ImpactActive;i++)f.Frame(new(true,false,false,false,false));
|
||||
Check(f.S.Contacts>0&&f.S.ImpactActive&&f.S.Steering.Speed==0,"actual porch wall enters impact");
|
||||
for(int i=0;i<240&&f.S.ImpactActive;i++)f.Frame(default);
|
||||
Check(!f.S.ImpactActive&&f.S.Velocity==Vector3.Zero,"four-second impact recovers");
|
||||
for(int i=0;i<20;i++)f.Frame(new(true,false,false,false,false));
|
||||
Check(f.S.Steering.Speed>0||f.S.ImpactActive,"throttle resumes after expiry");
|
||||
}
|
||||
static void Release()
|
||||
{
|
||||
using var f=new Fixture("VR05");int starts=0,stops=0,pitches=0;f.S.EngineStarted+=()=>starts++;f.S.EngineStopped+=()=>stops++;
|
||||
f.S.EngineSpeedChanged+=_=>pitches++;f.Summon();f.Frame(default);
|
||||
Check(starts==1&&pitches==0,"first engine frame captures base frequency without tuning");
|
||||
f.Mount();var root=f.S.Root;var dog=f.D.FindActor("C3DGODDARD")!;
|
||||
f.I.Inventory.SelectGadget(-1);NearV(f.P.ActorRoot,root+Vector3.UnitY*40,"dismount elevation");
|
||||
Check(!f.S.Spawned&&!f.S.Mounted&&f.D.Controlled&&f.P.Velocity==Vector3.Zero&&dog.Visible&&dog.BodyEnabled,"owners restored");
|
||||
NearV(dog.Position,root,"Goddard returns at scooter root");Check(starts==1&&stops==1&&!f.S.EnginePlaying,"engine cleanup once");
|
||||
}
|
||||
static void Camera()
|
||||
{
|
||||
var c=ScooterCamera.Follow(Vector3.Zero,Vector3.Zero,new(0,50,-300),.1f);
|
||||
NearV(c.DesiredEye,new(-30,50,-200),"defaultlocal");NearV(c.Eye,new(-3,50,-290),"near smoothing");
|
||||
int calls=0;var clipped=ScooterCamera.Follow(Vector3.Zero,Vector3.Zero,new(0,50,-1000),.1f,(a,b)=>{calls++;Check(a==Vector3.Zero,"sphere starts at root");return b*.8f;});
|
||||
Check(calls==1&&clipped.Gain==2.8f,"far gain/clip");var(p,y)=OriginalHeading.Angles(clipped.Look-clipped.Eye);
|
||||
NearV(Vector3.Normalize(clipped.Target-clipped.Eye),RocketOrientation.Rotate(Vector3.UnitZ,new(p*.02197265625f,y*.02197265625f,0)),"new eye heading");
|
||||
var impact=ScooterCamera.Follow(new(100,100,100),Vector3.Zero,new(0,50,-300),.1f,impact:true);
|
||||
NearV(impact.Eye,new(3,50,-288),"impact XZ-only smoothing");Check(impact.Look==new Vector3(100),"impact aims at root");
|
||||
}
|
||||
static void Lifecycle()
|
||||
{
|
||||
using var f=new Fixture("VR05");f.Summon();f.Mount();f.D.ReleasePlayerGadget();Check(!f.S.Spawned&&!f.S.EnginePlaying&&f.P.GadgetMode==-1,"namedJimmy cleanup");
|
||||
f.Summon();f.Mount();f.P.SetNoclip(true);f.Binding.Step(default);Check(!f.S.Spawned&&f.D.Controlled,"noclip releases");
|
||||
f.Binding.ResetVehicle();Check(f.S.BodySteps==0&&!f.S.Spawned,"reset");
|
||||
}
|
||||
static void Return()
|
||||
{
|
||||
using var f=new Fixture("VR05");f.I.SetReturnContext("level1b.gam","STARTEXP");f.Summon();f.Mount();
|
||||
var portal=f.Level.Entities.First(e=>e.Kind=="LOAD"&&e.Text("LevelName")=="RETURN");LevelTransition? request=null;f.I.Transition+=t=>request=t;
|
||||
f.P.ApplyAuthoredTransform(portal.Position,f.P.Yaw);f.I.Update(f.P.ActorRoot,60,f.S.Actor);
|
||||
Check(request is{Returning:true}&&!f.S.Spawned&&f.D.Controlled,"passenger RETURN releases vehicle");
|
||||
}
|
||||
static void Visuals()
|
||||
{
|
||||
using var f=new Fixture("VR05");var visuals=new ScooterVisuals(f.World,"artifacts/extracted");f.Summon();f.Mount();
|
||||
visuals.Update(visuals.Mesh,f.S,.1,f.P.Appearance);var vertices=visuals.Mesh.Vertices.Skip(f.World.Vertices.Length).ToArray();
|
||||
visuals.Update(visuals.Mesh,f.S,.1,f.P.Appearance);Check(vertices.SequenceEqual(visuals.Mesh.Vertices.Skip(f.World.Vertices.Length)),"repeated render does not accumulate transforms");
|
||||
Check(visuals.Mesh.Draws.Count(d=>d.Visible)>f.World.Draws.Count(d=>d.Visible),"body/wheel/rider visible");
|
||||
f.I.Inventory.SelectGadget(-1);visuals.Update(visuals.Mesh,f.S,.1,f.P.Appearance);Check(visuals.Mesh.Draws.Skip(f.World.Draws.Length).All(d=>!d.Visible),"helpers hide");
|
||||
}
|
||||
static void Companion()
|
||||
{
|
||||
using var f=new Fixture("LEV1");var jimmy=f.D.FindActor("JIM1")!;var dog=f.D.FindActor("C3DGODDARD")!;
|
||||
var patrol=new ActorPatrol(dog,f.D.FindActor,(b,dt)=>b with{Position=b.Position+b.Velocity*dt}){FollowPlayer=true};
|
||||
patrol.Step(FixedStepClock.Step);Check(patrol.Velocity.Length()>400,"state4 chooses follow velocity");
|
||||
var before=dog.Position;patrol.Step(FixedStepClock.Step);Check(dog.Position!=before,"prior velocity moves next body phase");
|
||||
f.Summon();before=dog.Position;patrol.Step(FixedStepClock.Step);Check(dog.Position==before,"disabled companion does not drift");
|
||||
f.I.Inventory.SelectGadget(-1);Check(dog.MovementEnabled,"unequip resumes companion");
|
||||
dog.Position=jimmy.Position+new Vector3(3000,0,0);patrol.Step(FixedStepClock.Step);
|
||||
NearV(dog.Position,jimmy.Position+RocketOrientation.Rotate(new(0,0,-800),jimmy.Rotation),"far follow warp");
|
||||
f.D.EnsureCompanion(jimmy.Position,Vector3.Zero);NearV(dog.Position,jimmy.Position,"explicit reset placement updates existing actor");
|
||||
}
|
||||
static void Check(bool ok,string name){if(!ok)throw new Exception(name);}
|
||||
static void Near(float a,float b,string name)=>Check(float.IsFinite(a)&&Math.Abs(a-b)<.02f,$"{name}: {a} != {b}");
|
||||
static void NearV(Vector3 a,Vector3 b,string name)=>Check(Vector3.Distance(a,b)<.04f,$"{name}: {a} != {b}");
|
||||
sealed class Fixture:IDisposable
|
||||
{
|
||||
public GamLevel Level{get;}public Mesh World{get;}public LabSimulation P{get;}public SceneDirector D{get;}public SceneInteractions I{get;}public Scooter S{get;}public PlayerSceneBinding Binding{get;}
|
||||
public Fixture(string code,string? startTag=null)
|
||||
{
|
||||
string name=code=="LEV1"?"level1":"VR05";World=Mesh.LoadSceneJson(AssetPath.Resolve("artifacts/extracted",name+"/scene.json"));Level=GamLevel.Load(AssetPath.Resolve("../Original","gam/"+name+".gam"));
|
||||
var save=OriginalSave.Load("../Original/NewGame.tsk");var tasks=new TaskStates(save.Tasks);var start=Level.FindStart(startTag)!;D=new(Level,tasks,(_,_)=>0);I=new(D,tasks,save);D.Begin(start,false);
|
||||
var ray=OriginalCameraRay.FromRouteScene(World,code);
|
||||
P=new(new(World),new MorphAnimation("artifacts/extracted/animations/jimstop/animation.json").Base,start.Position,start.Rotation.Y,
|
||||
(a,b)=>ray.Trace(a,b),(a,b)=>ray.TraceGeometry(a,b),code=="VR05"?OriginalStaticCollision.FromRouteScene(World,code):null){LevelCode=code};
|
||||
D.SyncActor("JIM1",P.ActorRoot,new(0,P.Yaw,0));D.EnsureCompanion(P.ActorRoot+RocketOrientation.Rotate(new(0,0,-250),new(0,P.Yaw,0)),startTag=="frontdoor"?Vector3.Zero:new(0,P.Yaw,0));
|
||||
S=new(D.AddOwnedActor("C3DJEEP","3JEE",Vector3.Zero),World,code);Binding=new(D,P,I.Inventory,"JIM1",scooter:S);
|
||||
}
|
||||
public void Summon(){I.Inventory.SetState(0,4,1);I.Inventory.SelectGadget(4);}
|
||||
public void Frame(PlayerInput input){Binding.Step(input);D.Step(FixedStepClock.Step);}
|
||||
public void Mount(){for(int i=0;i<120&&!S.Mounted;i++)Frame(new(false,true,false,false,false));if(!S.Mounted)throw new Exception($"Contact mount failed: Jimmy{P.ActorRoot}, Scooter{S.Root}");for(int i=0;i<60;i++)Frame(default);}
|
||||
public void Dispose(){S.Release();Binding.Dispose();}
|
||||
}
|
||||
Reference in new issue
Block a user