Merge pull request #15 from Chen-Yulin/Jaka

feat. seperate UDP for object space
Chen-Yulin · Jul 8, 2024 · c35239e · c35239e
2 parents 6455c0b + 1fdddc9
commit c35239e
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity
@@ -23431,6 +23431,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1278946179}
   - component: {fileID: 1278946180}
+  - component: {fileID: 1278946181}
   m_Layer: 0
   m_Name: Network
   m_TagString: Untagged
@@ -23466,11 +23467,31 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   isTxStarted: 0
+  Comment: sync ArmDT, send instr to physical arm
   IP: 127.0.0.1
   rxPort: 8000
   txPort: 8001
   ObjectManager: {fileID: 91002364}
   ArmDT: {fileID: 1023988670521322052}
+--- !u!114 &1278946181
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1278946177}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 84cea533f39f7994f8bc3914f7dfb8cb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isTxStarted: 0
+  Comment: sync object space
+  IP: 127.0.0.1
+  rxPort: 8002
+  txPort: 8003
+  ObjectManager: {fileID: 91002364}
+  ArmDT: {fileID: 0}
 --- !u!1 &1279699982
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Assets/Script/Network/UdpSocket.cs b/Assets/Script/Network/UdpSocket.cs
@@ -25,6 +25,8 @@ public class UdpSocket : MonoBehaviour
 {
     [HideInInspector] public bool isTxStarted = false;
 
+    public string Comment = "";
+
     [SerializeField] string IP = "127.0.0.1"; // local host
     [SerializeField] int rxPort = 8000; // port to receive data from Python on
     [SerializeField] int txPort = 8001; // port to send data to Python on

diff --git a/Assets/XR/Settings/OpenXR Package Settings.asset b/Assets/XR/Settings/OpenXR Package Settings.asset
@@ -522,7 +522,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9f34c86d1a130cc45a438373e1e8a4fc, type: 3}
   m_Name: PlayModeRemotingPlugin Standalone
   m_EditorClassIdentifier: 
-  m_enabled: 1
+  m_enabled: 0
   nameUi: Holographic Remoting for Play Mode
   version: 1.8.1
   featureIdInternal: com.microsoft.openxr.feature.playmoderemoting