Changed selected type
Moving away from using the pure ENTT library types and starting to use my own
This commit is contained in:
@ -1,13 +1,10 @@
|
||||
#include "../../YoggieEngine/src/EntryPoint.h"
|
||||
#include <mini/ini.h>
|
||||
|
||||
#include <glm/glm.hpp>
|
||||
#include <glm/gtc/type_ptr.hpp>
|
||||
#include <glm/gtc/matrix_transform.hpp>
|
||||
|
||||
#include "AssetManagement/SceneSerializer.h"
|
||||
#include "AssetManagement/AssetManager.h"
|
||||
|
||||
#include "Views/Viewport.h"
|
||||
#include "PropertyPanels/SceneExplorer.h"
|
||||
#include "AssetManagement/AssetFinder.h"
|
||||
@ -20,10 +17,9 @@
|
||||
|
||||
using namespace YoggieEngine;
|
||||
|
||||
|
||||
class Editor : public Application {
|
||||
public:
|
||||
Editor() : Application("Editor"), Selected((entt::entity)-1){}
|
||||
Editor() : Application("Editor"){}
|
||||
|
||||
void Run() override
|
||||
{
|
||||
@ -40,11 +36,13 @@ public:
|
||||
Viewport sceneview = Viewport(scene);
|
||||
RuntimeControls rc = RuntimeControls();
|
||||
SceneExplorer explorer(Selected, scene);
|
||||
Inspector inspector = Inspector();
|
||||
Inspector inspector = Inspector(Selected);
|
||||
Settings settings = Settings();
|
||||
// AssetFinder assetsView = AssetFinder();
|
||||
Console console = Console();
|
||||
|
||||
Selected = YoggieEngine::Entity((entt::entity) -1, &scene);
|
||||
|
||||
double previous = glfwGetTime();
|
||||
double lag = 0.0;
|
||||
while (!appWindow.WindowShouldClose())
|
||||
@ -129,14 +127,6 @@ public:
|
||||
|
||||
}
|
||||
|
||||
|
||||
if (scene.getReg().valid(Selected)) {
|
||||
Entity SelectedEntity = Entity(Selected, &scene);
|
||||
inspector.AddComponentDropDown(SelectedEntity);
|
||||
inspector.ShowComponents(SelectedEntity);
|
||||
}
|
||||
|
||||
|
||||
projectInfo.Update();
|
||||
sceneview.Update();
|
||||
rc.Update();
|
||||
@ -163,7 +153,6 @@ public:
|
||||
// OR
|
||||
// Load an empty project.
|
||||
mINI::INIStructure ini;
|
||||
|
||||
|
||||
if (std::filesystem::exists("build\\Debug\\Editor.ini"))
|
||||
{
|
||||
@ -189,7 +178,7 @@ public:
|
||||
|
||||
private:
|
||||
bool SimulatePhysics = true;
|
||||
entt::entity Selected;
|
||||
YoggieEngine::Entity Selected;
|
||||
|
||||
Project project;
|
||||
Scene scene;
|
||||
|
Reference in New Issue
Block a user