j.foucher/PS_AI_Agent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: j.foucher:0124de8b53a371de34af51fca9f6a152b207b719
Branches Tags
j.foucher:main
..
compare: j.foucher:fc728454d030201c45963ca903fd2fd47a6270d2
Branches Tags
j.foucher:main

No commits in common. "0124de8b53a371de34af51fca9f6a152b207b719" and "fc728454d030201c45963ca903fd2fd47a6270d2" have entirely different histories.
0124de8b53 ... fc728454d0

2 changed files with 21 additions and 38 deletions
Show Stats Expand all files Collapse all files

24
Unreal/PS_AI_Agent/Plugins/PS_AI_ConvAgent/Source/PS_AI_ConvAgent/Private/PS_AI_ConvAgent_ElevenLabsComponent.cpp
View File

@ -225,7 +225,6 @@ void UPS_AI_ConvAgent_ElevenLabsComponent::StartConversation()
APlayerController* PC = GetWorld()->GetFirstPlayerController();
bNetIsConversing = true;
NetConversatingPlayer = PC;
NetConversatingPawn = PC ? PC->GetPawn() : nullptr;
}
StartConversation_Internal();
}
@ -299,7 +298,6 @@ void UPS_AI_ConvAgent_ElevenLabsComponent::EndConversation()
// Reset replicated state so other players can talk to this NPC.
bNetIsConversing = false;
NetConversatingPlayer = nullptr;
NetConversatingPawn = nullptr;
}
else
{
@ -610,7 +608,6 @@ void UPS_AI_ConvAgent_ElevenLabsComponent::HandleDisconnected(int32 StatusCode,
{
bNetIsConversing = false;
NetConversatingPlayer = nullptr;
NetConversatingPawn = nullptr;
}
OnAgentDisconnected.Broadcast(StatusCode, Reason);
@ -1035,12 +1032,7 @@ void UPS_AI_ConvAgent_ElevenLabsComponent::EnqueueAgentAudio(const TArray<uint8>
else if (bPreBuffering)
{
// Second (or later) audio chunk arrived during pre-buffer period.
// On Authority: this means a genuine second TTS chunk arrived from the
// WebSocket, so we have enough data buffered — start playback immediately.
// On Clients: sub-chunks from network splitting arrive nearly simultaneously,
// which would defeat the pre-buffer. Let the timer in TickComponent handle it.
if (GetOwnerRole() == ROLE_Authority)
{
// We now have both chunks buffered — start playback immediately.
bPreBuffering = false;
if (bDebug)
{
@ -1055,7 +1047,6 @@ void UPS_AI_ConvAgent_ElevenLabsComponent::EnqueueAgentAudio(const TArray<uint8>
{
AudioPlaybackComponent->Play();
}
}
SilentTickCount = 0;
}
else
@ -1204,7 +1195,6 @@ void UPS_AI_ConvAgent_ElevenLabsComponent::GetLifetimeReplicatedProps(
Super::GetLifetimeReplicatedProps(OutLifetimeProps);
DOREPLIFETIME(UPS_AI_ConvAgent_ElevenLabsComponent, bNetIsConversing);
DOREPLIFETIME(UPS_AI_ConvAgent_ElevenLabsComponent, NetConversatingPlayer);
DOREPLIFETIME(UPS_AI_ConvAgent_ElevenLabsComponent, NetConversatingPawn);
DOREPLIFETIME(UPS_AI_ConvAgent_ElevenLabsComponent, CurrentEmotion);
DOREPLIFETIME(UPS_AI_ConvAgent_ElevenLabsComponent, CurrentEmotionIntensity);
}
@ -1220,15 +1210,15 @@ void UPS_AI_ConvAgent_ElevenLabsComponent::OnRep_ConversationState()
// on the local pawn, but remote clients never run that code path.
if (UPS_AI_ConvAgent_PostureComponent* Posture = Owner->FindComponentByClass<UPS_AI_ConvAgent_PostureComponent>())
{
// Use NetConversatingPawn (replicated to ALL clients) instead of
// NetConversatingPlayer->GetPawn() — PlayerControllers are only
// replicated to their owning client (bOnlyRelevantToOwner=true).
if (bNetIsConversing && NetConversatingPawn)
if (bNetIsConversing && NetConversatingPlayer)
{
Posture->TargetActor = NetConversatingPawn;
if (APawn* PlayerPawn = NetConversatingPlayer->GetPawn())
{
Posture->TargetActor = PlayerPawn;
Posture->ResetBodyTarget();
Posture->bEnableBodyTracking = true;
}
}
else
{
Posture->TargetActor = nullptr;
@ -1281,7 +1271,6 @@ void UPS_AI_ConvAgent_ElevenLabsComponent::ServerRequestConversation_Implementat
bNetIsConversing = true;
NetConversatingPlayer = RequestingPlayer;
NetConversatingPawn = RequestingPlayer ? RequestingPlayer->GetPawn() : nullptr;
StartConversation_Internal();
}
@ -1300,7 +1289,6 @@ void UPS_AI_ConvAgent_ElevenLabsComponent::ServerReleaseConversation_Implementat
bNetIsConversing = false;
NetConversatingPlayer = nullptr;
NetConversatingPawn = nullptr;
}
void UPS_AI_ConvAgent_ElevenLabsComponent::ServerSendMicAudio_Implementation(

7
Unreal/PS_AI_Agent/Plugins/PS_AI_ConvAgent/Source/PS_AI_ConvAgent/Public/PS_AI_ConvAgent_ElevenLabsComponent.h
View File

@ -296,15 +296,10 @@ public:
bool bNetIsConversing = false;
/** The player controller currently in conversation with this NPC (null if free).
* Only valid on server and owning client (PlayerControllers are not replicated to other clients). */
* Replicated so each client knows who is speaking (used for posture target, LOD). */
UPROPERTY(ReplicatedUsing = OnRep_ConversationState, BlueprintReadOnly, Category = "PS AI ConvAgent|Network")
TObjectPtr<APlayerController> NetConversatingPlayer = nullptr;
/** The pawn of the conversating player. Replicated to ALL clients (unlike PlayerController).
* Used by remote clients for posture target (head/eye tracking) and LOD distance checks. */
UPROPERTY(ReplicatedUsing = OnRep_ConversationState, BlueprintReadOnly, Category = "PS AI ConvAgent|Network")
TObjectPtr<APawn> NetConversatingPawn = nullptr;
// ── Network LOD ──────────────────────────────────────────────────────────
/** Distance (cm) beyond which remote clients stop receiving agent audio entirely.