diff --git a/Content/Luprex/InputActions/IA_Console.uasset b/Content/Luprex/InputActions/IA_Console.uasset new file mode 100644 index 00000000..23edb80d --- /dev/null +++ b/Content/Luprex/InputActions/IA_Console.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4d88681320a00e6b581e01108f1725e4fcdc75ce246445e8aa9e82a1d04abb0 +size 1359 diff --git a/Content/Luprex/InputActions/IA_DPadD.uasset b/Content/Luprex/InputActions/IA_DPadD.uasset new file mode 100644 index 00000000..de05c2a5 --- /dev/null +++ b/Content/Luprex/InputActions/IA_DPadD.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d56ee34a39d0cfc7f3ff8dc6e0e4fa635aba7d7cf006ad49246822291b53c863 +size 1690 diff --git a/Content/Luprex/InputActions/IA_DPadL.uasset b/Content/Luprex/InputActions/IA_DPadL.uasset new file mode 100644 index 00000000..df85086a --- /dev/null +++ b/Content/Luprex/InputActions/IA_DPadL.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:07728cc78de1c76e96a899a2ca902c53e6882454f56f098395da184f1940a411 +size 1690 diff --git a/Content/Luprex/InputActions/IA_DPadR.uasset b/Content/Luprex/InputActions/IA_DPadR.uasset new file mode 100644 index 00000000..96a8076d --- /dev/null +++ b/Content/Luprex/InputActions/IA_DPadR.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d02a15f4a7880b7917a5fbcf32d65ef6c173c19e98794991d5edc03f5d794f7 +size 1690 diff --git a/Content/Luprex/InputActions/IA_DPadU.uasset b/Content/Luprex/InputActions/IA_DPadU.uasset new file mode 100644 index 00000000..11601e23 --- /dev/null +++ b/Content/Luprex/InputActions/IA_DPadU.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c5daa8c44c4034e4863d67fcfad7c644029bd784466a832a8204d37cacface0 +size 1690 diff --git a/Content/Luprex/InputActions/IA_FaceL.uasset b/Content/Luprex/InputActions/IA_FaceL.uasset new file mode 100644 index 00000000..e5294693 --- /dev/null +++ b/Content/Luprex/InputActions/IA_FaceL.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf507789ac4d81521ffc6170ad56ecb20ad64687703a3d58f1bb8a2ebdeb2c1d +size 1690 diff --git a/Content/Luprex/InputActions/IA_FaceM.uasset b/Content/Luprex/InputActions/IA_FaceM.uasset new file mode 100644 index 00000000..fa38d99b --- /dev/null +++ b/Content/Luprex/InputActions/IA_FaceM.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9e0f6fa163a7b75f59c0f0fcfff0d454974751d1b48328df5d30124a5b5dc18 +size 1690 diff --git a/Content/Luprex/InputActions/IA_FaceR.uasset b/Content/Luprex/InputActions/IA_FaceR.uasset new file mode 100644 index 00000000..74acacd1 --- /dev/null +++ b/Content/Luprex/InputActions/IA_FaceR.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd139dc20c4d0be30a072221cec32ec40eafe2908650e452e8efd805fc6ee063 +size 1690 diff --git a/Content/Luprex/InputActions/IA_Focus_Console.uasset b/Content/Luprex/InputActions/IA_Focus_Console.uasset deleted file mode 100644 index 91ac8e84..00000000 --- a/Content/Luprex/InputActions/IA_Focus_Console.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d265a4201df46d20133de2101d1d7fcc4eab2ae834a4fb859a8ad018f320cf7b -size 1351 diff --git a/Content/Luprex/InputActions/IA_ShoulderL.uasset b/Content/Luprex/InputActions/IA_ShoulderL.uasset new file mode 100644 index 00000000..60c7514e --- /dev/null +++ b/Content/Luprex/InputActions/IA_ShoulderL.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:591bc29ad75d7190a4442d08ed6b137a0207960389c8d3794ef883f5475d5d99 +size 1718 diff --git a/Content/Luprex/InputActions/IA_ShoulderR.uasset b/Content/Luprex/InputActions/IA_ShoulderR.uasset new file mode 100644 index 00000000..e07d8f31 --- /dev/null +++ b/Content/Luprex/InputActions/IA_ShoulderR.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d17150562c3b10712c57e719d4583f1c0671381df0eef015c4715d2681a448f3 +size 1718 diff --git a/Content/Luprex/InputActions/IA_TriggerL.uasset b/Content/Luprex/InputActions/IA_TriggerL.uasset new file mode 100644 index 00000000..a2a20f77 --- /dev/null +++ b/Content/Luprex/InputActions/IA_TriggerL.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:99df075c932102fa8a2b61c1244e412ce1e4144bfe53c72b7f17d0523ab85ad6 +size 1711 diff --git a/Content/Luprex/InputActions/IA_TriggerR.uasset b/Content/Luprex/InputActions/IA_TriggerR.uasset new file mode 100644 index 00000000..98e6b8b6 --- /dev/null +++ b/Content/Luprex/InputActions/IA_TriggerR.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:98dd7483982e99dd2f49a62acfe7de4b141e4cf93f5fadf1517913c2e4c399b3 +size 1711 diff --git a/Content/Luprex/lxDefaultPawn.uasset b/Content/Luprex/lxDefaultPawn.uasset index bbe718bb..06125c56 100644 --- a/Content/Luprex/lxDefaultPawn.uasset +++ b/Content/Luprex/lxDefaultPawn.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:361fad7141c404f9fe23413251302d17054dd8b7e5f2020ab6c54baf3889243d -size 66415 +oid sha256:4ba24af5c0820f0f47921e3efb9952bf6b8b4e46cd101ef88bacaf7c0419c3b8 +size 68498 diff --git a/Content/Luprex/lxMappingContext.uasset b/Content/Luprex/lxMappingContext.uasset index b4e2d669..ba1e4a7d 100644 --- a/Content/Luprex/lxMappingContext.uasset +++ b/Content/Luprex/lxMappingContext.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f350ed6b6b5d406bfc7daab68d32a33c2d708992a50788977aed88ed681a9fe -size 14501 +oid sha256:7584c5d6741626e4aefeb8210a82c9dc0a620bfe982b4d888f0bc49dd059a73a +size 25118 diff --git a/Content/Tangibles/TAN_Character.uasset b/Content/Tangibles/TAN_Character.uasset index 4cad3f19..18f3852a 100644 --- a/Content/Tangibles/TAN_Character.uasset +++ b/Content/Tangibles/TAN_Character.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30e797a1ddbefeca26d9fe9c2fe5e2bc6e528b97aa80f62746b107325fad90e9 -size 372386 +oid sha256:5c45edcfa1ff909cf6e0363a08cf8bb79d3c2cc84b59cfcc71fcea5f011f6c1f +size 372202 diff --git a/Source/Integration/InputEvents.cpp b/Source/Integration/InputEvents.cpp index b7fb9085..481afae0 100644 --- a/Source/Integration/InputEvents.cpp +++ b/Source/Integration/InputEvents.cpp @@ -10,7 +10,7 @@ bool FlxEventRequest::operator==(const FlxEventRequest &Other) const { return (Widget == Other.Widget) && - (TakeControl == Other.TakeControl) && + (UseUIOnly == Other.UseUIOnly) && (ShowPointer == Other.ShowPointer) && (Hotkeys == Other.Hotkeys); } @@ -22,12 +22,12 @@ bool FlxEventRequests::SanityCheck(const FlxEventRequest &Request) UE_LOG(LogLuprexIntegration, Error, TEXT("RequestEvents called with null widget.")); return false; } - if (Request.ShowPointer && !Request.TakeControl) + if (Request.ShowPointer && !Request.UseUIOnly) { - UE_LOG(LogLuprexIntegration, Error, TEXT("RequestEvents: ShowPointer requires TakeControl.")); + UE_LOG(LogLuprexIntegration, Error, TEXT("RequestEvents: ShowPointer requires UseUIOnly.")); return false; } - if (Request.TakeControl && !Request.Hotkeys.IsEmpty()) + if (Request.UseUIOnly && !Request.Hotkeys.IsEmpty()) { UE_LOG(LogLuprexIntegration, Error, TEXT("RequestEvents: Widget asked for all events, and also, specific events")); return false; @@ -38,7 +38,7 @@ bool FlxEventRequests::SanityCheck(const FlxEventRequest &Request) void FlxEventRequests::SplitHighLow(View &High, View &Low) { int32 NumHigh = 0; - while ((NumHigh < Requests.Num()) && (Requests[NumHigh].TakeControl)) NumHigh++; + while ((NumHigh < Requests.Num()) && (Requests[NumHigh].UseUIOnly)) NumHigh++; int32 NumLow = Requests.Num() - NumHigh; High = View(Requests.GetData(), NumHigh); Low = View(Requests.GetData() + NumHigh, NumLow); @@ -52,7 +52,7 @@ void FlxEventRequests::Request(const FlxEventRequest &NewRequest) // This is a simple test to see if anything is going to change. // If not, we return early and avoid setting the dirty bit. - if (NewRequest.TakeControl) + if (NewRequest.UseUIOnly) { if ((High.Num() > 0) && (High[0] == NewRequest)) return; } @@ -65,12 +65,12 @@ void FlxEventRequests::Request(const FlxEventRequest &NewRequest) TArray Updated; // Add all high priority requests to the updated array, new request first. - if (NewRequest.TakeControl) Updated.Add(NewRequest); + if (NewRequest.UseUIOnly) Updated.Add(NewRequest); for (const FlxEventRequest &Req : High) if (Req.Widget != NewRequest.Widget) Updated.Add(Req); // Add all low priority requests to the updated array, new request first. - if (!NewRequest.TakeControl) Updated.Add(NewRequest); + if (!NewRequest.UseUIOnly) Updated.Add(NewRequest); for (const FlxEventRequest &Req : Low) if (Req.Widget != NewRequest.Widget) Updated.Add(Req); @@ -101,7 +101,7 @@ void FlxEventRequests::GarbageCollect() FlxEventRequests::InputMode FlxEventRequests::GetRequestedMode() const { - if ((Requests.Num() > 0) && (Requests[0].TakeControl)) + if ((Requests.Num() > 0) && (Requests[0].UseUIOnly)) { return InputMode::UIOnly; } diff --git a/Source/Integration/InputEvents.h b/Source/Integration/InputEvents.h index f5d1c2d0..e7ff85a9 100644 --- a/Source/Integration/InputEvents.h +++ b/Source/Integration/InputEvents.h @@ -4,7 +4,7 @@ // // Custom input event dispatching system. Uses Unreal's // built-in input modes (GameOnly / UIOnly) with an -// enhanced input component for character mode hotkeys. +// enhanced input component for GameOnly mode hotkeys. // //////////////////////////////////////////////////////////// @@ -22,12 +22,12 @@ // A widget's declaration of interest in input events. // // Widget: The widget that wants to receive events. -// TakeControl: If true, activating this request puts -// the system into Widget Mode. +// UseUIOnly: If true, activating this request puts +// the system into UIOnly mode. // ShowPointer: If true, the mouse pointer should be // visible when this widget has control. // Hotkeys: Keys that go to this widget when the -// player is in Character mode. +// player is in GameOnly mode. // //////////////////////////////////////////////////////////// @@ -37,8 +37,8 @@ struct FlxEventRequest GENERATED_BODY() FlxEventRequest() = default; - FlxEventRequest(UUserWidget *InWidget, bool InTakeControl, bool InShowPointer, const TArray &InHotkeys) - : Widget(InWidget), TakeControl(InTakeControl), ShowPointer(InShowPointer), Hotkeys(InHotkeys) {} + FlxEventRequest(UUserWidget *InWidget, bool InUseUIOnly, bool InShowPointer, const TArray &InHotkeys) + : Widget(InWidget), UseUIOnly(InUseUIOnly), ShowPointer(InShowPointer), Hotkeys(InHotkeys) {} bool operator == (const FlxEventRequest &Other) const; @@ -46,7 +46,7 @@ struct FlxEventRequest UUserWidget* Widget = nullptr; UPROPERTY(BlueprintReadWrite) - bool TakeControl = false; + bool UseUIOnly = false; UPROPERTY(BlueprintReadWrite) bool ShowPointer = false; diff --git a/Source/Integration/PlayerControllerBase.cpp b/Source/Integration/PlayerControllerBase.cpp index 210c4631..1e41dafb 100644 --- a/Source/Integration/PlayerControllerBase.cpp +++ b/Source/Integration/PlayerControllerBase.cpp @@ -74,9 +74,9 @@ FVector2D AlxPlayerControllerBase::GetLookAtPixel(const UObject *Context) void AlxPlayerControllerBase::BeginPlay() { Super::BeginPlay(); - CharacterModeInput = NewObject(this); - CharacterModeInput->bBlockInput = false; - PushInputComponent(CharacterModeInput); + HotkeyInputComponent = NewObject(this); + HotkeyInputComponent->bBlockInput = false; + PushInputComponent(HotkeyInputComponent); } void AlxPlayerControllerBase::UpdateEventDispatch() @@ -121,7 +121,7 @@ void AlxPlayerControllerBase::UpdateEventDispatch() { SetInputMode(FInputModeGameOnly()); - CharacterModeInput->KeyBindings.Empty(); + HotkeyInputComponent->KeyBindings.Empty(); TSet BoundKeys; for (const FlxEventRequest &Req : Requests) { @@ -130,7 +130,7 @@ void AlxPlayerControllerBase::UpdateEventDispatch() if (!BoundKeys.Contains(Key)) { BoundKeys.Add(Key); - CharacterModeInput->BindKey(Key, IE_Pressed, this, &AlxPlayerControllerBase::ForwardKeyEvent); + HotkeyInputComponent->BindKey(Key, IE_Pressed, this, &AlxPlayerControllerBase::ForwardKeyEvent); } } } diff --git a/Source/Integration/PlayerControllerBase.h b/Source/Integration/PlayerControllerBase.h index afacfa18..dd7cab8c 100644 --- a/Source/Integration/PlayerControllerBase.h +++ b/Source/Integration/PlayerControllerBase.h @@ -50,7 +50,7 @@ public: // Rebuild input component and switch input mode. void UpdateEventDispatch(); - // Handler for character mode hotkey presses. + // Handler for GameOnly mode hotkey presses. void ForwardKeyEvent(FKey Key); // Walk up from a Slate widget to find the nearest UMG widget class name. @@ -65,9 +65,9 @@ public: UPROPERTY() FlxEventRequests EventRequests; - // Input component for Character Mode: catches hotkeys only. + // Input component for GameOnly mode: catches hotkeys only. UPROPERTY() - UInputComponent *CharacterModeInput = nullptr; + UInputComponent *HotkeyInputComponent = nullptr; // Current input mode. InputMode CurrentInputMode = InputMode::GameOnly;