Merge pull request #224 from JujieX/cherryPick/boxSelect

Feat: upgrade version
galacean · Aug 17, 2023 · 8a2b778 · 8a2b778
2 parents 8b86d5f + 84487bd
commit 8a2b778
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 24 deletions.
diff --git a/packages/auxiliary-lines/package.json b/packages/auxiliary-lines/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-toolkit-auxiliary-lines",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.6",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"

diff --git a/packages/controls/package.json b/packages/controls/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-toolkit-controls",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.6",
   "license": "MIT",
   "publishConfig": {
     "access": "public",

diff --git a/packages/custom-material/package.json b/packages/custom-material/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-toolkit-custom-material",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.6",
   "license": "MIT",
   "scripts": {
     "b:types": "tsc",

diff --git a/packages/framebuffer-picker/package.json b/packages/framebuffer-picker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-toolkit-framebuffer-picker",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.6",
   "license": "MIT",
   "module": "dist/es/index.js",
   "main": "dist/commonjs/browser.js",

diff --git a/packages/framebuffer-picker/src/FramebufferPicker.ts b/packages/framebuffer-picker/src/FramebufferPicker.ts
@@ -145,38 +145,47 @@ export class FramebufferPicker extends Script {
 
   private _readPixelFromRenderTarget(x: number, y: number, xEnd?: number, yEnd?: number): Uint8Array {
     let pickPixel: Uint8Array, width: number, height: number;
-    this._getCoordOnRenderTarget(x, y);
+    const startCoord = this._getCoordOnRenderTarget(x, y);
     const argsLength = arguments.length;
 
     if (argsLength === 2) {
       pickPixel = FramebufferPicker._pickPixel;
       width = height = 1;
     } else if (argsLength === 4) {
-      this._getCoordOnRenderTarget(xEnd, yEnd);
+      const endCoord = this._getCoordOnRenderTarget(xEnd, yEnd);
 
-      width = Math.abs(xEnd - x);
-      height = Math.abs(yEnd - y);
+      width = Math.abs(startCoord.x - endCoord.x);
+      height = Math.abs(startCoord.y - endCoord.y);
 
-      x = x < xEnd ? x : xEnd;
-      y = y < yEnd ? y : yEnd;
+      startCoord.x = startCoord.x < endCoord.x ? startCoord.x : endCoord.x;
+      startCoord.y = startCoord.y < endCoord.y ? startCoord.y : endCoord.y;
 
       pickPixel = new Uint8Array(width * height * 4);
     }
+    (<Texture2D>this._pickRenderTarget.getColorTexture()).getPixelBuffer(
+      startCoord.x,
+      startCoord.y,
+      width,
+      height,
+      0,
+      pickPixel
+    );
 
-    (<Texture2D>this._pickRenderTarget.getColorTexture()).getPixelBuffer(x, y, width, height, 0, pickPixel);
     return pickPixel;
   }
 
-  private _getCoordOnRenderTarget(x: number, y: number) {
+  private _getCoordOnRenderTarget(x: number, y: number): { x: number; y: number } {
     const pickRenderTarget = this._pickRenderTarget;
     const { canvas } = this.engine;
 
     const viewport = this._camera.viewport;
     const viewWidth = (viewport.z - viewport.x) * canvas.width;
     const viewHeight = (viewport.w - viewport.y) * canvas.height;
 
-    x = Math.floor(((x - viewport.x) / viewWidth) * (pickRenderTarget.width - 1));
-    y = Math.floor((1 - (y - viewport.y) / viewHeight) * (pickRenderTarget.height - 1));
+    return {
+      x: Math.floor(((x - viewport.x) / viewWidth) * (pickRenderTarget.width - 1)),
+      y: Math.floor((1 - (y - viewport.y) / viewHeight) * (pickRenderTarget.height - 1))
+    };
   }
 
   private _getRendererByPixel(color: Uint8Array): Renderer {

diff --git a/packages/galacean-engine-toolkit/package.json b/packages/galacean-engine-toolkit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-toolkit",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.6",
   "license": "MIT",
   "scripts": {
     "b:types": "tsc"

diff --git a/packages/geometry-sketch/package.json b/packages/geometry-sketch/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-toolkit-geometry-sketch",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.6",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"

diff --git a/packages/gizmo/package.json b/packages/gizmo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-toolkit-gizmo",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.6",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"

diff --git a/packages/input-logger/package.json b/packages/input-logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-toolkit-input-logger",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.6",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"

diff --git a/packages/lines/package.json b/packages/lines/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-toolkit-lines",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.6",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"

diff --git a/packages/navigation-gizmo/package.json b/packages/navigation-gizmo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-toolkit-navigation-gizmo",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.6",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"

diff --git a/packages/outline/package.json b/packages/outline/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-toolkit-outline",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.6",
   "license": "MIT",
   "module": "dist/es/index.js",
   "main": "dist/commonjs/browser.js",

diff --git a/packages/skeleton-viewer/package.json b/packages/skeleton-viewer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-toolkit-skeleton-viewer",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.6",
   "license": "MIT",
   "scripts": {
     "b:types": "tsc"

diff --git a/packages/stats/package.json b/packages/stats/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-toolkit-stats",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.6",
   "license": "MIT",
   "scripts": {
     "b:types": "tsc"

diff --git a/packages/way-point/package.json b/packages/way-point/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-toolkit-way-point",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.6",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"