fix various regressions around plugin parameter setting and exporting

packages/engine/src/assets/exporters/gltf/extensions/EEMaterialExporterExtension.ts

@@ -119,8 +119,14 @@ export default class EEMaterialExporterExtension extends ExporterExtension {
     const materialComponent = getComponent(materialEntity, MaterialComponent[MaterialComponents.State])
     const prototype = getComponent(materialComponent.prototypeEntity!, MaterialComponent[MaterialComponents.Prototype])
     const plugins = Object.keys(MaterialPlugins).map((plugin) => {
-      if (hasComponent(materialEntity, MaterialPlugins[plugin]))
-        return { id: plugin ?? '', uniforms: getComponent(materialEntity, MaterialPlugins[plugin]) }
+      if (!hasComponent(materialEntity, MaterialPlugins[plugin])) return
+      const pluginComponent = getComponent(materialEntity, MaterialPlugins[plugin])
+      const uniforms = {}
+      for (const key in pluginComponent) {
+        console.log(pluginComponent[key])
+        uniforms[key] = pluginComponent[key].value
+      }
+      return { id: plugin, uniforms }
     })
     materialDef.extensions = materialDef.extensions ?? {}
     materialDef.extensions[this.name] = {

packages/engine/src/assets/loaders/gltf/extensions/EEMaterialImporterExtension.ts

@@ -82,6 +82,14 @@ export class EEMaterialImporterExtension extends ImporterExtension implements GL
     if (extension.plugins) {
       if (!materialDef.extras) materialDef.extras = {}
       materialDef.extras['plugins'] = extension.plugins
+      for (const plugin of extension.plugins) {
+        if (!plugin?.uniforms) continue
+        for (const v of Object.values(plugin.uniforms)) {
+          if (v.type === 'texture') {
+            parser.assignTexture(materialParams, v.name, v.contents)
+          }
+        }
+      }
     }
     const materialComponent = getComponent(
       UUIDComponent.getEntityByUUID(extension.uuid),

packages/engine/src/scene/materials/functions/materialSourcingFunctions.ts

@@ -132,9 +132,9 @@ export const createMaterialEntity = (material: Material, path?: string, user?: E
     material.userData.plugins.map((plugin: MaterialExtensionPluginType) => {
       if (!plugin) return
       setComponent(materialEntity, MaterialPlugins[plugin.id])
-      const pluginComponent = getMutableComponent(materialEntity, MaterialPlugins[plugin.id])
+      const pluginComponent = getComponent(materialEntity, MaterialPlugins[plugin.id])
       for (const [k, v] of Object.entries(plugin.uniforms)) {
-        if (v) pluginComponent[k].set(v)
+        if (v) pluginComponent[k].value = v
       }
     })
   setMaterialName(materialEntity, material.name)

packages/spatial/src/renderer/materials/constants/plugins/NoiseOffsetPlugin.ts

@@ -71,6 +71,7 @@ export const NoiseOffsetPlugin = defineComponent({
         shader.uniforms.textureSize = plugin.textureSize
         shader.uniforms.frequency = plugin.frequency
         shader.uniforms.amplitude = plugin.amplitude
+        plugin.noiseTexture.value = generateNoiseTexture(64)
         shader.uniforms.noiseTexture = plugin.noiseTexture
         shader.uniforms.offsetAxis = plugin.offsetAxis
         shader.uniforms.time = plugin.time

packages/ui/src/components/editor/panels/Properties/material/index.tsx

@@ -269,7 +269,7 @@ export function MaterialEditor(props: { materialUUID: EntityUUID }) {
             values={pluginValues.value}
             onChange={(key) => async (value) => {
               const property = await shouldLoadTexture(value, key, pluginParameters)
-              setComponent(entity, MaterialPlugins[selectedPlugin.value], { key: property })
+              getComponent(entity, MaterialPlugins[selectedPlugin.value])[key].value = property
               pluginValues[key].set(property)
             }}
             defaults={pluginParameters.value}