Fix Stuff
This commit is contained in:
parent
55d2a1a45c
commit
62cf609a89
11 changed files with 321 additions and 39 deletions
|
@ -1,13 +1,13 @@
|
|||
#pragma once
|
||||
|
||||
#include "CoreMinimal.h"
|
||||
#include "Device.generated.h"
|
||||
#include "DeviceEnum.generated.h"
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
UENUM(BlueprintType)
|
||||
enum class EDevice : uint8
|
||||
enum class EDeviceEnum : uint8
|
||||
{
|
||||
DESKTOP UMETA(DisplayName = "Desktop"),
|
||||
LAPTOP UMETA(DisplayName = "Laptop"),
|
|
@ -6,7 +6,7 @@
|
|||
#include "Kismet/BlueprintFunctionLibrary.h"
|
||||
#include "Structs/Battery.h"
|
||||
#include "Structs/CPUInfo.h"
|
||||
#include "Structs/FDevice.h"
|
||||
#include "Structs/Device.h"
|
||||
#include "Structs/OSVerInfo.h"
|
||||
#include "HarmonyLinkLibrary.generated.h"
|
||||
|
||||
|
|
30
Source/HarmonyLink/Public/Structs/Device.h
Normal file
30
Source/HarmonyLink/Public/Structs/Device.h
Normal file
|
@ -0,0 +1,30 @@
|
|||
#pragma once
|
||||
|
||||
#include "CoreMinimal.h"
|
||||
#include "Enums/DeviceEnum.h"
|
||||
#include "Enums/Platform.h"
|
||||
#include <Structs/FDevice.h>
|
||||
|
||||
#include "Device.generated.h"
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
USTRUCT(BlueprintType)
|
||||
struct FDevice
|
||||
{
|
||||
GENERATED_BODY()
|
||||
|
||||
FDevice() {}
|
||||
|
||||
UPROPERTY(BlueprintReadWrite, EditAnywhere)
|
||||
EPlatform Platform = EPlatform::WINDOWS;
|
||||
|
||||
UPROPERTY(BlueprintReadWrite, EditAnywhere)
|
||||
EDeviceEnum Device = EDeviceEnum::DESKTOP;
|
||||
|
||||
FDevice(HarmonyLinkLib::FDevice* oldDevice);
|
||||
|
||||
static EDeviceEnum Convert(HarmonyLinkLib::EDevice Device);
|
||||
static EPlatform Convert(HarmonyLinkLib::EPlatform Platform);
|
||||
};
|
|
@ -1,22 +0,0 @@
|
|||
#pragma once
|
||||
|
||||
#include "CoreMinimal.h"
|
||||
#include "Enums/Device.h"
|
||||
#include "Enums/Platform.h"
|
||||
|
||||
#include "FDevice.generated.h"
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
USTRUCT(BlueprintType)
|
||||
struct FDevice
|
||||
{
|
||||
GENERATED_BODY()
|
||||
|
||||
UPROPERTY(BlueprintReadWrite, EditAnywhere)
|
||||
EPlatform Platform = EPlatform::WINDOWS;
|
||||
|
||||
UPROPERTY(BlueprintReadWrite, EditAnywhere)
|
||||
EDevice Device = EDevice::DESKTOP;
|
||||
};
|
|
@ -1,6 +1,8 @@
|
|||
// Copyright (C) 2023 Jordon Brooks
|
||||
#pragma once
|
||||
|
||||
#include <HarmonyLinkLib.h>
|
||||
|
||||
#include "CoreMinimal.h"
|
||||
|
||||
#include "OSVerInfo.generated.h"
|
||||
|
@ -13,6 +15,8 @@ struct FOSVerInfo
|
|||
{
|
||||
GENERATED_BODY()
|
||||
|
||||
FOSVerInfo() {}
|
||||
|
||||
UPROPERTY(BlueprintReadWrite, EditAnywhere)
|
||||
FString Name;
|
||||
|
||||
|
@ -33,4 +37,6 @@ struct FOSVerInfo
|
|||
|
||||
UPROPERTY(BlueprintReadWrite, EditAnywhere)
|
||||
FString VariantID;
|
||||
|
||||
FOSVerInfo(HarmonyLinkLib::FOSVerInfo* oldInfo);
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue