Skip to content

Commit

Permalink
removed Docker.Net dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
micahpearlman committed Sep 17, 2021
1 parent c832f0e commit dff8f64
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 47 deletions.
11 changes: 0 additions & 11 deletions Editor/ZOSimLaunchMonitor.cs.meta

This file was deleted.

File renamed without changes.
44 changes: 22 additions & 22 deletions Runtime/Scripts/ROS/Unity/ZOROSUnityManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -92,27 +92,27 @@ public event ROSBridgeConnectionChangeHandler ROSBridgeDisconnectEvent {
}
#endregion // ROSBridgeConnection

#region ROS Docker Launch
public bool _launchROSDocker = false;
// #region ROS Docker Launch
// public bool _launchROSDocker = false;

/// <summary>
/// If set then launch docker image with ROS and execute ROS launch file.
/// </summary>
/// <value></value>
public bool LaunchROSDocker {
get => _launchROSDocker;
}
public ZODockerRunParameters _rosLaunchParameters;
// /// <summary>
// /// If set then launch docker image with ROS and execute ROS launch file.
// /// </summary>
// /// <value></value>
// public bool LaunchROSDocker {
// get => _launchROSDocker;
// }
// public ZODockerRunParameters _rosLaunchParameters;

/// <summary>
/// The ROS Launch parameter scriptable object.
/// </summary>
/// <value></value>
public ZODockerRunParameters ROSLaunchParameters {
get => _rosLaunchParameters;
}
// /// <summary>
// /// The ROS Launch parameter scriptable object.
// /// </summary>
// /// <value></value>
// public ZODockerRunParameters ROSLaunchParameters {
// get => _rosLaunchParameters;
// }

#endregion // Docker Launch
// #endregion // Docker Launch


#region Tranform Publishing
Expand Down Expand Up @@ -208,10 +208,10 @@ void Start() {
}

//
if (_launchROSDocker == true) {
string launchCommand = $"";
// ZO.Editor.ZODockerManager.DockerRun("zosim", launchCommand);
}
// if (_launchROSDocker == true) {
// string launchCommand = $"";
// // ZO.Editor.ZODockerManager.DockerRun("zosim", launchCommand);
// }
} else { // in play mode


Expand Down
11 changes: 0 additions & 11 deletions Runtime/Scripts/Util/Docker/ZODocker.cs.meta

This file was deleted.

File renamed without changes.
2 changes: 1 addition & 1 deletion Runtime/Scripts/Util/Docker/ZODockerRunParameters.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class ZODockerRunParameters : ScriptableObject {
/// <summary>
/// Volumes to mount.
/// </summary>
public List<ZODocker.VolumeMapEntry> volumes = null;
// public List<ZODocker.VolumeMapEntry> volumes = null;

/// <summary>
/// Ports to expose.
Expand Down
2 changes: 1 addition & 1 deletion Runtime/Scripts/Util/Docker/ZODockerRunParameters.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "com.fsstudio.zerosim",
"version": "0.1.16",
"version": "0.1.17",
"displayName": "ZeroSim",
"description": "ZeroSim ROS robotic simulator in Unity.",
"unity": "2020.1",
Expand Down

0 comments on commit dff8f64

Please sign in to comment.