diff --git a/distribution/RELEASE-NOTES.txt b/distribution/RELEASE-NOTES.txt index 654fb0a..6d46063 100644 --- a/distribution/RELEASE-NOTES.txt +++ b/distribution/RELEASE-NOTES.txt @@ -15,10 +15,9 @@ verifies its files locally. No retail game assets, disc images, BIOS, original-g dialogue, manual or installed-disc cache are supplied in these packages. FFmpeg and ffprobe are bundled; no separate installation or PATH configuration is needed. -This update fixes attached weapon geometry being projected through the body skeleton -during close-ups, which could place the sword through Ashley or leave stray geometry. -The audio-stall and shared hit-resource repairs from preview.6 and STR/XA installation -support from preview.5 are retained. +This update restores the intro's separately attached sword prop by removing its +extra standalone resting pose while mounted to another actor. The weapon projection, +audio-stall, shared hit-resource and STR/XA installation repairs are retained. The matching FFmpeg/Xiph source and build instructions are in the adjacent ProjectVagrant-media-sources.zip download. macOS previews are ad-hoc signed and are not notarized. This is preview software; diff --git a/docs/COMPLETION.md b/docs/COMPLETION.md index 62d7439..45d0e20 100644 --- a/docs/COMPLETION.md +++ b/docs/COMPLETION.md @@ -22,6 +22,14 @@ verify each against the current owner before treating that historical list as a ## Confirmed defects and remaining gaps +- **Intro sword prop attachment, repaired.** A static prop retained the standalone resting lift/hip turn + after being attached to another actor's bone. The intro's separate rapier could consequently miss its + intended position in the corpse. Attached static props now take the mounting frame without that extra + resting pose, and are placed after the parent's animation advances. Standalone props and ordinary held + weapons retain their existing poses. The expanded synthetic regression fails on the previous code and + passes after the repair, including restoration of the standalone pose after detachment. The owned-disc + intro was checked on an isolated rendered display, with the sword visible again. + - **Attached weapon geometry during close-ups, repaired.** The close-camera projector walked all skinned meshes in an actor but evaluated their binds through the body's skeleton, including a weapon's separate skeleton. That can place sword geometry through Ashley or leave a stray piece during a camera move. diff --git a/scenes/field/EventActor.cs b/scenes/field/EventActor.cs index 446ead8..5014b58 100644 --- a/scenes/field/EventActor.cs +++ b/scenes/field/EventActor.cs @@ -571,6 +571,13 @@ public void Apply() if (Scene != null && Scene.Actors.ContainsKey(Id)) Scene.SetActorVisible(Id, Visible); else Node.Visible = Visible; if (Parent?.Skeleton is { } skeleton && Parent.SkeletonBone(ParentBone) is >= 0 and var held) { + // A static prop's standalone rest pose is for placement in the room. Once attached, its + // first two bones inherit the mounting frame instead of adding the humanoid rest turn/lift. + if (Player?.AssignedAnimation == "rest" && Skeleton is { } own) + { + own.ResetBonePose(0); + if (own.GetBoneCount() > 1) own.ResetBonePose(1); + } var bone = skeleton.GlobalTransform * skeleton.GetBoneGlobalPose(held); Scene?.UpdateCharacterDirection(Id, false, 0); Scene?.SetActorBody(Id, Basis.Identity); diff --git a/scenes/field/FieldView.cs b/scenes/field/FieldView.cs index 566bc5e..7504db7 100644 --- a/scenes/field/FieldView.cs +++ b/scenes/field/FieldView.cs @@ -4219,7 +4219,11 @@ public override void _PhysicsProcess(double delta) // Room faces and characters the camera stands close to are drawn as the GTE and GPU would show them. DropNearFaces(); bool staged = _eventCamera && !Controlled; - foreach (var actor in Actors.Values) actor.ProjectAsRetail(Field.Camera, staged ? EventProjection : Gameplay.Projection, staged ? _eventFar : 4096); + foreach (var actor in Actors.Values) + { + if (actor.Parent != null) actor.Apply(); + actor.ProjectAsRetail(Field.Camera, staged ? EventProjection : Gameplay.Projection, staged ? _eventFar : 4096); + } foreach (var effect in _effects) (effect.Projection, effect.NearLimit) = (staged ? EventProjection : Gameplay.Projection, (staged ? EventProjection : Gameplay.Projection) / 2 * 4096 / (staged ? _eventFar : 4096)); PlaceSky(); // The simple map shows while Ashley is in hand, the HUD is up and nothing pauses the field. diff --git a/tests/ActorProjectionContracts.cs b/tests/ActorProjectionContracts.cs index 52f0be6..fb0df62 100644 --- a/tests/ActorProjectionContracts.cs +++ b/tests/ActorProjectionContracts.cs @@ -60,7 +60,34 @@ public override void _Ready() if(!projected.IsVisibleInTree()) throw new InvalidOperationException("A visible attachment did not return."); root.Free(); root=null; camera.Free();camera=null; } - GD.Print("ACTOR_PROJECTION_CONTRACTS_OK: numeric/named skin binds, body independence, moving and hidden attachments"); + root = new Node3D(); AddChild(root); + var mountingRig = new Node3D(); root.AddChild(mountingRig); + var mountingBones = new Skeleton3D(); mountingRig.AddChild(mountingBones); + mountingBones.AddBone("b0"); mountingBones.SetBoneRest(0,Transform3D.Identity); + var prop = new Node3D(); root.AddChild(prop); + var propBones = new Skeleton3D {Name="PropBones"}; prop.AddChild(propBones); + propBones.AddBone("b0"); propBones.AddBone("b1"); propBones.SetBoneParent(1,0); + propBones.SetBoneRest(0,Transform3D.Identity); propBones.SetBoneRest(1,Transform3D.Identity); + var player = new AnimationPlayer(); prop.AddChild(player); + var rest = new Animation {Length=1}; + int track=rest.AddTrack(Animation.TrackType.Position3D); rest.TrackSetPath(track,"PropBones:b0"); + rest.PositionTrackInsertKey(track,0,new Vector3(0,3,0)); + track=rest.AddTrack(Animation.TrackType.Rotation3D); rest.TrackSetPath(track,"PropBones:b1"); + rest.RotationTrackInsertKey(track,0,new Quaternion(Vector3.Right,Mathf.Pi/2)); + var library=new AnimationLibrary(); library.AddAnimation("rest",rest); player.AddAnimationLibrary("",library); + player.Play("rest"); player.Advance(0); + var standalone = new EventActor("prop",0,prop); + standalone.Apply(); + if(propBones.GetBonePosePosition(0).Y!=3) throw new InvalidOperationException("Standalone prop lost its resting pose."); + standalone.Parent=new EventActor("mount",0,mountingRig); standalone.ParentBone=0; + standalone.Apply(); + if(!propBones.GetBonePose(0).IsEqualApprox(Transform3D.Identity) + || !propBones.GetBonePose(1).IsEqualApprox(Transform3D.Identity)) + throw new InvalidOperationException("Attached prop added its standalone lift/turn to the mounting frame."); + standalone.Parent=null; player.Advance(0); + if(propBones.GetBonePosePosition(0).Y!=3) throw new InvalidOperationException("Detaching a prop did not restore its standalone pose."); + root.Free(); root=null; + GD.Print("ACTOR_PROJECTION_CONTRACTS_OK: numeric/named skin binds, body independence, moving and hidden attachments, static prop attachment pose"); GetTree().Quit(); } catch(Exception error){root?.Free();camera?.Free();GD.PrintErr("ACTOR_PROJECTION_CONTRACTS_FAILED: "+error);GetTree().Quit(1);}