Merge pull request #18 from lge-ros2/develop

Update app version info in Project settings
lge-ros2 · Jul 26, 2020 · 1a2565a · 1a2565a
2 parents 9fa2638 + f9ee8b0
commit 1a2565a
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/Assets/Scripts/Devices/Camera.cs b/Assets/Scripts/Devices/Camera.cs
@@ -188,7 +188,6 @@ private IEnumerator CameraWorker()
 
 				readback.WaitForCompletion();
 
-
 				if (readback.hasError)
 				{
 					Debug.LogError("Failed to read GPU texture");

diff --git a/Assets/Scripts/ModelLoader.cs b/Assets/Scripts/ModelLoader.cs
@@ -30,8 +30,9 @@ public class ModelLoader : MonoBehaviour
 	public string worldFileName;
 
 	private string filesRootDirectory = string.Empty;
-	private List<string> modelRootDirectories;
-	private List<string> worldRootDirectories;
+
+	public List<string> modelRootDirectories;
+	public List<string> worldRootDirectories;
 
 	private GameObject modelsRoot = null;
 
@@ -74,6 +75,8 @@ void Awake()
  		filesRootDirectory = "/usr/share/gazebo-9/";
 		modelRootDirectories.Add("../sample-resources/models/");
 		worldRootDirectories.Add("../sample-resources/worlds/");
+		// modelRootDirectories.Add("../../lgrs_resource/assets/models/");
+		// worldRootDirectories.Add("../../lgrs_resource/worlds/");
 #else
 		var separator = new char[] {':'};
 		filesRootDirectory = Environment.GetEnvironmentVariable("CLOISIM_FILES_PATH");

diff --git a/Assets/Scripts/Tools/SDF/Geometry.cs b/Assets/Scripts/Tools/SDF/Geometry.cs
@@ -32,7 +32,6 @@ public Geometry(XmlNode _node)
 
 		protected override void ParseElements()
 		{
-
 			if (IsValidNode("box"))
 			{
 				Type = "box";
@@ -82,6 +81,7 @@ protected override void ParseElements()
 					 IsValidNode("polyline"))
 			{
 				Console.WriteLine("Currently not supported");
+				empty = true;
 			}
 			else if (IsValidNode("empty"))
 			{
@@ -102,17 +102,29 @@ public ShapeType GetShape()
 		public Type GetShapeType()
 		{
 			if (Type.Equals("box"))
+			{
 				return typeof(Box);
+			}
 			else if (Type.Equals("mesh"))
+			{
 				return typeof(Mesh);
+			}
 			else if (Type.Equals("sphere"))
+			{
 				return typeof(Sphere);
+			}
 			else if (Type.Equals("cylinder"))
+			{
 				return typeof(Cylinder);
+			}
 			else if (Type.Equals("plane"))
+			{
 				return typeof(Plane);
+			}
 			else
+			{
 				return null;
+			}
 		}
 	}
 }
diff --git a/Assets/Scripts/Tools/SDFImporter/SDFImporter.Sensor.cs b/Assets/Scripts/Tools/SDFImporter/SDFImporter.Sensor.cs
@@ -21,7 +21,7 @@ protected override System.Object ImportSensor(in SDF.Sensor item, in System.Obje
 
 		var sensorType = item.Type;
 
-		if (sensorType.Equals("ray") || sensorType.Equals("gpu_ray"))
+		if (sensorType.Equals("lidar") || sensorType.Equals("ray") || sensorType.Equals("gpu_ray"))
 		{
 			var ray = item.GetSensor() as SDF.Ray;
 			sensor = SDFImplement.Sensor.AddLidar(ray, targetObject);
@@ -56,7 +56,8 @@ protected override System.Object ImportSensor(in SDF.Sensor item, in System.Obje
 			var gps = item.GetSensor() as SDF.GPS;
 			sensor = SDFImplement.Sensor.AddGps(gps, targetObject);
 		}
-		else if (sensorType.Equals("altimeter") || sensorType.Equals("contact") ||
+		else if (sensorType.Equals("air_pressure") ||
+				 sensorType.Equals("altimeter") || sensorType.Equals("contact") ||
 				 sensorType.Equals("force_torque") ||
 				 sensorType.Equals("logical_camera") || sensorType.Equals("magnetometer") ||
 				 sensorType.Equals("rfidtag") ||

diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -121,7 +121,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.4.0
+  bundleVersion: 1.4.1
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
-Original file line number
+Diff line change
@@ Expand Up / @@ -188,7 +188,6 @@ private IEnumerator CameraWorker() @@
     				readback.WaitForCompletion();
     				if (readback.hasError)
     				{
     					Debug.LogError("Failed to read GPU texture");
@@ Expand Down @@