Compare commits

..

No commits in common. "0b2148ad55d47dc8dac66f71e17ed70f57a51331" and "f7e087ee8d840d0e2f20bf2c988edab8a4a36d6c" have entirely different histories.

8 changed files with 13 additions and 30 deletions

3
.gitignore vendored
View File

@ -22,6 +22,3 @@ libs/physx/physx/compiler/
libs/physx/physx/buildtools/
libs/physx/physx/bin/
libs/nativefiledialog/build/
.docker
**/bin/

1
Editor/.gitignore vendored
View File

@ -1 +0,0 @@
**.dll

View File

@ -7,7 +7,7 @@ links{
"YoggieEngine",
"ImGuizmo",
"yaml-cpp",
"nfd"
"nfd.lib"
}
includedirs{

View File

@ -1,7 +1,7 @@
#pragma once
#include "../../YoggieEngine/src/YoggieEngine.h"
#include "../EditorWindow.h"
#include "AssetRegistry.h"
#include "EditorWindow.h"
#include "AssetManagement/AssetRegistry.h"
const char* hidden_extensions [] {
".exe",
@ -39,9 +39,7 @@ public:
continue;
Asset asset(filepath.filename().string().c_str());
auto filepathStr = filepath.string();
asset.setFilPath(filepathStr);
asset.setFilPath(filepath.string());
spdlog::info("Created asset: {0}", asset.GetName());
files.push_back(asset);

View File

@ -7,6 +7,7 @@
#include <nfd.h>
#include "AssetManagement/SceneSerializer.h"
#include "AssetManagement/AssetRegistry.h"
#include "AssetManagement/AssetFinder.h"
#include "PropertyPanels/Inspector.h"
#include "AssetManagement/uuid.h"
@ -51,11 +52,7 @@ public:
project.setProjectDirectory(path);
assetsView = AssetFinder(project.GetProjectDirectory());
LoadLastOrEmptyProject();
auto cubePath = std::filesystem::path("build/debug/Models/cube.obj");
cube = (ModelLoader()).LoadAsset(cubePath);
cube = (ModelLoader()).LoadAsset(std::filesystem::path("build/debug/Models/cube.obj"));
//Settings settings = Settings();
//Console console = Console();
@ -392,16 +389,14 @@ public:
ImGuizmo::SetRect(ImGui::GetWindowPos().x, ImGui::GetWindowPos().y, ImGui::GetWindowWidth(), ImGui::GetWindowHeight());
const auto& ProjMatrix = camera->projection;
const glm::mat4& viewMatrix = ((EditorCamera*)camera)->view;
glm::mat4 cameraView = glm::inverse(viewMatrix);
glm::mat4& cameraView = glm::inverse(((EditorCamera*)camera)->view);
glm::mat4 cameraDelta = glm::mat4(1.0f);
auto& tc = Selected.GetComponent<YoggieEngine::TransformComponent>();
auto transform = tc.GetTransform();
glm::mat4& transform = tc.GetTransform();
ImGuizmo::Manipulate(glm::value_ptr(cameraView), glm::value_ptr(ProjMatrix), activeOperation, ImGuizmo::WORLD, glm::value_ptr(transform), nullptr, nullptr);
if(ImGuizmo::IsUsing())
tc.Decompose(transform);

View File

@ -9,8 +9,7 @@ public:
void Update()
{
ImGui::Begin(name.c_str(), nullptr, flags);
ImGui::Begin(name.c_str(), false, flags);
Draw();
ImGui::End();
}

View File

@ -68,13 +68,8 @@ namespace YAML {
{
if (!node.IsMap())
return false;
std::string projectName = node["Project"].as<std::string>();
rhs.setName(projectName);
std::string projectDirectory = node["Directory"].as<std::string>();
rhs.setProjectDirectory(projectDirectory);
rhs.setName(node["Project"].as<std::string>());
rhs.setProjectDirectory(node["Directory"].as<std::string>());

View File

@ -20,11 +20,11 @@ workspace "Yoggie GameEngine"
}
filter "configurations:Debug"
defines {"DEBUG", "_DEBUG"}
defines {"DEBUG"}
symbols "On"
filter "configurations:Release"
defines {"NDEBUG", "_DEBUG"}
defines {"NDEBUG"}
optimize "On"