compiles again
This commit is contained in:
@@ -11,13 +11,13 @@ using namespace Seele::Editor;
|
||||
|
||||
InspectorView::InspectorView(Gfx::PGraphics graphics, PWindow window, const ViewportCreateInfo &createInfo)
|
||||
: View(graphics, std::move(window), std::move(createInfo), "InspectorView")
|
||||
, renderGraph(RenderGraphBuilder::build(
|
||||
UIPass(graphics),
|
||||
TextPass(graphics)
|
||||
))
|
||||
//, renderGraph(RenderGraphBuilder::build(
|
||||
// UIPass(graphics),
|
||||
// TextPass(graphics)
|
||||
//))
|
||||
, uiSystem(new UI::System())
|
||||
{
|
||||
renderGraph.updateViewport(viewport);
|
||||
//renderGraph.updateViewport(viewport);
|
||||
uiSystem->updateViewport(viewport);
|
||||
}
|
||||
|
||||
@@ -41,15 +41,11 @@ void InspectorView::commitUpdate()
|
||||
|
||||
void InspectorView::prepareRender()
|
||||
{
|
||||
renderGraph.updatePassData(
|
||||
uiSystem->getUIPassData(),
|
||||
uiSystem->getTextPassData()
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
void InspectorView::render()
|
||||
{
|
||||
renderGraph.render(uiSystem->getVirtualCamera());
|
||||
}
|
||||
|
||||
void InspectorView::keyCallback(KeyCode, InputAction, KeyModifier)
|
||||
|
||||
@@ -24,12 +24,6 @@ public:
|
||||
virtual void render() override;
|
||||
void selectActor();
|
||||
protected:
|
||||
RenderGraph<
|
||||
UIPass,
|
||||
TextPass> renderGraph;
|
||||
|
||||
UIPassData uiPassData;
|
||||
TextPassData textPassData;
|
||||
|
||||
UI::PSystem uiSystem;
|
||||
PActor selectedActor;
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "Asset/AssetRegistry.h"
|
||||
#include "Actor/CameraActor.h"
|
||||
#include "Component/Camera.h"
|
||||
#include "Component/StaticMesh.h"
|
||||
#include "Component/Mesh.h"
|
||||
|
||||
using namespace Seele;
|
||||
using namespace Seele::Editor;
|
||||
@@ -16,9 +16,9 @@ SceneView::SceneView(Gfx::PGraphics graphics, PWindow owner, const ViewportCreat
|
||||
: View(graphics, owner, createInfo, "SceneView")
|
||||
, scene(new Scene(graphics))
|
||||
, renderGraph(RenderGraphBuilder::build(
|
||||
DepthPrepass(graphics),
|
||||
LightCullingPass(graphics),
|
||||
BasePass(graphics)
|
||||
DepthPrepass(graphics, scene),
|
||||
LightCullingPass(graphics, scene),
|
||||
BasePass(graphics, scene)
|
||||
))
|
||||
, cameraSystem(createInfo.dimensions, Vector(0, 0, 10))
|
||||
{
|
||||
@@ -49,14 +49,10 @@ void SceneView::update()
|
||||
|
||||
void SceneView::commitUpdate()
|
||||
{
|
||||
depthPrepassData.staticDrawList = scene->getStaticMeshes();
|
||||
lightCullingPassData.lightEnv = scene->getLightBuffer();
|
||||
basePassData.staticDrawList = scene->getStaticMeshes();
|
||||
}
|
||||
|
||||
void SceneView::prepareRender()
|
||||
{
|
||||
renderGraph.updatePassData(depthPrepassData, lightCullingPassData, basePassData);
|
||||
}
|
||||
|
||||
void SceneView::render()
|
||||
|
||||
@@ -26,7 +26,7 @@ public:
|
||||
|
||||
PScene getScene() const { return scene; }
|
||||
private:
|
||||
PScene scene;
|
||||
OScene scene;
|
||||
Component::Camera viewportCamera;
|
||||
|
||||
RenderGraph<
|
||||
@@ -34,10 +34,6 @@ private:
|
||||
LightCullingPass,
|
||||
BasePass> renderGraph;
|
||||
|
||||
DepthPrepassData depthPrepassData;
|
||||
LightCullingPassData lightCullingPassData;
|
||||
BasePassData basePassData;
|
||||
|
||||
dp::thread_pool<> pool;
|
||||
ViewportControl cameraSystem;
|
||||
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
#include "MinimalEngine.h"
|
||||
#include "Math/Vector.h"
|
||||
#include "Component/Camera.h"
|
||||
#include "Math/Math.h"
|
||||
#include "Graphics/Enums.h"
|
||||
#include "Containers/Array.h"
|
||||
|
||||
namespace Seele
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user