Rename Aardvark.GLTF to Aardvark.Data.GLTF

aardvark-platform · Jul 30, 2024 · 330a680 · 330a680
1 parent 5828f1f
commit 330a680
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 14 deletions.
diff --git a/src/Aardvark.GLTF/Aardvark.GLTF.fsproj → ...dvark.Data.GLTF/Aardvark.Data.GLTF.fsproj b/src/Aardvark.GLTF/Aardvark.GLTF.fsproj → ...dvark.Data.GLTF/Aardvark.Data.GLTF.fsproj
diff --git a/src/Aardvark.GLTF/GLTF.fs → src/Aardvark.Data.GLTF/GLTF.fs b/src/Aardvark.GLTF/GLTF.fs → src/Aardvark.Data.GLTF/GLTF.fs
@@ -1,12 +1,12 @@
-namespace Aardvark.GLTF
+namespace Aardvark.Data.GLTF
 
 open System
 open glTFLoader
 open glTFLoader.Schema
 open Aardvark.Base
 open Aardvark.Rendering
 open Microsoft.FSharp.NativeInterop
-open Aardvark.GLTF
+open Aardvark.Data.GLTF
 open System.Text.RegularExpressions
 
 #nowarn "9"

diff --git a/src/Aardvark.GLTF/RELEASE_NOTES.md → src/Aardvark.Data.GLTF/RELEASE_NOTES.md b/src/Aardvark.GLTF/RELEASE_NOTES.md → src/Aardvark.Data.GLTF/RELEASE_NOTES.md
diff --git a/src/Aardvark.GLTF/Scene.fs → src/Aardvark.Data.GLTF/Scene.fs b/src/Aardvark.GLTF/Scene.fs → src/Aardvark.Data.GLTF/Scene.fs
@@ -1,4 +1,4 @@
-namespace Aardvark.GLTF
+namespace Aardvark.Data.GLTF
 
 open System.Threading
 open Aardvark.Base

diff --git a/src/Aardvark.GLTF/paket.references → src/Aardvark.Data.GLTF/paket.references b/src/Aardvark.GLTF/paket.references → src/Aardvark.Data.GLTF/paket.references
diff --git a/src/Aardvark.GLTF/paket.template → src/Aardvark.Data.GLTF/paket.template b/src/Aardvark.GLTF/paket.template → src/Aardvark.Data.GLTF/paket.template
@@ -1,5 +1,5 @@
 type project
-id Aardvark.GLTF
+id Aardvark.Data.GLTF
 authors Aardvark Platform Team
 owners Aardvark Platform Team
 projectUrl http://github.com/aardvark-platform

diff --git a/src/Aardvark.Data.NonWindows.slnf b/src/Aardvark.Data.NonWindows.slnf
@@ -4,6 +4,7 @@
     "projects": [
       "Aardvark.Data.Collada\\Aardvark.Data.Collada.csproj",
       "Aardvark.Data.DGM\\Aardvark.Data.DGM.fsproj",
+      "Aardvark.Data.GLTF\\Aardvark.Data.GLTF.fsproj",
       "Aardvark.Data.Photometry\\Aardvark.Data.Photometry.csproj",
       "Aardvark.Data.Vrml97\\Aardvark.Data.Vrml97.csproj",
       "Aardvark.Data.Wavefront\\Aardvark.Data.Wavefront.csproj",
@@ -14,6 +15,7 @@
       "Aardvark.PixImage.SystemDrawing\\Aardvark.PixImage.SystemDrawing.csproj",
       "FreeImage.Standard\\FreeImage.Standard.csproj",
       "Tests\\CSharpTests\\CSharpTests.csproj",
+      "Tests\\FSharpTests\\FSharpTests.fsproj",
       "Tests\\FreeImageTests\\Benchmarking\\Benchmarking.csproj",
       "Tests\\FreeImageTests\\UnitTest\\UnitTest.csproj"
     ]

