Moved Fin files again, because I wasn't entirely happy with the new s…

…tructure. Now, the audio/graphics libraries have been merged into a single "Fin.Ui" library, which better reflects the fact that these are UI-specific libraries for audio playback and graphics rendering.

FinModelUtility/Ast/Ast/Ast.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Fin\Fin.Audio\Fin.Audio.csproj" />
+    <ProjectReference Include="..\..\Fin\Fin.Ui\Fin.Ui.csproj" />
     <ProjectReference Include="..\..\Fin\Fin\Fin.csproj" />
   </ItemGroup>
 

FinModelUtility/Ast/Ast/src/api/AstAudioLoader.cs

@@ -1,5 +1,5 @@
 using ast.schema;
-using fin.audio;
+using fin.ui.audio;
 using fin.io;
 
 using schema.binary;

FinModelUtility/BanjoKazooie/BanjoKazooie.csproj

@@ -9,8 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\F3dzex2\F3dzex2.csproj" />
-    <ProjectReference Include="..\..\Fin\Fin\Fin.csproj" />
+    <ProjectReference Include="..\F3dzex2\F3dzex2.csproj" />
+    <ProjectReference Include="..\Fin\Fin\Fin.csproj" />
   </ItemGroup>
 
   <ItemGroup>

FinModelUtility/Fin/Fin Tests/Fin Tests.csproj

@@ -19,7 +19,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0-preview-20211130-02" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Fin.Graphics\Fin.Graphics.csproj" />
+    <ProjectReference Include="..\Fin.Ui\Fin.Ui.csproj" />
     <ProjectReference Include="..\Fin\Fin.csproj" />
     <ProjectReference Include="..\..\Asserts\Asserts.csproj" />
   </ItemGroup>

FinModelUtility/Fin/Fin Tests/gl/GlTransformTests.cs

@@ -2,7 +2,7 @@
 
 using Assert = Microsoft.VisualStudio.TestTools.UnitTesting.Assert;
 
