diff --git a/WickedEngine/Editor.cpp b/WickedEngine/Editor.cpp index cdb84dcd2..ceec5d817 100644 --- a/WickedEngine/Editor.cpp +++ b/WickedEngine/Editor.cpp @@ -366,34 +366,48 @@ void EditorComponent::Load() GetGUI().AddWidget(translatorCheckBox); wiCheckBox* isScalatorCheckBox = new wiCheckBox("S:"); - isScalatorCheckBox->SetTooltip("Scale"); - isScalatorCheckBox->SetPos(XMFLOAT2(screenW - 50 - 105 * 6 - 25 - 40 * 2, 22)); - isScalatorCheckBox->SetSize(XMFLOAT2(18, 18)); - isScalatorCheckBox->OnClick([=](wiEventArgs args) { - translator->isScalator = args.bValue; - }); - isScalatorCheckBox->SetCheck(translator->isScalator); - GetGUI().AddWidget(isScalatorCheckBox); - wiCheckBox* isRotatorCheckBox = new wiCheckBox("R:"); - isRotatorCheckBox->SetTooltip("Rotate"); - isRotatorCheckBox->SetPos(XMFLOAT2(screenW - 50 - 105 * 6 - 25 - 40 * 1, 22)); - isRotatorCheckBox->SetSize(XMFLOAT2(18, 18)); - isRotatorCheckBox->OnClick([=](wiEventArgs args) { - translator->isRotator = args.bValue; - }); - isRotatorCheckBox->SetCheck(translator->isRotator); - GetGUI().AddWidget(isRotatorCheckBox); - wiCheckBox* isTranslatorCheckBox = new wiCheckBox("T:"); - isTranslatorCheckBox->SetTooltip("Translate"); - isTranslatorCheckBox->SetPos(XMFLOAT2(screenW - 50 - 105 * 6 - 25, 22)); - isTranslatorCheckBox->SetSize(XMFLOAT2(18, 18)); - isTranslatorCheckBox->OnClick([=](wiEventArgs args) { - translator->isTranslator = args.bValue; - }); - isTranslatorCheckBox->SetCheck(translator->isTranslator); - GetGUI().AddWidget(isTranslatorCheckBox); + { + isScalatorCheckBox->SetTooltip("Scale"); + isScalatorCheckBox->SetPos(XMFLOAT2(screenW - 50 - 105 * 6 - 25 - 40 * 2, 22)); + isScalatorCheckBox->SetSize(XMFLOAT2(18, 18)); + isScalatorCheckBox->OnClick([=](wiEventArgs args) { + translator->isScalator = args.bValue; + translator->isTranslator = false; + translator->isRotator = false; + isTranslatorCheckBox->SetCheck(false); + isRotatorCheckBox->SetCheck(false); + }); + isScalatorCheckBox->SetCheck(translator->isScalator); + GetGUI().AddWidget(isScalatorCheckBox); + + isRotatorCheckBox->SetTooltip("Rotate"); + isRotatorCheckBox->SetPos(XMFLOAT2(screenW - 50 - 105 * 6 - 25 - 40 * 1, 22)); + isRotatorCheckBox->SetSize(XMFLOAT2(18, 18)); + isRotatorCheckBox->OnClick([=](wiEventArgs args) { + translator->isRotator = args.bValue; + translator->isScalator = false; + translator->isTranslator = false; + isScalatorCheckBox->SetCheck(false); + isTranslatorCheckBox->SetCheck(false); + }); + isRotatorCheckBox->SetCheck(translator->isRotator); + GetGUI().AddWidget(isRotatorCheckBox); + + isTranslatorCheckBox->SetTooltip("Translate"); + isTranslatorCheckBox->SetPos(XMFLOAT2(screenW - 50 - 105 * 6 - 25, 22)); + isTranslatorCheckBox->SetSize(XMFLOAT2(18, 18)); + isTranslatorCheckBox->OnClick([=](wiEventArgs args) { + translator->isTranslator = args.bValue; + translator->isScalator = false; + translator->isRotator = false; + isScalatorCheckBox->SetCheck(false); + isRotatorCheckBox->SetCheck(false); + }); + isTranslatorCheckBox->SetCheck(translator->isTranslator); + GetGUI().AddWidget(isTranslatorCheckBox); + } wiButton* saveButton = new wiButton("Save"); diff --git a/WickedEngine/wiFont.h b/WickedEngine/wiFont.h index 9c89a6f57..72aface8a 100644 --- a/WickedEngine/wiFont.h +++ b/WickedEngine/wiFont.h @@ -30,7 +30,7 @@ public: wiFontProps(int posX = 0, int posY = 0, int size = -1, wiFontAlign h_align = WIFALIGN_LEFT, wiFontAlign v_align = WIFALIGN_TOP , int spacingX = 2, int spacingY = 1) - :posX(posX), posY(posY), size(size), h_align(h_align), v_align(v_align), spacingX(spacingX), spacingY(spacingY), color(XMFLOAT4(1,1,1,1)), shadowColor(XMFLOAT4(0,0,0,0)) + :posX(posX), posY(posY), size(size), h_align(h_align), v_align(v_align), spacingX(spacingX), spacingY(spacingY), color(XMFLOAT4(1,1,1,1)), shadowColor(XMFLOAT4(0,0,0,1)) {} };