diff --git a/src/Aardvark.Data.sln b/src/Aardvark.Data.sln
@@ -43,9 +43,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTest", "Tests\FreeImage
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FreeImageTests", "FreeImageTests", "{F70E7322-F0BF-490F-9170-C70C1E23B093}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Aardvark.GLTF", "Aardvark.GLTF\Aardvark.GLTF.fsproj", "{7C6BD77C-4CC9-4A09-AC0F-BD0E977786AC}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Aardvark.Data.GLTF", "Aardvark.Data.GLTF\Aardvark.Data.GLTF.fsproj", "{7C6BD77C-4CC9-4A09-AC0F-BD0E977786AC}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Aardvark.GLTF.Tests", "Tests\Aardvark.GLTF.Tests\Aardvark.GLTF.Tests.fsproj", "{0EF2E8D6-D830-4964-97DC-530FAFEF4642}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharpTests", "Tests\FSharpTests\FSharpTests.fsproj", "{330D2C4C-5504-410A-AEA1-6F9A98A75AB2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -129,10 +129,10 @@ Global
 		{7C6BD77C-4CC9-4A09-AC0F-BD0E977786AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7C6BD77C-4CC9-4A09-AC0F-BD0E977786AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7C6BD77C-4CC9-4A09-AC0F-BD0E977786AC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0EF2E8D6-D830-4964-97DC-530FAFEF4642}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0EF2E8D6-D830-4964-97DC-530FAFEF4642}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0EF2E8D6-D830-4964-97DC-530FAFEF4642}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0EF2E8D6-D830-4964-97DC-530FAFEF4642}.Release|Any CPU.Build.0 = Release|Any CPU
+		{330D2C4C-5504-410A-AEA1-6F9A98A75AB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{330D2C4C-5504-410A-AEA1-6F9A98A75AB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{330D2C4C-5504-410A-AEA1-6F9A98A75AB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{330D2C4C-5504-410A-AEA1-6F9A98A75AB2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -144,7 +144,7 @@ Global
 		{FCF53410-061F-4A04-B5BC-ADCE0D23C43E} = {F70E7322-F0BF-490F-9170-C70C1E23B093}
 		{E6B33282-B9F6-4911-833E-EE9CA7CA92A0} = {F70E7322-F0BF-490F-9170-C70C1E23B093}
 		{F70E7322-F0BF-490F-9170-C70C1E23B093} = {CC8BC009-48FC-4E2C-A7C4-D2DBA184A638}
-		{0EF2E8D6-D830-4964-97DC-530FAFEF4642} = {CC8BC009-48FC-4E2C-A7C4-D2DBA184A638}
+		{330D2C4C-5504-410A-AEA1-6F9A98A75AB2} = {CC8BC009-48FC-4E2C-A7C4-D2DBA184A638}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EC3469FF-BF00-4F6A-AA02-EAD006852FFE}

diff --git a/...ark.GLTF.Tests/Aardvark.GLTF.Tests.fsproj → src/Tests/FSharpTests/FSharpTests.fsproj b/...ark.GLTF.Tests/Aardvark.GLTF.Tests.fsproj → src/Tests/FSharpTests/FSharpTests.fsproj
@@ -9,11 +9,11 @@
     <EmbeddedResource Include="data\Avocado.zip" />
     <EmbeddedResource Include="data\Avocado.glb" />
     <EmbeddedResource Include="data\2CylinderEngine.gltf" />
-    <Compile Include="Tests.fs" />
+    <Compile Include="GLTFTests.fs" />
     <Content Include="paket.references" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Aardvark.GLTF\Aardvark.GLTF.fsproj" />
+    <ProjectReference Include="..\..\Aardvark.Data.GLTF\Aardvark.Data.GLTF.fsproj" />
   </ItemGroup>
   <Import Project="..\..\..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/src/Tests/Aardvark.GLTF.Tests/Tests.fs → src/Tests/FSharpTests/GLTFTests.fs b/src/Tests/Aardvark.GLTF.Tests/Tests.fs → src/Tests/FSharpTests/GLTFTests.fs
@@ -1,8 +1,9 @@
-module Aardvark.GLTF.Tests
+module Aardvark.Data.Tests.GLTF
 
 open NUnit.Framework
 open Aardvark.Base
 open Aardvark.Rendering
+open Aardvark.Data.GLTF
 open System.IO
 open System.IO.Compression
 

diff --git a/...vark.GLTF.Tests/data/2CylinderEngine.gltf → ...sts/FSharpTests/data/2CylinderEngine.gltf b/...vark.GLTF.Tests/data/2CylinderEngine.gltf → ...sts/FSharpTests/data/2CylinderEngine.gltf
diff --git a/...ests/Aardvark.GLTF.Tests/data/Avocado.glb → src/Tests/FSharpTests/data/Avocado.glb b/...ests/Aardvark.GLTF.Tests/data/Avocado.glb → src/Tests/FSharpTests/data/Avocado.glb
diff --git a/...ests/Aardvark.GLTF.Tests/data/Avocado.zip → src/Tests/FSharpTests/data/Avocado.zip b/...ests/Aardvark.GLTF.Tests/data/Avocado.zip → src/Tests/FSharpTests/data/Avocado.zip
diff --git a/...ests/Aardvark.GLTF.Tests/paket.references → src/Tests/FSharpTests/paket.references b/...ests/Aardvark.GLTF.Tests/paket.references → src/Tests/FSharpTests/paket.references