Feature/mesh loader impl

Assets/VFX/RibbonGarden.json

@@ -38,7 +38,7 @@
     {
       "name": "PathRibbon",
       "renderMode": "Ribbon",
-      "material": { "color": "$canopy_color_start", "emissive": [0.10, 0.25, 0.50, 0.0] },
+      "material": { "color": "$canopy_color_start", "emissive": [10.0, 25.0, 50.0, 0.0] },
       "maxParticles": 256,
       "spawnRate": "$spawn_rate",
       "parameters": {

Assets/VFX/RibbonVortex.json

@@ -38,7 +38,7 @@
     {
       "name": "PathRibbon",
       "renderMode": "Ribbon",
-      "material": { "color": "$canopy_color_start", "emissive": [0.10, 0.25, 0.50, 0.0] },
+      "material": { "color": "$canopy_color_start", "emissive": [10.0, 25.0, 50.0, 0.0] },
       "maxParticles": 256,
       "spawnRate": "$spawn_rate",
       "parameters": {

Dissolve/Dissolve.cmake

@@ -7,6 +7,7 @@ file(GLOB_RECURSE SOURCES
     "${CMAKE_CURRENT_LIST_DIR}/Source/*.h"
     "${CMAKE_CURRENT_LIST_DIR}/Source/*.cpp"
 )
+list(APPEND SOURCES "${CMAKE_SOURCE_DIR}/Elixir/Vendor/stb/stb_image.cpp")
 add_executable(${PROJECT_NAME} ${SOURCES})
 
 # Set output name
@@ -58,6 +59,7 @@ endif()
 
 target_include_directories(${PROJECT_NAME} PRIVATE
     ${CMAKE_SOURCE_DIR}/Elixir/Source
+    ${CMAKE_SOURCE_DIR}/Elixir/Vendor/stb
 )
 
 # Linking
@@ -66,4 +68,4 @@ add_dependencies(${PROJECT_NAME}
     Elixir
 )
 
-link_target_to_engine(${PROJECT_NAME})
+link_target_to_engine(${PROJECT_NAME})

Dissolve/Source/Dissolve.cpp

@@ -1,9 +1,9 @@
 #include "Dissolve.h"
 
+#include "Engine/Materials/Nodes/Color.h"
 #include "Engine/Materials/Nodes/Parameter.h"
 
 #include <Engine/Core/Entrypoint.h>
-#include <Engine/Graphics/SamplerBuilder.h>
 #include <Engine/Aether/Manager.h>
 
 #include <Engine/Materials/MaterialGraph.h>
@@ -16,20 +16,21 @@
 
 using namespace Elixir::Materials::Nodes;
 
-Ref<GraphicsPipeline> pipeline;
 std::array<Ref<Aether::System>, 2> m_ParticleSystems;
 std::array<Ref<Aether::SystemInstance>, 2> m_ParticleSystemInstances;
 
 Ref<Material> graphMaterial;
 
+Ref<StaticMesh> mesh;
+SStaticMeshLighting s_LightingSetup;
+
 Dissolve::Dissolve()
 {
     EE_PROFILE_ZONE_SCOPED()
 
     m_Window->SetTitle("Dissolve");
-    m_DrawExtent = m_Window->GetFramebufferExtent();
-
-    const auto aspectRatio = (float)m_DrawExtent.Width / (float)m_DrawExtent.Height;
+    const auto drawExtent = m_Window->GetFramebufferExtent();
+    const auto aspectRatio = (float)drawExtent.Width / (float)drawExtent.Height;
     // m_CameraController = CreateScope<SplineCameraController>(aspectRatio);
     // m_CameraController->AddKeyframe({ { 0.0f, 0.5f, 5.0f }, { 0.0f, 0.0f, 0.0f }, 60.0f });
     // m_CameraController->AddKeyframe({ { 1.0f, 0.3f, 2.5f }, { 0.0f, 0.0f, 0.0f }, 50.0f });
@@ -38,34 +39,36 @@ Dissolve::Dissolve()
     // m_CameraController->SetLooping(true);
     // m_CameraController->Play();
     m_CameraController = CreateScope<ArcBallCameraController>(60.0f, aspectRatio);
-    m_FrameData.ViewProj = m_CameraController->GetCamera().GetViewProjectionMatrix();
-
-    const auto sampler = SamplerBuilder()
-        .Build(m_GraphicsContext.get());
-
     const auto tex = TextureLoader::Load("./Assets/Bricks.png");
 
-    const auto shader = m_ShaderLoader->LoadShader("./Shaders/", "FixedTriangle");
-    shader->BindTexture("texture", tex);
-    shader->BindSampler("sampl", sampler);
-
-    PipelineBuilder builder;
-    builder.SetShader(shader);
-    builder.SetInputTopology(EPrimitiveTopology::TriangleList);
-    builder.SetPolygonMode(EPolygonMode::Fill);
-    builder.DisableBlending();
-    builder.DisableDepthTest();
-    builder.SetColorAttachmentFormat(EImageFormat::R8G8B8A8_SRGB);
-    builder.SetBufferLayout({});
-    pipeline = builder.Build(m_GraphicsContext.get());
-
-    m_FrameConstantBuffer = UniformBuffer::Create(
+    m_Environment = Environment::Load(
+        *m_GraphicsContext,
+        "./Assets/Textures/white_home_studio_2k.hdr"
+    );
+    EE_CORE_ASSERT(m_Environment, "Could not load the Environment.")
+
+    m_StaticMeshRenderer = CreateScope<StaticMeshRenderer>(
         m_GraphicsContext.get(),
-        sizeof(SFrameData),
-        &m_FrameData
+        GetMaterialSystem(),
+        StaticMeshLoaderRegistry::GetGeometryPool()
     );
 
-    shader->BindConstantBuffer("cbFrame", m_FrameConstantBuffer);
+    s_LightingSetup = {
+        .Environment = {
+            .Environment = m_Environment->GetEnvironment(),
+            .Irradiance = m_Environment->GetIrradiance(),
+            .Prefiltered = m_Environment->GetPrefiltered(),
+            .Sampler = m_Environment->GetSampler(),
+            .Intensity = 1.5f,
+            .MaxLod = Environment::GetMaxLod(),
+        },
+        .DirectionalLightDirection = glm::normalize(
+            glm::vec3{ -0.5f, 0.65f, -0.55f }
+        ),
+        .DirectionalLightColor = { 1.0f, 0.96f, 0.9f },
+        .DirectionalLightIntensity = 2.2f,
+        .DebugView = ESurfaceDebugView::Composite,
+    };
 
     m_ParticleSystems[0] = GetAetherManager().LoadEffect("./Assets/VFX/FireAndFireworks.json");
     EE_CORE_ASSERT(
@@ -82,10 +85,10 @@ Dissolve::Dissolve()
     {
         MaterialGraph graph;
 
-        graphMaterial = CreateRef<Material>("DissolveGraph");
+        graphMaterial = CreateRef<Material>("DissolveGraph", EMaterialUsage::Particle);
         EE_CORE_ASSERT(
-            graphMaterial->SetUsage(EMaterialUsage::ParticleSprite, true),
-            "Dissolve graph material must enable ParticleSprite usage."
+            graphMaterial->SetBlendMode(EMaterialBlendMode::Translucent),
+            "Dissolve graph material must enable translucent blending."
         )
 
         EE_CORE_ASSERT(graphMaterial->DefineParameter("Tint", {
@@ -126,76 +129,49 @@ Dissolve::Dissolve()
         {
             EE_CORE_ERROR("Dissolve particle emitter 'FlameCore' was not found.")
         }
+
+        if (auto loaded = StaticMeshLoaderRegistry::Load("./Assets/Meshes/McLaren/scene.gltf"))
+            mesh = std::move(*loaded);
     }
 
     {
         MaterialGraph graph1;
 
-        const auto ribbonMaterial = CreateRef<Material>("RibbonEnergy");
-        EE_CORE_ASSERT(
-            ribbonMaterial->SetUsage(EMaterialUsage::ParticleRibbon, true),
-            "Ribbon material must enable ParticleRibbon usage."
-        )
+        const auto ribbonMaterial = CreateRef<Material>("RibbonEnergy", EMaterialUsage::Particle);
         EE_CORE_ASSERT(
-            ribbonMaterial->SetUsage(EMaterialUsage::ParticleMesh, true),
-            "Ribbon material must enable ParticleRibbon usage."
+            ribbonMaterial->SetBlendMode(EMaterialBlendMode::Translucent),
+            "Ribbon material must enable translucent blending."
         )
 
         EE_CORE_ASSERT(ribbonMaterial->DefineParameter("Tint", {
             .Kind = EMaterialParameterKind::Value,
             .ValueType = EMaterialValueType::Float4,
-            .DefaultValue = SMaterialParameter::MakeVector({ 0.2f, 0.5f, 1.0f, 1.0f }),
-        }), "")
-
-        EE_CORE_ASSERT(ribbonMaterial->DefineParameter("Glow", {
-            .Kind = EMaterialParameterKind::Value,
-            .ValueType = EMaterialValueType::Float4,
-            .DefaultValue = SMaterialParameter::MakeVector({ 0.05f, 0.2f, 1.0f, 1.0f }),
+            .DefaultValue = SMaterialParameter::MakeVector({ 1.0f, 1.0f, 1.0f, 1.0f }),
         }), "")
 
-        EE_CORE_ASSERT(ribbonMaterial->DefineParameter("Albedo", {
-            .Kind = EMaterialParameterKind::Texture,
-            .DefaultValue = SMaterialParameter::MakeTexture(tex),
-        }), "")
-
-        const auto panner = graph1.AddNode<Panner>(glm::vec2{ 0.08f, -0.35f });
-
-        const auto albedo1 = graph1.AddNode<TextureSample>("Albedo");
-        graph1.Connect(panner, albedo1, 0);
-
-        const auto tint1 = graph1.AddNode<Parameter>(
+        const auto tint = graph1.AddNode<Parameter>(
             "Tint",
             EMaterialValueType::Float4
         );
 
+        const auto color = graph1.AddNode<Nodes::Color>();
+
         const auto multiply = graph1.AddNode<Multiply>();
-        graph1.Connect(albedo1, multiply, 0);
-        graph1.Connect(tint1, multiply, 1);
-        graph1.SetChannel(EMaterialChannel::BaseColor, albedo1);
+        graph1.Connect(tint, multiply, 0);
+        graph1.Connect(color, multiply, 1);
+        graph1.SetChannel(EMaterialChannel::BaseColor, multiply);
 
         // const auto glow = graph1.AddNode<Parameter>("Glow", EMaterialValueType::Float4);
         //graph1.SetChannel(EMaterialChannel::Emissive, glow);
 
         ribbonMaterial->SetGraph(std::move(graph1));
         EE_CORE_ASSERT(GetMaterialRegistry().Register(ribbonMaterial), "RibbonEnergy must be unique.")
 
-        const auto instance = ribbonMaterial->CreateInstance();
-        EE_CORE_ASSERT(
-            instance->SetVector("Tint", { 0.15f, 0.6f, 1.0f, 1.0f }),
-            "Ribbon tint override must match the schema."
-        )
-
         if (auto* emitter = m_ParticleSystems[1]->FindEmitter("PathRibbon"))
         {
-            emitter->SetMaterial(instance);
+            //emitter->SetMaterial(ribbonMaterial);
             EE_CORE_INFO("Published graph material to the PathRibbon particle emitter.")
         }
-
-        if (auto* emitter = m_ParticleSystems[1]->FindEmitter("CrystalShards"))
-        {
-            emitter->SetMaterial(instance);
-            EE_CORE_INFO("Published graph material to the CrystalShards particle emitter.")
-        }
     }
 
     m_ParticleSystemInstances[0] = m_ParticleSystems[0]->CreateInstance();
@@ -216,7 +192,12 @@ Dissolve::Dissolve()
 
 Dissolve::~Dissolve()
 {
-    pipeline.reset();
+    m_StaticMeshRenderer.reset();
+    mesh.reset();
+    s_LightingSetup = {};
+    graphMaterial.reset();
+    m_ParticleSystemInstances = {};
+    m_ParticleSystems = {};
 }
 
 void Dissolve::OnGUI(const Timestep frameTime)
@@ -237,19 +218,16 @@ void Dissolve::Render(const Timestep frameTime)
     Application::Render(frameTime);
 
     m_CameraController->Update(frameTime);
-    m_FrameData.ViewProj = m_CameraController->GetCamera().GetViewProjectionMatrix();
-    m_FrameConstantBuffer->UpdateData(&m_FrameData, sizeof(SFrameData));
-
     auto& aether = GetAetherManager();
     aether.BeginFrame(frameTime);
 
     m_GraphicsContext->Clear();
 
-    //DrawGeometry();
+    m_StaticMeshRenderer->BeginFrame(m_CameraController->GetCamera(), s_LightingSetup);
+    DrawGeometry();
+    m_StaticMeshRenderer->EndFrame();
 
-    aether.Render(m_CameraController->GetCamera());
-    const auto& simulationMetrics = aether.GetLastSimulationMetrics();
-    const auto& renderMetrics = aether.GetLastRenderingMetrics();
+    aether.Render(m_CameraController->GetCamera(), m_SceneTarget);
 }
 
 void Dissolve::OnEvent(Event& event)
@@ -260,37 +238,10 @@ void Dissolve::OnEvent(Event& event)
 
 void Dissolve::DrawGeometry()
 {
-     const auto renderingInfo = SRenderingInfo
-     {
-         .ColorAttachment = m_GraphicsContext->GetRenderTarget(),
-         .RenderArea = m_DrawExtent
-     };
-
-     Viewport viewport = {};
-     viewport.X = 0;
-     viewport.Y = 0;
-     viewport.Width = m_DrawExtent.Width;
-     viewport.Height = m_DrawExtent.Height;
-     viewport.MinDepth = 0.0f;
-     viewport.MaxDepth = 1.0f;
-
-     Rect2D scissor = {};
-     scissor.Offset = { 0, 0 };
-     scissor.Extent = m_DrawExtent;
-
-     m_Executor.Enqueue([this, renderingInfo, viewport, scissor]()
-     {
-         const auto cmd = this->m_GraphicsContext->GetSecondaryCommandBuffer();
-         cmd->BeginRendering(renderingInfo);
-         cmd->SetViewports({ viewport });
-         cmd->SetScissors({ scissor });
-         pipeline->Bind(cmd);
-         cmd->Draw(3);
-         cmd->EndRendering();
-         this->m_GraphicsContext->EnqueueSecondaryCommandBuffer(cmd);
-     }, &m_WaitGroup);
-
-    m_WaitGroup.Wait();
+    if (m_StaticMeshRenderer)
+    {
+        m_StaticMeshRenderer->Render(mesh);
+    }
 }
 
 Application* Elixir::CreateApplication()

Dissolve/Source/Dissolve.h

@@ -2,10 +2,7 @@
 
 #include <Engine.h>
 
-struct SFrameData
-{
-    glm::mat4 ViewProj;
-};
+#include "Environment.h"
 
 class Dissolve final : public Elixir::Application
 {
@@ -22,11 +19,9 @@ class Dissolve final : public Elixir::Application
 private:
     void DrawGeometry();
 
-    WaitGroup m_WaitGroup;
-    Extent2D m_DrawExtent;
+    Scope<Environment> m_Environment;
 
-    SFrameData m_FrameData;
-    Ref<UniformBuffer> m_FrameConstantBuffer;
+    Scope<StaticMeshRenderer> m_StaticMeshRenderer;
 
     Scope<ArcBallCameraController> m_CameraController;
-};
+};