Merge from 'develop' into 'main' for CLOiSim-4.5.0 (#279)

lge-ros2 · Apr 23, 2024 · 346b0fc · 346b0fc
2 parents 1be7130 + 78a87ca
commit 346b0fc
Show file tree

Hide file tree

Showing 77 changed files with 2,201 additions and 1,141 deletions.
diff --git a/.gitignore b/.gitignore
@@ -116,4 +116,9 @@ tags
 [._]*.un~
 
 # UI 
-/UIElementsSchema
+/UIElementsSchema
+
+
+# SDF files
+*.world
+*.sdf
diff --git a/Assets/Plugins/AssimpNet.5.0.0-beta1/runtimes/win-x86/native.meta b/Assets/Plugins/AssimpNet.5.0.0-beta1/runtimes/win-x86/native.meta
diff --git a/Assets/Plugins/AssimpNet.5.0.0-beta1/runtimes/win-x86/native/assimp.dll b/Assets/Plugins/AssimpNet.5.0.0-beta1/runtimes/win-x86/native/assimp.dll
diff --git a/Assets/Plugins/AssimpNet.5.0.0-beta1/runtimes/win-x86/native/assimp.dll.meta b/Assets/Plugins/AssimpNet.5.0.0-beta1/runtimes/win-x86/native/assimp.dll.meta
diff --git a/Assets/Resources/PhysicsMaterials/Asphalt.physicMaterial b/Assets/Resources/PhysicsMaterials/Asphalt.physicMaterial
@@ -0,0 +1,14 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!134 &13400000
+PhysicMaterial:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Asphalt
+  dynamicFriction: 0.7
+  staticFriction: 0.8
+  bounciness: 0
+  frictionCombine: 1
+  bounceCombine: 1
diff --git a/...simpNet.5.0.0-beta1/runtimes/win-x86.meta → ...sicsMaterials/Asphalt.physicMaterial.meta b/...simpNet.5.0.0-beta1/runtimes/win-x86.meta → ...sicsMaterials/Asphalt.physicMaterial.meta
diff --git a/...icsMaterials/temp_material.physicMaterial → ...s/PhysicsMaterials/Default.physicMaterial b/...icsMaterials/temp_material.physicMaterial → ...s/PhysicsMaterials/Default.physicMaterial
@@ -6,7 +6,7 @@ PhysicMaterial:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: temp_material
+  m_Name: Default
   dynamicFriction: 0.5
   staticFriction: 0.6
   bounciness: 0

diff --git a/...terials/temp_material.physicMaterial.meta → ...sicsMaterials/Default.physicMaterial.meta b/...terials/temp_material.physicMaterial.meta → ...sicsMaterials/Default.physicMaterial.meta