Skip to content

Commit 6dc5d4f

Browse files
hyazinthhhyazinthh
committed
Switch to Aardvark.Data.Assimp
See: #81
1 parent ed764d0 commit 6dc5d4f

File tree

77 files changed

+36
-106
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+36
-106
lines changed

‎lib/Native/Aardvark.SceneGraph.Assimp/remap.xml

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎paket.dependencies

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ nuget CommonMark.NET ~> 0.15.1
3333
nuget GLSLangSharp ~> 0.4.14
3434

3535
nuget Unofficial.LibTessDotNet ~> 2.0.2
36-
nuget AssimpNet ~> 5.0.0-beta1
36+
nuget Aardvark.Data.Assimp ~> 1.0.1
3737
nuget Offler ~> 2.1.1
3838
nuget FSharp.Data ~> 6.4.0
3939

‎paket.lock

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@ NUGET
5252
FSharp.Core (>= 3.1.2.5) - restriction: || (== net471) (&& (== net8.0) (>= net45)) (&& (== net8.0-windows10.0.17763.0) (>= net45)) (&& (== netstandard2.0) (>= net45))
5353
FSharp.Core (>= 4.2.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)
5454
Aardvark.Build (2.0.3)
55+
Aardvark.Data.Assimp (1.0.1)
56+
Aardvark.Base (>= 5.3 < 5.4)
57+
System.Memory (>= 4.5.5)
58+
System.Numerics.Vectors (>= 4.5)
59+
System.Runtime.CompilerServices.Unsafe (>= 6.0)
5560
Aardvark.Data.GLTF (1.0)
5661
Aardvark.Base.Tensors (>= 5.3 < 5.4)
5762
Aardvark.Rendering.Common (>= 5.5)
@@ -85,8 +90,6 @@ NUGET
8590
Aardvark.Base (>= 5.3)
8691
FSharp.Core (>= 8.0)
8792
System.Reflection.Emit.Lightweight (>= 4.7)
88-
AssimpNet (5.0.0-beta1)
89-
NETStandard.Library (>= 1.6.1) - restriction: || (&& (== net471) (< net35)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)
9093
BenchmarkDotNet (0.13.12)
9194
BenchmarkDotNet.Annotations (>= 0.13.12)
9295
CommandLineParser (>= 2.9.1)
@@ -271,7 +274,7 @@ NUGET
271274
Microsoft.NET.Test.Sdk (17.5)
272275
Microsoft.CodeCoverage (>= 17.5) - restriction: || (== net471) (== net8.0) (== net8.0-windows10.0.17763.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1))
273276
Microsoft.TestPlatform.TestHost (>= 17.5) - restriction: || (&& (== net471) (>= netcoreapp3.1)) (== net8.0) (== net8.0-windows10.0.17763.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
274-
Microsoft.NETCore.Platforms (6.0.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)
277+
Microsoft.NETCore.Platforms (6.0.3)
275278
Microsoft.NETCore.Targets (5.0) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)
276279
Microsoft.NETFramework.ReferenceAssemblies (1.0)
277280
Microsoft.NETFramework.ReferenceAssemblies.net471 (>= 1.0) - restriction: || (== net471) (&& (== net8.0) (>= net471)) (&& (== net8.0-windows10.0.17763.0) (>= net471)) (&& (== netstandard2.0) (>= net471))

‎src/Aardvark.SceneGraph.Assimp/Aardvark.SceneGraph.Assimp.fsproj

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@
1515
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
1616
<OutputPath>..\..\bin\Release</OutputPath>
1717
</PropertyGroup>
18-
<PropertyGroup Condition="($(DesignTimeBuild) == true)">
19-
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
20-
</PropertyGroup>
2118
<ItemGroup>
19+
<None Include="paket.references" />
20+
<None Include="paket.template" />
2221
<Compile Include="Loader.fs" />
2322
<Compile Include="AssimpExporter.fs" />
2423
</ItemGroup>
@@ -27,4 +26,4 @@
2726
<ProjectReference Include="..\Aardvark.SceneGraph\Aardvark.SceneGraph.fsproj" />
2827
</ItemGroup>
2928
<Import Project="..\..\.paket\Paket.Restore.targets" />
30-
</Project>
29+
</Project>

‎src/Aardvark.SceneGraph.Assimp/Loader.fs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -334,8 +334,8 @@ module Loader =
334334

