Merge remote-tracking branch 'origin/features/spiceRework' into featu…

…res/gisView
pro3d-space · Feb 7, 2024 · 5a73120 · 5a73120
2 parents a4f6f13 + d70ca82
commit 5a73120
Show file tree

Hide file tree

Showing 39 changed files with 742 additions and 85 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,35 +30,6 @@ src\Aardvark.OpcViewer.psess
 /src/PRo3D.DomainModel/bin/Release
 /src/PRo3D.Base/bin/Release
 /.paket/Paket.Restore.targets
-/src/Aardvark.Opc.Viewer/bin/Debug/Aardvark.Opc.Viewer.XML
-/src/Aardvark.Opc.Viewer/bin/Debug/Aardvark.Opc.Viewer.exe
-/src/Aardvark.Opc.Viewer/bin/Debug/Aardvark.Opc.Viewer.exe.config
-/src/Aardvark.Opc.Viewer/bin/Debug/Aardvark.Opc.Viewer.pdb
-/src/Aardvark.Opc.Viewer/bin/Debug/FSharp.Core.dll
-/src/Aardvark.Opc.Viewer/bin/Debug/FSharp.Core.xml
-/src/Aardvark.Opc.Viewer/bin/Debug/System.ValueTuple.dll
-/src/Aardvark.Opc.Viewer/bin/Release/Aardvark.Opc.Viewer.XML
-/src/Aardvark.Opc.Viewer/packages.config
-/src/Aardvark.Opc.Viewer/paket.references
-/src/packages/System.ValueTuple.4.3.1/System.ValueTuple.4.3.1.nupkg
-/src/packages/System.ValueTuple.4.3.1/ThirdPartyNotices.txt
-/src/packages/System.ValueTuple.4.3.1/dotnet_library_license.txt
-/src/packages/System.ValueTuple.4.3.1/lib/MonoAndroid10/_._
-/src/packages/System.ValueTuple.4.3.1/lib/MonoTouch10/_._
-/src/packages/System.ValueTuple.4.3.1/lib/netstandard1.0/.xml
-/src/packages/System.ValueTuple.4.3.1/lib/netstandard1.0/System.ValueTuple.dll
-/src/packages/System.ValueTuple.4.3.1/lib/portable-net40+sl4+win8+wp8/.xml
-/src/packages/System.ValueTuple.4.3.1/lib/portable-net40+sl4+win8+wp8/System.ValueTuple.dll
-/src/packages/System.ValueTuple.4.3.1/lib/xamarinios10/_._
-/src/packages/System.ValueTuple.4.3.1/lib/xamarinmac20/_._
-/src/packages/System.ValueTuple.4.3.1/lib/xamarintvos10/_._
-/src/packages/System.ValueTuple.4.3.1/lib/xamarinwatchos10/_._
-/src/packages/System.ValueTuple.4.3.1/ref/MonoAndroid10/_._
-/src/packages/System.ValueTuple.4.3.1/ref/MonoTouch10/_._
-/src/packages/System.ValueTuple.4.3.1/ref/xamarinios10/_._
-/src/packages/System.ValueTuple.4.3.1/ref/xamarinmac20/_._
-/src/packages/System.ValueTuple.4.3.1/ref/xamarintvos10/_._
-/src/packages/System.ValueTuple.4.3.1/ref/xamarinwatchos10/_._
 /src/Aardvark.Opc.Viewer/bin/Release
 *.domaincache
 /.paket
@@ -81,3 +52,5 @@ src\Aardvark.OpcViewer.psess
 /aardium/dist
 /aardium/yarn-error.log
 /provex/result.obj
