From 101f96773e53ee80fb607dc3752b3c06b718f2ad Mon Sep 17 00:00:00 2001
From: Takahiro <hogehoge@gachapin.jp>
Date: Wed, 16 Aug 2023 18:37:25 -0700
Subject: [PATCH] bitECS: Take ownership when rotatin or scaling object

**Problem**

With new loader enabled, objects are not rotated or scaled
even if you attempt to rotate or scale objects that you don't
have ownership. You first need to click objects to take
ownership and then you can rotate or scale.

https://github.com/mozilla/hubs/issues/6199

But it is not a expected limitation. You should be able to
rotate or scale objects without taking ownership with
other operations beforehand.

**Root issue**

Rotate and Scale with Object menu don't take ownership.

**Solution**

Take ownership when starting rotate or scale.
---
 src/bit-systems/object-menu.ts | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/bit-systems/object-menu.ts b/src/bit-systems/object-menu.ts
index 73eec837054..fef415163fb 100644
--- a/src/bit-systems/object-menu.ts
+++ b/src/bit-systems/object-menu.ts
@@ -1,10 +1,12 @@
-import { defineQuery, enterQuery, entityExists, exitQuery, hasComponent } from "bitecs";
+import { addComponent, defineQuery, enterQuery, entityExists, exitQuery, hasComponent } from "bitecs";
 import { Matrix4, Quaternion, Vector3 } from "three";
 import type { HubsWorld } from "../app";
 import {
+  EntityStateDirty,
   HeldRemoteRight,
   HoveredRemoteRight,
   Interacted,
+  Networked,
   ObjectMenu,
   ObjectMenuTarget,
   RemoteRight,
@@ -14,6 +16,7 @@ import { anyEntityWith, findAncestorWithComponent } from "../utils/bit-utils";
 import { createNetworkedEntity } from "../utils/create-networked-entity";
 import HubChannel from "../utils/hub-channel";
 import type { EntityID } from "../utils/networking-types";
+import { takeOwnership } from "../utils/take-ownership";
 import { setMatrixWorld } from "../utils/three-utils";
 import { deleteTheDeletableAncestor } from "./delete-entity-system";
 import { createMessageDatas, isPinned } from "./networking";
@@ -81,6 +84,9 @@ function moveToTarget(world: HubsWorld, menu: EntityID) {
 //       temporary implementation that rely on the old systems.
 //       They should be rewritten more elegantly with bitecs.
 function startRotation(world: HubsWorld, targetEid: EntityID) {
+  if (hasComponent(world, Networked, targetEid)) {
+    takeOwnership(world, targetEid);
+  }
   const transformSystem = APP.scene!.systems["transform-selected-object"];
   const physicsSystem = AFRAME.scenes[0].systems["hubs-systems"].physicsSystem;
   physicsSystem.updateRigidBodyOptions(Rigidbody.bodyId[targetEid], { type: "kinematic" });
@@ -90,12 +96,18 @@ function startRotation(world: HubsWorld, targetEid: EntityID) {
   });
 }
 
-function stopRotation() {
+function stopRotation(world: HubsWorld, targetEid: EntityID) {
+  if (hasComponent(world, Networked, targetEid)) {
+    addComponent(world, EntityStateDirty, targetEid);
+  }
   const transformSystem = APP.scene!.systems["transform-selected-object"];
   transformSystem.stopTransform();
 }
 
 function startScaling(world: HubsWorld, targetEid: EntityID) {
+  if (hasComponent(world, Networked, targetEid)) {
+    takeOwnership(world, targetEid);
+  }
   // TODO: Don't use any
   // TODO: Remove the dependency with AFRAME
   const transformSystem = (AFRAME as any).scenes[0].systems["transform-selected-object"];
@@ -107,7 +119,10 @@ function startScaling(world: HubsWorld, targetEid: EntityID) {
   scalingHandler!.startScaling(world.eid2obj.get(rightCursorEid));
 }
 
-function stopScaling(world: HubsWorld) {
+function stopScaling(world: HubsWorld, targetEid: EntityID) {
+  if (hasComponent(world, Networked, targetEid)) {
+    addComponent(world, EntityStateDirty, targetEid);
+  }
   const rightCursorEid = anyEntityWith(world, RemoteRight)!;
   scalingHandler!.endScaling(world.eid2obj.get(rightCursorEid));
   scalingHandler = null;
@@ -188,10 +203,10 @@ function handleHeldEnter(world: HubsWorld, eid: EntityID, menuEid: EntityID) {
 function handleHeldExit(world: HubsWorld, eid: EntityID, menuEid: EntityID) {
   switch (eid) {
     case ObjectMenu.rotateButtonRef[menuEid]:
-      stopRotation();
+      stopRotation(world, ObjectMenu.targetRef[menuEid]);
       break;
     case ObjectMenu.scaleButtonRef[menuEid]:
-      stopScaling(world);
+      stopScaling(world, ObjectMenu.targetRef[menuEid]);
       break;
   }
 }