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

updated editor

Browse Source
This commit is contained in:
turanszkij
2016-10-21 23:33:10 +02:00
parent 25599b9b39
commit d2578f3782
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WickedEngine/MaterialWindow.cpp
+21 -1
View File
@@ -12,7 +12,7 @@ MaterialWindow::MaterialWindow(wiGUI* gui) : GUI(gui)
float screenH = (float)wiRenderer::GetDevice()->GetScreenHeight();
materialWindow = new wiWindow(GUI, "Material Window");
materialWindow->SetSize(XMFLOAT2(600, 600));
materialWindow->SetSize(XMFLOAT2(600, 670));
materialWindow->SetEnabled(false);
GUI->AddWidget(materialWindow);
@@ -142,6 +142,22 @@ MaterialWindow::MaterialWindow(wiGUI* gui) : GUI(gui)
});
materialWindow->AddWidget(movingTexSliderV);
texMulSliderX = new wiSlider(0.01f, 10.0f, 0, 1000, "Texture TileSize X: ");
texMulSliderX->SetSize(XMFLOAT2(100, 30));
texMulSliderX->SetPos(XMFLOAT2(x, y += step));
texMulSliderX->OnSlide([&](wiEventArgs args) {
material->texMulAdd.x = args.fValue;
});
materialWindow->AddWidget(texMulSliderX);
texMulSliderY = new wiSlider(0.01f, 10.0f, 0, 1000, "Texture TileSize Y: ");
texMulSliderY->SetSize(XMFLOAT2(100, 30));
texMulSliderY->SetPos(XMFLOAT2(x, y += step));
texMulSliderY->OnSlide([&](wiEventArgs args) {
material->texMulAdd.y = args.fValue;
});
materialWindow->AddWidget(texMulSliderY);
colorPickerToggleButton = new wiButton("Color");
colorPickerToggleButton->SetPos(XMFLOAT2(x, y += step));
@@ -183,6 +199,8 @@ MaterialWindow::~MaterialWindow()
SAFE_DELETE(pomSlider);
SAFE_DELETE(movingTexSliderU);
SAFE_DELETE(movingTexSliderV);
SAFE_DELETE(texMulSliderX);
SAFE_DELETE(texMulSliderY);
SAFE_DELETE(colorPickerToggleButton);
SAFE_DELETE(colorPicker);
SAFE_DELETE(alphaRefSlider);
@@ -210,6 +228,8 @@ void MaterialWindow::SetMaterial(Material* mat)
pomSlider->SetValue(material->parallaxOcclusionMapping);
movingTexSliderU->SetValue(material->movingTex.x);
movingTexSliderU->SetValue(material->movingTex.x);
texMulSliderX->SetValue(material->texMulAdd.x);
texMulSliderY->SetValue(material->texMulAdd.y);
alphaRefSlider->SetValue(material->alphaRef);
materialWindow->SetEnabled(true);
colorPicker->SetEnabled(true);
WickedEngine/MaterialWindow.h
+2
View File
@@ -37,6 +37,8 @@ public:
wiSlider* pomSlider;
wiSlider* movingTexSliderU;
wiSlider* movingTexSliderV;
wiSlider* texMulSliderX;
wiSlider* texMulSliderY;
wiButton* colorPickerToggleButton;
wiColorPicker* colorPicker;
wiSlider* alphaRefSlider;