335335
[<AutoOpen>]
336336
module Conversions =
337-
let toC4f (c : Assimp.Color4D) =
338-
C4f(c.R, c.G, c.B, c.A)
337+
let toC4f (c : System.Numerics.Vector4) =
338+
C4f(c.X, c.Y, c.Z, c.W)
339339

340340
let toBlendMode (m : Assimp.BlendMode) =
341341
match m with
@@ -416,7 +416,7 @@ module Loader =
416416
textureFiles
417417

418418

419-
let toTextures (table : Map<string, Map<Symbol, string>>) (m : Assimp.TextureSlot[]) : Map<Symbol, Texture> =
419+
let toTextures (table : Map<string, Map<Symbol, string>>) (m : Assimp.TextureSlot seq) : Map<Symbol, Texture> =
420420
let slots =
421421
m |> Seq.toList |> List.map (fun slot ->
422422
let path = slot.FilePath.Replace('\\', Path.DirectorySeparatorChar).Replace('/', Path.DirectorySeparatorChar)
@@ -470,21 +470,21 @@ module Loader =
470470

471471
textures
472472

473-
let toM44d (m : Assimp.Matrix4x4) : M44d =
473+
let toM44d (m : System.Numerics.Matrix4x4) : M44d =
474474
M44d(
475-
float m.A1, float m.A2, float m.A3, float m.A4,
476-
float m.B1, float m.B2, float m.B3, float m.B4,
477-
float m.C1, float m.C2, float m.C3, float m.C4,
478-
float m.D1, float m.D2, float m.D3, float m.D4
475+
float m.M11, float m.M12, float m.M13, float m.M14,
476+
float m.M21, float m.M22, float m.M23, float m.M24,
477+
float m.M31, float m.M32, float m.M33, float m.M34,
478+
float m.M41, float m.M42, float m.M43, float m.M44
479479
)
480480

481-
let toV3d (v : Assimp.Vector3D) =
481+
let toV3d (v : System.Numerics.Vector3) =
482482
V3d(v.X, v.Y, v.Z)
483483

484-
let toV2d (v : Assimp.Vector2D) =
484+
let toV2d (v : System.Numerics.Vector2) =
485485
V2d(v.X, v.Y)
486486

487-
let toQuaternion (v : Assimp.Quaternion) =
487+
let toQuaternion (v : System.Numerics.Quaternion) =
488488
Rot3d(QuaternionD(float v.W, float v.X, float v.Y, float v.Z).Normalized)
489489

490490
let private toV4i (arr : int[]) =
@@ -616,7 +616,7 @@ module Loader =
616616
let indices = m.GetIndices()
617617
let identity = indices |> Seq.indexed |> Seq.forall(fun (a,b) -> a = b)
618618
if not identity then
619-
res.IndexArray <- indices
619+
res.IndexArray <- Array.ofSeq indices
620620

621621

622622

@@ -800,15 +800,15 @@ module Loader =
800800
0
801801

802802

803-
let duration = a.DurationInTicks * a.TicksPerSecond
803+
let duration = a.DurationInTicks / a.TicksPerSecond
804804
let fps = float frames / duration
805805

806806
let keyFrames = Dict.empty
807807

808808
for na in a.NodeAnimationChannels do
809-
let pos = na.PositionKeys |> Seq.map (fun e -> e.Time, toV3d e.Value) |> MapExt.ofSeq
810-
let rot = na.RotationKeys |> Seq.map (fun e -> e.Time, toQuaternion e.Value) |> MapExt.ofSeq
811-
let scale = na.ScalingKeys |> Seq.map (fun e -> e.Time, toV3d e.Value) |> MapExt.ofSeq
809+
let pos = na.PositionKeys |> Seq.map (fun e -> e.Time / a.TicksPerSecond, toV3d e.Value) |> MapExt.ofSeq
810+
let rot = na.RotationKeys |> Seq.map (fun e -> e.Time / a.TicksPerSecond, toQuaternion e.Value) |> MapExt.ofSeq
811+
let scale = na.ScalingKeys |> Seq.map (fun e -> e.Time / a.TicksPerSecond, toV3d e.Value) |> MapExt.ofSeq
812812

813813
let position (t : float) =
814814
let (l,s,r) = MapExt.neighbours t pos

‎src/Aardvark.SceneGraph.Assimp/paket.references

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Aardvark.Base.Incremental
22
FShade.Core
33
FShade.GLSL
4-
AssimpNet
4+
Aardvark.Data.Assimp
55
FSharp.Core
66
Aardvark.Base.Tensors
77
Aardvark.Build

‎src/Demo/Examples/AssimpInterop.fs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ module Assimp =
129129
| _ ->
130130
if m.HasFaces && m.FaceCount > 0 && m.PrimitiveType = PrimitiveType.Triangle then
131131
let scene : Scene = scope.Scene
132-
let indexArray = m.GetIndices()
132+
let indexArray = Array.ofSeq <| m.GetIndices()
133133

134134
let vertexCount = m.Vertices.Count
135135

@@ -163,7 +163,7 @@ module Assimp =
163163
// if the mesh is indexed use its index for determinig the
164164
// total face-vertex-count. otherwise use any
165165
let faceVertexCount =
166-
if indexArray <> null then
166+
if indexArray.Length > 0 then
167167
indexArray.Length
168168
else
169169
vertexCount
@@ -190,7 +190,7 @@ module Assimp =
190190
) :> ISg
191191

