From ac74b05b68c6423b32b923d1ef98eaeedecaf71e Mon Sep 17 00:00:00 2001 From: Martin Date: Wed, 24 Jul 2024 14:08:09 +0200 Subject: [PATCH] Rename SceneGraph.IO to SceneGraph.Assimp --- .../Aardvark.Rendering.Interactive.fsproj | 2 +- .../LoadReferences.fsx | 2 +- ...dvark.Rendering.NoExamples.NonWindows.slnf | 2 +- src/Aardvark.Rendering.NoExamples.slnf | 2 +- src/Aardvark.Rendering.NonWindows.slnf | 2 +- src/Aardvark.Rendering.sln | 2 +- .../Aardvark.SceneGraph.Assimp.fsproj} | 60 +++++++++---------- .../AssimpExporter.fs | 4 +- .../Loader.fs} | 4 +- .../paket.references | 0 .../paket.template | 2 +- .../FsiHelper.fsx | 2 +- src/Demo/Examples/AssimpInterop.fs | 7 ++- src/Demo/Examples/Eigi.fs | 2 +- src/Demo/Examples/Examples.fsproj | 2 +- src/Demo/Examples/IGPrimitives.fs | 2 +- src/Demo/Examples/Jpeg.fs | 2 +- src/Demo/Examples/LiveDemo.fsx | 4 +- src/Demo/Examples/Sponza.fs | 4 +- src/Demo/Examples/Terrain.fs | 2 +- src/Demo/FontRendering/FontRendering.fsproj | 2 +- .../04 - ModelLoading.fsproj | 2 +- .../04 - ModelLoading/Program.fs | 2 +- .../25 - AutomaticInstancing.fsproj | 2 +- .../25 - AutomaticInstancing/Program.fs | 2 +- .../36 - Raytracing/36 - Raytracing.fsproj | 2 +- .../36 - Raytracing/Program.fs | 2 +- .../00 - HelloWorld (net471).fsproj | 2 +- .../05 - HickupTest/05 - HickupTest.fsproj | 2 +- .../06 - MemoryLeakTest.fsproj | 2 +- .../07 - RenderTaskCustom.fsproj | 2 +- .../08 - DerivedAttributePerformance.fsproj | 2 +- .../09 - MappedBufferPerformance.fsproj | 2 +- .../24 - QuadbufferStereo.fsproj | 2 +- .../24 - QuadbufferStereo/Program.fs | 2 +- 35 files changed, 69 insertions(+), 70 deletions(-) rename src/{Aardvark.SceneGraph.IO/Aardvark.SceneGraph.IO.fsproj => Aardvark.SceneGraph.Assimp/Aardvark.SceneGraph.Assimp.fsproj} (91%) rename src/{Aardvark.SceneGraph.IO => Aardvark.SceneGraph.Assimp}/AssimpExporter.fs (99%) rename src/{Aardvark.SceneGraph.IO/IO.fs => Aardvark.SceneGraph.Assimp/Loader.fs} (99%) rename src/{Aardvark.SceneGraph.IO => Aardvark.SceneGraph.Assimp}/paket.references (100%) rename src/{Aardvark.SceneGraph.IO => Aardvark.SceneGraph.Assimp}/paket.template (92%) diff --git a/src/Aardvark.Rendering.Interactive/Aardvark.Rendering.Interactive.fsproj b/src/Aardvark.Rendering.Interactive/Aardvark.Rendering.Interactive.fsproj index f558fde0c..ae2dd1a66 100644 --- a/src/Aardvark.Rendering.Interactive/Aardvark.Rendering.Interactive.fsproj +++ b/src/Aardvark.Rendering.Interactive/Aardvark.Rendering.Interactive.fsproj @@ -25,7 +25,7 @@ - + diff --git a/src/Aardvark.Rendering.Interactive/LoadReferences.fsx b/src/Aardvark.Rendering.Interactive/LoadReferences.fsx index 6e1e81236..dc7a48ee5 100644 --- a/src/Aardvark.Rendering.Interactive/LoadReferences.fsx +++ b/src/Aardvark.Rendering.Interactive/LoadReferences.fsx @@ -14,7 +14,7 @@ #r "Aardvark.Application.WinForms.GL.dll" #r "System.Reactive.Core.dll" #r "Aardvark.Rendering.Interactive.dll" -#r "Aardvark.SceneGraph.IO.dll" +#r "Aardvark.SceneGraph.Assimp.dll" namespace Aardvark.Rendering.Interactive diff --git a/src/Aardvark.Rendering.NoExamples.NonWindows.slnf b/src/Aardvark.Rendering.NoExamples.NonWindows.slnf index 5b09785e8..b59abb3bb 100644 --- a/src/Aardvark.Rendering.NoExamples.NonWindows.slnf +++ b/src/Aardvark.Rendering.NoExamples.NonWindows.slnf @@ -10,7 +10,7 @@ "Aardvark.Rendering.Vulkan\\Aardvark.Rendering.Vulkan.fsproj", "Aardvark.Rendering\\Aardvark.Rendering.fsproj", "Aardvark.SceneGraph.Browser\\Aardvark.SceneGraph.Browser.fsproj", - "Aardvark.SceneGraph.IO\\Aardvark.SceneGraph.IO.fsproj", + "Aardvark.SceneGraph.Assimp\\Aardvark.SceneGraph.Assimp.fsproj", "Aardvark.SceneGraph.Opc\\Aardvark.SceneGraph.Opc.fsproj", "Aardvark.SceneGraph\\Aardvark.SceneGraph.fsproj", "Application\\Aardvark.Application.OpenVR.GL\\Aardvark.Application.OpenVR.GL.fsproj", diff --git a/src/Aardvark.Rendering.NoExamples.slnf b/src/Aardvark.Rendering.NoExamples.slnf index e349c999c..d2ce23dcb 100644 --- a/src/Aardvark.Rendering.NoExamples.slnf +++ b/src/Aardvark.Rendering.NoExamples.slnf @@ -10,7 +10,7 @@ "Aardvark.Rendering.Vulkan\\Aardvark.Rendering.Vulkan.fsproj", "Aardvark.Rendering\\Aardvark.Rendering.fsproj", "Aardvark.SceneGraph.Browser\\Aardvark.SceneGraph.Browser.fsproj", - "Aardvark.SceneGraph.IO\\Aardvark.SceneGraph.IO.fsproj", + "Aardvark.SceneGraph.Assimp\\Aardvark.SceneGraph.Assimp.fsproj", "Aardvark.SceneGraph.Opc\\Aardvark.SceneGraph.Opc.fsproj", "Aardvark.SceneGraph\\Aardvark.SceneGraph.fsproj", "Application\\Aardvark.Application.OpenVR.GL\\Aardvark.Application.OpenVR.GL.fsproj", diff --git a/src/Aardvark.Rendering.NonWindows.slnf b/src/Aardvark.Rendering.NonWindows.slnf index 1a59e031f..3d37ec831 100644 --- a/src/Aardvark.Rendering.NonWindows.slnf +++ b/src/Aardvark.Rendering.NonWindows.slnf @@ -10,7 +10,7 @@ "Aardvark.Rendering.Vulkan\\Aardvark.Rendering.Vulkan.fsproj", "Aardvark.Rendering\\Aardvark.Rendering.fsproj", "Aardvark.SceneGraph.Browser\\Aardvark.SceneGraph.Browser.fsproj", - "Aardvark.SceneGraph.IO\\Aardvark.SceneGraph.IO.fsproj", + "Aardvark.SceneGraph.Assimp\\Aardvark.SceneGraph.Assimp.fsproj", "Aardvark.SceneGraph.Opc\\Aardvark.SceneGraph.Opc.fsproj", "Aardvark.SceneGraph\\Aardvark.SceneGraph.fsproj", "Application\\Aardvark.Application.OpenVR.GL\\Aardvark.Application.OpenVR.GL.fsproj", diff --git a/src/Aardvark.Rendering.sln b/src/Aardvark.Rendering.sln index e63f5f683..45a0e0883 100644 --- a/src/Aardvark.Rendering.sln +++ b/src/Aardvark.Rendering.sln @@ -135,7 +135,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencie ..\paket.dependencies = ..\paket.dependencies EndProjectSection EndProject -Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Aardvark.SceneGraph.IO", "Aardvark.SceneGraph.IO\Aardvark.SceneGraph.IO.fsproj", "{D7B02E89-DC77-462D-A3D4-A28DAA403AAF}" +Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Aardvark.SceneGraph.Assimp", "Aardvark.SceneGraph.Assimp\Aardvark.SceneGraph.Assimp.fsproj", "{D7B02E89-DC77-462D-A3D4-A28DAA403AAF}" EndProject Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Aardvark.Rendering.Vulkan", "Aardvark.Rendering.Vulkan\Aardvark.Rendering.Vulkan.fsproj", "{8BBC1EF6-9C85-4BAF-A732-FC46DCA64EC3}" EndProject diff --git a/src/Aardvark.SceneGraph.IO/Aardvark.SceneGraph.IO.fsproj b/src/Aardvark.SceneGraph.Assimp/Aardvark.SceneGraph.Assimp.fsproj similarity index 91% rename from src/Aardvark.SceneGraph.IO/Aardvark.SceneGraph.IO.fsproj rename to src/Aardvark.SceneGraph.Assimp/Aardvark.SceneGraph.Assimp.fsproj index 2b0d434a9..d3c658f3a 100644 --- a/src/Aardvark.SceneGraph.IO/Aardvark.SceneGraph.IO.fsproj +++ b/src/Aardvark.SceneGraph.Assimp/Aardvark.SceneGraph.Assimp.fsproj @@ -1,30 +1,30 @@ - - - - netstandard2.0 - Aardvark.SceneGraph.IO - Library - true - true - 3389;3390;3395 - - - ..\..\bin\Debug\ - DEBUG;TRACE - - - ..\..\bin\Release - - - true - - - - - - - - - - - + + + + netstandard2.0 + Aardvark.SceneGraph.Assimp + Library + true + true + 3389;3390;3395 + + + ..\..\bin\Debug\ + DEBUG;TRACE + + + ..\..\bin\Release + + + true + + + + + + + + + + + diff --git a/src/Aardvark.SceneGraph.IO/AssimpExporter.fs b/src/Aardvark.SceneGraph.Assimp/AssimpExporter.fs similarity index 99% rename from src/Aardvark.SceneGraph.IO/AssimpExporter.fs rename to src/Aardvark.SceneGraph.Assimp/AssimpExporter.fs index 45d6fae7e..60d7597e1 100644 --- a/src/Aardvark.SceneGraph.IO/AssimpExporter.fs +++ b/src/Aardvark.SceneGraph.Assimp/AssimpExporter.fs @@ -1,4 +1,4 @@ -namespace Aardvark.SceneGraph.IO +namespace Aardvark.SceneGraph.Assimp open System open Aardvark.Base @@ -7,8 +7,6 @@ open Aardvark.SceneGraph open Aardvark.SceneGraph.CSharp open Aardvark.SceneGraph.Semantics open FSharp.Data.Adaptive -open Assimp -open Assimp.Unmanaged open System.Runtime.CompilerServices open System.Collections.Generic open System.Runtime.InteropServices diff --git a/src/Aardvark.SceneGraph.IO/IO.fs b/src/Aardvark.SceneGraph.Assimp/Loader.fs similarity index 99% rename from src/Aardvark.SceneGraph.IO/IO.fs rename to src/Aardvark.SceneGraph.Assimp/Loader.fs index 0562ce0b7..8bde857a3 100644 --- a/src/Aardvark.SceneGraph.IO/IO.fs +++ b/src/Aardvark.SceneGraph.Assimp/Loader.fs @@ -1,4 +1,4 @@ -namespace Aardvark.SceneGraph.IO +namespace Aardvark.SceneGraph.Assimp open Aardvark.Base open Aardvark.Base.Sorting @@ -749,7 +749,7 @@ module Loader = // false // Log.stop () // if r then Log.line "Assimp native dependencies successfully unpacked." - // else Log.line "Failed to unpack native assimp dependencies. Did you forget Aardvark.Init()? Make sure Aardvark.SceneGraph.IO.dll is in your output directory." + // else Log.line "Failed to unpack native assimp dependencies. Did you forget Aardvark.Init()? Make sure Aardvark.SceneGraph.Assimp.dll is in your output directory." let defaultFlags = Assimp.PostProcessSteps.CalculateTangentSpace ||| diff --git a/src/Aardvark.SceneGraph.IO/paket.references b/src/Aardvark.SceneGraph.Assimp/paket.references similarity index 100% rename from src/Aardvark.SceneGraph.IO/paket.references rename to src/Aardvark.SceneGraph.Assimp/paket.references diff --git a/src/Aardvark.SceneGraph.IO/paket.template b/src/Aardvark.SceneGraph.Assimp/paket.template similarity index 92% rename from src/Aardvark.SceneGraph.IO/paket.template rename to src/Aardvark.SceneGraph.Assimp/paket.template index b341a5caa..01ee49a6e 100644 --- a/src/Aardvark.SceneGraph.IO/paket.template +++ b/src/Aardvark.SceneGraph.Assimp/paket.template @@ -1,5 +1,5 @@ type project -id Aardvark.SceneGraph.IO +id Aardvark.SceneGraph.Assimp authors Aardvark Platform Team owners Aardvark Platform Team projectUrl http://github.com/aardvark-platform diff --git a/src/Application/Aardvark.Application.Utilities/FsiHelper.fsx b/src/Application/Aardvark.Application.Utilities/FsiHelper.fsx index 3fbf43136..0e37f1f77 100644 --- a/src/Application/Aardvark.Application.Utilities/FsiHelper.fsx +++ b/src/Application/Aardvark.Application.Utilities/FsiHelper.fsx @@ -14,7 +14,7 @@ module InteractiveHelper = let assemblies = [ Assembly.Load("Aardvark.SceneGraph") - Assembly.Load("Aardvark.SceneGraph.IO") + Assembly.Load("Aardvark.SceneGraph.Assimp") Assembly.Load("AssimpNet") Assembly.Load("DevILSharp") ] @ others diff --git a/src/Demo/Examples/AssimpInterop.fs b/src/Demo/Examples/AssimpInterop.fs index 9e03ae312..990699015 100644 --- a/src/Demo/Examples/AssimpInterop.fs +++ b/src/Demo/Examples/AssimpInterop.fs @@ -14,7 +14,6 @@ open Aardvark.Rendering open Aardvark.Rendering.Interactive open FSharp.Data.Adaptive -open Aardvark.SceneGraph open Aardvark.Application @@ -26,6 +25,7 @@ module Assimp = open System.Collections.Generic open Aardvark.Base.Ag + open Aardvark.SceneGraph open Aardvark.SceneGraph.Semantics @@ -355,12 +355,13 @@ module Assimp = module AssimpInterop = - open Aardvark.SceneGraph.Semantics open Assimp + open Aardvark.SceneGraph + open Aardvark.SceneGraph.Semantics FsiSetup.initFsi (Path.combine [__SOURCE_DIRECTORY__; ".."; ".."; ".."; "bin";"Debug";"Examples.exe"]) System.Environment.CurrentDirectory <- Path.combine [__SOURCE_DIRECTORY__; ".."; ".."; ".."; "bin";"Debug"] - //Aardvark.SceneGraph.IO.Loader.Assimp.initialize () + //Aardvark.SceneGraph.Assimp.Loader.Assimp.initialize () let win = Interactive.Window diff --git a/src/Demo/Examples/Eigi.fs b/src/Demo/Examples/Eigi.fs index c5667b950..98faf3fa9 100644 --- a/src/Demo/Examples/Eigi.fs +++ b/src/Demo/Examples/Eigi.fs @@ -15,7 +15,7 @@ open Aardvark.Rendering.ShaderReflection open Aardvark.Rendering.Text open System.Runtime.InteropServices open Aardvark.SceneGraph -open Aardvark.SceneGraph.IO +open Aardvark.SceneGraph.Assimp module Eigi = diff --git a/src/Demo/Examples/Examples.fsproj b/src/Demo/Examples/Examples.fsproj index 0e7b72784..5a4c3d33d 100644 --- a/src/Demo/Examples/Examples.fsproj +++ b/src/Demo/Examples/Examples.fsproj @@ -60,7 +60,7 @@ - + diff --git a/src/Demo/Examples/IGPrimitives.fs b/src/Demo/Examples/IGPrimitives.fs index 73beed04e..4127c297b 100644 --- a/src/Demo/Examples/IGPrimitives.fs +++ b/src/Demo/Examples/IGPrimitives.fs @@ -15,7 +15,7 @@ open Aardvark.Rendering.ShaderReflection open Aardvark.Rendering.Text open System.Runtime.InteropServices open Aardvark.SceneGraph -open Aardvark.SceneGraph.IO +open Aardvark.SceneGraph.Assimp open FShade open FShade.Imperative open System.Reflection diff --git a/src/Demo/Examples/Jpeg.fs b/src/Demo/Examples/Jpeg.fs index a95ed58b1..313b93ddd 100644 --- a/src/Demo/Examples/Jpeg.fs +++ b/src/Demo/Examples/Jpeg.fs @@ -16,7 +16,7 @@ open Aardvark.Rendering.ShaderReflection open Aardvark.Rendering.Text open System.Runtime.InteropServices open Aardvark.SceneGraph -open Aardvark.SceneGraph.IO +open Aardvark.SceneGraph.Assimp module Jpeg = diff --git a/src/Demo/Examples/LiveDemo.fsx b/src/Demo/Examples/LiveDemo.fsx index 7584c8a19..e3cee043b 100644 --- a/src/Demo/Examples/LiveDemo.fsx +++ b/src/Demo/Examples/LiveDemo.fsx @@ -18,11 +18,11 @@ open Aardvark.Base.Incremental.Operators open Aardvark.SceneGraph open Aardvark.Application open Aardvark.Rendering.Interactive -open Aardvark.SceneGraph.IO +open Aardvark.SceneGraph.Assimp FsiSetup.initFsi (Path.combine [BinDirectory; "Examples.exe"]) -Aardvark.SceneGraph.IO.Loader.Assimp.initialize () +Aardvark.SceneGraph.Assimp.Loader.Assimp.initialize () let fillMode = Mod.init FillMode.Fill diff --git a/src/Demo/Examples/Sponza.fs b/src/Demo/Examples/Sponza.fs index 7a876a640..5149355eb 100644 --- a/src/Demo/Examples/Sponza.fs +++ b/src/Demo/Examples/Sponza.fs @@ -15,7 +15,7 @@ open Aardvark.Rendering.ShaderReflection open Aardvark.Rendering.Text open System.Runtime.InteropServices open Aardvark.SceneGraph -open Aardvark.SceneGraph.IO +open Aardvark.SceneGraph.Assimp open FShade module Sponza = @@ -31,7 +31,7 @@ module Sponza = } let sg = - Aardvark.SceneGraph.IO.Loader.Assimp.loadFrom @"E:\Development\WorkDirectory\Sponza bunt\sponza_cm.obj" Loader.Assimp.defaultFlags + Aardvark.SceneGraph.Assimp.Loader.Assimp.loadFrom @"E:\Development\WorkDirectory\Sponza bunt\sponza_cm.obj" Loader.Assimp.defaultFlags |> Sg.adapter |> Sg.scale (0.01) |> Sg.transform (Trafo3d.FromBasis(V3d.IOO, V3d.OOI, V3d.OIO, V3d.Zero)) diff --git a/src/Demo/Examples/Terrain.fs b/src/Demo/Examples/Terrain.fs index b35f84758..6c0ad08e6 100644 --- a/src/Demo/Examples/Terrain.fs +++ b/src/Demo/Examples/Terrain.fs @@ -15,7 +15,7 @@ open Aardvark.Rendering.ShaderReflection open Aardvark.Rendering.Text open System.Runtime.InteropServices open Aardvark.SceneGraph -open Aardvark.SceneGraph.IO +open Aardvark.SceneGraph.Assimp module Terrain = diff --git a/src/Demo/FontRendering/FontRendering.fsproj b/src/Demo/FontRendering/FontRendering.fsproj index 34436c293..cb8c5a2bd 100644 --- a/src/Demo/FontRendering/FontRendering.fsproj +++ b/src/Demo/FontRendering/FontRendering.fsproj @@ -25,7 +25,7 @@ - + diff --git a/src/Examples (netcore)/04 - ModelLoading/04 - ModelLoading.fsproj b/src/Examples (netcore)/04 - ModelLoading/04 - ModelLoading.fsproj index 6624320f3..efd58b37f 100644 --- a/src/Examples (netcore)/04 - ModelLoading/04 - ModelLoading.fsproj +++ b/src/Examples (netcore)/04 - ModelLoading/04 - ModelLoading.fsproj @@ -21,7 +21,7 @@ - + diff --git a/src/Examples (netcore)/04 - ModelLoading/Program.fs b/src/Examples (netcore)/04 - ModelLoading/Program.fs index 608e8ffb5..3f4ad58ad 100644 --- a/src/Examples (netcore)/04 - ModelLoading/Program.fs +++ b/src/Examples (netcore)/04 - ModelLoading/Program.fs @@ -2,7 +2,7 @@ open Aardvark.Rendering open FSharp.Data.Adaptive open Aardvark.SceneGraph -open Aardvark.SceneGraph.IO +open Aardvark.SceneGraph.Assimp open Aardvark.Application open System diff --git a/src/Examples (netcore)/25 - AutomaticInstancing/25 - AutomaticInstancing.fsproj b/src/Examples (netcore)/25 - AutomaticInstancing/25 - AutomaticInstancing.fsproj index e1f163d73..7e3f87f2b 100644 --- a/src/Examples (netcore)/25 - AutomaticInstancing/25 - AutomaticInstancing.fsproj +++ b/src/Examples (netcore)/25 - AutomaticInstancing/25 - AutomaticInstancing.fsproj @@ -20,7 +20,7 @@ - + diff --git a/src/Examples (netcore)/25 - AutomaticInstancing/Program.fs b/src/Examples (netcore)/25 - AutomaticInstancing/Program.fs index 7431ad745..13fc26730 100644 --- a/src/Examples (netcore)/25 - AutomaticInstancing/Program.fs +++ b/src/Examples (netcore)/25 - AutomaticInstancing/Program.fs @@ -3,7 +3,7 @@ open Aardvark.Rendering open FSharp.Data.Adaptive open FSharp.Data.Adaptive.Operators open Aardvark.SceneGraph -open Aardvark.SceneGraph.IO +open Aardvark.SceneGraph.Assimp open Aardvark.Rendering.Text open Aardvark.Application diff --git a/src/Examples (netcore)/36 - Raytracing/36 - Raytracing.fsproj b/src/Examples (netcore)/36 - Raytracing/36 - Raytracing.fsproj index e0787c74a..c1b3ababa 100644 --- a/src/Examples (netcore)/36 - Raytracing/36 - Raytracing.fsproj +++ b/src/Examples (netcore)/36 - Raytracing/36 - Raytracing.fsproj @@ -21,7 +21,7 @@ - + diff --git a/src/Examples (netcore)/36 - Raytracing/Program.fs b/src/Examples (netcore)/36 - Raytracing/Program.fs index aba754cd9..ba02fd8cc 100644 --- a/src/Examples (netcore)/36 - Raytracing/Program.fs +++ b/src/Examples (netcore)/36 - Raytracing/Program.fs @@ -2,7 +2,7 @@ open Aardvark.Rendering open Aardvark.Rendering.Raytracing open Aardvark.SceneGraph -open Aardvark.SceneGraph.IO +open Aardvark.SceneGraph.Assimp open Aardvark.SceneGraph.Raytracing open Aardvark.Application open Aardvark.Application.Slim diff --git a/src/Scratch (net471)/00 - HelloWorld (net471)/00 - HelloWorld (net471).fsproj b/src/Scratch (net471)/00 - HelloWorld (net471)/00 - HelloWorld (net471).fsproj index ed9e46e7c..401cafda9 100644 --- a/src/Scratch (net471)/00 - HelloWorld (net471)/00 - HelloWorld (net471).fsproj +++ b/src/Scratch (net471)/00 - HelloWorld (net471)/00 - HelloWorld (net471).fsproj @@ -26,7 +26,7 @@ - + diff --git a/src/Scratch (net471)/05 - HickupTest/05 - HickupTest.fsproj b/src/Scratch (net471)/05 - HickupTest/05 - HickupTest.fsproj index 1e6094296..33c3a69f2 100644 --- a/src/Scratch (net471)/05 - HickupTest/05 - HickupTest.fsproj +++ b/src/Scratch (net471)/05 - HickupTest/05 - HickupTest.fsproj @@ -24,7 +24,7 @@ - + diff --git a/src/Scratch (net471)/06 - MemoryLeakTest/06 - MemoryLeakTest.fsproj b/src/Scratch (net471)/06 - MemoryLeakTest/06 - MemoryLeakTest.fsproj index 1e6094296..33c3a69f2 100644 --- a/src/Scratch (net471)/06 - MemoryLeakTest/06 - MemoryLeakTest.fsproj +++ b/src/Scratch (net471)/06 - MemoryLeakTest/06 - MemoryLeakTest.fsproj @@ -24,7 +24,7 @@ - + diff --git a/src/Scratch (net471)/07 - RenderTaskCustom/07 - RenderTaskCustom.fsproj b/src/Scratch (net471)/07 - RenderTaskCustom/07 - RenderTaskCustom.fsproj index 1e6094296..33c3a69f2 100644 --- a/src/Scratch (net471)/07 - RenderTaskCustom/07 - RenderTaskCustom.fsproj +++ b/src/Scratch (net471)/07 - RenderTaskCustom/07 - RenderTaskCustom.fsproj @@ -24,7 +24,7 @@ - + diff --git a/src/Scratch (net471)/08 - DerivedAttributePerformance/08 - DerivedAttributePerformance.fsproj b/src/Scratch (net471)/08 - DerivedAttributePerformance/08 - DerivedAttributePerformance.fsproj index 1e6094296..33c3a69f2 100644 --- a/src/Scratch (net471)/08 - DerivedAttributePerformance/08 - DerivedAttributePerformance.fsproj +++ b/src/Scratch (net471)/08 - DerivedAttributePerformance/08 - DerivedAttributePerformance.fsproj @@ -24,7 +24,7 @@ - + diff --git a/src/Scratch (net471)/09 - MappedBufferPerformance/09 - MappedBufferPerformance.fsproj b/src/Scratch (net471)/09 - MappedBufferPerformance/09 - MappedBufferPerformance.fsproj index 1e6094296..33c3a69f2 100644 --- a/src/Scratch (net471)/09 - MappedBufferPerformance/09 - MappedBufferPerformance.fsproj +++ b/src/Scratch (net471)/09 - MappedBufferPerformance/09 - MappedBufferPerformance.fsproj @@ -24,7 +24,7 @@ - + diff --git a/src/Scratch (netcore)/24 - QuadbufferStereo/24 - QuadbufferStereo.fsproj b/src/Scratch (netcore)/24 - QuadbufferStereo/24 - QuadbufferStereo.fsproj index b431eb0b2..aef6747b6 100644 --- a/src/Scratch (netcore)/24 - QuadbufferStereo/24 - QuadbufferStereo.fsproj +++ b/src/Scratch (netcore)/24 - QuadbufferStereo/24 - QuadbufferStereo.fsproj @@ -22,7 +22,7 @@ - + diff --git a/src/Scratch (netcore)/24 - QuadbufferStereo/Program.fs b/src/Scratch (netcore)/24 - QuadbufferStereo/Program.fs index 3b37c72a5..16fe4a1f0 100644 --- a/src/Scratch (netcore)/24 - QuadbufferStereo/Program.fs +++ b/src/Scratch (netcore)/24 - QuadbufferStereo/Program.fs @@ -7,7 +7,7 @@ open FSharp.Data.Adaptive open Aardvark.SceneGraph open Aardvark.Application open Aardvark.Application.Slim -open Aardvark.SceneGraph.IO +open Aardvark.SceneGraph.Assimp open Aardvark.Rendering.Text open Aardvark.Glfw