commit

Author: dedouwe26

GAIL/Application.cs

@@ -6,6 +6,8 @@
 using LambdaKit.Logging.Targets;
 using LambdaKit.Terminal;
 
+// TODO: Add #if DEBUG when using LogDebug(string).
+
 namespace GAIL
 {
     /// <summary>
@@ -211,7 +213,7 @@ public void Start() {
         /// Stops the application (see: <see cref="Dispose"/>).
         /// </summary>
         public void Stop() {
-            Dispose(); // TODO: implement a correct way of stopping.
+            Dispose(); // layer.settings: implement a correct way of stopping.
         }
 
         /// <inheritdoc/>

GAIL/Graphics/AttributeType.cs GAIL/Graphics/FormatInfo.csGAIL/Graphics/AttributeType.cs renamed to GAIL/Graphics/FormatInfo.cs

@@ -4,15 +4,15 @@ namespace GAIL.Graphics
     /// The type of the attribute. <para/>
     /// 
     /// Long = 64-bit <br/>
-    /// (Default) = 32-bit<br/>
+    /// (Default) / Int = 32-bit<br/>
     /// Short = 16-bit <br/>
     /// Byte = 8-bit <para/>
     /// U- = unsigned (no negatives) <br/>
     /// -Float = signed, floating-point number <br/>
     /// Int (default) = signed, integer <br/>
     /// -(2, 3, 4) = multiple components
     /// </summary>
-    public enum AttributeType {
+    public enum FormatType : int {
         ///
         Byte = Silk.NET.Vulkan.Format.R8Sint,
         ///
@@ -104,6 +104,35 @@ public enum AttributeType {
         ///
         Float4 = Silk.NET.Vulkan.Format.R32G32B32A32Sfloat, 
         ///
-        LongFloat4 = Silk.NET.Vulkan.Format.R64G64B64A64Sfloat, 
+        LongFloat4 = Silk.NET.Vulkan.Format.R64G64B64A64Sfloat,
+    }
+
+    /// <summary>
+    /// Represents a class that describes a format.
+    /// </summary>
+    public class FormatInfo {
+        /// <summary>
+        /// The type of the format (see: <see cref="FormatType"/>).
+        /// </summary>
+        public FormatType type;
+        /// <summary>
+        /// The size of the type.
+        /// </summary>
+        public uint size;
+        /// <summary>
+        /// Creates a new format info.
+        /// </summary>
+        /// <param name="type">The type of the format (see: <see cref="FormatType"/>).</param>
+        /// <param name="size">The size of the type.</param>
+        public FormatInfo(FormatType type, uint size) {
+            this.type = type;
+            this.size = size;
+        }
+        /// <summary>
+        /// Creates a new format info from a Vulkan type.
+        /// </summary>
+        /// <param name="type">The Vulkan type of the format.</param>
+        /// <param name="size">The size of the type.</param>
+        public FormatInfo(Silk.NET.Vulkan.Format type, uint size) : this((FormatType)type, size) { }
     }
 }

GAIL/Graphics/Material/IShader.cs

@@ -1,3 +1,4 @@
+using System.Collections.Immutable;
 using System.Collections.ObjectModel;
 
 namespace GAIL.Graphics.Material;
@@ -9,9 +10,9 @@ public interface IShader : IDisposable {
     /// <summary>
     /// Which attributes a vertex must contain in order for this shader to work correctly.
     /// </summary>
-    public ReadOnlyCollection<AttributeType> RequiredAttributes { get; }
+    public ImmutableArray<FormatInfo> RequiredAttributes { get; }
     /// <summary>
     /// Which uniforms must be set in order for this shader to work correctly.
     /// </summary>
-    public ReadOnlyCollection<AttributeType> RequiredUniforms { get; }
+    public ImmutableArray<FormatInfo> RequiredUniforms { get; }
 }

GAIL/Graphics/Material/Material.cs

@@ -7,33 +7,26 @@ namespace GAIL.Graphics.Material;
 /// </summary>
 public interface IMaterial {
     /// <summary>
-    /// Which uniforms must be set in order for this shader to work correctly.
+    /// Applies all the uniforms.
     /// </summary>
-    public ReadOnlyCollection<AttributeType> RequiredUniforms { get; }
+    /// <param name="shader">The shader of which to set the uniforms.</param>
+    public abstract void Apply(IShader shader);
 }
 
 /// <summary>
 /// Contains information about how anything is drawn to the window, contains the shader and shader data.
 /// </summary>
 public abstract class Material : IMaterial {
-    // private static IShader CreateShader(GraphicsManager manager, ) {
-    //     
-    // }
-
-    public readonly IShader Shader;
-    
-    /// <inheritdoc/>
-    public virtual ReadOnlyCollection<AttributeType> RequiredUniforms => Shader.RequiredUniforms;
 
     /// <summary>
     /// Creates a new material.
     /// </summary>
-    /// <param name="shader">The shader corresponding to this material.</param> 
-    protected Material(IShader shader) {
-        Shader = shader;
-    }
+    protected Material() { }
 
-    protected bool SetUniform() {
+    // protected bool SetUniform() {
 
-    }
+    // }
+    
+    /// <inheritdoc/>
+    public abstract void Apply(IShader shader);
 }

GAIL/Graphics/Material/Uniform.cs

@@ -5,21 +5,21 @@ namespace GAIL.Graphics.Material;
 /// </summary>
 public abstract class Uniform {
     /// <summary>
-    /// The type of this uniform.
+    /// The info about the format of this uniform.
     /// </summary>
-    public AttributeType Type;
+    public FormatInfo info;
     /// <summary>
     /// The value of this uniform.
     /// </summary>
-    public byte[] Value;
+    public byte[] value;
 
     /// <summary>
     /// Creates a new Uniform
     /// </summary>
-    /// <param name="type">The type of this uniform.</param>
+    /// <param name="info">The info about the format of this uniform.</param>
     /// <param name="value">The value of this uniform.</param>
-    public Uniform(AttributeType type, byte[] value) {
-        Type = type;
-        Value = value;
+    public Uniform(FormatInfo info, byte[] value) {
+        this.info = info;
+        this.value = value;
     }
 }

GAIL/Graphics/Mesh/Attributes.cs

@@ -7,7 +7,7 @@ namespace GAIL.Graphics.Mesh
     /// A basic position attribute (Float3).
     /// </summary>
     /// <param name="position">The position of this attribute.</param>
-    public class PositionAttribute(Vector3 position) : VertexAttribute(AttributeType.Float3) {
+    public class PositionAttribute(Vector3 position) : VertexAttribute(FormatType.Float3) {
         /// <summary>
         /// The color of this color attribute.
         /// </summary>
@@ -25,7 +25,7 @@ public override byte[] Use() {
     /// Creates a color attribute (Float4).
     /// </remarks>
     /// <param name="color">The color of this attribute.</param>
-    public class ColorAttribute(Color color) : VertexAttribute(AttributeType.Float4) {
+    public class ColorAttribute(Color color) : VertexAttribute(FormatType.Float4) {
         /// <summary>
         /// The color of this color attribute.
         /// </summary>
@@ -43,7 +43,7 @@ public override byte[] Use() {
     /// Creates a normal attribute.
     /// </remarks>
     /// <param name="normal">The normal vector of this attribute.</param>
-    public class NormalAttribute(Vector3 normal) : VertexAttribute(AttributeType.Float3) {
+    public class NormalAttribute(Vector3 normal) : VertexAttribute(FormatType.Float3) {
         /// <summary>
         /// The normal vector of this normal attribute.
         /// </summary>
@@ -61,7 +61,7 @@ public override byte[] Use() {
     /// Creates a uv (texture coordinates) attribute (Float2).
     /// </remarks>
     /// <param name="uv">The uv vector of this attribute.</param>
-    public class UVAttribute(Vector2 uv) : VertexAttribute(AttributeType.Float2) {
+    public class UVAttribute(Vector2 uv) : VertexAttribute(FormatType.Float2) {
         /// <summary>
         /// The uv vector of this uv attribute.
         /// </summary>

GAIL/Graphics/Mesh/Mesh.cs

@@ -22,14 +22,15 @@ public class Mesh {
         public static Mesh FromObj(string path) { return Obj.Parse(path); }
 
         /// <summary>
-        /// (Face0-p1, Face0-p2, Face0-p3, Face1-p1, etc)
+        /// The vertices for the <see cref="indexFaces"/>.
         /// </summary>
-        public List<uint> indexFaces = [];
+        public Vertex[] vertices = [];
 
         /// <summary>
-        /// The vertices for the <see cref="indexFaces"/>.
+        /// (Face0-p1, Face0-p2, Face0-p3, Face1-p1, etc)
         /// </summary>
-        public List<Vertex> vertices = [];
+        public uint[] indexFaces = [];
+
 
         /// <summary>
         /// Creates an mesh from faces.
@@ -43,7 +44,7 @@ public Mesh(List<Face> faces) {
         /// </summary>
         /// <param name="vertices">The vertices for the indices.</param>
         /// <param name="indexFaces">The face indices.</param>
-        public Mesh(List<Vertex> vertices, List<uint> indexFaces) {
+        public Mesh(Vertex[] vertices, uint[] indexFaces) {
             this.vertices = vertices;
             this.indexFaces = indexFaces;
         }

GAIL/Graphics/Mesh/Vertex.cs

@@ -36,11 +36,11 @@ public Vertex(Vector3 position) : this() {
         /// <param name="requiredAttributes">The attribute types that are required by the shader.</param>
         /// <returns>The nessecary vertex attributes.</returns>
         /// <exception cref="NotSupportedException">This exception is fired when this vertex does not supply sufficient attributes.</exception>
-        public VertexAttribute[] Supply(ReadOnlyCollection<AttributeType> requiredAttributes) {
+        public VertexAttribute[] Supply(ReadOnlyCollection<FormatInfo> requiredAttributes) {
             VertexAttribute[] result = new VertexAttribute[requiredAttributes.Count];
             int requiredIndex = 0;
             foreach (VertexAttribute attribute in Attributes) {
-                if (attribute.type == requiredAttributes[requiredIndex]) {
+                if (attribute.info.type == requiredAttributes[requiredIndex].type) {
                     result[requiredIndex] = attribute;
                     requiredIndex++;
                 }

GAIL/Graphics/Mesh/VertexAttribute.cs

@@ -6,15 +6,15 @@ namespace GAIL.Graphics.Mesh
     /// </summary>
     public abstract class VertexAttribute : IEquatable<VertexAttribute> {
         /// <summary>
-        /// The type of this attribute.
+        /// The info of the format of this attribute.
         /// </summary>
-        public readonly AttributeType type;
+        public readonly FormatInfo info;
 
         /// <summary>
         /// Creates a new vertex attribute.
         /// </summary>
-        /// <param name="type">The type of the attribute.</param>
-        protected VertexAttribute(AttributeType type) { this.type = type; }
+        /// <param name="info">The info of the format of this attribute.</param>
+        protected VertexAttribute(FormatInfo info) { this.info = info; }
 
         /// <summary>
         /// Generates the data for this attribute.
@@ -28,7 +28,7 @@ public bool Equals(VertexAttribute? other)  {
 
             if (ReferenceEquals(this, other)) return true;
 
-            return type.Equals(other.type);
+            return info.Equals(other.info);
         }
 
         /// <inheritdoc/>

GAIL/Graphics/Object.cs

@@ -1,5 +1,24 @@
 namespace GAIL.Graphics;
 
+/// <summary>
+/// A renderable object.
+/// </summary>
 public class Object {
-    
+    /// <summary>
+    /// The mesh or shape of this object.
+    /// </summary>
+    public Mesh.Mesh mesh;
+    /// <summary>
+    /// The material or style of this object.
+    /// </summary>
+    public Material.Material material;
+    /// <summary>
+    /// Creates a new object.
+    /// </summary>
+    /// <param name="mesh">The mesh or shape of this object.</param>
+    /// <param name="material">The material or style of this object.</param>
+    public Object(Mesh.Mesh mesh, Material.Material material) {
+        this.mesh = mesh;
+        this.material = material;
+    }
 }