From 124244a5284d14b1230bccb7e3179904e261e5de Mon Sep 17 00:00:00 2001 From: Mamadou Babaei Date: Mon, 26 Feb 2024 20:09:32 +0100 Subject: [PATCH] list nova 2 gloves in the get devices from the device list --- .../Private/SGCore/SGDeviceList.cpp | 7 +++++++ .../Private/SGCoreImpl/SGDeviceListImpl.cpp | 15 +++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/Source/SenseGloveCore/Private/SGCore/SGDeviceList.cpp b/Source/SenseGloveCore/Private/SGCore/SGDeviceList.cpp index ecbe482c..8839e8b7 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGDeviceList.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGDeviceList.cpp @@ -38,6 +38,7 @@ #include "SGCore/SGBetaDevice.h" #include "SGCore/SGDevice.h" #include "SGCore/SGDeviceImplCast.h" +#include "SGCore/SGNova2Glove.h" #include "SGCore/SGNovaGlove.h" #include "SGCore/SGSenseGlove.h" #include "SGCoreImpl/SGBetaDeviceImpl.h" @@ -92,6 +93,12 @@ TArray FSGDeviceList::GetDevices(UObject* Outer) Devices.Push(BetaDevice); } break; + case ESGDeviceType::Nova2: + { + TSharedRef Nova2GloveImpl{FSGDeviceImplCast::ToNova2GloveImpl(DeviceImpl)}; + USGNova2Glove* Nova2Glove = USGNova2Glove::NewNova2Glove(Outer, MoveTemp(Nova2GloveImpl)); + Devices.Push(Nova2Glove); + } case ESGDeviceType::Nova: { TSharedRef NovaGloveImpl{FSGDeviceImplCast::ToNovaGloveImpl(DeviceImpl)}; diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceListImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceListImpl.cpp index 9e27e9d7..a36f4f5a 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceListImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceListImpl.cpp @@ -41,13 +41,12 @@ #include "SGBuildHacks/SGInclude_Core_BetaDevice.h" #include "SGBuildHacks/SGInclude_Core_DeviceList.h" -#include "SGBuildHacks/SGInclude_Core_HapticGlove.h" #include "SGBuildHacks/SGInclude_Core_NovaGlove.h" #include "SGBuildHacks/SGInclude_Core_SenseGlove.h" #include "SGBuildHacks/SGInclude_Core_SGDevice.h" #include "SGCoreImpl/SGBetaDeviceImpl.h" #include "SGCoreImpl/SGCoreEnumCast.h" -#include "SGCoreImpl/SGHapticGloveImpl.h" +#include "SGCoreImpl/SGNova2GloveImpl.h" #include "SGCoreImpl/SGNovaGloveImpl.h" #include "SGCoreImpl/SGSenseGloveImpl.h" #include "SGLog/SGLog.h" @@ -95,6 +94,18 @@ TArray> FSGDeviceListImpl::GetDevices() } break; + case ESGDeviceType::Nova2: + { + FSGNova2GloveImpl::FNova2GlovePtrType Nova2Glove = + std::dynamic_pointer_cast(Device); + if (ensureAlwaysMsgf(Nova2Glove, TEXT("Invalid Nova2Glove device!"))) + { + TSharedRef Nova2GloveImpl{MakeShared(Nova2Glove)}; + DeviceImpls.Push(MoveTemp(Nova2GloveImpl)); + } + } + break; + case ESGDeviceType::Nova: { FSGNovaGloveImpl::FNovaGlovePtrType NovaGlove =