Merge pull request #5 from oikawa-yusuke/update-unity-sensors-ros

Update unity sensors ros
Field-Robotics-Japan · Jun 30, 2023 · c796222 · c796222
2 parents 09bb823 + 535951b
commit c796222
Show file tree

Hide file tree

Showing 186 changed files with 1,718 additions and 13,455 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,3 +34,9 @@ sysinfo.txt
 # Builds
 *.apk
 *.unitypackage
+
+# mac
+*.DS_Store
+
+# default-2021.dwlt
+/UserSettings/*
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "External/UnitySensorsROSAssets"]
+	path = External/UnitySensorsROSAssets
+	url = https://github.com/Field-Robotics-Japan/UnitySensorsROSAssets.git
diff --git a/Assets/AddressableAssetsData b/Assets/AddressableAssetsData
@@ -0,0 +1 @@
+../External/UnitySensorsROSAssets/Assets/AddressableAssetsData
diff --git a/Assets/AddressableAssetsData.meta b/Assets/AddressableAssetsData.meta
@@ -0,0 +1 @@
+../External/UnitySensorsROSAssets/Assets/AddressableAssetsData.meta
diff --git a/Assets/Pcx/Editor/PlyImporter.cs b/Assets/Pcx/Editor/PlyImporter.cs
@@ -4,7 +4,7 @@
 using UnityEngine;
 using UnityEngine.Rendering;
 using UnityEditor;
-using UnityEditor.Experimental.AssetImporters;
+
 
 using System;
 using System.Collections.Generic;
@@ -13,16 +13,16 @@
 
 namespace Pcx
 {
-    [ScriptedImporter(1, "ply")]
-    class PlyImporter : ScriptedImporter
+    [UnityEditor.AssetImporters.ScriptedImporter(1, "ply")]
+    class PlyImporter : UnityEditor.AssetImporters.ScriptedImporter
     {
         #region ScriptedImporter implementation
 
         public enum ContainerType { Mesh, ComputeBuffer, Texture  }
 
         [SerializeField] ContainerType _containerType = ContainerType.Mesh;
 
-        public override void OnImportAsset(AssetImportContext context)
+        public override void OnImportAsset(UnityEditor.AssetImporters.AssetImportContext context)
         {
             if (_containerType == ContainerType.Mesh)
             {

diff --git a/Assets/Pcx/Editor/PlyImporterInspector.cs b/Assets/Pcx/Editor/PlyImporterInspector.cs
@@ -3,15 +3,15 @@
 
 using UnityEngine;
 using UnityEditor;
-using UnityEditor.Experimental.AssetImporters;
+
 
 namespace Pcx
 {
     // Note: Not sure why but EnumPopup doesn't work in ScriptedImporterEditor,
     // so it has been replaced with a normal Popup control.
 
     [CustomEditor(typeof(PlyImporter))]
-    class PlyImporterInspector : ScriptedImporterEditor
+    class PlyImporterInspector : UnityEditor.AssetImporters.ScriptedImporterEditor
     {
         SerializedProperty _containerType;
 

diff --git a/Assets/Resources b/Assets/Resources
@@ -0,0 +1 @@
+../External/UnitySensorsROSAssets/Assets/Resources
diff --git a/Assets/Resources.meta b/Assets/Resources.meta
@@ -0,0 +1 @@
+../External/UnitySensorsROSAssets/Assets/Resources.meta
diff --git a/Assets/UnitySensors b/Assets/UnitySensors
@@ -0,0 +1 @@
+../External/UnitySensorsROSAssets/Assets/UnitySensors
diff --git a/Assets/UnitySensors.meta b/Assets/UnitySensors.meta
@@ -0,0 +1 @@
+../External/UnitySensorsROSAssets/Assets/UnitySensors.meta
diff --git a/Assets/UnitySensorsROS b/Assets/UnitySensorsROS
@@ -0,0 +1 @@
+../External/UnitySensorsROSAssets/Assets/UnitySensorsROS
diff --git a/Assets/UnitySensorsROS.meta b/Assets/UnitySensorsROS.meta
@@ -0,0 +1 @@
+../External/UnitySensorsROSAssets/Assets/UnitySensorsROS.meta
diff --git a/Assets/UnitySensorsROSAssets b/Assets/UnitySensorsROSAssets
@@ -0,0 +1 @@
+../External/UnitySensorsROSAssets/Assets/UnitySensorsROSAssets
diff --git a/Assets/UnitySensorsROSAssets.meta b/Assets/UnitySensorsROSAssets.meta
@@ -0,0 +1 @@
+../External/UnitySensorsROSAssets/Assets/UnitySensorsROSAssets.meta
diff --git a/Assets/unit04_unity/Materials.meta b/Assets/unit04_unity/Materials.meta
diff --git a/Assets/unit04_unity/Materials/Body.physicMaterial b/Assets/unit04_unity/Materials/Body.physicMaterial
diff --git a/Assets/unit04_unity/Materials/Body.physicMaterial.meta b/Assets/unit04_unity/Materials/Body.physicMaterial.meta
diff --git a/Assets/unit04_unity/Materials/Plane.physicMaterial b/Assets/unit04_unity/Materials/Plane.physicMaterial
diff --git a/Assets/unit04_unity/Materials/Plane.physicMaterial.meta b/Assets/unit04_unity/Materials/Plane.physicMaterial.meta
diff --git a/Assets/unit04_unity/Materials/SimpleColor.meta b/Assets/unit04_unity/Materials/SimpleColor.meta
diff --git a/Assets/unit04_unity/Materials/SimpleColor/Blue.mat b/Assets/unit04_unity/Materials/SimpleColor/Blue.mat
diff --git a/Assets/unit04_unity/Materials/SimpleColor/Blue.mat.meta b/Assets/unit04_unity/Materials/SimpleColor/Blue.mat.meta
diff --git a/Assets/unit04_unity/Materials/SimpleColor/Green.mat b/Assets/unit04_unity/Materials/SimpleColor/Green.mat
diff --git a/Assets/unit04_unity/Materials/SimpleColor/Green.mat.meta b/Assets/unit04_unity/Materials/SimpleColor/Green.mat.meta
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../External/UnitySensorsROSAssets/Assets/AddressableAssetsData