Skip to content

Commit f2bae7a

Browse files
Update for ROS-TCP-Connector namespace changes
1 parent 55130ca commit f2bae7a

7 files changed

Lines changed: 10 additions & 15 deletions

File tree

tutorials/pick_and_place/PickAndPlaceProject/Assets/DemoScripts/Demo.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#if UNITY_EDITOR
22
using Microsoft.CSharp;
3-
using RosMessageGeneration;
43
using RosSharp;
54
using RosSharp.Control;
65
using RosSharp.Urdf.Editor;
@@ -12,6 +11,8 @@
1211
using System.Text;
1312
using UnityEditor;
1413
using UnityEngine;
14+
using Unity.Robotics.ROSTCPConnector;
15+
using Unity.Robotics.ROSTCPConnector.MessageGeneration;
1516

1617
public class Demo : MonoBehaviour
1718
{

tutorials/pick_and_place/PickAndPlaceProject/Packages/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"com.unity.ide.rider": "2.0.7",
55
"com.unity.ide.visualstudio": "2.0.3",
66
"com.unity.ide.vscode": "1.2.2",
7+
"com.unity.robotics.ros-tcp-connector": "https://github.com/Unity-Technologies/ROS-TCP-Connector.git?path=/com.unity.robotics.ros-tcp-connector#0b7ddbf36a13fbd47a0aeead062f0f57271b7e96",
78
"com.unity.robotics.urdf-importer": "https://github.com/Unity-Technologies/URDF-Importer.git#v0.1.2",
8-
"com.unity.robotics.ros-tcp-connector": "https://github.com/Unity-Technologies/ROS-TCP-Connector.git#v0.1.2",
99
"com.unity.test-framework": "1.1.18",
1010
"com.unity.textmeshpro": "3.0.1",
1111
"com.unity.timeline": "1.4.3",

tutorials/pick_and_place/Scripts/SourceDestinationPublisher.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
using RosMessageTypes.Geometry;
21
using RosMessageTypes.NiryoMoveit;
32
using UnityEngine;
4-
using ROSGeometry;
5-
using Quaternion = UnityEngine.Quaternion;
3+
using Unity.Robotics.ROSTCPConnector;
4+
using Unity.Robotics.ROSTCPConnector.ROSGeometry;
65

76
public class SourceDestinationPublisher : MonoBehaviour
87
{

tutorials/pick_and_place/Scripts/TrajectoryPlanner.cs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
using System.Collections;
22
using System.Linq;
3-
using RosMessageTypes.Geometry;
43
using RosMessageTypes.NiryoMoveit;
54
using UnityEngine;
6-
7-
using ROSGeometry;
8-
using Quaternion = UnityEngine.Quaternion;
9-
using RosImage = RosMessageTypes.Sensor.Image;
10-
using Transform = UnityEngine.Transform;
11-
using Vector3 = UnityEngine.Vector3;
5+
using Unity.Robotics.ROSTCPConnector;
6+
using Unity.Robotics.ROSTCPConnector.ROSGeometry;
127

138

149
public class TrajectoryPlanner : MonoBehaviour

tutorials/ros_unity_integration/unity_scripts/RosPublisherExample.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using RosMessageTypes.RoboticsDemo;
22
using UnityEngine;
3-
using Random = UnityEngine.Random;
3+
using Unity.Robotics.ROSTCPConnector;
44

55
/// <summary>
66
///

tutorials/ros_unity_integration/unity_scripts/RosServiceExample.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
using System;
21
using RosMessageTypes.RoboticsDemo;
32
using UnityEngine;
4-
using Debug = UnityEngine.Debug;
3+
using Unity.Robotics.ROSTCPConnector;
54

65
public class RosServiceExample : MonoBehaviour
76
{

tutorials/ros_unity_integration/unity_scripts/RosSubscriberExample.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using UnityEngine;
2+
using Unity.Robotics.ROSTCPConnector;
23
using RosColor = RosMessageTypes.RoboticsDemo.UnityColor;
34

45
public class RosSubscriberExample : MonoBehaviour

0 commit comments

Comments
 (0)