Clean-up unnecessary changes and remove Pinnable component

Hubs-Foundation · Jun 2, 2023 · 93cf42d · 93cf42d
1 parent 0fca373
commit 93cf42d
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 10 deletions.
diff --git a/src/bit-systems/media-loading.ts b/src/bit-systems/media-loading.ts
@@ -4,10 +4,10 @@ import { HubsWorld } from "../app";
 import {
   GLTFModel,
   MediaContentBounds,
+  MediaLoaded,
   MediaLoader,
   Networked,
-  ObjectMenuTarget,
-  MediaLoaded
+  ObjectMenuTarget
 } from "../bit-components";
 import { inflatePhysicsShape, Shape } from "../inflators/physics-shape";
 import { ErrorObject } from "../prefabs/error-object";

diff --git a/src/prefabs/media.tsx b/src/prefabs/media.tsx
@@ -13,7 +13,6 @@ export function MediaPrefab(params: MediaLoaderParams): EntityDef {
       networkedTransform
       mediaLoader={params}
       deletable
-      pinnable
       grabbable={{ cursor: true, hand: true }}
       destroyAtExtremeDistance
       floatyObject={{

diff --git a/src/utils/bit-pinning-helper.ts b/src/utils/bit-pinning-helper.ts
@@ -1,4 +1,3 @@
-import { hasComponent } from "bitecs";
 import { HubsWorld } from "../app";
 import { createEntityState, deleteEntityState } from "./entity-state-utils";
 import HubChannel from "./hub-channel";
@@ -40,7 +39,7 @@ export const canPin = (hubChannel: HubChannel, world: HubsWorld, eid: EntityID):
   } = createMessageDatas.get(eid)!;
   const hasFile = !!fileId;
   const hasPromotableFile =
-    hasFile && APP.store.state.uploadPromotionTokens.some((upload: { fileId: string }) => upload.fileId === fileId);
+    hasFile && APP.store.state.uploadPromotionTokens.some((upload: any) => upload.fileId === fileId);
   return (
     isNetworkInstantiated(eid) &&
     !isPinned(eid) &&

diff --git a/src/utils/entity-state-utils.ts b/src/utils/entity-state-utils.ts
@@ -47,7 +47,6 @@ export function hasSavedEntityState(world: HubsWorld, eid: EntityID) {
 
 export async function createEntityState(hubChannel: HubChannel, world: HubsWorld, eid: EntityID) {
   const payload = createEntityStatePayload(world, eid);
-
   // console.log("save_entity_state",  payload);
   return push(hubChannel, "save_entity_state", payload);
 }

diff --git a/src/utils/jsx-entity.ts b/src/utils/jsx-entity.ts
@@ -39,8 +39,7 @@ import {
   VideoTextureSource,
   Quack,
   Mirror,
-  MixerAnimatableInitialize,
-  Pinnable
+  MixerAnimatableInitialize
 } from "../bit-components";
 import { inflateMediaLoader } from "../inflators/media-loader";
 import { inflateMediaFrame } from "../inflators/media-frame";
@@ -312,7 +311,6 @@ export interface JSXComponentData extends ComponentData {
   rigidbody?: OptionalParams<RigidBodyParams>;
   physicsShape?: OptionalParams<PhysicsShapeParams>;
   floatyObject?: any;
-  pinnable?: any;
   networkedFloatyObject?: any;
   networkedTransform?: any;
   objectMenu?: {
@@ -453,7 +451,6 @@ const jsxInflators: Required<{ [K in keyof JSXComponentData]: InflatorFn }> = {
   networkedTransform: createDefaultInflator(NetworkedTransform),
   networked: createDefaultInflator(Networked),
   objectMenu: createDefaultInflator(ObjectMenu),
-  pinnable: createDefaultInflator(Pinnable),
   linkHoverMenu: createDefaultInflator(LinkHoverMenu),
   linkHoverMenuItem: createDefaultInflator(LinkHoverMenuItem),
   pdfMenu: createDefaultInflator(PDFMenu),

diff --git a/src/utils/listen-for-network-messages.ts b/src/utils/listen-for-network-messages.ts
@@ -91,6 +91,7 @@ export function queueEntityStateAsMessage(entityState: EntityState) {
 }
 
 function onEntityStateCreated(response: { data: EntityState[] }) {
+  // console.log("entity_state_saved", response);
   queueEntityStateAsMessage(response.data[0]!);
 }
 
@@ -99,5 +100,6 @@ function onEntityStateUpdated(_response: any) {
 }
 
 function onEntityStateDeleted(response: CreatorChange) {
+  // console.log("entity_state_deleted", response);
   pendingCreatorChanges.push(response);
 }