Updated qualisys_cpp_sdk and init scripts (#71)

Issue: The inclusion of tinyxml2 generates warning C4459 Engine\Source\Runtime\Core\Public\Math\RotationTranslationMatrix.h(60): error C4459: declaration of 'CR' hides global declaration Solution: Disabled shadow variable warning in QTMConnectLiveLink.Build.cs
qualisys · Feb 24, 2025 · 8e995be · 8e995be
1 parent f3ef3fb
commit 8e995be
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 48 deletions.
diff --git a/Qualisys/QTMConnectLiveLink/Source/QTMConnectLiveLink/Private/QTMConnectLiveLinkSource.cpp b/Qualisys/QTMConnectLiveLink/Source/QTMConnectLiveLink/Private/QTMConnectLiveLinkSource.cpp
@@ -339,17 +339,17 @@ uint32 FQTMConnectLiveLinkSource::Run()
                 components |= CRTProtocol::cComponentForceSingle;
             }
 
-            CRTProtocol::EStreamRate streamRate = CRTProtocol::RateAllFrames;
+            CRTProtocol::EStreamRate streamRate = CRTProtocol::EStreamRate::RateAllFrames;
             if (Settings.StreamRate == "Frequency") 
             {
-                streamRate = CRTProtocol::RateFrequency;
+                streamRate = CRTProtocol::EStreamRate::RateFrequency;
             }
             else if (Settings.StreamRate == "Frequency Divisor") 
             {
-                streamRate = CRTProtocol::RateFrequencyDivisor;
+                streamRate = CRTProtocol::EStreamRate::RateFrequencyDivisor;
             }
 
