Fix copy-paste issue where the raycasting didn't account for the size…

… of the copied item
briqNFT · Mar 11, 2022 · 410898d · 410898d
1 parent 08d6e2f
commit 410898d
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 17 deletions.
diff --git a/src/FeatureFlags.ts b/src/FeatureFlags.ts
@@ -4,7 +4,7 @@ import { reactive, watchEffect } from 'vue';
 import { logDebug } from "./Messages";
 
 export const featureFlags = reactive({
-    briq_copy_paste: false,
+    briq_copy_paste: true,
 });
 
 const admins = [
@@ -20,11 +20,9 @@ async function checkOnStore() {
         if (admins.indexOf(store?.store?.state?.wallet?.userWalletAddress) !== -1)
         {
             // Admin-only.
-            featureFlags.briq_copy_paste = true;
         }
         else
         {
-            featureFlags.briq_copy_paste = false;
         }
     })
 };

diff --git a/src/builder/inputs/input_states/BuilderInputState.ts b/src/builder/inputs/input_states/BuilderInputState.ts
@@ -57,20 +57,21 @@ export class MouseInputState extends BuilderInputState
         ]
     }
 
-    _getIntersectionPos(x: number, y: number, overlay = false): [number, number, number] | undefined
+    _getIntersectionPos(x: number, y: number, overlay = false)
     {
         let [start, end] = getCameraRay(...this.getCanvasRelativePosition(x, y));
         const intersection = voxWorld.intersectRay(start, end);
-        if (!intersection)
-            return undefined;
-        return intersection.position.map((v, ndx) => {
-            return v + intersection.normal[ndx] * (overlay ? -0.5 : +0.5);
-        });
+        return intersection;
     }
 
     getIntersectionPos(x: number, y: number, overlay = false): [number, number, number] | undefined
     {
-        return this._getIntersectionPos(x, y, overlay)?.map(x => Math.floor(x));
+        let intersection = this._getIntersectionPos(x, y, overlay);
+        if (!intersection)
+            return undefined;
+        return intersection.position.map((v, ndx) => {
+            return Math.floor(v + intersection.normal[ndx] * (overlay ? -0.5 : +0.5));
+        });
     }
 
     canvasSize() {

diff --git a/src/builder/inputs/input_states/CopyPaste.ts b/src/builder/inputs/input_states/CopyPaste.ts
@@ -66,11 +66,13 @@ export class CopyPasteInput extends MouseInputState {
     }
 
     async onPointerMove() {
-        let pos = this._getIntersectionPos(this.curX, this.curY);
-        if (!pos || pos[1] < 0) {
+        let intersection = this._getIntersectionPos(this.curX, this.curY);
+        if (!intersection)
             return;
-        }
-        this._specialClamp(pos);
+        let pos = intersection.position.map((v, ndx) => {
+            return v + intersection.normal[ndx] * (this.max[ndx] - this.min[ndx] + 1) / 2;
+        });
+        pos = this._specialClamp(pos);
         selectionRender.parent.position.set(
             Math.round(pos[0] - this.selectionCenter.x),
             Math.round(pos[1] - this.selectionCenter.y),
@@ -109,12 +111,16 @@ export class CopyPasteInput extends MouseInputState {
 
     async doPaste()
     {
-        let pos = this._getIntersectionPos(this.curX, this.curY);
-        if (!pos || pos[1] < 0) {
+        let intersection = this._getIntersectionPos(this.curX, this.curY);
+        if (!intersection)
+        {
             this.fsm.switchTo("inspect");
             return;
         }
-        this._specialClamp(pos);
+        let pos = intersection.position.map((v, ndx) => {
+            return v + intersection.normal[ndx] * (this.max[ndx] - this.min[ndx] + 1) / 2;
+        });
+        pos = this._specialClamp(pos);
         Math.round(pos[0] - this.selectionCenter.x);
         Math.round(pos[1] - this.selectionCenter.y);
         Math.round(pos[2] - this.selectionCenter.z);