celisej567/Nuake
1
0
Fork 0
mirror of https://github.com/antopilo/Nuake.git synced 2026-09-04 11:35:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into NK-103-Camera-corrupted-transform-2

Browse Source
This commit is contained in:
Antoine Pilote
2023-07-12 22:50:42 -04:00
parent 33569901ba fc8ad19d5a
commit 1ceef36e67
10 changed files with 44 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Editor/Editor.cpp
View File

@@ -92,7 +92,7 @@ int main(int argc, char* argv[])
editor.BuildFonts();
Ref<Nuake::Project> project = Nuake::Project::New();
FileSystem::SetRootDirectory(projectPath + "/../");
FileSystem::SetRootDirectory(FileSystem::GetParentPath(projectPath));
project->FullPath = projectPath;
project->Deserialize(FileSystem::ReadFile(projectPath, true));
@@ -143,7 +143,7 @@ int main(int argc, char* argv[])
if (shouldLoadProject)
{
FileSystem::SetRootDirectory(projectPath + "/../");
FileSystem::SetRootDirectory(FileSystem::GetParentPath(projectPath));
auto project = Project::New();
auto projectFileData = FileSystem::ReadFile(projectPath, true);

3
Editor/src/NewEditor.cpp
View File

@@ -41,8 +41,7 @@ namespace Nuake
{
// Parse the project and load it.
std::string projectPath = FileDialog::OpenFile(".project");
FileSystem::SetRootDirectory(projectPath + "/../");
FileSystem::SetRootDirectory(FileSystem::GetParentPath(projectPath));
Ref<Project> project = Project::New();
if (!project->Deserialize(FileSystem::ReadFile(projectPath, true)))
{

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

@@ -1291,7 +1291,7 @@ namespace Nuake {
if (projectPath == "") // Hit cancel.
return;
FileSystem::SetRootDirectory(projectPath + "/../");
FileSystem::SetRootDirectory(FileSystem::GetParentPath(projectPath));
Ref<Project> project = Project::New();
if (!project->Deserialize(FileSystem::ReadFile(projectPath, true)))
{

12
Editor/src/Windows/FileSystemUI.cpp
View File

@@ -176,15 +176,23 @@ namespace Nuake
if (ImGui::BeginPopup(hoverMenuId.c_str()))
{
if (ImGui::MenuItem("Show in File Explorer"))
{
OS::ShowInFileExplorer(file->GetAbsolutePath());
}
ImGui::Separator();
if (ImGui::MenuItem("Delete"))
{
if(FileSystem::RemoveFile(file->GetAbsolutePath()) != 0)
{
Logger::Log("Failed to remove file: " + file->GetAbsolutePath(), CRITICAL);
Logger::Log("Failed to remove file: " + file->GetRelativePath(), CRITICAL);
}
RefreshFileBrowser();
}
ImGui::EndPopup();
RefreshFileBrowser();
}
ImGui::Text(file->GetName().c_str());

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

@@ -254,7 +254,7 @@ namespace Nuake
SaveRecentFile();
std::string projectPath = _Projects[SelectedProject].Path;
FileSystem::SetRootDirectory(projectPath + "/../");
FileSystem::SetRootDirectory(FileSystem::GetParentPath(projectPath));
auto project = Project::New();
auto projectFileData = FileSystem::ReadFile(projectPath, true);

2
Nuake/Engine.cpp
View File

@@ -163,7 +163,7 @@ namespace Nuake
return false;
}
FileSystem::SetRootDirectory(project->FullPath + "/../");
FileSystem::SetRootDirectory(FileSystem::GetParentPath(project->FullPath));
return true;
}

6
Nuake/src/Core/FileSystem.cpp
View File

@@ -124,6 +124,12 @@ namespace Nuake
return fs::relative(absolutePath, rootPath).generic_string();
}
std::string FileSystem::GetParentPath(const std::string& fullPath)
{
std::filesystem::path pathObj(fullPath);
return pathObj.parent_path().string();
}
std::string FileSystem::ReadFile(const std::string& path, bool absolute)
{
std::string finalPath = path;

1
Nuake/src/Core/FileSystem.h
View File

@@ -30,6 +30,7 @@ namespace Nuake
static void Scan();
static std::string AbsoluteToRelative(const std::string& path);
static std::string GetParentPath(const std::string& fullPath);
static Ref<Directory> GetFileTree();
static Ref<File> GetFile(const std::string& path);
static std::string GetFileNameFromPath(const std::string& path);

16
Nuake/src/Core/OS.cpp Normal file
View File

@@ -0,0 +1,16 @@
#include "OS.h"
#include <chrono>
#include <Windows.h>
using namespace Nuake;
int OS::GetTime()
{
return static_cast<int>(std::chrono::system_clock::now().time_since_epoch().count());
}
void OS::ShowInFileExplorer(const std::string& filePath)
{
ShellExecuteA(nullptr, "open", "explorer.exe", ("/select," + std::string(filePath)).c_str(), nullptr, SW_SHOWDEFAULT);
}

10
Nuake/src/Core/OS.h
View File

@@ -1,13 +1,13 @@
#pragma once
#pragma once
#include <string>
namespace Nuake
{
class OS
{
public:
static int GetTime()
{
return static_cast<int>(std::chrono::system_clock::now().time_since_epoch().count());
}
static int GetTime();
static void ShowInFileExplorer(const std::string& filePath);
};
}