+**/bin/Debug/**
+**/bin/Release/**
diff --git a/lib/Native/JR.Wrappers/windows/AMD64/CooTransformation.dll b/lib/Native/JR.Wrappers/windows/AMD64/CooTransformation.dll
diff --git a/lib/Native/JR.Wrappers/windows/AMD64/CooTransformationDLL-LICENSE.txt b/lib/Native/JR.Wrappers/windows/AMD64/CooTransformationDLL-LICENSE.txt
diff --git a/lib/Native/JR.Wrappers/windows/AMD64/CooTransformationDemo.exe b/lib/Native/JR.Wrappers/windows/AMD64/CooTransformationDemo.exe
diff --git a/lib/Native/JR.Wrappers/windows/AMD64/GraphObject2d.dll b/lib/Native/JR.Wrappers/windows/AMD64/GraphObject2d.dll
diff --git a/lib/Native/JR.Wrappers/windows/AMD64/GraphObject3d.dll b/lib/Native/JR.Wrappers/windows/AMD64/GraphObject3d.dll
diff --git a/lib/Native/JR.Wrappers/windows/AMD64/InstrumentDLL-LICENSE.txt b/lib/Native/JR.Wrappers/windows/AMD64/InstrumentDLL-LICENSE.txt
diff --git a/lib/Native/JR.Wrappers/windows/AMD64/InstrumentPlatforms.dll b/lib/Native/JR.Wrappers/windows/AMD64/InstrumentPlatforms.dll
diff --git a/lib/Native/JR.Wrappers/windows/AMD64/InternationalisationRegistry.dll b/lib/Native/JR.Wrappers/windows/AMD64/InternationalisationRegistry.dll
diff --git a/lib/Native/JR.Wrappers/windows/AMD64/Progress.dll b/lib/Native/JR.Wrappers/windows/AMD64/Progress.dll
diff --git a/lib/Native/JR.Wrappers/windows/AMD64/SPICEKernels-LICENSE.txt b/lib/Native/JR.Wrappers/windows/AMD64/SPICEKernels-LICENSE.txt
diff --git a/lib/Native/JR.Wrappers/windows/AMD64/Strings.dll b/lib/Native/JR.Wrappers/windows/AMD64/Strings.dll
diff --git a/lib/Native/JR.Wrappers/windows/AMD64/boost_chrono-vc120-mt-1_58.dll b/lib/Native/JR.Wrappers/windows/AMD64/boost_chrono-vc120-mt-1_58.dll
diff --git a/lib/Native/JR.Wrappers/windows/AMD64/boost_chrono-vc120-mt-1_64.dll b/lib/Native/JR.Wrappers/windows/AMD64/boost_chrono-vc120-mt-1_64.dll
diff --git a/lib/Native/JR.Wrappers/windows/AMD64/boost_date_time-vc120-mt-1_64.dll b/lib/Native/JR.Wrappers/windows/AMD64/boost_date_time-vc120-mt-1_64.dll
diff --git a/lib/Native/JR.Wrappers/windows/AMD64/boost_filesystem-vc120-mt-1_58.dll b/lib/Native/JR.Wrappers/windows/AMD64/boost_filesystem-vc120-mt-1_58.dll
diff --git a/lib/Native/JR.Wrappers/windows/AMD64/boost_filesystem-vc120-mt-1_64.dll b/lib/Native/JR.Wrappers/windows/AMD64/boost_filesystem-vc120-mt-1_64.dll
diff --git a/lib/Native/JR.Wrappers/windows/AMD64/boost_system-vc120-mt-1_58.dll b/lib/Native/JR.Wrappers/windows/AMD64/boost_system-vc120-mt-1_58.dll
diff --git a/lib/Native/JR.Wrappers/windows/AMD64/boost_system-vc120-mt-1_64.dll b/lib/Native/JR.Wrappers/windows/AMD64/boost_system-vc120-mt-1_64.dll
diff --git a/lib/Native/JR.Wrappers/windows/AMD64/boost_thread-vc120-mt-1_58.dll b/lib/Native/JR.Wrappers/windows/AMD64/boost_thread-vc120-mt-1_58.dll
diff --git a/lib/Native/JR.Wrappers/windows/AMD64/boost_thread-vc120-mt-1_64.dll b/lib/Native/JR.Wrappers/windows/AMD64/boost_thread-vc120-mt-1_64.dll
diff --git a/lib/Native/JR.Wrappers/windows/AMD64/msvcp120.dll b/lib/Native/JR.Wrappers/windows/AMD64/msvcp120.dll
diff --git a/lib/Native/JR.Wrappers/windows/AMD64/msvcp140.dll b/lib/Native/JR.Wrappers/windows/AMD64/msvcp140.dll
diff --git a/lib/Native/JR.Wrappers/windows/AMD64/msvcp140d.dll b/lib/Native/JR.Wrappers/windows/AMD64/msvcp140d.dll
diff --git a/lib/Native/JR.Wrappers/windows/AMD64/msvcr120.dll b/lib/Native/JR.Wrappers/windows/AMD64/msvcr120.dll
diff --git a/lib/Native/JR.Wrappers/windows/AMD64/pugixml.dll b/lib/Native/JR.Wrappers/windows/AMD64/pugixml.dll
diff --git a/lib/Native/JR.Wrappers/windows/AMD64/spice.dll b/lib/Native/JR.Wrappers/windows/AMD64/spice.dll
diff --git a/lib/Native/JR.Wrappers/windows/AMD64/vcruntime140.dll b/lib/Native/JR.Wrappers/windows/AMD64/vcruntime140.dll
diff --git a/lib/Native/JR.Wrappers/windows/AMD64/vcruntime140_1.dll b/lib/Native/JR.Wrappers/windows/AMD64/vcruntime140_1.dll
diff --git a/lib/Native/JR.Wrappers/windows/AMD64/vcruntime140_1d.dll b/lib/Native/JR.Wrappers/windows/AMD64/vcruntime140_1d.dll
diff --git a/lib/Native/JR.Wrappers/windows/AMD64/vcruntime140d.dll b/lib/Native/JR.Wrappers/windows/AMD64/vcruntime140d.dll
diff --git a/paket.dependencies b/paket.dependencies
@@ -83,6 +83,20 @@ group Test
     nuget Expecto                  ~> 9.0.4
     nuget Expecto.FsCheck          ~> 9.0.4
     nuget YoloDev.Expecto.TestSdk  ~> 0.12.20
+
+	nuget FSharp.Data.Adaptive                  ~> 1.2.13
+
+	nuget Aardvark.Base                         ~> 5.2.13
+	nuget Aardvark.Base.Incremental             ~> 5.2.13
+	nuget Aardvark.Base.FSharp                  ~> 5.2.13
+
+	nuget Aardvark.Rendering                    ~> 5.4.0
+	nuget Aardvark.Rendering.Text               ~> 5.4.0
+	nuget Aardvark.SceneGraph                   ~> 5.4.0
+	nuget Aardvark.SceneGraph.IO                ~> 5.4.0
+	nuget Aardvark.Application.Slim             ~> 5.4.0
+	nuget Aardvark.Application.Slim.GL          ~> 5.4.0
+	nuget Aardvark.Application.Slim.Vulkan      ~> 5.4.0
 
     nuget BenchmarkDotNet          ~> 0.13.1