Merge from 'develop' into 'main' for CLOiSim-4.4.1 (#276)

lge-ros2 · Mar 27, 2024 · 1be7130 · 1be7130
2 parents 3b46ae2 + fb29a8e
commit 1be7130
Show file tree

Hide file tree

Showing 112 changed files with 8,011 additions and 6,812 deletions.
diff --git a/Assets/Plugins/AssimpNet.4.1.0/lib/net40/AssimpNet.dll b/Assets/Plugins/AssimpNet.4.1.0/lib/net40/AssimpNet.dll
diff --git a/Assets/Plugins/AssimpNet.4.1.0/runtimes/linux-x64/native/libassimp.so b/Assets/Plugins/AssimpNet.4.1.0/runtimes/linux-x64/native/libassimp.so
diff --git a/Assets/Plugins/AssimpNet.4.1.0/runtimes/osx-x64/native/libassimp.dylib b/Assets/Plugins/AssimpNet.4.1.0/runtimes/osx-x64/native/libassimp.dylib
diff --git a/Assets/Plugins/AssimpNet.4.1.0/runtimes/win-x64/native/assimp.dll b/Assets/Plugins/AssimpNet.4.1.0/runtimes/win-x64/native/assimp.dll
diff --git a/Assets/Plugins/AssimpNet.4.1.0.meta → Assets/Plugins/AssimpNet.5.0.0-beta1.meta b/Assets/Plugins/AssimpNet.4.1.0.meta → Assets/Plugins/AssimpNet.5.0.0-beta1.meta
diff --git a/...ts/Plugins/AssimpNet.4.1.0/.signature.p7s → ...gins/AssimpNet.5.0.0-beta1/.signature.p7s b/...ts/Plugins/AssimpNet.4.1.0/.signature.p7s → ...gins/AssimpNet.5.0.0-beta1/.signature.p7s
diff --git a/Assets/Plugins/AssimpNet.5.0.0-beta1/AssimpNet Documentation (October 2018).chm b/Assets/Plugins/AssimpNet.5.0.0-beta1/AssimpNet Documentation (October 2018).chm
diff --git a/...net.3.2.26/protobuf-net.3.2.26.nupkg.meta → ...Net Documentation (October 2018).chm.meta b/...net.3.2.26/protobuf-net.3.2.26.nupkg.meta → ...Net Documentation (October 2018).chm.meta
diff --git a/Assets/Plugins/AssimpNet.5.0.0-beta1/AssimpNet.5.0.0-beta1.nupkg b/Assets/Plugins/AssimpNet.5.0.0-beta1/AssimpNet.5.0.0-beta1.nupkg
diff --git a/....2.26/protobuf-net.Core.3.2.26.nupkg.meta → ....0-beta1/AssimpNet.5.0.0-beta1.nupkg.meta b/....2.26/protobuf-net.Core.3.2.26.nupkg.meta → ....0-beta1/AssimpNet.5.0.0-beta1.nupkg.meta
diff --git a/Assets/Plugins/AssimpNet.4.1.0/ChangeLog.txt → ...ugins/AssimpNet.5.0.0-beta1/ChangeLog.txt b/Assets/Plugins/AssimpNet.4.1.0/ChangeLog.txt → ...ugins/AssimpNet.5.0.0-beta1/ChangeLog.txt
diff --git a/...lugins/AssimpNet.4.1.0/ChangeLog.txt.meta → .../AssimpNet.5.0.0-beta1/ChangeLog.txt.meta b/...lugins/AssimpNet.4.1.0/ChangeLog.txt.meta → .../AssimpNet.5.0.0-beta1/ChangeLog.txt.meta
diff --git a/Assets/Plugins/AssimpNet.4.1.0/License.txt → ...Plugins/AssimpNet.5.0.0-beta1/License.txt b/Assets/Plugins/AssimpNet.4.1.0/License.txt → ...Plugins/AssimpNet.5.0.0-beta1/License.txt
@@ -1,5 +1,5 @@
 
-Copyright (c) 2012-2018 AssimpNet - Nicholas Woodfield
+Copyright (c) 2012-2020 AssimpNet - Nicholas Woodfield
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/.../Plugins/AssimpNet.4.1.0/License.txt.meta → ...ns/AssimpNet.5.0.0-beta1/License.txt.meta b/.../Plugins/AssimpNet.4.1.0/License.txt.meta → ...ns/AssimpNet.5.0.0-beta1/License.txt.meta
diff --git a/Assets/Plugins/AssimpNet.5.0.0-beta1/build.meta b/Assets/Plugins/AssimpNet.5.0.0-beta1/build.meta
diff --git a/Assets/Plugins/AssimpNet.5.0.0-beta1/build/AssimpNet.targets b/Assets/Plugins/AssimpNet.5.0.0-beta1/build/AssimpNet.targets
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- Copy/clean native dependencies only for projects that don't output a *.deps.json file (netframework projects). Netcore projects will
+       copy out the native dependencies during publish, and during development debugging/running, the binaries will be loaded from the nuget cache.
+       Optionally, the property $(ForceCopyNativeAssimp) can be set to true to always run these targets. -->
+
+  <Target Name="CopyNativeAssimp" AfterTargets="AfterBuild" Condition="'$(ForceCopyNativeAssimp)' == 'true' OR !Exists('$(TargetDir)$(AssemblyName).deps.json')">
+    <ItemGroup>
+        <NativeAssimpLibs Include="$(MSBuildThisFileDirectory)..\runtimes\**\*.*"/>
+    </ItemGroup>  
+    <Message Text="Copying native Assimp libraries..." Importance="high" />
+    <Message Text="$(TargetDir)$(AssemblyName).deps.json" Importance="high" />
+    <Copy SourceFiles="@(NativeAssimpLibs)" DestinationFolder="$(OutputPath)\runtimes\%(RecursiveDir)" />
+  </Target>
+
+  <Target Name="CleanNativeAssimp" BeforeTargets="BeforeClean" Condition="'$(ForceCopyNativeAssimp)' == 'true' OR !Exists('$(TargetDir)$(AssemblyName).deps.json')">
+    <Message Text="Cleaning native Assimp libraries..." Importance="high" />
+    <ItemGroup>
+	      <NativeAssimpLibsToDelete Include="$(TargetDir)runtimes\**\*assimp*.*;" />
+    </ItemGroup>
+    <Delete Files="@(NativeAssimpLibsToDelete)" />
+  </Target>
+</Project>
diff --git a/Assets/Plugins/AssimpNet.5.0.0-beta1/build/AssimpNet.targets.meta b/Assets/Plugins/AssimpNet.5.0.0-beta1/build/AssimpNet.targets.meta
diff --git a/Assets/Plugins/protobuf-net.3.2.26/lib.meta → ...ts/Plugins/AssimpNet.5.0.0-beta1/lib.meta b/Assets/Plugins/protobuf-net.3.2.26/lib.meta → ...ts/Plugins/AssimpNet.5.0.0-beta1/lib.meta
diff --git a/...ts/Plugins/AssimpNet.4.1.0/lib/net40.meta → ...gins/AssimpNet.5.0.0-beta1/lib/net40.meta b/...ts/Plugins/AssimpNet.4.1.0/lib/net40.meta → ...gins/AssimpNet.5.0.0-beta1/lib/net40.meta
diff --git a/Assets/Plugins/AssimpNet.5.0.0-beta1/lib/net40/AssimpNet.dll b/Assets/Plugins/AssimpNet.5.0.0-beta1/lib/net40/AssimpNet.dll
diff --git a/...impNet.4.1.0/lib/net40/AssimpNet.dll.meta → ....5.0.0-beta1/lib/net40/AssimpNet.dll.meta b/...impNet.4.1.0/lib/net40/AssimpNet.dll.meta → ....5.0.0-beta1/lib/net40/AssimpNet.dll.meta