Fixes #20 - on entity death, remove entity collision & hover/pick eve…

…nts so it doesnt prevent player picking up an dropped item
orion3dgames · Aug 9, 2023 · ea45867 · ea45867
1 parent bea9d48
commit ea45867
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/src/shared/Entities/Entity.ts b/src/shared/Entities/Entity.ts
@@ -180,12 +180,12 @@ export class Entity {
         }
 
         // what to do when an entity dies
-        if (this.health < 0 && !this.isDead) {
-            console.log("ENTITY IS DEAD REMOVE ACTION MANAGER");
+        if (this.health < 1 && !this.isDead) {
             this.isDead = true;
             global.T5C.selectedEntity = null;
             this.meshController.selectedMesh.isVisible = false;
             this.meshController.mesh.actionManager.dispose();
+            this.meshController.mesh.actionManager = null;
         }
 
         // tween entity

diff --git a/src/shared/Entities/Entity/EntityMesh.ts b/src/shared/Entities/Entity/EntityMesh.ts
@@ -125,7 +125,6 @@ export class EntityMesh {
         // register hover over player
         this.mesh.actionManager.registerAction(
             new ExecuteCodeAction(ActionManager.OnPointerOverTrigger, (ev) => {
-                console.log("ACTION MANAGER HOVER");
                 let mesh = ev.meshUnderPointer;
                 for (const childMesh of mesh.getChildMeshes()) {
                     childMesh.overlayColor = new Color3(1, 1, 1);

diff --git a/src/shared/Entities/Item.ts b/src/shared/Entities/Item.ts
@@ -135,15 +135,10 @@ export class Item {
         this.mesh.actionManager.registerAction(
             new ExecuteCodeAction(ActionManager.OnPointerOverTrigger, (ev) => {
                 let mesh = ev.meshUnderPointer;
-                console.log(mesh.name);
                 for (const childMesh of mesh.getChildMeshes()) {
                     childMesh.overlayColor = new Color3(1, 1, 1);
                     childMesh.overlayAlpha = 0.3;
                     childMesh.renderOverlay = true;
-                    //this.ui._hightlight.addMesh(childMesh as Mesh, new Color3(0, 1, 0));
-                    /*childMesh.outlineColor = new BABYLON.Color3(0, 1, 0);
-                    childMesh.outlineWidth = 0.1;
-                    childMesh.renderOutline = true;*/
                 }
             })
         );
@@ -154,8 +149,6 @@ export class Item {
                 let mesh = ev.meshUnderPointer;
                 for (const childMesh of mesh.getChildMeshes()) {
                     childMesh.renderOverlay = false;
-                    //childMesh.renderOutline = false;
-                    //this.ui._hightlight.removeMesh(childMesh as Mesh);
                 }
             })
         );