-namespace fin.graphics.gl {
+namespace fin.ui.graphics.gl {
   public class GlTransformTests {
     [Test]
     public void CrossProduct() {

FinModelUtility/Fin/Fin.Audio/Fin.Audio.csproj → FinModelUtility/Fin/Fin.Ui/Fin.Ui.csproj

@@ -5,8 +5,9 @@
     <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <RootNamespace>fin.audio</RootNamespace>
+    <RootNamespace>fin.ui</RootNamespace>
     <LangVersion>preview</LangVersion>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <ItemGroup>

FinModelUtility/Fin/Fin.Audio/src/AudioFileGatherer.cs → FinModelUtility/Fin/Fin.Ui/src/audio/AudioFileGatherer.cs

@@ -1,7 +1,7 @@
 using fin.io.bundles;
 
 
-namespace fin.audio {
+namespace fin.ui.audio {
   public interface IAudioFileBundle : IFileBundle { }
 
   public interface IAudioLoader<in TAudioFileBundle>

FinModelUtility/Fin/Fin.Audio/src/AudioInterfaces.cs → FinModelUtility/Fin/Fin.Ui/src/audio/AudioInterfaces.cs

@@ -1,7 +1,7 @@
 using System.Numerics;
 
 
-namespace fin.audio {
+namespace fin.ui.audio {
   public interface IAudioManager<TNumber> : IDisposable
       where TNumber : INumber<TNumber> {
     // TODO: Add support for looping a certain section of audio

FinModelUtility/Fin/Fin.Audio/src/OggAudioLoader.cs → FinModelUtility/Fin/Fin.Ui/src/audio/OggAudioLoader.cs

@@ -4,7 +4,7 @@
 using NVorbis;
 
 
-namespace fin.audio {
+namespace fin.ui.audio {
   public class OggAudioFileBundle : IAudioFileBundle {
     public OggAudioFileBundle(IFileHierarchyFile oggFile) {
       this.OggFile = oggFile;

FinModelUtility/Fin/Fin.Audio/src/al/AlAudioManager.cs → FinModelUtility/Fin/Fin.Ui/src/audio/al/AlAudioManager.cs

@@ -1,7 +1,7 @@
 using OpenTK.Audio;
 
 
-namespace fin.audio.al {
+namespace fin.ui.audio.al {
   public partial class AlAudioManager : IAudioManager<short> {
     private readonly AudioContext context_ = new();
 

FinModelUtility/Fin/Fin.Audio/src/al/AlAudioSource.cs → FinModelUtility/Fin/Fin.Ui/src/audio/al/AlAudioSource.cs

@@ -1,4 +1,4 @@
-namespace fin.audio.al {
+namespace fin.ui.audio.al {
   public partial class AlAudioManager {
     public IAudioSource<short> CreateAudioSource() => new AlAudioSource(this);
 

FinModelUtility/Fin/Fin.Audio/src/al/AlAudioSource_ActiveMusic.cs → FinModelUtility/Fin/Fin.Ui/src/audio/al/AlAudioSource_ActiveMusic.cs

@@ -5,7 +5,7 @@
 using OpenTK.Audio.OpenAL;
 
 
-namespace fin.audio.al {
+namespace fin.ui.audio.al {
   public partial class AlAudioManager {
     private partial class AlAudioSource : IAudioSource<short> {
       public IActiveMusic<short> CreateMusic(

FinModelUtility/Fin/Fin.Audio/src/al/AlAudioSource_ActiveSound.cs → FinModelUtility/Fin/Fin.Ui/src/audio/al/AlAudioSource_ActiveSound.cs

@@ -3,7 +3,7 @@
 using OpenTK.Audio.OpenAL;
 
 
-namespace fin.audio.al {
+namespace fin.ui.audio.al {
   public partial class AlAudioManager {
     private partial class AlAudioSource {
       public IActiveSound<short> Create(IAudioBuffer<short> buffer)

FinModelUtility/Fin/Fin.Audio/src/al/AlAudioStream.cs → FinModelUtility/Fin/Fin.Ui/src/audio/al/AlAudioStream.cs

@@ -1,4 +1,4 @@
-namespace fin.audio.al {
+namespace fin.ui.audio.al {
   public partial class AlAudioManager {
     public IBufferAudioStream<short> CreateBufferAudioStream(
         IAudioBuffer<short> buffer)

FinModelUtility/Fin/Fin.Audio/src/al/AlCircularQueueActiveSound.cs → FinModelUtility/Fin/Fin.Ui/src/audio/al/AlCircularQueueActiveSound.cs

@@ -4,7 +4,7 @@
 using OpenTK.Audio.OpenAL;
 
 
-namespace fin.audio.al {
+namespace fin.ui.audio.al {
   public partial class AlAudioManager {
     public ICircularQueueActiveSound<short> CreateBufferedSound(
         AudioChannelsType audioChannelsType,

FinModelUtility/Fin/Fin.Audio/src/al/AlMutableAudioBuffer.cs → FinModelUtility/Fin/Fin.Ui/src/audio/al/AlMutableAudioBuffer.cs

@@ -2,7 +2,7 @@
 using System;
 
 
-namespace fin.audio.al {
+namespace fin.ui.audio.al {
   public partial class AlAudioManager {
     public IMutableAudioBuffer<short> CreateMutableBuffer()
       => new AlMutableAudioBuffer();

FinModelUtility/Fin/Fin.Graphics/src/IRenderable.cs → FinModelUtility/Fin/Fin.Ui/src/graphics/IRenderable.cs

@@ -1,4 +1,4 @@
-namespace fin.graphics {
+namespace fin.ui.graphics {
   public interface IRenderable {
     void Render();
   }

FinModelUtility/Fin/Fin.Graphics/src/gl/GlBufferManager.cs → FinModelUtility/Fin/Fin.Ui/src/graphics/gl/GlBufferManager.cs

@@ -8,7 +8,7 @@
 using PrimitiveType = fin.model.PrimitiveType;
 
 
-namespace fin.graphics.gl {
+namespace fin.ui.graphics.gl {
   public class GlBufferManager : IDisposable {
     private class VertexArrayObject : IDisposable {
       private const int POSITION_SIZE_ = 3;

FinModelUtility/Fin/Fin.Graphics/src/gl/GlDisplayList.cs → FinModelUtility/Fin/Fin.Ui/src/graphics/gl/GlDisplayList.cs

@@ -1,7 +1,7 @@
 using OpenTK.Graphics.OpenGL;
 
 
-namespace fin.graphics.gl {
+namespace fin.ui.graphics.gl {
   public class GlDisplayList : IDisposable {
     private readonly int displayListId_;
     private bool valid_ = false;

FinModelUtility/Fin/Fin.Graphics/src/gl/GlShaderProgram.cs → FinModelUtility/Fin/Fin.Ui/src/graphics/gl/GlShaderProgram.cs

@@ -4,7 +4,7 @@
 using OpenTK.Graphics.OpenGL;
 
 
-namespace fin.graphics.gl {
+namespace fin.ui.graphics.gl {
   public class GlShaderProgram : IDisposable {
     private readonly CachedShaderProgram cachedShaderProgram_;
 

FinModelUtility/Fin/Fin.Graphics/src/gl/GlTexture.cs → FinModelUtility/Fin/Fin.Ui/src/graphics/gl/GlTexture.cs

@@ -12,7 +12,7 @@
 using TextureMinFilter = OpenTK.Graphics.OpenGL.TextureMinFilter;
 
 
-namespace fin.graphics.gl {
+namespace fin.ui.graphics.gl {
   public class GlTexture : IDisposable {
     private static readonly Dictionary<ITexture, GlTexture> cache_ = new();
 

FinModelUtility/Fin/Fin.Graphics/src/gl/GlTransform.cs → FinModelUtility/Fin/Fin.Ui/src/graphics/gl/GlTransform.cs

@@ -7,7 +7,7 @@
 
 using GlMatrixMode = OpenTK.Graphics.OpenGL.MatrixMode;
 
-namespace fin.graphics.gl {
+namespace fin.ui.graphics.gl {
   public static class GlTransform {
     private static readonly Matrix4x4Stack modelViewMatrix_ = new();
     private static readonly Matrix4x4Stack projectionMatrix_ = new();

FinModelUtility/Fin/Fin.Graphics/src/gl/material/BGlMaterialShader.cs → FinModelUtility/Fin/Fin.Ui/src/graphics/gl/material/BGlMaterialShader.cs

@@ -7,7 +7,7 @@
 using Matrix4x4 = System.Numerics.Matrix4x4;
 
 
-namespace fin.graphics.gl.material {
+namespace fin.ui.graphics.gl.material {
   public abstract class BGlMaterialShader<TMaterial> : IGlMaterialShader
       where TMaterial : IReadOnlyMaterial {
     private readonly IModel model_;

FinModelUtility/Fin/Fin.Graphics/src/gl/material/CommonShaderPrograms.cs → FinModelUtility/Fin/Fin.Ui/src/graphics/gl/material/CommonShaderPrograms.cs

@@ -1,4 +1,4 @@
-namespace fin.graphics.gl.material {
+namespace fin.ui.graphics.gl.material {
   public static class CommonShaderPrograms {
     private static GlShaderProgram? texturelessShaderProgram_;
 

FinModelUtility/Fin/Fin.Graphics/src/gl/material/GlFixedFunctionMaterialShaderV2.cs → FinModelUtility/Fin/Fin.Ui/src/graphics/gl/material/GlFixedFunctionMaterialShaderV2.cs

@@ -4,7 +4,7 @@
 using OpenTK.Graphics.OpenGL;
 
 
-namespace fin.graphics.gl.material {
+namespace fin.ui.graphics.gl.material {
   public class GlFixedFunctionMaterialShaderV2
       : BGlMaterialShader<IReadOnlyFixedFunctionMaterial> {
     private int[] textureLocations_ =

FinModelUtility/Fin/Fin.Graphics/src/gl/material/GlMaterialConstants.cs → FinModelUtility/Fin/Fin.Ui/src/graphics/gl/material/GlMaterialConstants.cs

@@ -3,7 +3,7 @@
 using fin.image;
 
 
-namespace fin.graphics.gl.material {
+namespace fin.ui.graphics.gl.material {
   public static class GlMaterialConstants {
     public static GlTexture NULL_WHITE_TEXTURE;
     public static GlTexture NULL_GRAY_TEXTURE;

FinModelUtility/Fin/Fin.Graphics/src/gl/material/GlMaterialShader.cs → FinModelUtility/Fin/Fin.Ui/src/graphics/gl/material/GlMaterialShader.cs

@@ -2,7 +2,7 @@
 using fin.model;
 
 
-namespace fin.graphics.gl.material {
+namespace fin.ui.graphics.gl.material {
   public static class GlMaterialShader {
     public static IGlMaterialShader FromMaterial(
         IModel model,

FinModelUtility/Fin/Fin.Graphics/src/gl/material/GlNullMaterialShaderV2.cs → FinModelUtility/Fin/Fin.Ui/src/graphics/gl/material/GlNullMaterialShaderV2.cs

@@ -3,7 +3,7 @@
 using fin.shaders.glsl;
 
 
-namespace fin.graphics.gl.material {
+namespace fin.ui.graphics.gl.material {
   public class GlNullMaterialShaderV2 : BGlMaterialShader<IReadOnlyMaterial?> {
     public GlNullMaterialShaderV2(
         IModel model,

FinModelUtility/Fin/Fin.Graphics/src/gl/material/GlSimpleMaterialShaderV2.cs → FinModelUtility/Fin/Fin.Ui/src/graphics/gl/material/GlSimpleMaterialShaderV2.cs

@@ -3,7 +3,7 @@
 using fin.model.util;
 
 
-namespace fin.graphics.gl.material {
+namespace fin.ui.graphics.gl.material {
   public class GlSimpleMaterialShaderV2 : BGlMaterialShader<IReadOnlyMaterial> {
     private readonly GlTexture primaryGlTexture_;
 

FinModelUtility/Fin/Fin.Graphics/src/gl/material/GlStandardMaterialShaderV2.cs → FinModelUtility/Fin/Fin.Ui/src/graphics/gl/material/GlStandardMaterialShaderV2.cs

@@ -4,7 +4,7 @@
 using OpenTK.Graphics.OpenGL;
 
 
-namespace fin.graphics.gl.material {
+namespace fin.ui.graphics.gl.material {
   public class GlStandardMaterialShaderV2
       : BGlMaterialShader<IStandardMaterial> {
     private GlTexture diffuseTexture_;

FinModelUtility/Fin/Fin.Graphics/src/gl/material/Interfaces.cs → FinModelUtility/Fin/Fin.Ui/src/graphics/gl/material/Interfaces.cs

@@ -1,7 +1,7 @@
 using fin.model;
 
 
-namespace fin.graphics.gl.material {
+namespace fin.ui.graphics.gl.material {
   public interface IGlMaterialShader : IDisposable {
     IReadOnlyMaterial Material { get; }
 

FinModelUtility/Fin/Fin.Graphics/src/gl/model/IModelRenderer.cs → FinModelUtility/Fin/Fin.Ui/src/graphics/gl/model/IModelRenderer.cs

@@ -1,7 +1,7 @@
 using fin.model;
 
 
-namespace fin.graphics.gl.model {
+namespace fin.ui.graphics.gl.model {
   public interface IModelRenderer : IRenderable, IDisposable {
     IModel Model { get; }
     ISet<IMesh> HiddenMeshes { get; }

FinModelUtility/Fin/Fin.Graphics/src/gl/model/MaterialMeshRendererV2.cs → FinModelUtility/Fin/Fin.Ui/src/graphics/gl/model/MaterialMeshRendererV2.cs

@@ -1,12 +1,11 @@
 using fin.model;
-
-using fin.graphics.gl.material;
 using fin.math;
+using fin.ui.graphics.gl.material;
 
 using PrimitiveType = fin.model.PrimitiveType;
 
 
-namespace fin.graphics.gl.model {
+namespace fin.ui.graphics.gl.model {
   public class MaterialMeshRendererV2 : IDisposable {
     // TODO: Set up shader for material
     // TODO: Use material's textures

FinModelUtility/Fin/Fin.Graphics/src/gl/model/ModelRendererV2.cs → FinModelUtility/Fin/Fin.Ui/src/graphics/gl/model/ModelRendererV2.cs

@@ -3,7 +3,7 @@
 using fin.model;
 
 
-namespace fin.graphics.gl.model {
+namespace fin.ui.graphics.gl.model {
   /// <summary>
   ///   A renderer for a Fin model.
   ///

FinModelUtility/Fin/Fin.Graphics/src/gl/model/SkeletonRenderer.cs → FinModelUtility/Fin/Fin.Ui/src/graphics/gl/model/SkeletonRenderer.cs

@@ -7,7 +7,7 @@
 using PrimitiveType = OpenTK.Graphics.OpenGL.PrimitiveType;
 
 
-namespace fin.graphics.gl.model {
+namespace fin.ui.graphics.gl.model {
   public interface ISkeletonRenderer : IRenderable {
     ISkeleton Skeleton { get; }
     IBone? SelectedBone { get; set; }

FinModelUtility/Fin/Fin.Graphics/src/gl/scene/SceneAreaRenderer.cs → FinModelUtility/Fin/Fin.Ui/src/graphics/gl/scene/SceneAreaRenderer.cs

@@ -1,6 +1,6 @@
 using fin.scene;
 
-namespace fin.graphics.gl.scene {
+namespace fin.ui.graphics.gl.scene {
   public class SceneAreaRenderer : IRenderable, IDisposable {
     public SceneAreaRenderer(ISceneArea sceneArea) {
       var customSkybox = sceneArea.CustomSkyboxObject;

FinModelUtility/Fin/Fin.Graphics/src/gl/scene/SceneModelRenderer.cs → FinModelUtility/Fin/Fin.Ui/src/graphics/gl/scene/SceneModelRenderer.cs

@@ -1,14 +1,14 @@
 using System.Numerics;
 
 using fin.config;
-using fin.graphics.gl.material;
-using fin.graphics.gl.model;
 using fin.math.matrix;
 using fin.model;
 using fin.scene;
 using fin.ui;
+using fin.ui.graphics.gl.material;
+using fin.ui.graphics.gl.model;
 
-namespace fin.graphics.gl.scene {
+namespace fin.ui.graphics.gl.scene {
   public class SceneModelRenderer : IRenderable, IDisposable {
     private readonly ISceneModel sceneModel_;
     private readonly IModelRenderer modelRenderer_;

FinModelUtility/Fin/Fin.Graphics/src/gl/scene/SceneObjectRenderer.cs → FinModelUtility/Fin/Fin.Ui/src/graphics/gl/scene/SceneObjectRenderer.cs

@@ -1,7 +1,7 @@
 using fin.math.matrix;
 using fin.scene;
 
-namespace fin.graphics.gl.scene {
+namespace fin.ui.graphics.gl.scene {
   public class SceneObjectRenderer : IRenderable, IDisposable {
     private readonly ISceneObject sceneObject_;
 

FinModelUtility/Fin/Fin.Graphics/src/gl/scene/SceneRenderer.cs → FinModelUtility/Fin/Fin.Ui/src/graphics/gl/scene/SceneRenderer.cs

@@ -1,6 +1,6 @@
 using fin.scene;
 
-namespace fin.graphics.gl.scene {
+namespace fin.ui.graphics.gl.scene {
   public class SceneRenderer : IRenderable, IDisposable {
     public SceneRenderer(IScene scene) {
       this.AreaRenderers

FinModelUtility/Fin/Fin.Graphics/src/gl/util/GlUtil.cs → FinModelUtility/Fin/Fin.Ui/src/graphics/gl/util/GlUtil.cs

@@ -1,7 +1,7 @@
 using OpenTK.Graphics.OpenGL;
 
 
-namespace fin.graphics.gl {
+namespace fin.ui.graphics.gl {
   public static partial class GlUtil {
     public static bool IsInitialized { get; private set; }
 

FinModelUtility/Fin/Fin.Graphics/src/gl/util/GlUtil_Blending.cs → FinModelUtility/Fin/Fin.Ui/src/graphics/gl/util/GlUtil_Blending.cs

@@ -5,7 +5,7 @@
 using GlLogicOp = OpenTK.Graphics.OpenGL.LogicOp;
 
 
-namespace fin.graphics.gl {
+namespace fin.ui.graphics.gl {
   public partial class GlState {
     public (BlendMode, BlendFactor, BlendFactor, FinLogicOp)
         CurrentBlending { get; set; } = (BlendMode.ADD, BlendFactor.SRC_ALPHA,

FinModelUtility/Fin/Fin.Graphics/src/gl/util/GlUtil_Clear.cs → FinModelUtility/Fin/Fin.Ui/src/graphics/gl/util/GlUtil_Clear.cs

@@ -3,7 +3,7 @@
 using OpenTK.Graphics.OpenGL;
 
 
-namespace fin.graphics.gl {
+namespace fin.ui.graphics.gl {
   public partial class GlState {
     public Color ClearColor { get; set; }
   }