@react-three/drei 10.0.2 → 10.0.3

package/core/shaderMaterial.cjs.js

@@ -1 +1 @@
-"use strict";function e(e){if(e&&e.__esModule)return e;var t=Object.create(null);return e&&Object.keys(e).forEach((function(r){if("default"!==r){var s=Object.getOwnPropertyDescriptor(e,r);Object.defineProperty(t,r,s.get?s:{enumerable:!0,get:function(){return e[r]}})}})),t.default=e,Object.freeze(t)}Object.defineProperty(exports,"__esModule",{value:!0});var t=e(require("three"));exports.shaderMaterial=function(e,r,s,n){const i=class extends t.ShaderMaterial{constructor(i={}){const a=Object.entries(e);super({uniforms:a.reduce(((e,[r,s])=>({...e,...t.UniformsUtils.clone({[r]:{value:s}})})),{}),vertexShader:r,fragmentShader:s}),this.key="",a.forEach((([e])=>Object.defineProperty(this,e,{get:()=>this.uniforms[e].value,set:t=>this.uniforms[e].value=t}))),Object.assign(this,i),n&&n(this)}};return i.key=t.MathUtils.generateUUID(),i};
+"use strict";function e(e){if(e&&e.__esModule)return e;var r=Object.create(null);return e&&Object.keys(e).forEach((function(t){if("default"!==t){var n=Object.getOwnPropertyDescriptor(e,t);Object.defineProperty(r,t,n.get?n:{enumerable:!0,get:function(){return e[t]}})}})),r.default=e,Object.freeze(r)}Object.defineProperty(exports,"__esModule",{value:!0});var r=e(require("three"));exports.shaderMaterial=function(e,t,n,u){var i;return(i=class extends r.ShaderMaterial{constructor(i){super({vertexShader:t,fragmentShader:n,...i});for(const t in e)this.uniforms[t]=new r.Uniform(e[t]),Object.defineProperty(this,t,{get(){return this.uniforms[t].value},set(e){this.uniforms[t].value=e}});null==u||u(this)}}).key=r.MathUtils.generateUUID(),i};

package/core/shaderMaterial.d.ts

@@ -1,7 +1,9 @@
 import * as THREE from 'three';
-import { MeshBVHUniformStruct } from 'three-mesh-bvh';
-export declare function shaderMaterial(uniforms: {
-    [name: string]: THREE.CubeTexture | THREE.Texture | Int32Array | Float32Array | THREE.Matrix4 | THREE.Matrix3 | THREE.Quaternion | THREE.Vector4 | THREE.Vector3 | THREE.Vector2 | THREE.Color | MeshBVHUniformStruct | number | boolean | Array<any> | null;
-}, vertexShader: string, fragmentShader: string, onInit?: (material?: THREE.ShaderMaterial) => void): typeof THREE.ShaderMaterial & {
+import { type ConstructorRepresentation } from '@react-three/fiber';
+import { type MeshBVHUniformStruct } from 'three-mesh-bvh';
+type UniformValue = THREE.Texture | THREE.TypedArray | THREE.Matrix4 | THREE.Matrix3 | THREE.Quaternion | THREE.Vector4 | THREE.Vector3 | THREE.Vector2 | THREE.Color | MeshBVHUniformStruct | number | boolean | null;
+type Uniforms = Record<string, UniformValue | Record<string, UniformValue> | Array<UniformValue>>;
+export declare function shaderMaterial<U extends Uniforms, M extends THREE.ShaderMaterial & U>(uniforms: U, vertexShader: string, fragmentShader: string, onInit?: (material?: M) => void): ConstructorRepresentation<M> & {
     key: string;
 };
+export {};

package/core/shaderMaterial.js

@@ -1,40 +1,28 @@
 import * as THREE from 'three';
 
 function shaderMaterial(uniforms, vertexShader, fragmentShader, onInit) {
-  const material = class material extends THREE.ShaderMaterial {
-    constructor(parameters = {}) {
-      const entries = Object.entries(uniforms);
-      // Create unforms and shaders
+  var _Class;
+  return _Class = class extends THREE.ShaderMaterial {
+    constructor(parameters) {
       super({
-        uniforms: entries.reduce((acc, [name, value]) => {
-          const uniform = THREE.UniformsUtils.clone({
-            [name]: {
-              value
-            }
-          });
-          return {
-            ...acc,
-            ...uniform
-          };
-        }, {}),
         vertexShader,
-        fragmentShader
+        fragmentShader,
+        ...parameters
       });
-      // Create getter/setters
-      this.key = '';
-      entries.forEach(([name]) => Object.defineProperty(this, name, {
-        get: () => this.uniforms[name].value,
-        set: v => this.uniforms[name].value = v
-      }));
-
-      // Assign parameters, this might include uniforms
-      Object.assign(this, parameters);
-      // Call onInit
-      if (onInit) onInit(this);
+      for (const key in uniforms) {
+        this.uniforms[key] = new THREE.Uniform(uniforms[key]);
+        Object.defineProperty(this, key, {
+          get() {
+            return this.uniforms[key].value;
+          },
+          set(value) {
+            this.uniforms[key].value = value;
+          }
+        });
+      }
+      onInit == null || onInit(this);
     }
-  };
-  material.key = THREE.MathUtils.generateUUID();
-  return material;
+  }, _Class.key = THREE.MathUtils.generateUUID(), _Class;
 }
 
 export { shaderMaterial };