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

large refactor

Browse Source
This commit is contained in:
Turanszki Janos
2019-12-12 22:15:16 +00:00
parent c495ce0088
commit fa267b0e7d
115 changed files with 1348 additions and 1739 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/PostprocessWindow.cpp
+1 -2
View File
@@ -199,7 +199,6 @@ PostprocessWindow::PostprocessWindow(wiGUI* gui, RenderPath3D* comp) : GUI(gui),
colorGradingButton->SetPos(XMFLOAT2(x + 35, y));
colorGradingButton->SetSize(XMFLOAT2(200, 18));
colorGradingButton->OnClick([=](wiEventArgs args) {
//auto x = wiRenderer::GetColorGrading();
auto x = component->getColorGradingTexture();
if (x == nullptr)
@@ -217,7 +216,7 @@ PostprocessWindow::PostprocessWindow(wiGUI* gui, RenderPath3D* comp) : GUI(gui),
if (result.ok) {
string fileName = result.filenames.front();
component->setColorGradingTexture((Texture*)wiResourceManager::GetGlobal().add(fileName));
component->setColorGradingTexture(wiResourceManager::Load(fileName));
if (component->getColorGradingTexture() != nullptr)
{
colorGradingButton->SetText(fileName);