192192
let sg =
193-
if indexArray <> null then
193+
if indexArray.Length > 0 then
194194
Sg.VertexIndexApplicator(BufferView.ofArray indexArray, sg) :> ISg
195195
else
196196
sg
@@ -220,13 +220,13 @@ module Assimp =
220220

221221
// another utility function for converting
222222
// transformation matrices
223-
let toTrafo (m : Matrix4x4) =
223+
let toTrafo (m : System.Numerics.Matrix4x4) =
224224
let m =
225225
M44d(
226-
float m.A1, float m.A2, float m.A3, float m.A4,
227-
float m.B1, float m.B2, float m.B3, float m.B4,
228-
float m.C1, float m.C2, float m.C3, float m.C4,
229-
float m.D1, float m.D2, float m.D3, float m.D4
226+
float m.M11, float m.M12, float m.M13, float m.M14,
227+
float m.M21, float m.M22, float m.M23, float m.M24,
228+
float m.M31, float m.M32, float m.M33, float m.M34,
229+
float m.M41, float m.M42, float m.M43, float m.M44
230230
)
231231

232232
Trafo3d(m, m.Inverse)

‎src/Demo/Examples/paket.references

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
Aardvark.Base.Essentials
22
Aardvark.Base.Incremental
33
Aardvark.PixImage.ImageSharp
4-
AssimpNet
54
FShade.Core
65
FShade.GLSL
76
FSharp.Core

‎src/Demo/FontRendering/paket.references

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ FShade.Core
44
FShade.GLSL
55
FSharp.Core
66
Unofficial.OpenTK
7-
AssimpNet
87
Unofficial.LibTessDotNet
98
CommonMark.NET
109
GLSLangSharp

‎src/Examples (netcore)/00 - HelloWorld/paket.references

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
Aardvark.Base.Essentials
22
Aardvark.Base.Incremental
3-
AssimpNet
43
FShade.Core
54
FShade.GLSL
65
FSharp.Core

‎src/Examples (netcore)/01 - Hello Wpf/paket.references

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
Aardvark.Base.Essentials
22
Aardvark.Base.Incremental
3-
AssimpNet
43
FShade.Core
54
FShade.GLSL
65
FSharp.Core

‎src/Examples (netcore)/01 - Triangle/paket.references

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
Aardvark.Base.Essentials
22
Aardvark.Base.Incremental
3-
AssimpNet
43
FShade.Core
54
FShade.GLSL
65
FSharp.Core

‎src/Examples (netcore)/02 - TexturedCube/paket.references

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
Aardvark.Base.Essentials
22
Aardvark.Base.Incremental
3-
AssimpNet
43
FShade.Core
54
FShade.GLSL
65
FSharp.Core

‎src/Examples (netcore)/03 - Animation/paket.references

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
Aardvark.Base.Essentials
22
Aardvark.Base.Incremental
3-
AssimpNet
43
FShade.Core
54
FShade.GLSL
65
FSharp.Core

‎src/Examples (netcore)/04 - ModelLoading/paket.references

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Aardvark.Base.Essentials
22
Aardvark.Base.Incremental
3-
AssimpNet
3+
Aardvark.PixImage.ImageSharp
44
FShade.Core
55
FShade.GLSL
66
FSharp.Core

‎src/Examples (netcore)/05 - Points/paket.references

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
Aardvark.Base.Essentials
22
Aardvark.Base.Incremental
3-
AssimpNet
43
FShade.Core
54
FShade.GLSL
65
FSharp.Core

‎src/Examples (netcore)/06 - GeometryPrimitives/paket.references

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
Aardvark.Base.Essentials
22
Aardvark.Base.Incremental
3-
AssimpNet
43
FShade.Core
54
FShade.GLSL
65
FSharp.Core

