@onerjs/core 8.26.9 → 8.27.1

package/Meshes/geometry.js

@@ -11,7 +11,7 @@ import { Tags } from "../Misc/tags.js";
 import { extractMinAndMax } from "../Maths/math.functions.js";
 import { EngineStore } from "../Engines/engineStore.js";
 import { useOpenGLOrientationForUV } from "../Compat/compatibilityOptions.js";
-import { CopyFloatData } from "../Buffers/bufferUtils.js";
+import { CopyFloatData, GetTypedArrayData } from "../Buffers/bufferUtils.js";
 /**
  * Class used to store geometry data (vertex buffers + index buffer)
  */
@@ -815,36 +815,37 @@ export class Geometry {
      * @returns a new geometry object
      */
     copy(id) {
-        const vertexData = new VertexData();
-        vertexData.indices = [];
-        const indices = this.getIndices();
+        const geometry = new Geometry(id, this._scene);
+        const indices = this.getIndices(undefined, true);
         if (indices) {
-            for (let index = 0; index < indices.length; index++) {
-                vertexData.indices.push(indices[index]);
-            }
+            geometry.setIndices(indices);
         }
         let updatable = false;
-        let stopChecking = false;
         let kind;
         for (kind in this._vertexBuffers) {
-            const data = this.getVerticesData(kind);
-            if (data) {
-                if (data instanceof Float32Array) {
-                    vertexData.set(new Float32Array(data), kind);
-                }
-                else {
-                    vertexData.set(data.slice(0), kind);
-                }
-                if (!stopChecking) {
-                    const vb = this.getVertexBuffer(kind);
-                    if (vb) {
-                        updatable = vb.isUpdatable();
-                        stopChecking = !updatable;
-                    }
-                }
+            const vb = this.getVertexBuffer(kind);
+            const bufferData = vb.getData();
+            if (!bufferData) {
+                continue;
             }
-        }
-        const geometry = new Geometry(id, this._scene, vertexData, updatable);
+            const isUpdatable = vb.isUpdatable();
+            const size = vb.getSize();
+            const { type, byteOffset, byteStride, normalized } = vb;
+            updatable = updatable || isUpdatable;
+            const data = GetTypedArrayData(bufferData, size, type, byteOffset, byteStride, normalized, this._totalVertices, true);
+            const newVb = new VertexBuffer(this._engine, data, kind, {
+                updatable: isUpdatable,
+                useBytes: true,
+                stride: byteStride,
+                size: size,
+                offset: byteOffset,
+                type: type,
+                normalized: normalized,
+                takeBufferOwnership: true,
+            });
+            geometry.setVerticesBuffer(newVb, this._totalVertices);
+        }
+        geometry._updatable = updatable;
         geometry.delayLoadState = this.delayLoadState;
         geometry.delayLoadingFile = this.delayLoadingFile;
         geometry._delayLoadingFunction = this._delayLoadingFunction;