Skip to content

Commit

Permalink
[Examples] Add GLTF example
Browse files Browse the repository at this point in the history
  • Loading branch information
hyazinthh committed Jul 30, 2024
1 parent d722830 commit 73f8991
Show file tree
Hide file tree
Showing 22 changed files with 295 additions and 221 deletions.
7 changes: 4 additions & 3 deletions paket.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ nuget FShade.Core ~> 5.6.0-prerelease0001
nuget FShade ~> 5.6.0-prerelease0001
nuget FShade.Debug ~> 5.6.0-prerelease0001

// Some tests and examples require an image loader
nuget Aardvark.PixImage.ImageSharp ~> 2.0.1-prerelease0001

nuget Unofficial.OpenVR ~> 1.1.0
nuget Unofficial.Typography ~> 0.1.0
nuget CommonMark.NET ~> 0.15.1
Expand All @@ -46,6 +43,10 @@ nuget Silk.NET.Direct3D9 = 2.15.0

nuget SharpZipLib ~> 1.4.1

// Examples
nuget Aardvark.PixImage.ImageSharp ~> 2.0.1-prerelease0001
nuget Aardvark.Data.GLTF ~> 1.0.0-prerelease0001

group Test
framework: net8.0
source https://api.nuget.org/v3/index.json
Expand Down
20 changes: 16 additions & 4 deletions paket.lock
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ NUGET
FSharp.Core (>= 3.1.2.5) - restriction: || (== net471) (&& (== net8.0) (>= net45)) (&& (== net8.0-windows10.0.17763.0) (>= net45)) (&& (== netstandard2.0) (>= net45))
FSharp.Core (>= 4.2.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)
Aardvark.Build (1.0.24)
Aardvark.Data.GLTF (1.0.0-prerelease0001)
Aardvark.Base.Tensors (>= 5.3.0-prerelease0005 < 5.4.0-prerelease)
Aardvark.Rendering.Common (>= 5.5.0-prerelease0002)
FSharp.Core (>= 8.0)
glTF2Loader (>= 1.1.4-alpha < 1.2.0-alpha)
Aardvark.Geometry (5.3.0-prerelease0005)
Aardvark.Base (5.3.0-prerelease0005)
Aardvark.Base.FSharp (5.3.0-prerelease0005)
Expand All @@ -58,6 +63,10 @@ NUGET
Aardvark.Base.Tensors (>= 5.3.0-prerelease0004 < 5.4.0-prerelease)
FSharp.Core (>= 8.0)
SixLabors.ImageSharp (>= 2.1.8 < 2.2)
Aardvark.Rendering.Common (5.5.0-prerelease0002)
Aardvark.Base (>= 5.3.0-prerelease0005)
FSharp.Core (>= 8.0)
System.Reflection.Emit.Lightweight (>= 4.7)
AssimpNet (5.0.0-beta1)
NETStandard.Library (>= 1.6.1) - restriction: || (&& (== net471) (< net35)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)
CommonMark.NET (0.15.1)
Expand Down Expand Up @@ -144,6 +153,9 @@ NUGET
FSharp.Core (>= 4.7)
GLSLangSharp (0.4.15)
FSharp.Core (>= 5.0)
glTF2Loader (1.1.4-alpha)
NETStandard.Library (>= 1.6.1)
Newtonsoft.Json (>= 10.0.3)
Microsoft.Bcl.AsyncInterfaces (8.0) - restriction: || (== net471) (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0-windows10.0.17763.0) (>= net462)) (&& (== net8.0-windows10.0.17763.0) (< net6.0)) (== netstandard2.0)
System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (== net471) (&& (== net8.0) (>= net462)) (&& (== net8.0) (< netstandard2.1)) (&& (== net8.0-windows10.0.17763.0) (>= net462)) (&& (== net8.0-windows10.0.17763.0) (< netstandard2.1)) (== netstandard2.0)
Microsoft.Bcl.HashCode (1.1.1) - restriction: || (== net471) (&& (== net8.0) (< netstandard2.1)) (&& (== net8.0-windows10.0.17763.0) (< netstandard2.1)) (== netstandard2.0)
Expand All @@ -162,7 +174,7 @@ NUGET
Microsoft.NETFramework.ReferenceAssemblies (1.0)
Microsoft.NETFramework.ReferenceAssemblies.net471 (>= 1.0) - restriction: || (== net471) (&& (== net8.0) (>= net471)) (&& (== net8.0-windows10.0.17763.0) (>= net471)) (&& (== netstandard2.0) (>= net471))
Microsoft.NETFramework.ReferenceAssemblies.net471 (1.0.2) - restriction: || (== net471) (&& (== net8.0) (>= net471)) (&& (== net8.0-windows10.0.17763.0) (>= net471)) (&& (== netstandard2.0) (>= net471))
NETStandard.Library (2.0.3) - restriction: || (&& (== net471) (< net35)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)
NETStandard.Library (2.0.3)
Microsoft.NETCore.Platforms (>= 1.1)
Newtonsoft.Json (13.0.1)
Offler (2.1.1-prerelease0001)
Expand Down Expand Up @@ -260,7 +272,7 @@ NUGET
System.Threading (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)
System.Memory (4.5.5)
System.Buffers (>= 4.5.1) - restriction: || (== net471) (&& (== net8.0) (>= monotouch)) (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp2.0)) (&& (== net8.0) (< netstandard1.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= xamarinios)) (&& (== net8.0) (>= xamarinmac)) (&& (== net8.0) (>= xamarintvos)) (&& (== net8.0) (>= xamarinwatchos)) (&& (== net8.0-windows10.0.17763.0) (>= monotouch)) (&& (== net8.0-windows10.0.17763.0) (>= net461)) (&& (== net8.0-windows10.0.17763.0) (< netcoreapp2.0)) (&& (== net8.0-windows10.0.17763.0) (< netstandard1.1)) (&& (== net8.0-windows10.0.17763.0) (< netstandard2.0)) (&& (== net8.0-windows10.0.17763.0) (>= xamarinios)) (&& (== net8.0-windows10.0.17763.0) (>= xamarinmac)) (&& (== net8.0-windows10.0.17763.0) (>= xamarintvos)) (&& (== net8.0-windows10.0.17763.0) (>= xamarinwatchos)) (== netstandard2.0)
System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net471) (== net8.0)) (&& (== net471) (== net8.0-windows10.0.17763.0)) (&& (== net471) (< net45)) (&& (== net8.0) (< netcoreapp2.0)) (&& (== net8.0-windows10.0.17763.0) (< netcoreapp2.0)) (== netstandard2.0)
System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net471) (< net45)) (&& (== net8.0) (< netcoreapp2.0)) (&& (== net8.0-windows10.0.17763.0) (< netcoreapp2.0)) (== netstandard2.0)
System.Numerics.Vectors (>= 4.5) - restriction: || (== net471) (&& (== net8.0) (>= net461)) (&& (== net8.0-windows10.0.17763.0) (>= net461)) (&& (== netstandard2.0) (>= net461))
System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (== net471) (&& (== net8.0) (>= monotouch)) (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp2.0)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net8.0) (< netstandard1.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= uap10.1)) (&& (== net8.0) (>= xamarinios)) (&& (== net8.0) (>= xamarinmac)) (&& (== net8.0) (>= xamarintvos)) (&& (== net8.0) (>= xamarinwatchos)) (&& (== net8.0-windows10.0.17763.0) (>= monotouch)) (&& (== net8.0-windows10.0.17763.0) (>= net461)) (&& (== net8.0-windows10.0.17763.0) (< netcoreapp2.0)) (&& (== net8.0-windows10.0.17763.0) (< netcoreapp2.1)) (&& (== net8.0-windows10.0.17763.0) (< netstandard1.1)) (&& (== net8.0-windows10.0.17763.0) (< netstandard2.0)) (&& (== net8.0-windows10.0.17763.0) (>= uap10.1)) (&& (== net8.0-windows10.0.17763.0) (>= xamarinios)) (&& (== net8.0-windows10.0.17763.0) (>= xamarinmac)) (&& (== net8.0-windows10.0.17763.0) (>= xamarintvos)) (&& (== net8.0-windows10.0.17763.0) (>= xamarinwatchos)) (== netstandard2.0)
System.Numerics.Vectors (4.5)
Expand All @@ -277,10 +289,10 @@ NUGET
System.Reflection.Primitives (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)
System.Runtime (>= 4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)
System.Reflection.Emit (4.7) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)
System.Reflection.Emit.ILGeneration (>= 4.7) - restriction: || (&& (== net471) (== net8.0)) (&& (== net471) (== net8.0-windows10.0.17763.0)) (&& (== net471) (< net45)) (&& (== net471) (< netstandard1.1)) (&& (== net471) (< netstandard2.0) (>= wpa81)) (&& (== net471) (>= uap10.1)) (&& (== net8.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net8.0) (< netstandard1.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= uap10.1)) (&& (== net8.0-windows10.0.17763.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net8.0-windows10.0.17763.0) (< netstandard1.1)) (&& (== net8.0-windows10.0.17763.0) (< netstandard2.0)) (&& (== net8.0-windows10.0.17763.0) (>= uap10.1)) (== netstandard2.0)
System.Reflection.Emit.ILGeneration (>= 4.7) - restriction: || (&& (== net471) (< net45)) (&& (== net471) (< netstandard1.1)) (&& (== net471) (< netstandard2.0) (>= wpa81)) (&& (== net471) (>= uap10.1)) (&& (== net8.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net8.0) (< netstandard1.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= uap10.1)) (&& (== net8.0-windows10.0.17763.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net8.0-windows10.0.17763.0) (< netstandard1.1)) (&& (== net8.0-windows10.0.17763.0) (< netstandard2.0)) (&& (== net8.0-windows10.0.17763.0) (>= uap10.1)) (== netstandard2.0)
System.Reflection.Emit.ILGeneration (4.7) - restriction: || (&& (== net471) (< net45)) (&& (== net471) (< netstandard2.0) (>= wpa81)) (&& (== net471) (< portable-net45+wp8)) (&& (== net471) (>= uap10.1)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)
System.Reflection.Emit.Lightweight (4.7)
System.Reflection.Emit.ILGeneration (>= 4.7) - restriction: || (&& (== net471) (== net8.0)) (&& (== net471) (== net8.0-windows10.0.17763.0)) (&& (== net471) (< net45)) (&& (== net471) (< netstandard2.0) (>= wpa81)) (&& (== net471) (< portable-net45+wp8)) (&& (== net471) (>= uap10.1)) (&& (== net8.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (< portable-net45+wp8)) (&& (== net8.0) (>= uap10.1)) (&& (== net8.0-windows10.0.17763.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net8.0-windows10.0.17763.0) (< netstandard2.0)) (&& (== net8.0-windows10.0.17763.0) (< portable-net45+wp8)) (&& (== net8.0-windows10.0.17763.0) (>= uap10.1)) (== netstandard2.0)
System.Reflection.Emit.ILGeneration (>= 4.7) - restriction: || (&& (== net471) (< net45)) (&& (== net471) (< netstandard2.0) (>= wpa81)) (&& (== net471) (< portable-net45+wp8)) (&& (== net471) (>= uap10.1)) (&& (== net8.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (< portable-net45+wp8)) (&& (== net8.0) (>= uap10.1)) (&& (== net8.0-windows10.0.17763.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net8.0-windows10.0.17763.0) (< netstandard2.0)) (&& (== net8.0-windows10.0.17763.0) (< portable-net45+wp8)) (&& (== net8.0-windows10.0.17763.0) (>= uap10.1)) (== netstandard2.0)
System.Reflection.Extensions (4.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)
Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)
Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0)
Expand Down
4 changes: 3 additions & 1 deletion src/Aardvark.Rendering.NonWindows.slnf
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"Aardvark.Rendering.Vulkan.Wrapper\\Aardvark.Rendering.Vulkan.Wrapper.fsproj",
"Aardvark.Rendering.Vulkan\\Aardvark.Rendering.Vulkan.fsproj",
"Aardvark.Rendering\\Aardvark.Rendering.fsproj",
"Aardvark.SceneGraph.Browser\\Aardvark.SceneGraph.Browser.fsproj",
"Aardvark.SceneGraph.Assimp\\Aardvark.SceneGraph.Assimp.fsproj",
"Aardvark.SceneGraph.Browser\\Aardvark.SceneGraph.Browser.fsproj",
"Aardvark.SceneGraph.Opc\\Aardvark.SceneGraph.Opc.fsproj",
"Aardvark.SceneGraph\\Aardvark.SceneGraph.fsproj",
"Application\\Aardvark.Application.OpenVR.GL\\Aardvark.Application.OpenVR.GL.fsproj",
Expand Down Expand Up @@ -59,6 +59,8 @@
"Examples (netcore)\\34 - StorageBuffers\\34 - StorageBuffers.fsproj",
"Examples (netcore)\\35 - Picking\\35 - Picking.fsproj",
"Examples (netcore)\\36 - Raytracing\\36 - Raytracing.fsproj",
"Examples (netcore)\\37 - ReversedDepth\\37 - ReversedDepth.fsproj",
"Examples (netcore)\\38 - GLTF\\38 - GLTF.fsproj",
"Scratch (netcore)\\01 - Triangle\\01 - Triangle.fsproj",
"Scratch (netcore)\\02 - OpcDemo\\02 - OpcDemo.fsproj",
"Scratch (netcore)\\03 - Sorted\\03 - Sorted.fsproj",
Expand Down
7 changes: 7 additions & 0 deletions src/Aardvark.Rendering.sln
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,8 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "23 - NativeMemoryLeak", "Sc
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Aardvark.Rendering.Common", "Aardvark.Rendering.Common\Aardvark.Rendering.Common.fsproj", "{FBFF12BC-5292-4154-B985-31130061F3D6}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "38 - GLTF", "Examples (netcore)\38 - GLTF\38 - GLTF.fsproj", "{470275FD-9F08-4814-A6DF-73E9C812C1D6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -624,6 +626,10 @@ Global
{FBFF12BC-5292-4154-B985-31130061F3D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FBFF12BC-5292-4154-B985-31130061F3D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FBFF12BC-5292-4154-B985-31130061F3D6}.Release|Any CPU.Build.0 = Release|Any CPU
{470275FD-9F08-4814-A6DF-73E9C812C1D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{470275FD-9F08-4814-A6DF-73E9C812C1D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{470275FD-9F08-4814-A6DF-73E9C812C1D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{470275FD-9F08-4814-A6DF-73E9C812C1D6}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -717,6 +723,7 @@ Global
{159213C5-ECA5-48B6-BDCF-D75BAE733E80} = {5E3312C4-1B3C-4D41-964C-C3A3E01DA966}
{6DFA9CC5-3C57-44FC-A989-F1DC5097C2DB} = {29CA9CA1-CC31-4B5D-8DB0-2FEA748C09D8}
{DD9808AD-AEB3-4E90-A70C-E398CADE55FF} = {29CA9CA1-CC31-4B5D-8DB0-2FEA748C09D8}
{470275FD-9F08-4814-A6DF-73E9C812C1D6} = {5E3312C4-1B3C-4D41-964C-C3A3E01DA966}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C41172B9-09C3-4327-8CE2-CB47CBAA29AC}
Expand Down
49 changes: 49 additions & 0 deletions src/Examples (netcore)/38 - GLTF/38 - GLTF.fsproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<OutputPath>..\..\..\bin\Debug</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>..\..\..\bin\Release</OutputPath>
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="data\chapel_bk.png" />
<EmbeddedResource Include="data\chapel_dn.png" />
<EmbeddedResource Include="data\chapel_ft.png" />
<EmbeddedResource Include="data\chapel_lf.png" />
<EmbeddedResource Include="data\chapel_rt.png" />
<EmbeddedResource Include="data\chapel_up.png" />
<EmbeddedResource Include="data\miramar_bk.png" />
<EmbeddedResource Include="data\miramar_dn.png" />
<EmbeddedResource Include="data\miramar_ft.png" />
<EmbeddedResource Include="data\miramar_lf.png" />
<EmbeddedResource Include="data\miramar_rt.png" />
<EmbeddedResource Include="data\miramar_up.png" />
<EmbeddedResource Include="data\random.png" />
<None Include="paket.references" />
<Compile Include="CubeMap.fs" />
<Compile Include="SceneGraph.fs" />
<Compile Include="Program.fs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Aardvark.Rendering\Aardvark.Rendering.fsproj" />
<ProjectReference Include="..\..\Aardvark.Rendering.GL\Aardvark.Rendering.GL.fsproj" />
<ProjectReference Include="..\..\Aardvark.Rendering.Text\Aardvark.Rendering.Text.fsproj" />
<ProjectReference Include="..\..\Aardvark.Rendering.Vulkan\Aardvark.Rendering.Vulkan.fsproj" />
<ProjectReference Include="..\..\Aardvark.SceneGraph\Aardvark.SceneGraph.fsproj" />
<ProjectReference Include="..\..\Application\Aardvark.Application.OpenVR.Vulkan\Aardvark.Application.OpenVR.Vulkan.fsproj" />
<ProjectReference Include="..\..\Application\Aardvark.Application.OpenVR\Aardvark.Application.OpenVR.fsproj" />
<ProjectReference Include="..\..\Application\Aardvark.Application.Utilities\Aardvark.Application.Utilities.fsproj" />
<ProjectReference Include="..\..\Application\Aardvark.Application.Slim.GL\Aardvark.Application.Slim.GL.fsproj" />
<ProjectReference Include="..\..\Application\Aardvark.Application.Slim.Vulkan\Aardvark.Application.Slim.Vulkan.fsproj" />
<ProjectReference Include="..\..\Application\Aardvark.Application.Slim\Aardvark.Application.Slim.fsproj" />
<ProjectReference Include="..\..\Application\Aardvark.Application\Aardvark.Application.fsproj" />
</ItemGroup>
<Import Project="..\..\..\.paket\Paket.Restore.targets" />
</Project>
Loading

0 comments on commit 73f8991

Please sign in to comment.