From 25c3c128e46e620599f7b5be8b02062a418ffb6d Mon Sep 17 00:00:00 2001 From: "MINGLE-RENDER\\Mingle-Render" Date: Sat, 13 Jun 2026 17:08:39 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Fix=20:=20=EC=98=B5=ED=8B=B0=ED=8A=B8?= =?UTF-8?q?=EB=9E=99=20=EC=8B=9C=EC=8A=A4=ED=85=9C=20=EC=97=85=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=8A=B8=20DLL=EA=B5=AC=EC=A1=B0=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OptiTrack/Plugins/x86/NatNetLib.dll | 3 - .../OptiTrack/Plugins/x86/NatNetLib.dll.meta | 52 - .../OptiTrack/Plugins/x86_64/NatNetLib.dll | 3 - .../Plugins/x86_64/NatNetLib.dll.meta | 2 - .../Prefabs/Client - OptiTrack.prefab | 4 +- .../Editor/OptitrackStreamingClientEditor.cs | 10 +- .../UXML/OptitrackStreamingClientEditor.uxml | 23 +- .../OptitrackSkeletonAnimator_Mingle.cs | 89 +- .../Scripts/OptitrackStreamingClient.cs | 1533 ++++++++++++++--- .../StreamingleFacial/NatnetDeviceListener.cs | 282 +-- .../StreamingleFacialReceiver.cs | 116 +- 11 files changed, 1534 insertions(+), 583 deletions(-) delete mode 100644 Assets/External/OptiTrack Unity Plugin/OptiTrack/Plugins/x86/NatNetLib.dll delete mode 100644 Assets/External/OptiTrack Unity Plugin/OptiTrack/Plugins/x86/NatNetLib.dll.meta delete mode 100644 Assets/External/OptiTrack Unity Plugin/OptiTrack/Plugins/x86_64/NatNetLib.dll delete mode 100644 Assets/External/OptiTrack Unity Plugin/OptiTrack/Plugins/x86_64/NatNetLib.dll.meta diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/Plugins/x86/NatNetLib.dll b/Assets/External/OptiTrack Unity Plugin/OptiTrack/Plugins/x86/NatNetLib.dll deleted file mode 100644 index 5bb72641d..000000000 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/Plugins/x86/NatNetLib.dll +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8dce3d5bca185ff7241a0dab86bf33f79c50731f85e5d4b342cfd112d55ba858 -size 136192 diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/Plugins/x86/NatNetLib.dll.meta b/Assets/External/OptiTrack Unity Plugin/OptiTrack/Plugins/x86/NatNetLib.dll.meta deleted file mode 100644 index 6bd03e4e1..000000000 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/Plugins/x86/NatNetLib.dll.meta +++ /dev/null @@ -1,52 +0,0 @@ -fileFormatVersion: 2 -guid: 86f370a71a6ec2a4da168a46e45eef86 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: x86 - DefaultValueInitialized: true - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Win - second: - enabled: 1 - settings: - CPU: x86 - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: None - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/Plugins/x86_64/NatNetLib.dll b/Assets/External/OptiTrack Unity Plugin/OptiTrack/Plugins/x86_64/NatNetLib.dll deleted file mode 100644 index 7f77fd2b1..000000000 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/Plugins/x86_64/NatNetLib.dll +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d1c63719ccbf7c2010f64d3bdd6e54ca816de301baff85a658f0d9363728c829 -size 137216 diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/Plugins/x86_64/NatNetLib.dll.meta b/Assets/External/OptiTrack Unity Plugin/OptiTrack/Plugins/x86_64/NatNetLib.dll.meta deleted file mode 100644 index 47f86b1cd..000000000 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/Plugins/x86_64/NatNetLib.dll.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 90a37dc4ae5b35a45876059d687031bc \ No newline at end of file diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/Prefabs/Client - OptiTrack.prefab b/Assets/External/OptiTrack Unity Plugin/OptiTrack/Prefabs/Client - OptiTrack.prefab index 63586374a..9dc81a0ad 100644 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/Prefabs/Client - OptiTrack.prefab +++ b/Assets/External/OptiTrack Unity Plugin/OptiTrack/Prefabs/Client - OptiTrack.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8fc5f2f318752bfee1302d10448847f4d37cf312d296bf80929f91ace8b33d87 -size 1798 +oid sha256:4d28138cba0db2a44f9c41ad868dbfdea158c28bbc7b7460500b72c5f851bf05 +size 5115 diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/Scripts/Editor/OptitrackStreamingClientEditor.cs b/Assets/External/OptiTrack Unity Plugin/OptiTrack/Scripts/Editor/OptitrackStreamingClientEditor.cs index ce0c5c5d6..8c05238e6 100644 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/Scripts/Editor/OptitrackStreamingClientEditor.cs +++ b/Assets/External/OptiTrack Unity Plugin/OptiTrack/Scripts/Editor/OptitrackStreamingClientEditor.cs @@ -22,30 +22,25 @@ public class OptitrackStreamingClientEditor : Editor client = (OptitrackStreamingClient)target; var root = new VisualElement(); - // Load stylesheets var commonUss = AssetDatabase.LoadAssetAtPath(CommonUssPath); if (commonUss != null) root.styleSheets.Add(commonUss); var uss = AssetDatabase.LoadAssetAtPath(UssPath); if (uss != null) root.styleSheets.Add(uss); - // Load UXML var uxml = AssetDatabase.LoadAssetAtPath(UxmlPath); if (uxml != null) uxml.CloneTree(root); - // Cache references statusDot = root.Q("statusDot"); statusText = root.Q