Merge branch 'ui-features' of github.com:ProtectedVariable/ICE into ui-features

Author: Thomas Ibanez

ICE/Entity/include/Entity.h

@@ -46,7 +46,7 @@ class EntityManager {
     void setSignature(Entity e, Signature s) { signatures[e] = s; }
 
     Signature getSignature(Entity e) const {
-        if (e == 0) {
+        if (e == 0 || !signatures.contains(e)) {
             return 0;
         }
         return signatures.at(e);

ICE/Scene/include/Scene.h

@@ -30,6 +30,7 @@ class Scene {
     Entity createEntity();
     void addEntity(Entity e, const std::string& alias, Entity parent);
     void removeEntity(Entity e);
+    bool hasEntity(Entity e);
 
    private:
     std::string name;

ICE/Scene/src/Scene.cpp

@@ -57,4 +57,9 @@ void Scene::removeEntity(Entity e) {
     aliases.erase(e);
     m_graph->removeEntity(e);
 }
+
+bool Scene::hasEntity(Entity e) {
+    return aliases.contains(e);
+}
+
 }  // namespace ICE

ICEBERG/src/Editor.cpp

@@ -11,7 +11,10 @@ Editor::Editor(const std::shared_ptr<ICE::ICEEngine>& engine, const std::shared_
       m_open_scene_popup(engine) {
     m_viewport = std::make_unique<Viewport>(
         engine, [this]() { m_inspector->setSelectedEntity(m_hierarchy->getSelectedEntity(), true); },
-        [this](ICE::Entity e) { m_hierarchy->setSelectedEntity(e); });
+        [this](ICE::Entity e) {
+            if (m_engine->getProject()->getCurrentScene()->hasEntity(e))
+                m_hierarchy->setSelectedEntity(e);
+        });
     m_hierarchy = std::make_unique<Hierarchy>(engine);
     m_inspector = std::make_unique<Inspector>(engine);
     m_assets = std::make_unique<Assets>(engine, g_factory);

ICEBERG/src/Inspector.cpp

@@ -34,13 +34,16 @@ bool Inspector::entityHasChanged() {
 }
 
 void Inspector::setSelectedEntity(ICE::Entity e, bool force_refesh) {
+    if (!m_engine->getProject()->getCurrentScene()->hasEntity(e)) {
+        return;
+    }
     if (m_selected_entity == e && !force_refesh) {
         return;
     }
     m_entity_has_changed = 0;
     m_selected_entity = e;
-    auto registry = m_engine->getProject()->getCurrentScene()->getRegistry();
 
+    auto registry = m_engine->getProject()->getCurrentScene()->getRegistry();
     ui.setEntityName(m_engine->getProject()->getCurrentScene()->getAlias(e));
     ui.setLightComponent(nullptr);
     ui.setRenderComponent(nullptr, {}, {}, {}, {});