celisej567/Nuake-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added delition queue + removed OGL code

Browse Source
This commit is contained in:
antopilo
2024-12-02 22:24:31 -05:00
parent 84a7d5e248
commit e5c252629b
6 changed files with 57 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Editor/src/EditorLayer.cpp
View File

@@ -23,6 +23,7 @@ void EditorLayer::OnUpdate()
Nuake::Engine::Tick();
Nuake::Engine::Draw();
/*
auto sceneFramebuffer = GetApplication().GetWindow()->GetFrameBuffer();
// Draw gizmos
@@ -70,8 +71,8 @@ void EditorLayer::OnUpdate()
m_EditorInterface->Draw();
m_EditorInterface->Update(Nuake::Engine::GetTimestep());
Nuake::Engine::EndDraw();
*/
Nuake::Input::Update();
}

23
Editor/src/Windows/EditorInterface.cpp
View File

@@ -110,11 +110,11 @@ namespace Nuake {
mCommandBuffer = &commandBuffer;
// Load textures
NuakeTexture = Nuake::TextureManager::Get()->GetTexture("Resources/Images/editor-icon.png");
CloseIconTexture = Nuake::TextureManager::Get()->GetTexture("Resources/Images/close-icon.png");
MaximizeTexture = Nuake::TextureManager::Get()->GetTexture("Resources/Images/maximize-icon.png");
RestoreTexture = Nuake::TextureManager::Get()->GetTexture("Resources/Images/restore-icon.png");
MinimizeTexture = Nuake::TextureManager::Get()->GetTexture("Resources/Images/minimize-icon.png");
//NuakeTexture = Nuake::TextureManager::Get()->GetTexture("Resources/Images/editor-icon.png");
//CloseIconTexture = Nuake::TextureManager::Get()->GetTexture("Resources/Images/close-icon.png");
//MaximizeTexture = Nuake::TextureManager::Get()->GetTexture("Resources/Images/maximize-icon.png");
//RestoreTexture = Nuake::TextureManager::Get()->GetTexture("Resources/Images/restore-icon.png");
//MinimizeTexture = Nuake::TextureManager::Get()->GetTexture("Resources/Images/minimize-icon.png");
Logger::Log("Creating editor windows", "window", VERBOSE);
filesystem = new FileSystemUI(this);
@@ -2072,9 +2072,9 @@ namespace Nuake {
cam->Translation = transform.GetGlobalPosition();
cam->SetTransform(glm::inverse(transform.GetGlobalTransform()));
auto sceneRenderer = Engine::GetCurrentScene()->m_SceneRenderer;
sceneRenderer->BeginRenderScene(cam->GetPerspective(), cam->GetTransform(), cam->Translation);
sceneRenderer->RenderScene(*Engine::GetCurrentScene().get(), *virtualCamera.get(), false);
static SceneRenderer sceneRenderer = Nuake::SceneRenderer();
sceneRenderer.BeginRenderScene(cam->GetPerspective(), cam->GetTransform(), cam->Translation);
sceneRenderer.RenderScene(*Engine::GetCurrentScene().get(), *virtualCamera.get(), false);
virtualCamera->Clear();
ImGui::Image((void*)virtualCamera->GetTexture()->GetID(), { 640, 360 }, { 0, 1 }, {1, 0});
@@ -2447,7 +2447,7 @@ namespace Nuake {
auto window = Window::Get();
window->SetDecorated(true);
window->ShowTitleBar(false);
//window->ShowTitleBar(false);
window->SetSize({ 1600, 900 });
window->Center();
frameCount = 0;
@@ -2560,6 +2560,7 @@ namespace Nuake {
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, isMaximized ? ImVec2(6.0f, 8.0f) : ImVec2(1.0f, 1.0f));
ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 3.0f);
ImGui::PushStyleColor(ImGuiCol_MenuBarBg, UI::PrimaryCol);
ImGui::Begin("DockSpaceWindow22", nullptr, window_flags);
ImGui::PopStyleColor(); // MenuBarBg
@@ -2673,6 +2674,10 @@ namespace Nuake {
DrawLogger();
filesystem->Draw();
filesystem->DrawDirectoryExplorer();
//auto node = ImGui::DockBuilderGetNode(1);
//node->SizeRef = { node->Size.x, 50.0f };
if (isNewProject)
{
ImVec2 center = ImGui::GetMainViewport()->GetCenter();

8
Editor/src/Windows/EditorSelectionPanel.cpp
View File

@@ -2048,10 +2048,10 @@ void EditorSelectionPanel::DrawFieldTypeString(entt::meta_data& field, entt::met
std::string controlId = std::string("##") + displayName;
ImGui::InputText(controlId.c_str(), &fieldValProxy);
if (fieldValProxy != fieldVal)
{
Engine::GetProject()->IsDirty = true;
}
//if (fieldValProxy != fieldVal)
//{
// Engine::GetProject()->IsDirty = true;
//}
}
else
{

6
Editor/src/Windows/WelcomeWindow.cpp
View File

@@ -42,11 +42,11 @@ namespace Nuake
const std::string projectIconPath = Path + "/../icon.png";
if (FileSystem::FileExists(projectIconPath, true))
{
ProjectIcon = TextureManager::Get()->GetTexture(projectIconPath);
//ProjectIcon = TextureManager::Get()->GetTexture(projectIconPath);
}
else
{
ProjectIcon = TextureManager::Get()->GetTexture("Resources/Images/nuake-logo.png");
//ProjectIcon = TextureManager::Get()->GetTexture("Resources/Images/nuake-logo.png");
}
}
else
@@ -87,7 +87,7 @@ namespace Nuake
}
// Load Nuake logo
_NuakeLogo = TextureManager::Get()->GetTexture(NUAKE_LOGO_PATH);
//_NuakeLogo = TextureManager::Get()->GetTexture(NUAKE_LOGO_PATH);
}
void WelcomeWindow::LoadQueuedProject()