@woosh/meep-engine 2.33.26 → 2.33.30

package/engine/ecs/foliage/ecs/Foliage2System.js

@@ -1,7 +1,7 @@
 import { System } from "../../System.js";
 import { InstancedFoliage } from "../InstancedFoliage.js";
 import { Cache } from "../../../../core/cache/Cache.js";
-import { Foliage2 } from "./Foliage2.js";
+import { InstancedMeshComponent } from "./InstancedMeshComponent.js";
 import { guessAssetType } from "../../../asset/guessAssetType.js";
 
 
@@ -19,7 +19,7 @@ function cleanupLayer(layerData, renderLayer) {
 
 /**
  *
- * @param {FoliageLayer} layer
+ * @param {InstancedMeshLayer} layer
  * @param {AssetManager} assetManager
  * @returns {Promise<InstancedFoliage>}
  */
@@ -60,7 +60,7 @@ export function loadFoliageLayer(layer, assetManager) {
 
 /**
  *
- * @param {FoliageLayer} layer
+ * @param {InstancedMeshLayer} layer
  * @param {Cache<string, Promise<InstancedFoliage>>} cache
  * @param {AssetManager} assetManager
  * @returns {Promise<InstancedFoliage>}
@@ -83,7 +83,7 @@ export class Foliage2System extends System {
      * @param {AssetManager} assetManager
      * @param {GraphicsEngine} graphicsEngine
      * @constructor
-     * @extends {System.<Foliage2>}
+     * @extends {System.<InstancedMeshComponent>}
      */
     constructor(assetManager, graphicsEngine) {
         super();
@@ -96,7 +96,7 @@ export class Foliage2System extends System {
          */
         this.renderLayer = null;
 
-        this.dependencies = [Foliage2];
+        this.dependencies = [InstancedMeshComponent];
 
         /**
          *
@@ -166,7 +166,7 @@ export class Foliage2System extends System {
 
     /**
      *
-     * @param {Foliage2} foliage
+     * @param {InstancedMeshComponent} foliage
      * @param entity
      */
     link(foliage, entity) {
@@ -181,7 +181,7 @@ export class Foliage2System extends System {
         for (let i = 0; i < layer_count; i++) {
             /**
              *
-             * @type {FoliageLayer}
+             * @type {InstancedMeshLayer}
              */
             const foliage_layer = layerList.get(i);
 

package/engine/ecs/foliage/ecs/InstancedMeshComponent.js

@@ -0,0 +1,37 @@
+import List from "../../../../core/collection/list/List.js";
+import { InstancedMeshLayer } from "./InstancedMeshLayer.js";
+
+
+export class InstancedMeshComponent {
+    constructor() {
+        /**
+         *
+         * @type {List<InstancedMeshLayer>}
+         * @readonly
+         */
+        this.layers = new List();
+    }
+
+    toJSON() {
+        return this.layers.toJSON();
+    }
+
+    fromJSON(data) {
+        this.layers.fromJSON(data, InstancedMeshLayer);
+    }
+
+    dispose() {
+
+        const layers = this.layers;
+        const n = layers.length;
+
+        for (let i = 0; i < n; i++) {
+            const layer = layers.get(i);
+
+            layer.dispose();
+        }
+    }
+}
+
+InstancedMeshComponent.typeName = "InstancedMeshComponent";
+

package/engine/ecs/foliage/ecs/{Foliage2.js → InstancedMeshLayer.js}

@@ -1,12 +1,11 @@
+import { InstancedFoliage } from "../InstancedFoliage.js";
 import ObservedString from "../../../../core/model/ObservedString.js";
-import List from "../../../../core/collection/list/List.js";
 import ObservedBoolean from "../../../../core/model/ObservedBoolean.js";
-import { InstancedFoliage } from "../InstancedFoliage.js";
+import { computeHashIntegerArray } from "../../../../core/collection/array/computeHashIntegerArray.js";
 import { Base64 } from "../../../../core/binary/Base64.js";
 import { BinaryBuffer } from "../../../../core/binary/BinaryBuffer.js";
-import { computeHashIntegerArray } from "../../../../core/collection/array/computeHashIntegerArray.js";
 
-export class FoliageLayer {
+export class InstancedMeshLayer {
     constructor() {
         /**
          *
@@ -22,12 +21,6 @@ export class FoliageLayer {
          */
         this.modelURL = new ObservedString("");
 
-        /**
-         * @deprecated
-         * @type {ObservedString}
-         */
-        this.dataURL = new ObservedString("");
-
         /**
          *
          * @type {ObservedBoolean}
@@ -123,38 +116,3 @@ export class FoliageLayer {
         this.data.deserialize(buffer);
     }
 }
-
-
-export class Foliage2 {
-    constructor() {
-        /**
-         *
-         * @type {List<FoliageLayer>}
-         * @readonly
-         */
-        this.layers = new List();
-    }
-
-    toJSON() {
-        return this.layers.toJSON();
-    }
-
-    fromJSON(data) {
-        this.layers.fromJSON(data, FoliageLayer);
-    }
-
-    dispose() {
-
-        const layers = this.layers;
-        const n = layers.length;
-
-        for (let i = 0; i < n; i++) {
-            const layer = layers.get(i);
-
-            layer.dispose();
-        }
-    }
-}
-
-Foliage2.typeName = "Foliage2";
-

package/engine/ecs/foliage/ecs/InstancedMeshSerializationAdapter.js

@@ -1,18 +1,19 @@
 import { BinaryClassSerializationAdapter } from "../../storage/binary/BinaryClassSerializationAdapter.js";
-import { Foliage2, FoliageLayer } from "./Foliage2.js";
+import { InstancedMeshComponent } from "./InstancedMeshComponent.js";
+import { InstancedMeshLayer } from "./InstancedMeshLayer.js";
 
 export class InstancedMeshSerializationAdapter extends BinaryClassSerializationAdapter {
     constructor() {
         super();
 
-        this.klass = Foliage2;
+        this.klass = InstancedMeshComponent;
         this.version = 0;
     }
 
     /**
      *
      * @param {BinaryBuffer} buffer
-     * @param {Foliage2} value
+     * @param {InstancedMeshComponent} value
      */
     serialize(buffer, value) {
         value.layers.toBinaryBuffer(buffer);
@@ -21,10 +22,10 @@ export class InstancedMeshSerializationAdapter extends BinaryClassSerializationA
     /**
      *
      * @param {BinaryBuffer} buffer
-     * @param {Foliage2} value
+     * @param {InstancedMeshComponent} value
      */
     deserialize(buffer, value) {
 
-        value.layers.fromBinaryBuffer(buffer, FoliageLayer);
+        value.layers.fromBinaryBuffer(buffer, InstancedMeshLayer);
     }
 }

package/engine/ecs/foliage/ecs/InstancedMeshUtils.js

@@ -2,13 +2,14 @@ import EntityBuilder from "../../EntityBuilder.js";
 import { loadFoliageLayer } from "./Foliage2System.js";
 import Mesh, { MeshFlags } from "../../../graphics/ecs/mesh/Mesh.js";
 import { Transform } from "../../transform/Transform.js";
-import { Foliage2, FoliageLayer } from "./Foliage2.js";
+import { InstancedMeshComponent } from "./InstancedMeshComponent.js";
 import { InstancedFoliage } from "../InstancedFoliage.js";
 import { buildTreeOptimizationTask } from "../../../../core/bvh2/BVHTasks.js";
 import Task from "../../../../core/process/task/Task.js";
 import TaskSignal from "../../../../core/process/task/TaskSignal.js";
 import { countTask, promiseTask } from "../../../../core/process/task/TaskUtils.js";
 import { assert } from "../../../../core/assert.js";
+import { InstancedMeshLayer } from "./InstancedMeshLayer.js";
 
 /**
  * Convert all existing instanced mesh components to individual Transform+Mesh pairs
@@ -23,7 +24,7 @@ export function convertInstancedMeshComponents2Entities(dataset, assetManager) {
 
     /**
      *
-     * @param {Foliage2} foliage2
+     * @param {InstancedMeshComponent} foliage2
      * @param entity
      */
     function visitFoliageEntities(foliage2, entity) {
@@ -59,11 +60,11 @@ export function convertInstancedMeshComponents2Entities(dataset, assetManager) {
         entitiesToStrip.push(entity);
     }
 
-    dataset.traverseEntities([Foliage2], visitFoliageEntities);
+    dataset.traverseEntities([InstancedMeshComponent], visitFoliageEntities);
 
     //remove converted foliage components
     entitiesToStrip.forEach(function (entity) {
-        dataset.removeComponentFromEntity(entity, Foliage2);
+        dataset.removeComponentFromEntity(entity, InstancedMeshComponent);
     });
 }
 
@@ -125,7 +126,7 @@ export function optimizeIndividualMeshesEntitiesToInstances(dataset, threshold =
 
     const tasks = [];
 
-    const foliage2 = new Foliage2();
+    const foliage2 = new InstancedMeshComponent();
 
     const tBuild = new Task({
         name: "Build Meshes",
@@ -213,7 +214,7 @@ export function optimizeIndividualMeshesEntitiesToInstances(dataset, threshold =
             cycleFunction: function () {
 
                 //create foliage layer
-                const layer = new FoliageLayer();
+                const layer = new InstancedMeshLayer();
 
                 layer.data = instancedFoliage;
                 layer.modelURL.set(modelURL);

package/engine/ecs/storage/binary/BinarySerializationRegistry.js

@@ -37,7 +37,7 @@ export class BinarySerializationRegistry {
      * @returns {boolean}
      */
     registerAdapter(adapter, className) {
-        assert.notEqual(adapter, undefined, 'adapter is undefined');
+        assert.defined(adapter, 'adapter');
         assert.ok(adapter.isBinaryClassSerializationAdapter, 'adapter is not a BinaryClassSerializationAdapter');
 
         if (className === undefined) {

package/engine/ecs/terrain/ecs/layers/TerrainLayer.js

@@ -5,6 +5,7 @@ import { Cache } from "../../../../../core/cache/Cache.js";
 import { computeUTF8StringByteSize } from "../../../../../core/primitives/strings/StringUtils.js";
 import Signal from "../../../../../core/events/signal/Signal.js";
 import { computeStringHash } from "../../../../../core/primitives/strings/computeStringHash.js";
+import { copy_Sampler2D_channel_data } from "../../../../graphics/texture/sampler/copy_Sampler2D_channel_data.js";
 
 /**
  *
@@ -107,33 +108,28 @@ export class TerrainLayer {
             .then(assert => {
                 const image = assert.create();
 
-                const s = image.width * image.height;
+                const source_item_size = image.itemSize;
 
-                const data = image.data;
+                const source_data = image.data;
+
+                // RGB
+                const destination_item_size = 3;
 
                 if (this.diffuse === null || this.diffuse.width !== image.width || this.diffuse.height !== image.height) {
                     // loaded image does not match the side of the layer
-                    this.diffuse = Sampler2D.uint8(3, image.width, image.height);
+                    this.diffuse = Sampler2D.uint8(destination_item_size, image.width, image.height);
                 }
 
-                const layerData = this.diffuse.data;
-
-                // copy RGBA image data into the layer's RGB data
+                const source = new Sampler2D(source_data,source_item_size,image.width, image.height);
 
-                for (let i = 0; i < s; i++) {
-                    const a4 = i * 4;
-                    const a3 = i * 3;
-
-                    layerData[a3] = data[a4];
-                    layerData[a3 + 1] = data[a4 + 1];
-                    layerData[a3 + 2] = data[a4 + 2];
-                }
+                copy_Sampler2D_channel_data(source,this.diffuse);
 
                 this.onChanged.send0();
 
-                const cacheCopy = Sampler2D.uint8(3, image.width, image.height);
+                // write to cache
+                const cacheCopy = Sampler2D.uint8(destination_item_size, image.width, image.height);
 
-                cacheCopy.data.set(layerData);
+                cacheCopy.data.set(this.diffuse.data);
 
                 cache.put(path, cacheCopy);
 

package/engine/graphics/geometry/instancing/InstancedMeshGroup.js

@@ -9,6 +9,7 @@ import ThreeFactory from "../../three/ThreeFactory.js";
 import { StaticMaterialCache } from "../../../asset/loaders/material/StaticMaterialCache.js";
 import { composeCompile } from "../../material/composeCompile.js";
 import { typed_array_copy } from "../../../../core/collection/array/typed/typed_array_copy.js";
+import { rewriteMaterial } from "./rewriteMaterial.js";
 
 /**
  *
@@ -94,77 +95,6 @@ InstancedMeshGroup.prototype.setGeometry = function (geometry) {
 };
 
 
-const SHADER_PREAMBLE = `
-    attribute vec3 instancePosition;
-    attribute vec4 instanceRotation;
-    attribute vec3 instanceScale;
-    
-    vec3 instanceTransform( in vec3 position, vec3 T, vec4 R, vec3 S ){
-        vec3 result = position;
-        
-        //applies the scale
-        result *= S;
-        //computes the rotation where R is a (vec4) quaternion
-        result += 2.0 * cross( R.xyz, cross( R.xyz, result ) + R.w * result );
-        //translates the transformed 'blueprint'
-        result += T;
-        
-        return result;
-    }
-    
-    mat4 getInstanceMatrix(){
-      vec4 q = instanceRotation;
-      vec3 s = instanceScale;
-      vec3 v = instancePosition;
-
-      vec3 q2 = q.xyz + q.xyz;
-      vec3 a = q.xxx * q2.xyz;
-      vec3 b = q.yyz * q2.yzz;
-      vec3 c = q.www * q2.xyz;
-    
-      vec3 r0 = vec3( 1.0 - (b.x + b.z) , a.y + c.z , a.z - c.y ) * s.xxx;
-      vec3 r1 = vec3( a.y - c.z , 1.0 - (a.x + b.z) , b.y + c.x ) * s.yyy;
-      vec3 r2 = vec3( a.z + c.y , b.y - c.x , 1.0 - (a.x + b.x) ) * s.zzz;
-    
-      return mat4(
-          r0 , 0.0,
-          r1 , 0.0,
-          r2 , 0.0,
-          v  , 1.0
-      );
-    }\n`;
-
-function rewriteMaterial(shader) {
-    const originalVertexShader = shader.vertexShader;
-
-    const newVertexShader = SHADER_PREAMBLE
-        + originalVertexShader
-            .replace(
-                '#include <uv_vertex>',
-                `
-                mat4 instanceMatrix = getInstanceMatrix();
-                #include <uv_vertex>
-                `
-            )
-            .replace(
-                '#include <begin_vertex>',
-                `
-                vec3 transformed = ( instanceMatrix * vec4(position,1.0) ).xyz;
-                `
-            )
-            .replace(
-                '#include <beginnormal_vertex>',
-                `
-                vec3 objectNormal = mat3( instanceMatrix ) * vec3( normal );
-                #ifdef USE_TANGENT
-                    vec3 objectTangent = vec3( tangent.xyz );
-                #endif
-                `
-            );
-
-    shader.vertexShader = newVertexShader;
-}
-
 /**
  *
  * @param {THREE.Material} sourceMaterial
@@ -332,7 +262,19 @@ InstancedMeshGroup.prototype.add = function (reference) {
  * @param {*} [thisArg]
  */
 InstancedMeshGroup.prototype.traverseReferences = function (visitor, thisArg) {
-    this.indices.forEach(visitor, thisArg);
+    const indices = this.indices;
+    const index_count = indices.length;
+
+    for (let i = 0; i < index_count; i++) {
+        const index = indices[i];
+
+        if (index === undefined) {
+            // unoccupied
+            continue;
+        }
+
+        visitor.call(thisArg, index, i);
+    }
 };
 
 /**

package/engine/graphics/geometry/instancing/rewriteMaterial.js

@@ -0,0 +1,70 @@
+const SHADER_PREAMBLE = `
+    attribute vec3 instancePosition;
+    attribute vec4 instanceRotation;
+    attribute vec3 instanceScale;
+    
+    vec3 instanceTransform( in vec3 position, vec3 T, vec4 R, vec3 S ){
+        vec3 result = position;
+        
+        //applies the scale
+        result *= S;
+        //computes the rotation where R is a (vec4) quaternion
+        result += 2.0 * cross( R.xyz, cross( R.xyz, result ) + R.w * result );
+        //translates the transformed 'blueprint'
+        result += T;
+        
+        return result;
+    }
+    
+    mat4 getInstanceMatrix(){
+      vec4 q = instanceRotation;
+      vec3 s = instanceScale;
+      vec3 v = instancePosition;
+
+      vec3 q2 = q.xyz + q.xyz;
+      vec3 a = q.xxx * q2.xyz;
+      vec3 b = q.yyz * q2.yzz;
+      vec3 c = q.www * q2.xyz;
+    
+      vec3 r0 = vec3( 1.0 - (b.x + b.z) , a.y + c.z , a.z - c.y ) * s.xxx;
+      vec3 r1 = vec3( a.y - c.z , 1.0 - (a.x + b.z) , b.y + c.x ) * s.yyy;
+      vec3 r2 = vec3( a.z + c.y , b.y - c.x , 1.0 - (a.x + b.x) ) * s.zzz;
+    
+      return mat4(
+          r0 , 0.0,
+          r1 , 0.0,
+          r2 , 0.0,
+          v  , 1.0
+      );
+    }\n`;
+
+export function rewriteMaterial(shader) {
+    const originalVertexShader = shader.vertexShader;
+
+    const newVertexShader = SHADER_PREAMBLE
+        + originalVertexShader
+            .replace(
+                '#include <uv_vertex>',
+                `
+                mat4 instanceMatrix = getInstanceMatrix();
+                #include <uv_vertex>
+                `
+            )
+            .replace(
+                '#include <begin_vertex>',
+                `
+                vec3 transformed = ( instanceMatrix * vec4(position,1.0) ).xyz;
+                `
+            )
+            .replace(
+                '#include <beginnormal_vertex>',
+                `
+                vec3 objectNormal = mat3( instanceMatrix ) * vec3( normal );
+                #ifdef USE_TANGENT
+                    vec3 objectTangent = vec3( tangent.xyz );
+                #endif
+                `
+            );
+
+    shader.vertexShader = newVertexShader;
+}

package/engine/graphics/material/manager/MaterialManager.js

@@ -14,7 +14,8 @@ export class MaterialManager {
          */
         this.__library = new HashMap({
             keyHashFunction: computeMaterialHash,
-            keyEqualityFunction: computeMaterialEquality
+            keyEqualityFunction: computeMaterialEquality,
+            capacity: 1024
         });
 
         /**

package/engine/graphics/micron/render/instanced/AttributeDataTexture.js

@@ -237,8 +237,8 @@ export class AttributeDataTexture {
     /**
      *
      * @param {number} slot
-     * @param {number[]} indices
-     * @param {number[]} source
+     * @param {number[]} indices triangle indices (index buffer)
+     * @param {number[]} source vertex data
      */
     write_slot_from_indexed(slot, indices, source) {
         assert.isNonNegativeInteger(slot, 'index');
@@ -289,8 +289,10 @@ export class AttributeDataTexture {
         const start_index = slot_size * index;
         const end_index = slot_size * (index + 1);
 
-        this.__texture.image.data.fill(0, start_index, end_index);
-        this.__texture.needsUpdate = true;
+        const texture = this.__texture;
+
+        texture.image.data.fill(0, start_index, end_index);
+        texture.needsUpdate = true;
     }
 
     /**

package/engine/graphics/micron/render/instanced/ThreeInstancedAdapter.js

@@ -11,7 +11,6 @@ import Signal from "../../../../../core/events/signal/Signal.js";
 import { ATTRIBUTE_NAME_ADDRESS, ATTRIBUTE_NAME_TRANSFORM } from "./shader/constants.js";
 import { shader_rewrite_standard } from "./shader/shader_rewrite_standard.js";
 
-
 export class ThreeInstancedAdapter {
     /**
      *
@@ -79,7 +78,6 @@ export class ThreeInstancedAdapter {
         const position_buffer = new BufferAttribute(new Uint8Array(MICRON_PATCH_SIZE_MAX * 3 * 3), 3, false);
 
 
-
         position_buffer.setUsage(StaticReadUsage);
 
         geo.setAttribute('position', position_buffer);

package/engine/graphics/particles/particular/engine/shader/ShaderManager.js

@@ -192,8 +192,7 @@ export class ShaderManager {
             }
         };
 
-        // debugAtlas(this.parameterSheet.atlas, { scale: new Vector2(16, 16) });
-        // debugAtlas(this.spriteAtlas.atlas, { scale: new Vector2(0.5, 0.5) });
+        // debugAtlas(this.spriteAtlas.atlas, { scale: new Vector2(1, 1) });
     }
 
     /**

package/engine/graphics/particles/particular/engine/shader/debugAtlas.js

@@ -5,7 +5,7 @@ import { TextureAtlasDebugger } from "../../../../texture/atlas/TextureAtlasDebu
  * @param {TextureAtlas} atlas
  * @param {*} options
  */
-function debugAtlas(atlas, options) {
+export function debugAtlas(atlas, options) {
 
     const spriteAtlasDebugger = new TextureAtlasDebugger(atlas, options);
 

package/engine/graphics/particles/particular/engine/utils/volume/prototypeParticleVolume.js

@@ -77,6 +77,7 @@ import ButtonView from "../../../../../../../view/elements/button/ButtonView.js"
 import { UnitSphereShape3D } from "../../../../../../../core/geom/3d/shape/UnitSphereShape3D.js";
 import TopDownCameraController from "../../../../../ecs/camera/topdown/TopDownCameraController.js";
 import { randomFloatBetween } from "../../../../../../../core/math/random/randomFloatBetween.js";
+import { MicronRenderPlugin } from "../../../../../micron/plugin/MicronRenderPlugin.js";
 
 const engineHarness = new EngineHarness();
 
@@ -130,7 +131,7 @@ function makeConfig(engine) {
 
 
     // Plugins
-    // config.addPlugin(MicronRenderPlugin);
+    config.addPlugin(MicronRenderPlugin);
 
 
     // Knowledge
@@ -306,6 +307,7 @@ async function sample_scene_0(engine) {
 
     // load_model('moicon/06_04_hapro/00-environment/model.gltf', -0.1);
     load_model_s('moicon/06_04_hapro/05-ground-floor/model.gltf');
+    load_model_s('C:/git/moh/app/moicon/06_04_hapro/08-clickable-assets-new/model.gltf');
     // load_model('moicon/06_04_hapro/02-bearers/model.gltf');
     // load_model('moicon/06_04_hapro/04-1st-floor/model.gltf');
 
@@ -607,7 +609,8 @@ async function main(engine) {
 
     engine.graphics.renderer.setClearColor('rgba(99,99,99,1)');
 
-    await sample_scene_nam(engine);
+    // await sample_scene_nam(engine);
+    await sample_scene_0(engine);
 }
 
 /**

package/engine/graphics/render/buffer/simple-fx/ao/AmbientOcclusionPostProcessEffect.js

@@ -1,4 +1,3 @@
-import { max2 } from "../../../../../../core/math/max2.js";
 import { EnginePlugin } from "../../../../../plugin/EnginePlugin.js";
 import {
     LinearFilter,
@@ -161,9 +160,9 @@ export class AmbientOcclusionPostProcessEffect extends EnginePlugin {
         uniforms.bias.value = 0.5;
         uniforms.intensity.value = 0.18;
 
-        const depth_range = far - near;
-
-        uniforms.scale.value = 5 * max2(1, depth_range / 30);
+        // scale is divided by camera far in the shader, we unbias it here
+        // TODO remove this term from the shader
+        uniforms.scale.value = far * 0.25;
 
         uniforms.kernelRadius.value = 30;
         uniforms.minResolution.value = 0;

package/engine/graphics/render/forward_plus/materials/FPlusDebugMaterial.js

@@ -36,7 +36,7 @@ const f_shader = `
     
     uniform sampler2D t_heatmap_lookup;
     
-    uniform vec2 resolution;
+    uniform vec2 fp_resolution;
     
     uniform mat4 projectionMatrix;
     
@@ -79,7 +79,7 @@ const f_shader = `
     
     void main(){
     
-            vec3 clip_v = vec3(gl_FragCoord.xy / resolution, convert_depth_to_linear( gl_FragCoord.z));
+            vec3 clip_v = vec3(gl_FragCoord.xy / fp_resolution, convert_depth_to_linear( gl_FragCoord.z));
        
             ivec3 v3_cluster_resolution = textureSize(fp_t_light_tiles, 0);
             ivec3 v3_cluster_position = ivec3( ( 1.0 - clip_v.x) * float(v3_cluster_resolution.x), clip_v.y*float(v3_cluster_resolution.y), (clip_v.z)*float(v3_cluster_resolution.z) );
@@ -119,7 +119,7 @@ export class FPlusDebugMaterial extends ShaderMaterial {
                     type: 'f',
                     value: 0
                 },
-                resolution: {
+                fp_resolution: {
                     type: 'v2',
                     value: new Vector2()
                 },

package/engine/graphics/render/forward_plus/materials/ForwardPlusThreeMaterial.js

@@ -29,7 +29,7 @@ export class ForwardPlusThreeMaterial extends ShaderMaterial {
                     type: 'f',
                     value: 0
                 },
-                resolution: {
+                fp_resolution: {
                     type: 'v2',
                     value: new Vector2()
                 }