nick/WickedEngine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

0.49 (#160)

Browse Source 
* renderer updates: material shadertype, customshaders

* custom shader updates

* hologram fix

* editor windows refactor

* major gui update:
- gui no longer lifetime manager
- window no longer needs gui to construct
- removed gui constructors/destructors
- rewritten every editor window

* renderer update

* gui hasfocus fix

* editor fix

* renderpath upgrades: hybrid forward-deferred

* fix

* water ripple refactor

* cmake fix

* cmake fix

* renderer fix

* volumetric light fix

* customshader stencilref

* cmake fix

* rtdeferred fix

* editor update

* raytraced shadows denoise

* anisotropic shader

* sss stencil greater

* added cartoon shader

* using precomputed tangents

* added unlit object shader

* importer update

* editor update

* editor fix

* vulkan envmap rendering fix

* terrain shader simplification (normal texture mapping instead of triplanar)

* added subsurface profiles, reduced gbuffer

* denoise disocclusion fallback

* editor fix

* more sorting priority for blend than instancing

* hairparticle culling

* particle updates; font update instancing instead of index buffer; vulkan/dx12 fixes;

* shader fixes

* hairparticle trianglestrip and no cross section

* editor fix

* cam wnd update

* terrain shader fix
This commit is contained in:
Turánszki János
2020-10-17 13:17:07 +02:00
committed by GitHub
parent b88bc8d94e
commit 180ddc3586
227 changed files with 7170 additions and 9702 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/EnvProbeWindow.cpp
+30 -40
View File
@@ -5,20 +5,17 @@
using namespace wiECS;
using namespace wiScene;
EnvProbeWindow::EnvProbeWindow(EditorComponent* editor) : GUI(&editor->GetGUI())
void EnvProbeWindow::Create(EditorComponent* editor)
{
assert(GUI && "Invalid GUI!");
envProbeWindow = new wiWindow(GUI, "Environment Probe Window");
envProbeWindow->SetSize(XMFLOAT2(300, 200));
GUI->AddWidget(envProbeWindow);
wiWindow::Create("Environment Probe Window");
SetSize(XMFLOAT2(300, 200));
float x = 100, y = 5, step = 35;
realTimeCheckBox = new wiCheckBox("RealTime: ");
realTimeCheckBox->SetPos(XMFLOAT2(x, y += step));
realTimeCheckBox->SetEnabled(false);
realTimeCheckBox->OnClick([&](wiEventArgs args) {
realTimeCheckBox.Create("RealTime: ");
realTimeCheckBox.SetPos(XMFLOAT2(x, y += step));
realTimeCheckBox.SetEnabled(false);
realTimeCheckBox.OnClick([&](wiEventArgs args) {
EnvironmentProbeComponent* probe = wiScene::GetScene().probes.GetComponent(entity);
if (probe != nullptr)
{
@@ -26,36 +23,37 @@ EnvProbeWindow::EnvProbeWindow(EditorComponent* editor) : GUI(&editor->GetGUI())
probe->SetDirty();
}
});
envProbeWindow->AddWidget(realTimeCheckBox);
AddWidget(&realTimeCheckBox);
generateButton = new wiButton("Put");
generateButton->SetPos(XMFLOAT2(x, y += step));
generateButton->OnClick([=](wiEventArgs args) {
generateButton.Create("Put");
generateButton.SetPos(XMFLOAT2(x, y += step));
generateButton.OnClick([=](wiEventArgs args) {
XMFLOAT3 pos;
XMStoreFloat3(&pos, XMVectorAdd(wiRenderer::GetCamera().GetEye(), wiRenderer::GetCamera().GetAt() * 4));
Entity entity = wiScene::GetScene().Entity_CreateEnvironmentProbe("editorProbe", pos);
editor->ClearSelected();
editor->AddSelected(entity);
editor->RefreshSceneGraphView();
SetEntity(entity);
});
envProbeWindow->AddWidget(generateButton);
AddWidget(&generateButton);
refreshButton = new wiButton("Refresh");
refreshButton->SetPos(XMFLOAT2(x, y += step));
refreshButton->SetEnabled(false);
refreshButton->OnClick([&](wiEventArgs args) {
refreshButton.Create("Refresh");
refreshButton.SetPos(XMFLOAT2(x, y += step));
refreshButton.SetEnabled(false);
refreshButton.OnClick([&](wiEventArgs args) {
EnvironmentProbeComponent* probe = wiScene::GetScene().probes.GetComponent(entity);
if (probe != nullptr)
{
probe->SetDirty();
}
});
envProbeWindow->AddWidget(refreshButton);
AddWidget(&refreshButton);
refreshAllButton = new wiButton("Refresh All");
refreshAllButton->SetPos(XMFLOAT2(x, y += step));
refreshAllButton->SetEnabled(true);
refreshAllButton->OnClick([&](wiEventArgs args) {
refreshAllButton.Create("Refresh All");
refreshAllButton.SetPos(XMFLOAT2(x, y += step));
refreshAllButton.SetEnabled(true);
refreshAllButton.OnClick([&](wiEventArgs args) {
Scene& scene = wiScene::GetScene();
for (size_t i = 0; i < scene.probes.GetCount(); ++i)
{
@@ -63,25 +61,17 @@ EnvProbeWindow::EnvProbeWindow(EditorComponent* editor) : GUI(&editor->GetGUI())
probe.SetDirty();
}
});
envProbeWindow->AddWidget(refreshAllButton);
AddWidget(&refreshAllButton);
envProbeWindow->Translate(XMFLOAT3(100, 100, 0));
envProbeWindow->SetVisible(false);
Translate(XMFLOAT3(100, 100, 0));
SetVisible(false);
SetEntity(INVALID_ENTITY);
}
EnvProbeWindow::~EnvProbeWindow()
{
envProbeWindow->RemoveWidgets(true);
GUI->RemoveWidget(envProbeWindow);
delete envProbeWindow;
}
void EnvProbeWindow::SetEntity(Entity entity)
{
this->entity = entity;
@@ -90,14 +80,14 @@ void EnvProbeWindow::SetEntity(Entity entity)
if (probe == nullptr)
{
realTimeCheckBox->SetEnabled(false);
refreshButton->SetEnabled(false);
realTimeCheckBox.SetEnabled(false);
refreshButton.SetEnabled(false);
}
else
{
realTimeCheckBox->SetCheck(probe->IsRealTime());
realTimeCheckBox->SetEnabled(true);
refreshButton->SetEnabled(true);
realTimeCheckBox.SetCheck(probe->IsRealTime());
realTimeCheckBox.SetEnabled(true);
refreshButton.SetEnabled(true);
}
}