Skip to content

Commit

Permalink
Cleaned up some more package names.
Browse files Browse the repository at this point in the history
  • Loading branch information
MeltyPlayer committed Oct 9, 2023
1 parent 525c187 commit bf09f5e
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 8 deletions.
21 changes: 20 additions & 1 deletion FinModelUtility/Fin/Fin/src/audio/AudioInterfaces.cs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ public interface IAudioData<out TNumber> : IStaticAudioFormat<TNumber>
public interface IAudioBuffer<out TNumber> : IAudioData<TNumber>
where TNumber : INumber<TNumber> { }


/// <summary>
/// Type for storing static audio data that can be mutated dynamically.
/// </summary>
public interface IMutableAudioBuffer<TNumber> : IAudioBuffer<TNumber>
where TNumber : INumber<TNumber> {
new int Frequency { get; set; }
Expand Down Expand Up @@ -106,6 +108,10 @@ public enum SoundState {
DISPOSED,
}

/// <summary>
/// An actively playing sound. Certain attributes can be mutated on-the-fly,
/// like volume, offset, etc.
/// </summary>
public interface IActiveSound<out TNumber>
: IStaticAudioFormat<TNumber>, IDisposable
where TNumber : INumber<TNumber> {
Expand All @@ -124,6 +130,15 @@ public interface IActiveSound<out TNumber>
bool Looping { get; set; }
}

/// <summary>
/// Actively playing music. Certain attributes can be mutated on-the-fly,
/// like volume, offset, etc.
///
/// Different from an actively played sound because this assumes one audio
/// stream will be used to play an intro, and another a loop.
/// </summary>
// TODO: Probably should represented in some other way, this is clearly just
// one case for chained audio
public interface IActiveMusic<out TNumber>
: IStaticAudioFormat<TNumber>, IDisposable
where TNumber : INumber<TNumber> {
Expand All @@ -138,6 +153,10 @@ public interface IActiveMusic<out TNumber>
float Volume { get; set; }
}

/// <summary>
/// An actively played sound that represents some kind of live, streaming
/// audio.
/// </summary>
public interface ICircularQueueActiveSound<TNumber>
: IAudioFormat<TNumber>, IDisposable where TNumber : INumber<TNumber> {
SoundState State { get; }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Threading.Tasks;

namespace fin.model.io.importer {
namespace fin.model.io.importers {

public interface IModelImporter<in TModelFileBundle>
where TModelFileBundle : IModelFileBundle {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

using SixLabors.ImageSharp.PixelFormats;

namespace fin.model.io.importer.assimp {
namespace fin.model.io.importers.assimp {
public class AssimpModelImporter : IModelImporter<AssimpModelFileBundle> {
public unsafe IModel ImportModel(AssimpModelFileBundle modelFileBundle) {
var mainFile = modelFileBundle.MainFile;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
using fin.model;
using fin.model.impl;
using fin.model.io;
using fin.model.io.importer;
using fin.model.io.importers;
using fin.util.asserts;

using Microsoft.Toolkit.HighPerformance.Helpers;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using fin.math.rotations;
using fin.model;
using fin.model.impl;
using fin.model.io.importer;
using fin.model.io.importers;

using level5.schema;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using fin.image;
using fin.model;
using fin.model.impl;
using fin.model.io.importer;
using fin.model.io.importers;
using fin.util.asserts;

using gx;
Expand Down
2 changes: 1 addition & 1 deletion FinModelUtility/Formats/Xmod/src/api/XmodModelImporter.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using fin.model;
using fin.model.impl;
using fin.model.io.importer;
using fin.model.io.importers;

using schema.text.reader;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using fin.audio.io;
using fin.color;
using fin.data.queue;
using fin.model.io.exporter.assimp;
using fin.model.io.exporters.assimp;
using fin.io;
using fin.io.bundles;
using fin.model;
Expand Down

0 comments on commit bf09f5e

Please sign in to comment.