Implement ECS resource interface for materials

chances · Apr 9, 2024 · d061131 · d061131
1 parent 94566c1
commit d061131
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/examples/triangle/dub.selections.json b/examples/triangle/dub.selections.json
@@ -3,6 +3,7 @@
 	"versions": {
 		"bindbc-glfw": "1.0.3",
 		"bindbc-loader": "1.0.3",
+		"concepts": "0.1.0",
 		"eventcore": "0.9.30",
 		"gfm": "8.0.6",
 		"intel-intrinsics": "1.11.18",

diff --git a/source/graphics/package.d b/source/graphics/package.d
@@ -3,14 +3,18 @@
 /// License: 3-Clause BSD License
 module teraflop.graphics;
 
+import concepts : implements;
+import teraflop.ecs : Resource;
 import teraflop.math;
 import teraflop.traits : isStruct;
 public import teraflop.graphics.color;
 public import teraflop.graphics.primitives;
 public import wgpu.api : ShaderStage;
+import wgpu.api : Adapter, Device;
 
 /// A shaded material for geometry encapsulating its `Shader`s, graphics pipeline state, and optionally a `Texture`.
 /// See_Also: `teraflop.systems.rendering.PipelinePreparer`
+@implements!(Material, Resource)
 struct Material {
   import std.typecons : Flag, No, Yes;
   import wgpu.api : CullMode, FrontFace;
@@ -19,7 +23,7 @@ struct Material {
   private FrontFace _frontFace = FrontFace.cw;
   private CullMode _cullMode = CullMode.back;
 
-  package (teraflop) Shader*[] _shaders;
+  package (teraflop) Shader*[] shaders;
   // TODO: package (teraflop) Texture _texture;
 
   /// Initialize a new Material.
@@ -32,10 +36,10 @@ struct Material {
     FrontFace frontFace = FrontFace.cw, CullMode cullMode = CullMode.back,
     Flag!"depthTest" depthTest = Yes.depthTest
   ) {
-    _shaders = shaders;
+    shaders = shaders;
+    _depthTest = depthTest;
     _frontFace = frontFace;
     _cullMode = cullMode;
-    _depthTest = depthTest;
   }
 
   /// Whether to perform the depth test. If `true`, assumes the render target has a depth buffer attachment.
@@ -50,6 +54,11 @@ struct Material {
   CullMode cullMode() @property const {
     return _cullMode;
   }
+
+  ///
+  void initialize(Adapter adapter, Device device) {
+    foreach (shader; shaders) shader.initialize(adapter, device);
+  }
 }
 
 ///
@@ -69,6 +78,7 @@ enum SourceLanguage {
 }
 
 ///
+@implements!(Shader, Resource)
 struct Shader {
   import std.conv : to;
   import std.exception : enforce;
@@ -137,7 +147,7 @@ struct Shader {
   }
 
   /// Initialize this Shader.
-  void initialize(scope Device device) {
+  void initialize(scope Adapter adapter, scope Device device) {
     assert(!initialized);
     this.device = device;
     this._shaderModule = _language == SourceLanguage.spirv