Import Aardvark.UI.Screenshotr

aardvark-platform · Jul 22, 2024 · e5b38a7 · e5b38a7
1 parent f1d874d
commit e5b38a7
Show file tree

Hide file tree

Showing 18 changed files with 338 additions and 284 deletions.
diff --git a/paket.dependencies b/paket.dependencies
@@ -31,6 +31,8 @@ nuget Another.Unofficial.Xilium.CefGlue                             ~> 0.4.0
 nuget Another.Unofficial.Xilium.CefGlue.UnpackNativeDependencies    ~> 0.4.0
 nuget Another.Unofficial.Xilium.CefGlue.WindowsForms                ~> 0.4.0
 
+nuget Screenshotr.Client                                            ~> 1.5.2
+
 // Examples & Demos
 nuget Aardvark.Geometry.Intersection                                ~> 5.5.0-prerelease0001
 nuget Aardium                                                       ~> 2.1.1-prerelease0002

diff --git a/paket.lock b/paket.lock
diff --git a/src/Aardvark.Media.NoExamples.NonWindows.slnf b/src/Aardvark.Media.NoExamples.NonWindows.slnf
@@ -5,6 +5,7 @@
       "Aardvark.Service.Giraffe\\Aardvark.Service.Giraffe.fsproj",
       "Aardvark.Service\\Aardvark.Service.fsproj",
       "Aardvark.UI.Primitives\\Aardvark.UI.Primitives.fsproj",
+      "Aardvark.UI.Screenshotr\\Aardvark.UI.Screenshotr.fsproj",
       "Aardvark.UI\\Aardvark.UI.fsproj",
       "Tests\\Aardvark.UI.Animation.Benchmarks\\Aardvark.UI.Animation.Benchmarks.fsproj"
     ]

diff --git a/src/Aardvark.Media.NoExamples.slnf b/src/Aardvark.Media.NoExamples.slnf
@@ -9,6 +9,7 @@
       "Aardvark.Service.Giraffe\\Aardvark.Service.Giraffe.fsproj",
       "Aardvark.Service\\Aardvark.Service.fsproj",
       "Aardvark.UI.Primitives\\Aardvark.UI.Primitives.fsproj",
+      "Aardvark.UI.Screenshotr\\Aardvark.UI.Screenshotr.fsproj",
       "Aardvark.UI\\Aardvark.UI.fsproj",
       "Tests\\Aardvark.UI.Animation.Benchmarks\\Aardvark.UI.Animation.Benchmarks.fsproj"
     ]

diff --git a/src/Aardvark.Media.NonWindows.slnf b/src/Aardvark.Media.NonWindows.slnf
@@ -5,6 +5,7 @@
       "Aardvark.Service.Giraffe\\Aardvark.Service.Giraffe.fsproj",
       "Aardvark.Service\\Aardvark.Service.fsproj",
       "Aardvark.UI.Primitives\\Aardvark.UI.Primitives.fsproj",
+      "Aardvark.UI.Screenshotr\\Aardvark.UI.Screenshotr.fsproj",
       "Aardvark.UI\\Aardvark.UI.fsproj",
       "Examples (dotnetcore)\\01 - Inc\\01 - Inc.fsproj",
       "Examples (dotnetcore)\\02 - RenderControl\\02 - RenderControl.fsproj",
@@ -33,6 +34,7 @@
       "Scratch\\01 - PerfTest\\01 - PerfTest.fsproj",
       "Scratch\\02 - DrawRects\\02 - DrawRects.fsproj",
       "Scratch\\03 - LinePicking\\03 - LinePicking.fsproj",
+      "Scratch\\04 - Screenshotr\\04 - Screenshotr.fsproj",
       "Scratch\\06 - DrawRectsShader\\06 - DrawRectsShader.fsproj",
       "Scratch\\07 - UIUpdatePerformance\\07 - UIUpdatePerformance.fsproj",
       "Scratch\\08 - ColorTest\\08 - ColorTest.fsproj",

diff --git a/src/Aardvark.Media.sln b/src/Aardvark.Media.sln
@@ -152,6 +152,10 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "27 - GoldenLayout", "Exampl
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "28 - Notifications", "Examples (dotnetcore)\28 - Notifications\28 - Notifications.fsproj", "{B4F07EA9-16EA-4E80-93AD-4EF15EBAFCE8}"
 EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Aardvark.UI.Screenshotr", "Aardvark.UI.Screenshotr\Aardvark.UI.Screenshotr.fsproj", "{24D7C14A-3337-494B-8D72-4A2104D4956D}"
+EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "04 - Screenshotr", "Scratch\04 - Screenshotr\04 - Screenshotr.fsproj", "{F54A0F8D-DBF7-4483-B47E-DFBB3273027B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -406,6 +410,14 @@ Global
 		{B4F07EA9-16EA-4E80-93AD-4EF15EBAFCE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B4F07EA9-16EA-4E80-93AD-4EF15EBAFCE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B4F07EA9-16EA-4E80-93AD-4EF15EBAFCE8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{24D7C14A-3337-494B-8D72-4A2104D4956D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{24D7C14A-3337-494B-8D72-4A2104D4956D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{24D7C14A-3337-494B-8D72-4A2104D4956D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{24D7C14A-3337-494B-8D72-4A2104D4956D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F54A0F8D-DBF7-4483-B47E-DFBB3273027B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F54A0F8D-DBF7-4483-B47E-DFBB3273027B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F54A0F8D-DBF7-4483-B47E-DFBB3273027B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F54A0F8D-DBF7-4483-B47E-DFBB3273027B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -473,6 +485,8 @@ Global
 		{5F1B5AF1-73B4-44F4-89D7-84BBC929B770} = {49FCD64D-3937-4F2E-BA36-D5B1837D4E5F}
 		{3AFDD56A-F6AB-4BB0-AD88-8912071E998C} = {DAC89FC7-17D3-467D-929D-781A88DA5324}
 		{B4F07EA9-16EA-4E80-93AD-4EF15EBAFCE8} = {DAC89FC7-17D3-467D-929D-781A88DA5324}
+		{24D7C14A-3337-494B-8D72-4A2104D4956D} = {5DAFA99B-848D-4185-B4C1-287119815657}
+		{F54A0F8D-DBF7-4483-B47E-DFBB3273027B} = {49FCD64D-3937-4F2E-BA36-D5B1837D4E5F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B7FCCF28-D562-4E8F-86A7-2310B38A1016}

diff --git a/src/Aardvark.UI.Primitives/Aardvark.UI.Primitives.fsproj b/src/Aardvark.UI.Primitives/Aardvark.UI.Primitives.fsproj
@@ -88,6 +88,7 @@
     <EmbeddedResource Include="resources\accordion.js" />
     <EmbeddedResource Include="resources\dropdown.js" />
     <None Include="paket.references" />
+    <None Include="paket.template" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Aardvark.Service\Aardvark.Service.fsproj" />

diff --git a/src/Aardvark.UI.Screenshotr/Aardvark.UI.Screenshotr.fsproj b/src/Aardvark.UI.Screenshotr/Aardvark.UI.Screenshotr.fsproj
@@ -17,6 +17,11 @@
     <Compile Include="Screenshot.fs" />
     <Compile Include="View.fs" />
     <Compile Include="Update.fs" />
+    <None Include="paket.references" />
+    <None Include="paket.template" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Aardvark.UI.Primitives\Aardvark.UI.Primitives.fsproj" />
   </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/src/Aardvark.UI.Screenshotr/paket.references b/src/Aardvark.UI.Screenshotr/paket.references
@@ -1,14 +1,5 @@
 FSharp.Core
-
-FSharp.Data.Adaptive
-Aardvark.Base
-Aardvark.Base.Incremental
-Aardvark.Base.FSharp
-
-Aardvark.UI
-Aardvark.UI.Primitives
-Adaptify.MSBuild
 Aardvark.Build
 
-Microsoft.Bcl.AsyncInterfaces
+Adaptify.MSBuild
 Screenshotr.Client
diff --git a/src/Aardvark.UI.Screenshotr/paket.template b/src/Aardvark.UI.Screenshotr/paket.template
@@ -2,10 +2,14 @@ type project
 id Aardvark.UI.Screenshotr
 authors Aardvark Platform Team
 owners Aardvark Platform Team
-projectUrl http://github.com/aardvark-community
+projectUrl http://github.com/aardvark-platform
 licenseUrl http://www.apache.org/licenses/LICENSE-2.0.txt
 repositoryType git
-repositoryUrl http://github.com/aardvark-community/ScreenshotrExample
+repositoryUrl https://github.com/aardvark-platform/aardvark.media
 description
     Aardvark is an open-source platform for visual computing, real-time graphics and visualization.
-include-pdbs true
+include-pdbs true
+excludeddependencies
+    Adaptify.MSBuild
+dependencies
+    Adaptify.Core ~> LOCKEDVERSION
diff --git a/src/Scratch/04 - Screenshotr/04 - Screenshotr.fsproj b/src/Scratch/04 - Screenshotr/04 - Screenshotr.fsproj
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <DisableImplicitFSharpCoreReference>True</DisableImplicitFSharpCoreReference>
+    <AssemblyName>$(MSBuildProjectName.Replace(" ", "_"))</AssemblyName>
+    <WarnOn>3389;3390;3395</WarnOn>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <OutputPath>..\..\..\bin\Debug\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <OutputPath>..\..\..\bin\Release\</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Model.fs" />
+    <Compile Include="App.fs" />
+    <Compile Include="Program.fs" />
+    <None Include="paket.references" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Aardvark.UI.Screenshotr\Aardvark.UI.Screenshotr.fsproj" />
+  </ItemGroup>
+  <Import Project="..\..\..\.paket\Paket.Restore.targets" />
+</Project>
diff --git a/src/screenhotr.example/App.fs → src/Scratch/04 - Screenshotr/App.fs b/src/screenhotr.example/App.fs → src/Scratch/04 - Screenshotr/App.fs
diff --git a/src/screenhotr.example/Model.fs → src/Scratch/04 - Screenshotr/Model.fs b/src/screenhotr.example/Model.fs → src/Scratch/04 - Screenshotr/Model.fs
diff --git a/src/screenhotr.example/Program.fs → src/Scratch/04 - Screenshotr/Program.fs b/src/screenhotr.example/Program.fs → src/Scratch/04 - Screenshotr/Program.fs
@@ -28,6 +28,7 @@ let main args =
         width 1024
         height 768
         url mediaUrl
+        debug true
     }
 
     0
diff --git a/src/Scratch/04 - Screenshotr/paket.references b/src/Scratch/04 - Screenshotr/paket.references
@@ -0,0 +1,4 @@
+FSharp.Core
+Adaptify.MSBuild
+Aardvark.Application.Slim.GL
+Aardium
diff --git a/src/screenhotr.example.sln b/src/screenhotr.example.sln
diff --git a/src/screenhotr.example/paket.references b/src/screenhotr.example/paket.references
diff --git a/src/screenhotr.example/screenhotr.example.fsproj b/src/screenhotr.example/screenhotr.example.fsproj