@rings-webgpu/core 1.0.45 → 1.0.47

package/dist/rings.umd.max.js

@@ -22850,13 +22850,15 @@ struct InstanceData {
     }
     
     // === calcSplatUV() - returns optional UV ===
-    fn calcSplatUV(orderId: u32, textureWidth: u32, numSplats: u32) -> vec2<i32> {
+    fn getSplatId(orderId: u32, textureWidth: u32, numSplats: u32) -> u32 {
         let orderUV = vec2<i32>(
             i32(orderId % textureWidth),
             i32(orderId / textureWidth)
         );
         
-        let splatId = textureLoad(splatOrder, orderUV, 0).r;
+        return u32(textureLoad(splatOrder, orderUV, 0).r);
+    }
+    fn calcSplatUV(splatId: u32, textureWidth: u32, numSplats: u32) -> vec2<i32> {
         return vec2<i32>(
             i32(splatId % textureWidth),
             i32(splatId / textureWidth)
@@ -22955,9 +22957,11 @@ struct InstanceData {
         if (orderId >= numSplats) {
             return discardSplat();
         }
+
+        let splatId = getSplatId(orderId, textureWidth, numSplats);
         
         // Calculate splat UV and load all data in one go
-        let splatUV = calcSplatUV(orderId, textureWidth, numSplats);
+        let splatUV = calcSplatUV(splatId, textureWidth, numSplats);
         let splatData = getSplatData(splatUV);
         
         // Load color early for alpha test
@@ -24308,75 +24312,44 @@ struct InstanceData {
   }
 
   const _floatView$1 = new Float32Array(1);
-  const _int32View$1 = new Int32Array(_floatView$1.buffer);
-  function batchConvertToHalfFloat(src, dst, offset, length) {
-    for (let i = 0; i < length; i++) {
-      const val = src[offset + i];
-      _floatView$1[0] = val;
-      const x = _int32View$1[0];
-      let bits = x >> 16 & 32768;
-      let m = x >> 12 & 2047;
-      const e = x >> 23 & 255;
-      if (e < 103) {
-        dst[offset + i] = bits;
-        continue;
-      }
-      if (e > 142) {
-        bits |= 31744;
-        bits |= (e == 255 ? 1 : 0) && x & 8388607;
-        dst[offset + i] = bits;
-        continue;
-      }
-      if (e < 114) {
-        m |= 2048;
-        bits |= (m >> 114 - e) + (m >> 113 - e & 1);
-        dst[offset + i] = bits;
-        continue;
-      }
-      bits |= e - 112 << 10 | m >> 1;
-      bits += m & 1;
-      dst[offset + i] = bits;
-    }
-  }
+  new Int32Array(_floatView$1.buffer);
   class Float16ArrayTexture extends Texture {
     uint16Array;
-    floatArray;
     _dataBuffer;
     /**
-     * 使用数字数组填充纹理，格式为[红0, 绿0, 蓝0, 透明度0, 红1, 绿1, 蓝1, 透明度1...]
+     * 使用 Uint16Array 填充纹理（Float16 格式），格式为[红0, 绿0, 蓝0, 透明度0, 红1, 绿1, 蓝1, 透明度1...]
      * @param width 纹理宽度
      * @param height 纹理高度
-     * @param numbers 每个像素的颜色值数组
+     * @param data Float16 数据数组（Uint16Array），每个元素是一个 Float16 值
      * @param useMipmap 是否生成Mipmap
      * @returns 返回纹理实例
      */
-    create(width, height, numbers = null, mipmap = true) {
-      if (numbers == null) {
-        numbers = [];
-        for (let i = 0, c = width * height * 4; i < c; i++) {
-          numbers[i] = 0;
-        }
+    create(width, height, data = null, mipmap = true) {
+      if (data == null) {
+        const size = width * height * 4;
+        data = new Uint16Array(size);
+        data.fill(0);
       }
-      this.updateTexture(width, height, numbers, mipmap);
+      this.updateTexture(width, height, data, mipmap);
       return this;
     }
     /**
      * 更新纹理内容
      * @param width 纹理宽度
      * @param height 纹理高度
-     * @param numbers 像素数据数组
+     * @param data Float16 数据数组（Uint16Array），每个元素是一个 Float16 值
      * @param mipmap 是否生成Mipmap
      * @param startRow 起始行（部分更新）
      * @param rowCount 更新的行数（部分更新）
      */
-    updateTexture(width, height, numbers, mipmap = true, startRow, rowCount) {
+    updateTexture(width, height, data, mipmap = true, startRow, rowCount) {
       if (width != this.width || height != this.height) {
         this._dataBuffer && this._dataBuffer.destroy();
         this._dataBuffer = null;
         this.gpuTexture && this.gpuTexture.destroy();
         this.gpuTexture = null;
       }
-      this.floatArray = numbers;
+      this.uint16Array = data;
       let device = webGPUContext.device;
       const bytesPerRow = width * 4 * 2;
       this.format = GPUTextureFormat.rgba16float;
@@ -24386,14 +24359,7 @@ struct InstanceData {
         const updateHeight = rowCount;
         const updateOffset = startRow * width * 4;
         const updateLength = updateHeight * width * 4;
-        if (!this.uint16Array || this.uint16Array.length < updateOffset + updateLength) {
-          if (!this.uint16Array || this.uint16Array.length < numbers.length) {
-            this.uint16Array = new Uint16Array(numbers.length);
-          }
-        }
-        const uint16Array2 = this.uint16Array;
-        batchConvertToHalfFloat(numbers, uint16Array2, updateOffset, updateLength);
-        const updateData = uint16Array2.subarray(updateOffset, updateOffset + updateLength);
+        const updateData = data.subarray(updateOffset, updateOffset + updateLength);
         const neededSize2 = updateData.byteLength;
         if (!this._dataBuffer || this._dataBuffer.size < neededSize2) {
           this._dataBuffer && this._dataBuffer.destroy();
@@ -24428,11 +24394,7 @@ struct InstanceData {
         GPUContext.endCommandEncoder(commandEncoder2);
         return;
       }
-      if (!this.uint16Array || this.uint16Array.length != numbers.length) {
-        this.uint16Array = new Uint16Array(numbers.length);
-      }
-      const uint16Array = this.uint16Array;
-      batchConvertToHalfFloat(numbers, uint16Array, 0, numbers.length);
+      const uint16Array = data;
       const neededSize = uint16Array.byteLength;
       if (!this._dataBuffer || this._dataBuffer.size < neededSize) {
         this._dataBuffer && this._dataBuffer.destroy();
@@ -24821,7 +24783,8 @@ struct InstanceData {
       const h = this.size.y | 0;
       const count = asset.count;
       const tA = new Uint32Array(w * h * 4);
-      const tB = new Array(w * h * 4).fill(0);
+      const tB = new Uint16Array(w * h * 4);
+      tB.fill(0);
       const fb = new ArrayBuffer(4);
       const f32 = new Float32Array(fb);
       const u32 = new Uint32Array(fb);
@@ -24895,10 +24858,10 @@ struct InstanceData {
         const cBy = r01 * r02 + r11 * r12 + r21 * r22;
         const cBz = r02 * r02 + r12 * r12 + r22 * r22;
         const bidx = idx;
-        tB[bidx + 0] = cAx;
-        tB[bidx + 1] = cAy;
-        tB[bidx + 2] = cAz;
-        tB[bidx + 3] = cBz;
+        tB[bidx + 0] = toHalfFloat(cAx) & 65535;
+        tB[bidx + 1] = toHalfFloat(cAy) & 65535;
+        tB[bidx + 2] = toHalfFloat(cAz) & 65535;
+        tB[bidx + 3] = toHalfFloat(cBz) & 65535;
         const hx = toHalfFloat(cBx) & 65535;
         const hy = toHalfFloat(cBy) & 65535;
         tA[idx + 3] = hx | hy << 16;
@@ -42370,7 +42333,7 @@ else if (typeof exports === 'object')
     }
   }
 
-  const version = "1.0.44";
+  const version = "1.0.46";
 
   class Engine3D {
     /**
@@ -54633,7 +54596,7 @@ fn frag(){
     _transformAData;
     // RGBA32U: count * 4
     _transformBData;
-    // RGBA16F: count * 4
+    // RGBA16F: count * 4 (Float16 format)
     _orderData;
     // R32U: size.x * size.y
     _positions;
@@ -54691,7 +54654,8 @@ fn frag(){
       this._colorData.fill(0);
       this._transformAData = new Uint32Array(total * 4);
       this._transformAData.fill(0);
-      this._transformBData = new Array(total * 4).fill(0);
+      this._transformBData = new Uint16Array(total * 4);
+      this._transformBData.fill(0);
       this._orderData = new Uint32Array(total);
       for (let i = 0; i < total; i++) {
         this._orderData[i] = i < totalCount ? i : totalCount > 0 ? totalCount - 1 : 0;
@@ -54841,10 +54805,10 @@ fn frag(){
       const cBy = r01 * r02 + r11 * r12 + r21 * r22;
       const cBz = r02 * r02 + r12 * r12 + r22 * r22;
       const bidx = idx;
-      this._transformBData[bidx + 0] = cAx;
-      this._transformBData[bidx + 1] = cAy;
-      this._transformBData[bidx + 2] = cAz;
-      this._transformBData[bidx + 3] = cBz;
+      this._transformBData[bidx + 0] = toHalfFloat(cAx) & 65535;
+      this._transformBData[bidx + 1] = toHalfFloat(cAy) & 65535;
+      this._transformBData[bidx + 2] = toHalfFloat(cAz) & 65535;
+      this._transformBData[bidx + 3] = toHalfFloat(cBz) & 65535;
       const hx = toHalfFloat(cBx) & 65535;
       const hy = toHalfFloat(cBy) & 65535;
       this._transformAData[idx + 3] = hx | hy << 16;
@@ -66409,6 +66373,7 @@ fn frag(){
       toggleTime: 0,
       queueProcessTime: 0
     };
+    transCdnUrlFunc = null;
     constructor(url = null) {
       this.rootURL = url;
       this.lruCache = new LRUCache();
@@ -66857,7 +66822,7 @@ fn frag(){
         return parts.length > 1 ? parts[parts.length - 1] : "";
       };
       const extension = getUrlExtension(uri);
-      const fullUrl = url;
+      const fullUrl = this.transCdnUrlFunc ? this.transCdnUrlFunc(url) : url;
       let scene = null;
       const loader = new FileLoader();
       switch (extension.toLowerCase()) {
@@ -71931,14 +71896,19 @@ fn frag(){
         this.color.b,
         this.color.a
       );
-      this._internalTexture.create(this._minSize, this._minSize, numbers, false);
+      const float16Data = new Uint16Array(numbers.length);
+      for (let i = 0; i < numbers.length; i++) {
+        float16Data[i] = toHalfFloat(numbers[i]) & 65535;
+      }
+      this._internalTexture.create(this._minSize, this._minSize, float16Data, false);
       this.createFromTexture(this._minSize, this._internalTexture);
       return this;
     }
     changeColor(color) {
       this._skyColor = color;
+      const numbers = [];
       Engine3D.res.fillColor(
-        this._internalTexture.floatArray,
+        numbers,
         this._minSize,
         this._minSize,
         this.color.r,
@@ -71946,10 +71916,14 @@ fn frag(){
         this.color.b,
         this.color.a
       );
+      const float16Data = new Uint16Array(numbers.length);
+      for (let i = 0; i < numbers.length; i++) {
+        float16Data[i] = toHalfFloat(numbers[i]) & 65535;
+      }
       this._internalTexture.updateTexture(
         this._minSize,
         this._minSize,
-        this._internalTexture.floatArray,
+        float16Data,
         false
       );
       this._faceData.uploadTexture(0, this._internalTexture);

package/dist/types/loader/parser/tileRenderer/TilesRenderer.d.ts

@@ -136,6 +136,7 @@ export declare class TilesRenderer {
     private _bytesUsed;
     private _eventListeners;
     performanceStats: PerformanceStats;
+    transCdnUrlFunc: (oriUrl: string) => string;
     constructor(url?: string | null);
     /**
      * Get root tile

package/dist/types/textures/Float16ArrayTexture.d.ts

@@ -6,25 +6,24 @@ import { Texture } from "../gfx/graphics/webGpu/core/texture/Texture";
  */
 export declare class Float16ArrayTexture extends Texture {
     uint16Array: Uint16Array;
-    floatArray: number[];
     private _dataBuffer;
     /**
-     * 使用数字数组填充纹理，格式为[红0, 绿0, 蓝0, 透明度0, 红1, 绿1, 蓝1, 透明度1...]
+     * 使用 Uint16Array 填充纹理（Float16 格式），格式为[红0, 绿0, 蓝0, 透明度0, 红1, 绿1, 蓝1, 透明度1...]
      * @param width 纹理宽度
      * @param height 纹理高度
-     * @param numbers 每个像素的颜色值数组
+     * @param data Float16 数据数组（Uint16Array），每个元素是一个 Float16 值
      * @param useMipmap 是否生成Mipmap
      * @returns 返回纹理实例
      */
-    create(width: number, height: number, numbers?: number[], mipmap?: boolean): this;
+    create(width: number, height: number, data?: Uint16Array | null, mipmap?: boolean): this;
     /**
      * 更新纹理内容
      * @param width 纹理宽度
      * @param height 纹理高度
-     * @param numbers 像素数据数组
+     * @param data Float16 数据数组（Uint16Array），每个元素是一个 Float16 值
      * @param mipmap 是否生成Mipmap
      * @param startRow 起始行（部分更新）
      * @param rowCount 更新的行数（部分更新）
      */
-    updateTexture(width: number, height: number, numbers: number[], mipmap?: boolean, startRow?: number, rowCount?: number): void;
+    updateTexture(width: number, height: number, data: Uint16Array, mipmap?: boolean, startRow?: number, rowCount?: number): void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rings-webgpu/core",
-  "version": "1.0.45",
+  "version": "1.0.47",
   "description": "Rings webgpu Engine",
   "main": "index.js",
   "exports": {