Merge branch 'develop' of https://github.com/antopilo/nuake into develop
This commit is contained in:
@@ -15,7 +15,6 @@
|
||||
|
||||
#include <GLFW/glfw3.h>
|
||||
#include <src/Vendors/glm/trigonometric.hpp>
|
||||
#include <src/Scripting/ScriptingEngine.h>
|
||||
#include <src/Resource/FGD/FGDFile.h>
|
||||
#include <src/Rendering/Shaders/ShaderManager.h>
|
||||
#include <src/Rendering/Renderer.h>
|
||||
|
||||
@@ -2122,16 +2122,6 @@ namespace Nuake {
|
||||
}
|
||||
ImGui::EndMenu();
|
||||
}
|
||||
|
||||
if (ImGui::BeginMenu("Script"))
|
||||
{
|
||||
if (ImGui::MenuItem("Script"))
|
||||
{
|
||||
entity = scene->CreateEntity("Script");
|
||||
entity.AddComponent<WrenScriptComponent>();
|
||||
}
|
||||
ImGui::EndMenu();
|
||||
}
|
||||
|
||||
if (entity.IsValid())
|
||||
{
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
#include <src/Rendering/Textures/Material.h>
|
||||
#include <src/Resource/ResourceLoader.h>
|
||||
#include <src/Resource/FontAwesome5.h>
|
||||
#include <src/Scripting/WrenScript.h>
|
||||
#include <src/FileSystem/FileDialog.h>
|
||||
|
||||
#include <Engine.h>
|
||||
@@ -224,7 +223,6 @@ void EditorSelectionPanel::DrawFile(Ref<Nuake::File> file)
|
||||
}
|
||||
case FileType::Script:
|
||||
{
|
||||
DrawWrenScriptPanel(CreateRef<WrenScript>(file, true));
|
||||
break;
|
||||
}
|
||||
case FileType::NetScript:
|
||||
@@ -494,26 +492,6 @@ void EditorSelectionPanel::DrawProjectPanel(Ref<Nuake::Project> project)
|
||||
ImGui::InputText("Trenchbroom Path", &project->TrenchbroomPath);
|
||||
}
|
||||
|
||||
void EditorSelectionPanel::DrawWrenScriptPanel(Ref<Nuake::WrenScript> wrenFile)
|
||||
{
|
||||
auto filePath = wrenFile->GetFile()->GetAbsolutePath();
|
||||
std::string fileContent = Nuake::FileSystem::ReadFile(filePath, true);
|
||||
|
||||
ImGui::Text("Content");
|
||||
ImGui::SameLine(ImGui::GetWindowWidth()-90);
|
||||
if(ImGui::Button("Open..."))
|
||||
{
|
||||
Nuake::OS::OpenIn(filePath);
|
||||
}
|
||||
|
||||
ImGui::Separator();
|
||||
|
||||
ImGui::PushTextWrapPos(ImGui::GetCursorPos().x + ImGui::GetWindowWidth());
|
||||
ImGui::Text(fileContent.c_str(), ImGui::GetWindowWidth());
|
||||
|
||||
ImGui::PopTextWrapPos();
|
||||
}
|
||||
|
||||
void EditorSelectionPanel::DrawNetScriptPanel(Ref<Nuake::File> file)
|
||||
{
|
||||
auto filePath = file->GetRelativePath();
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
#include "../ComponentsPanel/NetScriptPanel.h"
|
||||
#include "../ComponentsPanel/NavMeshVolumePanel.h"
|
||||
|
||||
#include <src/Scene/Components/WrenScriptComponent.h>
|
||||
#include <src/Resource/Prefab.h>
|
||||
|
||||
|
||||
@@ -82,7 +81,6 @@ private:
|
||||
void ResolveFile(Ref<Nuake::File> file);
|
||||
void DrawMaterialPanel(Ref<Nuake::Material> material);
|
||||
void DrawProjectPanel(Ref<Nuake::Project> project);
|
||||
void DrawWrenScriptPanel(Ref<Nuake::WrenScript> wrenFile);
|
||||
void DrawNetScriptPanel(Ref<Nuake::File> file);
|
||||
|
||||
void DrawComponent(Nuake::Entity& entity, entt::meta_any& component);
|
||||
|
||||
Reference in New Issue
Block a user