celisej567/Nuake
1
0
Fork 0
mirror of https://github.com/antopilo/Nuake.git synced 2026-09-15 20:08:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Can now open .map in trenchbroom automatically

Browse Source
This commit is contained in:
Antoine Pilote
2023-09-15 17:53:07 -04:00
parent a5cf290f4c
commit 61776b4fb8
11 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Editor/resources/Fonts/FiraMono-Bold.ttf Normal file
View File

Binary file not shown.

BIN
Editor/resources/Fonts/FiraMono-Regular.ttf Normal file
View File

Binary file not shown.

BIN
Editor/resources/Fonts/Poppins-Regular.ttf Normal file
View File

Binary file not shown.

8
Editor/src/Misc/InterfaceFonts.cpp
View File

@@ -12,10 +12,10 @@ void FontManager::LoadFonts()
ImFontConfig icons_config; icons_config.MergeMode = true; icons_config.PixelSnapH = true;
mFonts[Normal] = io.Fonts->AddFontFromFileTTF("resources/Fonts/fa-solid-900.ttf", 11.0f, &icons_config, icons_ranges);
mFonts[Bold] = io.Fonts->AddFontFromFileTTF("resources/Fonts/OpenSans-Bold.ttf", 16.0);
mFonts[LargeBold] = io.Fonts->AddFontFromFileTTF("resources/Fonts/OpenSans-Regular.ttf", 32);
mFonts[Title] = io.Fonts->AddFontFromFileTTF("resources/Fonts/OpenSans-Bold.ttf", 50.0);
mFonts[SubTitle] = io.Fonts->AddFontFromFileTTF("resources/Fonts/OpenSans-Regular.ttf", 24.0);
mFonts[Bold] = io.Fonts->AddFontFromFileTTF("resources/Fonts/FiraMono-Bold.ttf", 16.0);
mFonts[LargeBold] = io.Fonts->AddFontFromFileTTF("resources/Fonts/FiraMono-Regular.ttf", 32);
mFonts[Title] = io.Fonts->AddFontFromFileTTF("resources/Fonts/FiraMono-Bold.ttf", 50.0);
mFonts[SubTitle] = io.Fonts->AddFontFromFileTTF("resources/Fonts/FiraMono-Regular.ttf", 24.0);
ImGui::GetIO().Fonts->AddFontDefault();
icons_config.MergeMode = true;
mFonts[BigIcon] = io.Fonts->AddFontFromFileTTF("resources/Fonts/fa-solid-900.ttf", 42.0f, &icons_config, icons_ranges);

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

@@ -430,8 +430,14 @@ void EditorSelectionPanel::DrawProjectPanel(Ref<Nuake::Project> project)
if (ImGui::Button("Locate"))
{
const std::string& locationPath = Nuake::FileDialog::OpenFile("TrenchBroom (.exe)\0TrenchBroom.exe\0");
if (!locationPath.empty())
{
project->TrenchbroomPath = locationPath;
}
}
ImGui::SameLine();
ImGui::InputText("Trenchbroom Path", &project->TrenchbroomPath);
}

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

@@ -213,6 +213,10 @@ namespace Nuake
{
Editor->Selection = EditorSelection(file);
}
if (ImGui::IsItemHovered() && ImGui::IsMouseDoubleClicked(0))
{
OS::OpenTrenchbroomMap(file->GetAbsolutePath());
}
}
ImGui::PopStyleVar();
if (ImGui::BeginDragDropSource())

1
Editor/src/Windows/ProjectInterface.cpp
View File

@@ -8,7 +8,6 @@ namespace Nuake {
{
if (ImGui::Begin("Project settings"))
{
char buffer[256];
memset(buffer, 0, sizeof(buffer));
std::strncpy(buffer, Engine::GetProject()->Name.c_str(), sizeof(buffer));

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

@@ -1,5 +1,6 @@
#include "OS.h"
#include "src/Window.h"
#include "Engine.h"
#define GLFW_EXPOSE_NATIVE_WIN32
#include "GLFW/glfw3.h"
@@ -69,6 +70,11 @@ void OS::ShowInFileExplorer(const std::string& filePath)
ShellExecuteA(nullptr, "open", "explorer.exe", ("/select," + std::string(filePath)).c_str(), nullptr, SW_SHOWDEFAULT);
}
void OS::OpenTrenchbroomMap(const std::string& filePath)
{
ShellExecuteA(nullptr, nullptr, Engine::GetProject()->TrenchbroomPath.c_str(), filePath.c_str(), nullptr, SW_SHOW);
}
void OS::OpenURL(const std::string& url)
{
ShellExecute(nullptr, nullptr, std::wstring(url.begin(), url.end()).c_str(), 0, 0, SW_SHOW);

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

@@ -12,9 +12,10 @@ namespace Nuake
static std::string GetFromClipboard();
static int GetTime();
static void OpenIn(const std::string& filePath);
static int OS::RenameFile(const Ref<File>& file, const std::string& newName);
static int OS::RenameDirectory(const Ref<Directory>& dir, const std::string& newName);
static int RenameFile(const Ref<File>& file, const std::string& newName);
static int RenameDirectory(const Ref<Directory>& dir, const std::string& newName);
static void ShowInFileExplorer(const std::string& filePath);
static void OpenTrenchbroomMap(const std::string& filePath);
static void OpenURL(const std::string& url);
};
}

4
Nuake/src/Rendering/SceneRenderer.cpp
View File

@@ -279,6 +279,7 @@ namespace Nuake
gBufferShader->SetUniformMat4f("u_View", mView);
// Models
glCullFace(GL_FRONT);
auto view = scene.m_Registry.view<TransformComponent, ModelComponent, VisibilityComponent>();
for (auto e : view)
{
@@ -292,8 +293,7 @@ namespace Nuake
}
}
}
glCullFace(GL_FRONT);
Renderer::Flush(gBufferShader, false);
// Quake BSPs

2
Nuake/src/Window.cpp
View File

@@ -260,7 +260,7 @@ namespace Nuake
{
ImGui::CreateContext();
ImGuiIO& io = ImGui::GetIO(); (void)io;
io.Fonts->AddFontFromFileTTF("resources/Fonts/OpenSans-Regular.ttf", 16.0);
io.Fonts->AddFontFromFileTTF("resources/Fonts/Poppins-Regular.ttf", 16.0);
io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;
ImGui::StyleColorsDark();