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

updated editor

Browse Source
This commit is contained in:
turanszkij
2017-04-01 12:15:40 +02:00
parent b9c845ab82
commit 5aad72f3d6
5 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WickedEngine/Renderable3DComponent.cpp
+1 -1
View File
@@ -420,7 +420,7 @@ void Renderable3DComponent::RenderSecondaryScene(wiRenderTarget& mainRT, wiRende
wiRenderer::GetDevice()->EventEnd();
}
if (wiRenderer::GetTemporalAAEnabled())
if (wiRenderer::GetTemporalAAEnabled() && !wiRenderer::GetTemporalAADebugEnabled())
{
wiRenderer::GetDevice()->EventBegin("Temporal AA Resolve", threadID);
wiProfiler::GetInstance().BeginRange("Temporal AA Resolve", wiProfiler::DOMAIN_GPU, threadID);
WickedEngine/RendererWindow.cpp
+10
View File
@@ -333,6 +333,16 @@ RendererWindow::RendererWindow(Renderable3DComponent* component)
temporalAACheckBox->SetCheck(wiRenderer::GetTemporalAAEnabled());
rendererWindow->AddWidget(temporalAACheckBox);
temporalAADebugCheckBox = new wiCheckBox("DEBUGJitter: ");
temporalAADebugCheckBox->SetText("DEBUG: ");
temporalAADebugCheckBox->SetTooltip("Disable blending of frame history. Camera Subpixel jitter will be visible.");
temporalAADebugCheckBox->SetPos(XMFLOAT2(x + 100, y));
temporalAADebugCheckBox->OnClick([](wiEventArgs args) {
wiRenderer::SetTemporalAADebugEnabled(args.bValue);
});
temporalAADebugCheckBox->SetCheck(wiRenderer::GetTemporalAADebugEnabled());
rendererWindow->AddWidget(temporalAADebugCheckBox);
rendererWindow->Translate(XMFLOAT3(130, 20, 0));
WickedEngine/RendererWindow.h
+1
View File
@@ -43,6 +43,7 @@ public:
wiComboBox* shadowPropsCubeComboBox;
wiComboBox* MSAAComboBox;
wiCheckBox* temporalAACheckBox;
wiCheckBox* temporalAADebugCheckBox;
int GetPickType();
};
WickedEngine/wiRenderer.cpp
+1 -1
View File
@@ -59,7 +59,7 @@ Texture2D* wiRenderer::enviroMap,*wiRenderer::colorGrading;
float wiRenderer::GameSpeed=1,wiRenderer::overrideGameSpeed=1;
bool wiRenderer::debugLightCulling = false;
bool wiRenderer::occlusionCulling = true;
bool wiRenderer::temporalAA = true;
bool wiRenderer::temporalAA = true, wiRenderer::temporalAADEBUG = false;
wiRenderer::VoxelizedSceneData wiRenderer::voxelSceneData = VoxelizedSceneData();
int wiRenderer::visibleCount;
wiRenderTarget wiRenderer::normalMapRT, wiRenderer::imagesRT, wiRenderer::imagesRTAdd;
WickedEngine/wiRenderer.h
+3 -1
View File
@@ -311,7 +311,7 @@ protected:
static bool debugLightCulling;
static bool occlusionCulling;
static bool temporalAA;
static bool temporalAA, temporalAADEBUG;
struct VoxelizedSceneData
{
@@ -375,6 +375,8 @@ public:
static bool GetOcclusionCullingEnabled() { return occlusionCulling; }
static void SetTemporalAAEnabled(bool enabled) { temporalAA = enabled; }
static bool GetTemporalAAEnabled() { return temporalAA; }
static void SetTemporalAADebugEnabled(bool enabled) { temporalAADEBUG = enabled; }
static bool GetTemporalAADebugEnabled() { return temporalAADEBUG; }
static void SetVoxelRadianceEnabled(bool enabled) { voxelSceneData.enabled = enabled; }
static bool GetVoxelRadianceEnabled() { return voxelSceneData.enabled; }
static void SetVoxelRadianceSecondaryBounceEnabled(bool enabled) { voxelSceneData.secondaryBounceEnabled = enabled; }