- Dev: bindless material textures for deferred

Author: AEspinosaDev

examples/raytracing/application.cpp

@@ -55,7 +55,7 @@ void Application::setup() {
 
     Mesh* lightDummy = new Mesh();
     Tools::Loaders::load_3D_file(lightDummy, ENGINE_MESH_PATH + "sphere.obj");
-    lightDummy->push_material(new UnlitMaterial());
+    lightDummy->add_material(new UnlitMaterial());
     lightDummy->set_scale(0.5f);
     lightDummy->ray_hittable(false);
     lightDummy->cast_shadows(false);
@@ -89,7 +89,7 @@ void Application::setup() {
     // toriiMat->set_mask_texture(toriiM, UNREAL_ENGINE);
     toriiMat->set_metalness(0.05);
     toriiMat->set_roughness(0.5);
-    toriiMesh->push_material(toriiMat);
+    toriiMesh->add_material(toriiMat);
 
     Tools::Loaders::load_3D_file(toriiMesh, MESH_PATH + "torii.obj");
     toriiMesh->set_name("Torii");
@@ -100,7 +100,7 @@ void Application::setup() {
 
     Mesh* plane = new Mesh();
     // Tools::Loaders::load_3D_file(plane, MESH_PATH + "torii.obj", false);
-    plane->push_geometry(Geometry::create_quad());
+    plane->set_geometry(Geometry::create_quad());
     auto     terrainMat = new PhysicalMaterial();
     TextureLDR* floorText  = new TextureLDR();
     Tools::Loaders::load_texture(floorText, TEXTURE_PATH + "floor_diffuse.jpg");
@@ -115,7 +115,7 @@ void Application::setup() {
     terrainMat->set_roughness(0.2f);
     terrainMat->set_tile({10.0f, 10.0f});
     terrainMat->reflective(true);
-    plane->push_material(terrainMat);
+    plane->add_material(terrainMat);
     plane->set_name("Floor");
     plane->set_position({0.0, -2.3, 0.0});
     plane->set_rotation({-90.0f, 0.0f, 0.0f});
@@ -130,7 +130,7 @@ void Application::setup() {
     TextureLDR* stonelanternN = new TextureLDR();
     Tools::Loaders::load_texture(stonelanternN, TEXTURE_PATH + "moisturizer_normal.png", TEXTURE_FORMAT_UNORM);
     stoneMat->set_normal_texture(stonelanternN);
-    stoneMesh->push_material(stoneMat);
+    stoneMesh->add_material(stoneMat);
     stoneMesh->set_name("Tower");
     stoneMesh->set_position({2.0f, -2.3f, -2.3f});
     stoneMesh->set_rotation({0.0, 126.0f, 0.0f});
@@ -151,7 +151,7 @@ void Application::setup() {
     TextureLDR* droidText2 = new TextureLDR();
     Tools::Loaders::load_texture(droidText2, TEXTURE_PATH + "DROID_Body_Normal.jpg", TEXTURE_FORMAT_UNORM);
     droidMat->set_normal_texture(droidText2);
-    droidMesh->push_material(droidMat);
+    droidMesh->add_material(droidMat);
     droidMesh->set_name("Droid");
     droidMesh->set_position({-0.7f, -2.3f, -1.6f});
     droidMesh->set_rotation({0.0, -136.0f, 0.0f});
@@ -161,7 +161,7 @@ void Application::setup() {
     auto droidMat1 = new PhysicalMaterial();
     droidMat1->set_emissive_color(Vec3(1.0));
     droidMat1->set_emission_intensity(10.0);
-    eyesMesh->push_material(droidMat1);
+    eyesMesh->add_material(droidMat1);
     eyesMesh->set_name("Eyes");
     droidMesh->add_child(eyesMesh);
     m_scene->add(droidMesh);
@@ -178,7 +178,7 @@ void Application::setup() {
     TextureLDR* stormtrooperText2 = new TextureLDR();
     Tools::Loaders::load_texture(stormtrooperText2, TEXTURE_PATH + "stormtrooper_mask.png", TEXTURE_FORMAT_UNORM);
     stormtrooperMat->set_mask_texture(stormtrooperText2, MaskType::UNREAL_ENGINE);
-    stormtrooper->push_material(stormtrooperMat);
+    stormtrooper->add_material(stormtrooperMat);
     stormtrooper->set_name("Trooper");
     stormtrooper->set_position({-1.8f, -2.3f, 0.4f});
     stormtrooper->set_rotation({0.0, -136.0f, 0.0f});
@@ -195,15 +195,15 @@ void Application::setup() {
     TextureLDR* stormtrooperText13 = new TextureLDR();
     Tools::Loaders::load_texture(stormtrooperText13, TEXTURE_PATH + "stormtrooper_head_mask.png", TEXTURE_FORMAT_UNORM);
     stormtrooperMat1->set_mask_texture(stormtrooperText13, MaskType::UNREAL_ENGINE);
-    stormtrooperHead->push_material(stormtrooperMat1);
+    stormtrooperHead->add_material(stormtrooperMat1);
     stormtrooperHead->set_name("Head");
     stormtrooper->add_child(stormtrooperHead);
     m_scene->add(stormtrooper);
 
     Mesh* roninMesh = new Mesh();
     Tools::Loaders::load_3D_file(roninMesh, MESH_PATH + "ronin.obj");
     auto roninMat = new PhysicalMaterial();
-    roninMesh->push_material(roninMat);
+    roninMesh->add_material(roninMat);
     roninMesh->set_name("Ronin");
     roninMesh->set_position({-2.1f, -2.065f, -3.4f});
     roninMesh->set_rotation({0.0, 14.0f, 0.0f});
@@ -214,7 +214,7 @@ void Application::setup() {
     Mesh* sphereMesh = new Mesh();
     Tools::Loaders::load_3D_file(sphereMesh, ENGINE_MESH_PATH + "sphere.obj");
     auto spheremat = new PhysicalMaterial();
-    sphereMesh->push_material(spheremat);
+    sphereMesh->add_material(spheremat);
     sphereMesh->set_name("Energy ball");
     spheremat->set_albedo(Vec3(0.0));
     spheremat->set_metalness(0.0);

examples/renderer-app/application.cpp

@@ -171,7 +171,7 @@ void Application::setup() {
     toriiMat->set_metalness(0.05);
     toriiMat->set_roughness(0.5);
     // toriiMat->set_mask_texture(toriiM, UNREAL_ENGINE);
-    toriiMesh->push_material(toriiMat);
+    toriiMesh->add_material(toriiMat);
     Tools::Loaders::load_3D_file(toriiMesh, MESH_PATH + "torii.obj");
     toriiMesh->set_name("Torii");
     toriiMesh->set_scale(0.2f);
@@ -196,15 +196,15 @@ void Application::setup() {
     terrainMat->set_normal_texture(floorNormalText);
     terrainMat->set_roughness_texture(floorRoughText);
     terrainMat->set_tile({25.0f, 25.0f});
-    terrainMesh->push_material(terrainMat);
+    terrainMesh->add_material(terrainMat);
     terrainMesh->set_name("Terrain");
     m_scene->add(terrainMesh);
 
     auto lightMat = new UnlitMaterial();
     lightMat->set_color(glm::vec4(m_scene->get_lights()[0]->get_color(), 1.0f));
     m_lightDummy = new Mesh();
     Tools::Loaders::load_3D_file(m_lightDummy, ENGINE_MESH_PATH + "sphere.obj");
-    m_lightDummy->push_material(lightMat);
+    m_lightDummy->add_material(lightMat);
     m_lightDummy->set_scale(0.5f);
     m_lightDummy->set_name("Light Gizmo");
     // m_scene->add(m_lightDummy);
@@ -219,7 +219,7 @@ void Application::setup() {
     kabutoMat->set_albedo({0.0, 1.0, 0.0});
     kabutoMat->set_metalness(0.8f);
     kabutoMat->set_roughness(0.4f);
-    kabutoMesh->push_material(kabutoMat);
+    kabutoMesh->add_material(kabutoMat);
     kabutoMesh->set_name("Kabuto");
     m_scene->add(kabutoMesh);
 
@@ -240,7 +240,7 @@ void Application::setup() {
     templeMat->set_albedo({0.0, 1.0, 0.0});
     templeMat->set_metalness(0.8f);
     templeMat->set_roughness(0.4f);
-    templeMesh->push_material(templeMat);
+    templeMesh->add_material(templeMat);
     templeMesh->set_name("Temple");
     templeMesh->set_position({7.2, -2.87, 14.1});
     templeMesh->set_rotation({0.0, 230.0f, 0.0f});
@@ -260,7 +260,7 @@ void Application::setup() {
     templeMat2->set_albedo_texture(templeText2);
     templeMat2->set_metallic_texture(templeMText2);
     templeMat2->set_roughness_texture(templeRText2);
-    templeMesh2->push_material(templeMat2);
+    templeMesh2->add_material(templeMat2);
     templeMesh2->set_name("Shrine");
     templeMesh2->set_position({0, -2.77, 14.1});
     templeMesh2->set_rotation({0.0, 160.0f, 0.0f});
@@ -273,7 +273,7 @@ void Application::setup() {
     TextureLDR* lanternT   = new TextureLDR();
     Tools::Loaders::load_texture(lanternT, TEXTURE_PATH + "lantern_diffuse.png");
     lanternMat->set_albedo_texture(lanternT);
-    lanternMesh->push_material(lanternMat);
+    lanternMesh->add_material(lanternMat);
     lanternMesh->set_name("Lantern");
     lanternMesh->set_position({2.5, -1.67, 2.8});
     lanternMesh->set_rotation({0.0, 23.0f, 0.0f});
@@ -302,7 +302,7 @@ void Application::setup() {
     TextureLDR* stonelanternT = new TextureLDR();
     Tools::Loaders::load_texture(stonelanternT, TEXTURE_PATH + "stone_diffuse.png");
     stoneMat->set_albedo_texture(stonelanternT);
-    stoneMesh->push_material(stoneMat);
+    stoneMesh->add_material(stoneMat);
     stoneMesh->set_name("Stone Lantern");
     stoneMesh->set_position({2.5, -2.67, 9.5});
     stoneMesh->set_rotation({0.0, 107.0f, 0.0f});

examples/rotating-kabuto/main.cpp

@@ -56,7 +56,7 @@ int main() {
 
         Core::PhysicalMaterial* material = new Core::PhysicalMaterial();
         material->set_albedo(Vec4{1.0});
-        kabuto->push_material(material);
+        kabuto->add_material(material);
 
         scene->add(kabuto);
 

include/engine/common.h

@@ -97,6 +97,8 @@
 // Max object ocurrence
 #define ENGINE_MAX_OBJECTS 100
 #define ENGINE_MAX_LIGHTS 50
+#define MAX_TEXTURES_PER_MATERIAL 6
+#define MAX_TEXTURES ENGINE_MAX_OBJECTS * MAX_TEXTURES_PER_MATERIAL
 
 // File terminations
 #define PLY "ply"

include/engine/core/materials/material.h

@@ -34,7 +34,7 @@ class IMaterial
     std::string             m_shaderPassID      = {};
     Graphics::DescriptorSet m_textureDescriptor = {};
 
-    bool  m_isDirty  = true;
+    bool m_isDirty = true;
 
     friend class Renderer;
 
@@ -52,13 +52,10 @@ class IMaterial
     ~IMaterial() {
     }
 
-    virtual Graphics::MaterialUniforms get_uniforms() const = 0;
-
-    virtual std::unordered_map<int, ITexture*> get_textures() const = 0;
-
-    virtual std::unordered_map<int, bool> get_texture_binding_state() const = 0;
-
-    virtual void set_texture_binding_state(int id, bool state) = 0;
+    virtual Graphics::MaterialUniforms         get_uniforms() const                          = 0;
+    virtual std::unordered_map<int, ITexture*> get_textures() const                          = 0;
+    virtual std::unordered_map<int, bool>      get_texture_binding_state() const             = 0;
+    virtual void                               set_texture_binding_state(int id, bool state) = 0;
 
     virtual std::string get_shaderpass_ID() const {
         return m_shaderPassID;

include/engine/core/passes/forward_pass.h

@@ -30,6 +30,7 @@ class ForwardPass final : public BaseGraphicPass
     struct FrameDescriptors {
         Graphics::DescriptorSet globalDescritor;
         Graphics::DescriptorSet objectDescritor;
+        Graphics::DescriptorSet textureDescriptor;
     };
     std::vector<FrameDescriptors> m_descriptors;
 
@@ -50,21 +51,20 @@ class ForwardPass final : public BaseGraphicPass
          - Depth
      */
     ForwardPass(const ptr<Graphics::Device>& device,
-                const PassLinkage<3, 3>& config,
-                Extent2D                 extent,
-                ColorFormatType          colorFormat,
-                ColorFormatType          depthFormat,
-                MSAASamples              samples,
-                bool                     isDefault = false)
+                const PassLinkage<3, 3>&     config,
+                Extent2D                     extent,
+                ColorFormatType              colorFormat,
+                ColorFormatType              depthFormat,
+                MSAASamples                  samples,
+                bool                         isDefault = false)
         : BaseGraphicPass(device, extent, 1, 1, true, isDefault, "FORWARD")
         , m_colorFormat(colorFormat)
         , m_depthFormat(depthFormat)
         , m_aa(samples) {
         BasePass::store_attachments<3, 3>(config);
     }
 
-    void setup_out_attachments(std::vector<Graphics::AttachmentConfig>&  attachments,
-                               std::vector<Graphics::SubPassDependency>& dependencies) override;
+    void setup_out_attachments(std::vector<Graphics::AttachmentConfig>& attachments, std::vector<Graphics::SubPassDependency>& dependencies) override;
 
     void create_framebuffer() override;
 

include/engine/core/passes/geometry_pass.h

@@ -28,10 +28,11 @@ class GeometryPass final : public BaseGraphicPass
     struct FrameDescriptors {
         Graphics::DescriptorSet globalDescritor;
         Graphics::DescriptorSet objectDescritor;
+        Graphics::DescriptorSet textureDescritor;
     };
     std::vector<FrameDescriptors> m_descriptors;
 
-    void setup_material_descriptor(IMaterial* mat);
+    void setup_material_descriptor(IMaterial* mat, uint32_t meshIdx);
 
   public:
     /*
@@ -49,7 +50,11 @@ class GeometryPass final : public BaseGraphicPass
         - Velocity + Emissive buffer
         - Depth buffer
     */
-    GeometryPass(const ptr<Graphics::Device>& device, const PassLinkage<3, 5>& config, Extent2D extent, ColorFormatType floatingPointFormat, ColorFormatType depthFormat)
+    GeometryPass(const ptr<Graphics::Device>& device,
+                 const PassLinkage<3, 5>&     config,
+                 Extent2D                     extent,
+                 ColorFormatType              floatingPointFormat,
+                 ColorFormatType              depthFormat)
         : BaseGraphicPass(device, extent, 1, 1, true, false, "GEOMETRY")
         , m_depthFormat(depthFormat)
         , m_floatFormat(floatingPointFormat) {

include/engine/core/passes/voxelization_pass.h

@@ -33,11 +33,12 @@ class VoxelizationPass final : public BaseGraphicPass
     struct FrameDescriptors {
         Graphics::DescriptorSet globalDescritor;
         Graphics::DescriptorSet objectDescritor;
+        Graphics::DescriptorSet textureDescritor;
     };
     std::vector<FrameDescriptors> m_descriptors;
 
     void create_voxelization_image();
-    void setup_material_descriptor(IMaterial* mat);
+    void setup_material_descriptor(IMaterial* mat, uint32_t meshIdx);
 
   public:
     /*

include/engine/core/scene/mesh.h

@@ -35,6 +35,8 @@ struct BoundingVolume {
         : TYPE(t)
         , obj(o) {
     }
+    ~BoundingVolume() {
+    }
 
     virtual void setup(Mesh* const mesh) = 0;
 
@@ -84,7 +86,7 @@ Class used to represent a 3D model instance.
 class Mesh : public Object3D
 {
   protected:
-    std::vector<Geometry*>  m_geometry;
+    Geometry*               m_geometry;
     std::vector<IMaterial*> m_material;
 
     BV*         m_volume         = nullptr;
@@ -111,25 +113,26 @@ class Mesh : public Object3D
         : Object3D("Mesh #" + std::to_string(Mesh::m_instanceCount), ObjectType::MESH)
         , m_volume(nullptr) {
         Mesh::m_instanceCount++;
-        m_geometry.push_back(geom);
+        m_geometry = geom;
         m_material.push_back(mat);
     }
     ~Mesh() {
         // delete m_geometry;
     }
-    /**
-     * Returns the geometry in the slot.
-     */
-    inline Geometry* const get_geometry(size_t id = 0) const {
-        return m_geometry.size() >= id + 1 ? m_geometry[id] : nullptr;
-    }
-    inline std::vector<Geometry*> get_geometries() const {
+
+    inline Geometry* const get_geometry() const {
         return m_geometry;
-    };
-    /**
-     * Change the geometry in the given slot and returns the old one ref.
+    }
+    inline void set_geometry(Geometry* g) {
+        m_geometry = g;
+        setup_volume();
+    }
+    /*
+     * Adds this material in the next free slot
      */
-    Geometry* change_geometry(Geometry* g, size_t id = 0);
+    inline void add_material(IMaterial* m) {
+        m_material.push_back(m);
+    }
     /**
      * Returns the material in the slot.
      */
@@ -142,29 +145,10 @@ class Mesh : public Object3D
     /**
      * Change the material in the given slot and returns the old one ref.
      */
-    IMaterial* change_material(IMaterial* m, size_t id = 0);
-    /*
-     * Adds this geometry in the next free slot. It is important to set correctly the id of the material slot this
-     * geometry is pointing.
-     */
-    inline void push_geometry(Geometry* g) {
-        m_geometry.push_back(g);
-        setup_volume();
-    }
-    /*
-     * Adds this material in the next free slot
-     */
-    inline void push_material(IMaterial* m) {
-        m_material.push_back(m);
-    }
-
-    inline size_t get_num_geometries() const {
-        return m_geometry.size();
-    }
+    IMaterial*    change_material(IMaterial* m, size_t id = 0);
     inline size_t get_num_materials() const {
         return m_material.size();
     }
-
     inline void cast_shadows(bool op) {
         m_castShadows = op;
     }
@@ -213,13 +197,6 @@ class Mesh : public Object3D
         m_fileRoute = r;
     }
 
-    inline size_t get_material_ID(size_t geometrySlot) const {
-        return m_geometry[geometrySlot]->get_material_ID();
-    }
-    inline void set_material_ID(size_t geometrySlot, size_t materialSlot) {
-        m_geometry[geometrySlot]->set_material_ID(materialSlot);
-    }
-
     void  setup_volume(VolumeType type = VolumeType::SPHERE_VOLUME);
     Mesh* clone() const;
 };