ed/Cog
1
0
Fork 0
mirror of https://github.com/Ed94/Cog.git synced 2026-08-05 15:18:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compling errors on various platforms/consoles

Browse Source 
- Fixed some include paths case sensitive
- Fixed CogImguiInputHelper.h including itself
- Added missing includes
- Added missing forward declarations
- Fixed enums forward declarations
- Fixed "TCHAR_TO_ANSI" and const char* formatting issues
- Fixed "sscanf" on Linux
This commit is contained in:
Elhoussine Mehnik
2023-12-09 04:38:02 +01:00
parent caa0f015d4
commit 3e73c486a4
62 changed files with 194 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Actions.cpp
+9 -8
View File
@@ -8,6 +8,7 @@
#include "GameFramework/Pawn.h"
#include "InputAction.h"
#include "InputMappingContext.h"
#include "Engine/World.h"
//--------------------------------------------------------------------------------------------------------------------------
void FCogInputWindow_Actions::Initialize()
@@ -116,7 +117,7 @@ void FCogInputWindow_Actions::RenderContent()
{
ImGui::PushID(Index);
const char* ActionName = TCHAR_TO_ANSI(*ActionInfo.Action->GetName());
const auto ActionName = StringCast<ANSICHAR>(*ActionInfo.Action->GetName());
FInputActionValue ActionValue = EnhancedInputSubsystem->GetPlayerInput()->GetActionValue(ActionInfo.Action);
@@ -126,7 +127,7 @@ void FCogInputWindow_Actions::RenderContent()
{
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::Text("%s", ActionName);
ImGui::Text("%s", ActionName.Get());
const ImVec4 ActiveColor(1, 0.8f, 0, 1);
const ImVec4 InnactiveColor(0.3f, 0.3f, 0.3f, 1);
@@ -148,24 +149,24 @@ void FCogInputWindow_Actions::RenderContent()
case EInputActionValueType::Axis1D:
{
const float Value = ActionValue.Get<float>();
DrawAxis("%s", ActionName, Value, &ActionInfo.X);
DrawAxis("%s", ActionName.Get(), Value, &ActionInfo.X);
break;
}
case EInputActionValueType::Axis2D:
{
const FVector2D Value = ActionValue.Get<FVector2D>();
DrawAxis("%s X", ActionName, Value.X, &ActionInfo.X);
DrawAxis("%s Y", ActionName, Value.Y, &ActionInfo.Y);
DrawAxis("%s X", ActionName.Get(), Value.X, &ActionInfo.X);
DrawAxis("%s Y", ActionName.Get(), Value.Y, &ActionInfo.Y);
break;
}
case EInputActionValueType::Axis3D:
{
const FVector Value = ActionValue.Get<FVector>();
DrawAxis("%s X", ActionName, Value.X, &ActionInfo.X);
DrawAxis("%s Y", ActionName, Value.Y, &ActionInfo.Y);
DrawAxis("%s Z", ActionName, Value.Z, &ActionInfo.Z);
DrawAxis("%s X", ActionName.Get(), Value.X, &ActionInfo.X);
DrawAxis("%s Y", ActionName.Get(), Value.Y, &ActionInfo.Y);
DrawAxis("%s Z", ActionName.Get(), Value.Z, &ActionInfo.Z);
break;
}
}
Plugins/CogInput/Source/CogInput/Private/CogInputWindow_Gamepad.cpp
+1
View File
@@ -8,6 +8,7 @@
#include "EnhancedInputSubsystems.h"
#include "imgui_internal.h"
#include "InputMappingContext.h"
#include "Engine/World.h"
//--------------------------------------------------------------------------------------------------------------------------
void FCogInputWindow_Gamepad::Initialize()
Plugins/CogInput/Source/CogInput/Public/CogInputDataAsset.h
+1
View File
@@ -1,6 +1,7 @@
#pragma once
#include "CoreMinimal.h"
#include "Engine/DataAsset.h"
#include "CogInputDataAsset.generated.h"
class UInputAction;
Plugins/CogInput/Source/CogInput/Public/CogInputWindow_Gamepad.h
+3
View File
@@ -4,12 +4,15 @@
#include "CogInjectActionInfo.h"
#include "CogWindow.h"
#include "CogWindowConfig.h"
#include "imgui.h"
#include "InputCoreTypes.h"
#include "CogInputWindow_Gamepad.generated.h"
class UEnhancedPlayerInput;
class UCogInputConfig_Gamepad;
class UCogInputDataAsset;
struct ImDrawList;
struct FKey;
//--------------------------------------------------------------------------------------------------------------------------
class COGINPUT_API FCogInputWindow_Gamepad : public FCogWindow