Fixed some instance selection issues

Author: eduardodoria

editor/window/SceneWindow.cpp

@@ -575,8 +575,17 @@ void editor::SceneWindow::sceneEventHandler(SceneProject* sceneProject) {
                 std::vector<Entity> selEntities = project->getSelectedEntities(sceneId);
                 if (selEntities.size() == 1 && !io.KeyShift) {
                     Entity selEntity = selEntities[0];
-                    bool gizmoSideActiveLocal = sceneProject->sceneRender->isAnyGizmoSideSelected();
-                    if (!gizmoSideActiveLocal) {
+                    bool blockInstanceHit;
+                    if (gizmoSelected == GizmoSelected::OBJECT2D) {
+                        // With the 2D gizmo, CENTER is set when hovering over the entity body —
+                        // the same region where instances live. Allow hit-testing in that case,
+                        // mirroring the logic used for tile sub-selection.
+                        Gizmo2DSideSelected gizmo2DSide = sceneProject->sceneRender->getToolsLayer()->getGizmo2DSideSelected();
+                        blockInstanceHit = !(gizmo2DSide == Gizmo2DSideSelected::NONE || gizmo2DSide == Gizmo2DSideSelected::CENTER);
+                    } else {
+                        blockInstanceHit = sceneProject->sceneRender->isAnyGizmoSideSelected();
+                    }
+                    if (!blockInstanceHit) {
                         int instHit = sceneProject->sceneRender->hitTestInstance(selEntity, x, y);
                         if (instHit >= 0) {
                             sceneProject->sceneRender->selectInstance(selEntity, instHit);

editor/window/Structure.cpp

@@ -11,6 +11,8 @@
 #include "command/type/DeleteEntityCmd.h"
 #include "command/type/DuplicateEntityCmd.h"
 #include "command/type/AddComponentCmd.h"
+#include "command/type/MultiPropertyCmd.h"
+#include "component/InstancedMeshComponent.h"
 #include "command/type/ImportEntityBundleCmd.h"
 #include "command/type/RemoveEntityFromBundleCmd.h"
 #include "command/type/AddEntityToBundleCmd.h"
@@ -880,13 +882,33 @@ void editor::Structure::showTreeNode(editor::TreeNode& node) {
             selectedScenes.clear();
             project->addSelectedEntity(node.entitySceneId, node.id);
             project->setSelectedSceneForProperties(node.entitySceneId);
+            // Clear any selected instance or tile that belonged to this entity
+            SceneProject* sp = project->getScene(node.entitySceneId);
+            if (sp && sp->sceneRender) {
+                if (sp->sceneRender->getSelectedInstanceEntity() == node.id) {
+                    sp->sceneRender->clearInstanceSelection();
+                }
+                if (sp->sceneRender->getSelectedTileEntity() == (Entity)node.id) {
+                    sp->sceneRender->clearTileSelection();
+                }
+            }
         } else if (!node.isScene){
             ImGuiIO& io = ImGui::GetIO();
             if (!io.KeyShift){
                 project->clearAllSelections(project->getSelectedSceneId());
             }
             project->addSelectedEntity(project->getSelectedSceneId(), node.id);
             project->setSelectedSceneForProperties(project->getSelectedSceneId());
+            // Clear any selected instance or tile that belonged to this entity
+            SceneProject* sp = project->getSelectedScene();
+            if (sp && sp->sceneRender) {
+                if (sp->sceneRender->getSelectedInstanceEntity() == node.id) {
+                    sp->sceneRender->clearInstanceSelection();
+                }
+                if (sp->sceneRender->getSelectedTileEntity() == (Entity)node.id) {
+                    sp->sceneRender->clearTileSelection();
+                }
+            }
         }else{
             project->clearAllSelections(project->getSelectedSceneId());
             selectedScenes.clear();
@@ -1011,7 +1033,11 @@ void editor::Structure::showTreeNode(editor::TreeNode& node) {
                     bool hasMesh = signature.test(selectedScene->scene->getComponentId<MeshComponent>());
                     bool hasInstanced = signature.test(selectedScene->scene->getComponentId<InstancedMeshComponent>());
                     if (hasMesh && ImGui::MenuItem(ICON_FA_LAYER_GROUP "  Add Instanced Mesh", nullptr, false, !node.isLocked && !hasInstanced)) {
-                        CommandHandle::get(project->getSelectedSceneId())->addCommandNoMerge(new AddComponentCmd(project, project->getSelectedSceneId(), node.id, ComponentType::InstancedMeshComponent));
+                        MultiPropertyCmd* multiCmd = new MultiPropertyCmd();
+                        multiCmd->addCommand(std::make_unique<AddComponentCmd>(project, project->getSelectedSceneId(), node.id, ComponentType::InstancedMeshComponent));
+                        std::vector<InstanceData> initialInstances = { InstanceData() };
+                        multiCmd->addPropertyCmd<std::vector<InstanceData>>(project, project->getSelectedSceneId(), node.id, ComponentType::InstancedMeshComponent, "instances", initialInstances);
+                        CommandHandle::get(project->getSelectedSceneId())->addCommandNoMerge(multiCmd);
                     }
                 }
             }

engine/core/subsystem/MeshSystem.cpp

@@ -2948,6 +2948,8 @@ void MeshSystem::onComponentRemoved(Entity entity, ComponentId componentId) {
     }
     if (componentId == scene->getComponentId<InstancedMeshComponent>()) {
         if (MeshComponent* mesh = scene->findComponent<MeshComponent>(entity)) {
+            mesh->aabb = mesh->verticesAABB;
+            mesh->needUpdateAABB = true;
             if (mesh->loaded) mesh->needReload = true;
         }
     }

engine/core/subsystem/RenderSystem.cpp

@@ -2903,11 +2903,13 @@ void RenderSystem::update(double dt){
             if (instmesh){
                 bool sortTransparentInstances = mesh.transparent && mainCamera.type != CameraType::CAMERA_UI;
 
-                if (instmesh->needUpdateInstances && !instmesh->instancedBillboard){
+                bool instancesNeedUpdate = instmesh->needUpdateInstances || mesh.needUpdateAABB;
+
+                if (instancesNeedUpdate && !instmesh->instancedBillboard){
                     updateInstancedMesh(*instmesh, mesh, transform, mainCamera, mainCameraTransform);
                 }
 
-                if (instmesh->needUpdateInstances || ((mainCamera.needUpdate || transform.needUpdate) && sortTransparentInstances)){
+                if (instancesNeedUpdate || ((mainCamera.needUpdate || transform.needUpdate) && sortTransparentInstances)){
                     if (!hasMultipleCameras || !sortTransparentInstances){
                         if (instmesh->instancedBillboard){
                             updateInstancedMesh(*instmesh, mesh, transform, mainCamera, mainCameraTransform);