‎src/Examples (netcore)/07 - RenderToTexture/paket.references

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
Aardvark.Base.Essentials
22
Aardvark.Base.Incremental
3-
AssimpNet
43
FShade.Core
54
FShade.GLSL
65
FSharp.Core

‎src/Examples (netcore)/08 - NaiveViewFrustumCulling/paket.references

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
Aardvark.Base.Essentials
22
Aardvark.Base.Incremental
3-
AssimpNet
43
FShade.Core
54
FShade.GLSL
65
FSharp.Core

‎src/Examples (netcore)/09 - TesselatedSphere/paket.references

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
Aardvark.Base.Essentials
22
Aardvark.Base.Incremental
3-
AssimpNet
43
FShade.Core
54
FShade.GLSL
65
FSharp.Core

‎src/Examples (netcore)/10 - NBodyCompute/paket.references

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
Aardvark.Base.Essentials
22
Aardvark.Base.Incremental
3-
AssimpNet
43
FShade.Core
54
FShade.GLSL
65
FSharp.Core

‎src/Examples (netcore)/11 - ParallelPrimitives/paket.references

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
Aardvark.Base.Essentials
22
Aardvark.Base.Incremental
3-
AssimpNet
43
FShade.Core
54
FShade.GLSL
65
FSharp.Core

‎src/Examples (netcore)/12 - GlslIntrinsics/paket.references

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
Aardvark.Base.Essentials
22
Aardvark.Base.Incremental
3-
AssimpNet
43
FShade.Core
54
FShade.GLSL
65
FSharp.Core

‎src/Examples (netcore)/13 - Mandelbrot/paket.references

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
Aardvark.Base.Essentials
22
Aardvark.Base.Incremental
3-
AssimpNet
43
FShade.Core
54
FShade.GLSL
65
FSharp.Core

‎src/Examples (netcore)/14 - GeometryShaders/paket.references

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
Aardvark.Base.Essentials
22
Aardvark.Base.Incremental
3-
AssimpNet
43
FShade.Core
54
FShade.GLSL
65
FSharp.Core

‎src/Examples (netcore)/15 - GeometryPooling/paket.references

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
Aardvark.Base.Essentials
22
Aardvark.Base.Incremental
3-
AssimpNet
43
FShade.Core
54
FShade.GLSL
65
FSharp.Core

‎src/Examples (netcore)/16 - ShaderSwitches/paket.references

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
Aardvark.Base.Essentials
22
Aardvark.Base.Incremental
3-
AssimpNet
43
FShade.Core
54
FShade.GLSL
65
FSharp.Core

‎src/Examples (netcore)/17 - TextureArrays/paket.references

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
Aardvark.Base.Essentials
22
Aardvark.Base.Incremental
3-
AssimpNet
43
FShade.Core
54
FShade.GLSL
65
FSharp.Core

‎src/Examples (netcore)/18 - RenderCommands/paket.references

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
Aardvark.Base.Essentials
22
Aardvark.Base.Incremental
3-
AssimpNet
43
FShade.Core
54
FShade.GLSL
65
FSharp.Core

‎src/Examples (netcore)/19 - NativeTensors/paket.references

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
Aardvark.Base.Essentials
22
Aardvark.Base.Incremental
3-
AssimpNet
43
FShade.Core
54
FShade.GLSL
65
FSharp.Core

‎src/Examples (netcore)/20 - VolumeRendering/paket.references

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
Aardvark.Base.Essentials
22
Aardvark.Base.Incremental
33
Aardvark.PixImage.ImageSharp
4-
AssimpNet
54
FShade.Core
65
FShade.GLSL
76
FSharp.Core

‎src/Examples (netcore)/21 - LoD/paket.references

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
Aardvark.Base.Essentials
22
Aardvark.Base.Incremental
33
Aardvark.PixImage.ImageSharp
4-
AssimpNet
54
FShade.Core
65
FShade.GLSL
76
FSharp.Core

‎src/Examples (netcore)/22 - HardwareFeatures/paket.references

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
Aardvark.Base.Essentials
22
Aardvark.Base.Incremental
3-
AssimpNet
43
FShade.Core
54
FShade.GLSL
65
FSharp.Core

‎src/Examples (netcore)/23 - FlexibleDrawCommands/paket.references

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
Aardvark.Base.Essentials
22
Aardvark.Base.Incremental
3-
AssimpNet
43
FShade.Core
54
FShade.GLSL
65
FSharp.Core

0 commit comments

Comments
 (0)