-            if (!mRTProtocol->StreamFrames(streamRate, (streamRate != CRTProtocol::RateAllFrames) ? Settings.FrequencyValue : 0, 0, nullptr, components))
+            if (!mRTProtocol->StreamFrames(streamRate, (streamRate != CRTProtocol::EStreamRate::RateAllFrames) ? Settings.FrequencyValue : 0, 0, nullptr, components))
             {
                 SourceStatus = FText::FromString(ANSI_TO_TCHAR(mRTProtocol->GetErrorString()));
 

diff --git a/Qualisys/QTMConnectLiveLink/Source/QTMConnectLiveLink/QTMConnectLiveLink.Build.cs b/Qualisys/QTMConnectLiveLink/Source/QTMConnectLiveLink/QTMConnectLiveLink.Build.cs
@@ -8,23 +8,26 @@ public class QTMConnectLiveLink : ModuleRules
     public QTMConnectLiveLink(ReadOnlyTargetRules Target) : base(Target)
     {
         PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
-        string pluginPublicIncludePath = Path.Combine(ModuleDirectory, "Public");
-        string pluginPrivateIncludePath = Path.Combine(ModuleDirectory, "Private");
+
+        bWarningsAsErrors = false;
+
+        bEnableExceptions = true;
+
+        ShadowVariableWarningLevel = WarningLevel.Off;
 
         PublicIncludePaths.AddRange(
             new string[] {
-                pluginPublicIncludePath
+                Path.Combine(ModuleDirectory, "Public")
             }
         );
 
         PrivateIncludePaths.AddRange(
             new string[] {
-                pluginPrivateIncludePath
+                Path.Combine(ModuleDirectory, "Private"),
+                Path.Combine(ModuleDirectory, "Private/RtClientSDK/External/tinyxml2")
             }
         );
 
-        bEnableExceptions = true;
-
         PublicDependencyModuleNames.AddRange(
             new string[]
             {

diff --git a/qualisys_cpp_sdk b/qualisys_cpp_sdk
diff --git a/qualisys_cpp_sdk_init.bat b/qualisys_cpp_sdk_init.bat
@@ -1,20 +1,33 @@
 @echo off
 
 set "dir_private=Qualisys\QTMConnectLiveLink\Source\QTMConnectLiveLink\Private\RTClientSDK"
-
-echo Ensuring directories exist...
-if not exist "%dir_private%" (
-    mkdir "%dir_private%"
-    echo Created %dir_private%
-)
-
+echo Ensuring directory exists...
+if not exist "%dir_private%" mkdir "%dir_private%"
 echo Copying files from qualisys_cpp_sdk into %dir_private%
-copy /Y "qualisys_cpp_sdk\Markup.cpp" "%dir_private%"
-copy /Y "qualisys_cpp_sdk\Network.cpp" "%dir_private%"
-copy /Y "qualisys_cpp_sdk\RTPacket.cpp" "%dir_private%"
-copy /Y "qualisys_cpp_sdk\RTProtocol.cpp" "%dir_private%"
-copy /Y "qualisys_cpp_sdk\Markup.h" "%dir_private%"
-copy /Y "qualisys_cpp_sdk\Network.h" "%dir_private%"
-copy /Y "qualisys_cpp_sdk\RTPacket.h" "%dir_private%"
-copy /Y "qualisys_cpp_sdk\RTProtocol.h" "%dir_private%"
+xcopy /Y "qualisys_cpp_sdk\Deserializer.cpp" "%dir_private%\"
+xcopy /Y "qualisys_cpp_sdk\Deserializer.h" "%dir_private%\"
+xcopy /Y "qualisys_cpp_sdk\LICENSE.md" "%dir_private%\"
+xcopy /Y "qualisys_cpp_sdk\Network.cpp" "%dir_private%\"
+xcopy /Y "qualisys_cpp_sdk\Network.h" "%dir_private%\"
+xcopy /Y "qualisys_cpp_sdk\RTPacket.cpp" "%dir_private%\"
+xcopy /Y "qualisys_cpp_sdk\RTPacket.h" "%dir_private%\"
+xcopy /Y "qualisys_cpp_sdk\RTProtocol.cpp" "%dir_private%\"
+xcopy /Y "qualisys_cpp_sdk\RTProtocol.h" "%dir_private%\"
+xcopy /Y "qualisys_cpp_sdk\Serializer.cpp" "%dir_private%\"
+xcopy /Y "qualisys_cpp_sdk\Serializer.h" "%dir_private%\"
+xcopy /Y "qualisys_cpp_sdk\Settings.cpp" "%dir_private%\"
+xcopy /Y "qualisys_cpp_sdk\Settings.h" "%dir_private%\"
+xcopy /Y "qualisys_cpp_sdk\SettingsDeserializer.cpp" "%dir_private%\"
+xcopy /Y "qualisys_cpp_sdk\SettingsDeserializer.h" "%dir_private%\"
+xcopy /Y "qualisys_cpp_sdk\SettingsSerializer.cpp" "%dir_private%\"
+xcopy /Y "qualisys_cpp_sdk\SettingsSerializer.h" "%dir_private%\"
 echo Done copying files from qualisys_cpp_sdk into %dir_private%
+
+set "tinyxml2_private=Qualisys\QTMConnectLiveLink\Source\QTMConnectLiveLink\Private\RTClientSDK\External\tinyxml2"
+echo Ensuring directory exists...
+if not exist "%tinyxml2_private%" mkdir "%tinyxml2_private%"
+echo Copying files from qualisys_cpp_sdk into %tinyxml2_private%
+xcopy /Y "qualisys_cpp_sdk\External\tinyxml2\LICENSE.txt" "%tinyxml2_private%\"
+xcopy /Y "qualisys_cpp_sdk\External\tinyxml2\tinyxml2.cpp" "%tinyxml2_private%\"
+xcopy /Y "qualisys_cpp_sdk\External\tinyxml2\tinyxml2.h" "%tinyxml2_private%\"
+echo Done copying files from qualisys_cpp_sdk into %tinyxml2_private%
diff --git a/qualisys_cpp_sdk_init.sh b/qualisys_cpp_sdk_init.sh
@@ -1,28 +1,34 @@
-#!/usr/bin/env bash
+#!/bin/bash
+set -e  # Exit on error
 
-# The target directory for copied files
 dir_private="Qualisys/QTMConnectLiveLink/Source/QTMConnectLiveLink/Private/RTClientSDK"
-
-# Files to copy
-files=(
-    "Markup.cpp"
-    "Network.cpp"
-    "RTPacket.cpp"
-    "RTProtocol.cpp"
-    "Markup.h"
-    "Network.h"
-    "RTPacket.h"
-    "RTProtocol.h"
-)
-
 echo "Ensuring directory exists..."
 mkdir -p "$dir_private"
-
 echo "Copying files from qualisys_cpp_sdk into $dir_private"
-
-# Loop over files array and copy each into $dir_private
-for file in "${files[@]}"; do
-    cp -f "qualisys_cpp_sdk/$file" "$dir_private"
-done
-
+cp -u "qualisys_cpp_sdk/Deserializer.cpp" "$dir_private/"
+cp -u "qualisys_cpp_sdk/Deserializer.h" "$dir_private/"
+cp -u "qualisys_cpp_sdk/LICENSE.md" "$dir_private/"
+cp -u "qualisys_cpp_sdk/Network.cpp" "$dir_private/"
+cp -u "qualisys_cpp_sdk/Network.h" "$dir_private/"
+cp -u "qualisys_cpp_sdk/RTPacket.cpp" "$dir_private/"
+cp -u "qualisys_cpp_sdk/RTPacket.h" "$dir_private/"
+cp -u "qualisys_cpp_sdk/RTProtocol.cpp" "$dir_private/"
+cp -u "qualisys_cpp_sdk/RTProtocol.h" "$dir_private/"
+cp -u "qualisys_cpp_sdk/Serializer.cpp" "$dir_private/"
+cp -u "qualisys_cpp_sdk/Serializer.h" "$dir_private/"
+cp -u "qualisys_cpp_sdk/Settings.cpp" "$dir_private/"
+cp -u "qualisys_cpp_sdk/Settings.h" "$dir_private/"
+cp -u "qualisys_cpp_sdk/SettingsDeserializer.cpp" "$dir_private/"
+cp -u "qualisys_cpp_sdk/SettingsDeserializer.h" "$dir_private/"
+cp -u "qualisys_cpp_sdk/SettingsSerializer.cpp" "$dir_private/"
+cp -u "qualisys_cpp_sdk/SettingsSerializer.h" "$dir_private/"
 echo "Done copying files from qualisys_cpp_sdk into $dir_private"
+
+tinyxml2_private="Qualisys/QTMConnectLiveLink/Source/QTMConnectLiveLink/Private/RTClientSDK/External/tinyxml2/"
+echo "Ensuring directory exists..."
+mkdir -p "$tinyxml2_private"
+echo "Copying files from qualisys_cpp_sdk into $tinyxml2_private"
+cp -u "qualisys_cpp_sdk/External/tinyxml2/LICENSE.txt" "$tinyxml2_private/"
+cp -u "qualisys_cpp_sdk/External/tinyxml2/tinyxml2.cpp" "$tinyxml2_private/"
+cp -u "qualisys_cpp_sdk/External/tinyxml2/tinyxml2.h" "$tinyxml2_private/"
+echo "Done copying files from qualisys_cpp_sdk into $tinyxml2_private"
+82 −0		.github/workflows/cmake-multi-platform.yml
+1 −0		.gitignore
+0 −0		.gitmodules
+84 −18		CMakeLists.txt
+22 −0		CMakeSettings.json
+246 −0		Deserializer.cpp
+78 −0		Deserializer.h
+31 −0		External/tinyxml2.README.md
+18 −0		External/tinyxml2/LICENSE.txt
+335 −0		External/tinyxml2/readme.md
+3,031 −0		External/tinyxml2/tinyxml2.cpp
+2,384 −0		External/tinyxml2/tinyxml2.h
+0 −1,253		Markup.cpp
+0 −170		Markup.h
+35 −16		Network.h
+25 −10		README.md
+119 −80		RTClientExample/Input.cpp
+23 −16		RTClientExample/Input.h
+74 −62		RTClientExample/Operations.cpp
+80 −80		RTClientExample/OutputSettings.cpp
+20 −4		RTClientSDK.vcxproj
+32 −2		RTClientSDK.vcxproj.filters
+0 −1		RTPacket.cpp
+1 −2		RTPacket.h
+672 −4,275		RTProtocol.cpp
+212 −783		RTProtocol.h
+1 −1		RigidBodyStreaming/RigidBodyStreaming.cpp
+108 −0		Serializer.cpp
+46 −0		Serializer.h
+38 −0		Settings.cpp
+630 −0		Settings.h
+2,249 −0		SettingsDeserializer.cpp
+34 −0		SettingsDeserializer.h
+843 −0		SettingsSerializer.cpp
+63 −0		SettingsSerializer.h
+89 −0		Tests/3dParametersTests.cpp
+198 −0		Tests/6dParametersTests.cpp
+52 −0		Tests/AnalogParametersTests.cpp
+71 −0		Tests/CMakeLists.txt
+142 −0		Tests/CalibrationParametersTests.cpp
+427 −0		Tests/Data/3d.h
+185 −0		Tests/Data/6d.h
+60 −0		Tests/Data/Analog.h
+21 −0		Tests/Data/Calibration.h
+16 −0		Tests/Data/EyeTracker.h
+258 −0		Tests/Data/Force.h
+23 −0		Tests/Data/GazeVector.h
+791 −0		Tests/Data/General.h
+40 −0		Tests/Data/Image.h
+132 −0		Tests/Data/Skeleton.h
+27 −0		Tests/EyeTrackerParametersTests.cpp
+155 −0		Tests/ForceParametersTests.cpp
+31 −0		Tests/GazeVectorParametersTests.cpp
+491 −0		Tests/GeneralParametersTests.cpp
+71 −0		Tests/ImageParametersTests.cpp
+2 −0		Tests/Main.cpp
+9 −0		Tests/ParametersTestsShared.h
+280 −0		Tests/SkeletonParametersTests.cpp
+210 −0		Tests/TestUtils.h
+18 −0		cmake/doctest.cmake