Commit 29ebabea authored by Felix Schröder's avatar Felix Schröder
Browse files

Merge branch 'renderLayerGui' of...

Merge branch 'renderLayerGui' of https://gitlab.uni-koblenz.de/CVFP_DF18/Framework into renderLayerGui
parents abbd3514 2e27297e
......@@ -939,6 +939,15 @@ void Editor::processInputsMain()
{
saveScene();
}
if (m_ctrlN.pressed(*m_window))
{
m_selectedFieldIndices.clear();
m_selectedFieldIndices.emplace(m_allFieldIds.size());
m_activeFieldIndex = m_allFieldIds.size();
m_allFieldIds.push_back(std::nullopt);
m_blueprints.emplace_back(std::make_unique<dino::Blueprints>(*m_window));
glfwShowWindow(*m_editorWindow);
}
bool leftDownFirst = !m_mouseBtnDown[0] && glfwGetMouseButton(*m_window, GLFW_MOUSE_BUTTON_LEFT) == GLFW_PRESS;
bool rightDownFirst = !m_mouseBtnDown[1] && glfwGetMouseButton(*m_window, GLFW_MOUSE_BUTTON_RIGHT) == GLFW_PRESS;
......
......@@ -57,7 +57,7 @@ private:
void drawLightsTab();
void drawRenderingTab();
void drawPreview();
void drawMenuBar();
void drawMenuBar();
void processInputsEditor();
void processInputsMain();
void processInputsFields();
......@@ -81,13 +81,13 @@ private:
dino::TextureResource m_textureResourceHatching;
dino::TextureResource m_textureResourceBrick;
bool m_mainFocussed = false;
bool m_mainFocussed = false;
float m_previewScale = 200.f;
float m_windowAspect = 9.f / 16.f;
std::unique_ptr<dino::FrameBuffer> m_previewFramebuffer;
std::shared_ptr<dino::Texture> m_previewTexture;
std::shared_ptr<Window> m_window = nullptr;
std::shared_ptr<Renderer> m_renderer;
std::shared_ptr<Renderer> m_renderer;
std::unique_ptr<Window> m_editorWindow;
std::set<uint32_t> m_selectedFieldIndices;
std::set<uint32_t> m_selectedLightIndices;
......@@ -103,6 +103,7 @@ private:
KeyboardButton m_ctrlSMain = KeyboardButton(GLFW_KEY_S, GLFW_KEY_LEFT_CONTROL);
KeyboardButton m_ctrlO = KeyboardButton(GLFW_KEY_O, GLFW_KEY_LEFT_CONTROL);
KeyboardButton m_ctrlA = KeyboardButton(GLFW_KEY_A, GLFW_KEY_LEFT_CONTROL);
KeyboardButton m_ctrlN = KeyboardButton(GLFW_KEY_N, GLFW_KEY_LEFT_CONTROL);
KeyboardButton m_shiftTabEditor = KeyboardButton(GLFW_KEY_LEFT_SHIFT, GLFW_KEY_TAB);
KeyboardButton m_shiftTabMain = KeyboardButton(GLFW_KEY_LEFT_SHIFT, GLFW_KEY_TAB);
bool m_mouseBtnDown[2] = {false, false};
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment