diff --git a/.gitignore b/.gitignore index ddadc82..9c6cdff 100644 --- a/.gitignore +++ b/.gitignore @@ -30,4 +30,5 @@ # Executables *.exe *.out -*.app \ No newline at end of file +*.app +imgui.ini \ No newline at end of file diff --git a/imgui.ini b/imgui.ini deleted file mode 100644 index 0259cc4..0000000 --- a/imgui.ini +++ /dev/null @@ -1,37 +0,0 @@ -[Window][Debug##Default] -Pos=60,60 -Size=400,400 - -[Window][components] -Pos=521,45 -Size=327,529 -Collapsed=1 - -[Window][Rotation] -Pos=635,26 -Size=349,94 - -[Window][Entities] -Pos=1419,41 -Size=261,703 - -[Window][Test] -Pos=-6,616 -Size=1023,59 - -[Window][Inside window] -Pos=345,90 -Size=473,366 - -[Window][SFML + ImGui Window] -Pos=99,19 -Size=1047,729 - -[Window][SFML Window] -Pos=61,37 -Size=1030,694 - -[Window][Paused] -Pos=807,314 -Size=81,54 - diff --git a/main b/main index d6b3d59..44bac9d 100755 Binary files a/main and b/main differ diff --git a/src/WoopWoop/Editor/Editor.cpp b/src/WoopWoop/Editor/Editor.cpp index a58dff0..5c38446 100644 --- a/src/WoopWoop/Editor/Editor.cpp +++ b/src/WoopWoop/Editor/Editor.cpp @@ -1,7 +1,7 @@ #include "Editor.hpp" #include - #define DEBUG true +#define NO_OPEN (bool *)__null namespace wpwp::Editor { @@ -30,6 +30,10 @@ namespace wpwp::Editor { #pragma region Entities List #if DEBUG + static int selectedUUIDIndex = -1; + static Entity *selectedEntity = nullptr; + static std::vector componentNames{}; + ImGui::Begin("Entities"); // Convert UUIDs to const char* array @@ -40,9 +44,6 @@ namespace wpwp::Editor uuidschr.push_back(uuid.c_str()); } - static int selectedUUIDIndex = -1; - static Entity *selectedEntity = nullptr; - static std::vector componentNames{}; if (ImGui::BeginCombo("Choose", (selectedUUIDIndex >= 0 && selectedUUIDIndex < uuidschr.size()) ? uuidschr[selectedUUIDIndex] @@ -99,12 +100,24 @@ namespace wpwp::Editor sprite.setTexture(Engine::getInstance()->m_renderTexture.getTexture()); sf::Vector2u textureSize = sprite.getTexture()->getSize(); #if DEBUG - ImGui::Begin("SFML Window"); - - ImVec2 imageSize(textureSize.x, textureSize.y); - ImGui::Image(Engine::getInstance()->m_renderTexture, sf::Color::White, sf::Color::White); - Input::mouseOffset = sf::Vector2i(ImGui::GetWindowPos().x, ImGui::GetWindowPos().y); + ImGui::Begin("Screen View", NO_OPEN, ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove); + ImGui::SetWindowSize(ImVec2(1280, 720)); + ImGui::SetWindowPos(ImVec2(13, 4)); + ImGui::BeginTabBar("View"); + if (ImGui::BeginTabItem("Gamplay")) + { + Engine::getInstance()->m_isPaused = false; + ImGui::Image(Engine::getInstance()->m_renderTexture, sf::Color::White, sf::Color::White); + Input::mouseOffset = sf::Vector2i(ImGui::GetWindowPos().x, ImGui::GetWindowPos().y + 49); + ImGui::EndTabItem(); + } + if (ImGui::BeginTabItem("Editor")) + { + Engine::getInstance()->m_isPaused = true; + ImGui::EndTabItem(); + } + ImGui::EndTabBar(); ImGui::End(); #else Engine::getInstance()->window.draw(sprite); // render usually to the screen if isn't in debug mode diff --git a/src/WoopWoop/Engine.cpp b/src/WoopWoop/Engine.cpp index 2234f97..67ab1dc 100644 --- a/src/WoopWoop/Engine.cpp +++ b/src/WoopWoop/Engine.cpp @@ -105,7 +105,8 @@ namespace wpwp checkForEvents(); updateSequence(); - + // #if DEBUG + // #endif m_renderTexture.display(); window.clear();