Merge branch 'develop' into feature/docking-layout
# Conflicts: # src/Editor/Ghost.Editor/ActivationHandler.cs # src/Editor/Ghost.Editor/App.xaml # src/Editor/Ghost.Editor/View/Windows/EngineEditorWindow.xaml
This commit is contained in:
@@ -3,10 +3,8 @@ using Ghost.Engine.Components;
|
||||
using Ghost.Entities;
|
||||
using Ghost.Graphics;
|
||||
using Ghost.Graphics.Core;
|
||||
using Ghost.Graphics.RHI;
|
||||
using Misaki.HighPerformance.LowLevel.Buffer;
|
||||
using Misaki.HighPerformance.Mathematics;
|
||||
using Misaki.HighPerformance.Mathematics.Geometry;
|
||||
|
||||
namespace Ghost.Engine.Systems;
|
||||
|
||||
@@ -27,6 +25,8 @@ public class RenderExtractionSystem : ISystem
|
||||
.WithAll<Camera, LocalToWorld>()
|
||||
.Build(systemAPI.World, false);
|
||||
|
||||
builder.Clear();
|
||||
|
||||
_meshQueryID = builder
|
||||
.WithAll<MeshInstance, LocalToWorld>()
|
||||
.Build(systemAPI.World, true);
|
||||
|
||||
@@ -636,10 +636,6 @@ public ref partial struct QueryBuilder : IDisposable
|
||||
{
|
||||
Dispose();
|
||||
}
|
||||
else
|
||||
{
|
||||
Clear();
|
||||
}
|
||||
|
||||
return query;
|
||||
}
|
||||
@@ -669,10 +665,6 @@ public ref partial struct QueryBuilder : IDisposable
|
||||
{
|
||||
Dispose();
|
||||
}
|
||||
else
|
||||
{
|
||||
Clear();
|
||||
}
|
||||
|
||||
return queryID;
|
||||
}
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
using Ghost.Core;
|
||||
using Ghost.Graphics.RenderGraphModule;
|
||||
using Ghost.Graphics.RHI;
|
||||
|
||||
namespace Ghost.Graphics.Core.Contracts;
|
||||
|
||||
public interface IRenderPass
|
||||
{
|
||||
void Initialize(ref readonly RenderingContext ctx);
|
||||
void Build(RenderGraph graph, Identifier<RGTexture> backbuffer);
|
||||
void Cleanup(ResourceManager resourceManager, IResourceDatabase resourceDatabase);
|
||||
}
|
||||
@@ -8,13 +8,13 @@ namespace Ghost.Graphics.RenderPipeline;
|
||||
|
||||
public sealed class GhostRenderPipelineSettings : IRenderPipelineSettings
|
||||
{
|
||||
public IRenderPipeline CreatePipeline(RenderSystem renderSystem)
|
||||
IRenderPipeline IRenderPipelineSettings.CreatePipeline(RenderSystem renderSystem)
|
||||
{
|
||||
return new GhostRenderPipeline(renderSystem);
|
||||
}
|
||||
}
|
||||
|
||||
public unsafe partial class GhostRenderPipeline : IRenderPipeline
|
||||
internal unsafe partial class GhostRenderPipeline : IRenderPipeline
|
||||
{
|
||||
private readonly RenderGraph _renderGraph;
|
||||
|
||||
|
||||
@@ -357,34 +357,6 @@ public unsafe partial class TestRenderPipeline : IRenderPipeline
|
||||
builder.SetColorAttachment(backbuffer, 0);
|
||||
builder.SetRenderFunc<MeshletDebugPassData>(static (data, ctx)=>
|
||||
{
|
||||
//var cmd = ctx.GetCommandBufferUnsafe();
|
||||
//var (backBufferDesc, err) = ctx.ResourceDatabase.GetResourceDescription(ctx.GetActualResource(data.backbuffer.AsResource()));
|
||||
//if (err != Error.None)
|
||||
//{
|
||||
// return;
|
||||
//}
|
||||
|
||||
//var viewportDesc = new ViewportDesc
|
||||
//{
|
||||
// X = 0,
|
||||
// Y = 0,
|
||||
// Width = backBufferDesc.TextureDescription.Width,
|
||||
// Height = backBufferDesc.TextureDescription.Height,
|
||||
// MinDepth = 0,
|
||||
// MaxDepth = 1
|
||||
//};
|
||||
|
||||
//var rectDesc = new ScissorRectDesc
|
||||
//{
|
||||
// Left = 0,
|
||||
// Top = 0,
|
||||
// Right = backBufferDesc.TextureDescription.Width,
|
||||
// Bottom = backBufferDesc.TextureDescription.Height
|
||||
//};
|
||||
|
||||
//cmd.SetViewport(viewportDesc);
|
||||
//cmd.SetScissorRect(rectDesc);
|
||||
|
||||
ctx.SetGlobalData(data.globalIndex, data.viewIndex);
|
||||
ctx.SetInstanceData(data.instanceIndex);
|
||||
ctx.SetActiveMaterial(data.material);
|
||||
|
||||
Reference in New Issue
Block a user