3D engine that AI agents drive
Merge origin/main into feat/vegetation-impostors
Nguyen Xuan An5d04c01b2e16
diff --cc src/renderer.jsindex b9338362,7a62f43c..3d11135b--- a/src/renderer.js+++ b/src/renderer.js@@@ -1943,8 -1854,7 +1856,7 @@@ export class Renderer67const uniforms = this.depthAlphaUniforms;context.uniform1f(uniforms.alphaMasked, masked ? 1 : 0);context.uniform1f(uniforms.alphaCutoff, batch.alphaCutoff);- // A fading level still casts its whole shadow.- context.uniform1f(uniforms.materialOpacity, batch.opacity);+ context.uniform1f(uniforms.materialOpacity, dithered ? 1 : batch.opacity);context.uniform1f(uniforms.hasBaseMap, batch.mapState[0] ? 1 : 0);if (masked) {context.activeTexture(context.TEXTURE0 + 1);@@@ -1952,7 -1862,8 +1864,8 @@@}return;}+ this.applyDepthLayer(batch.depthLayer);- const useCoverage = masked && this.samples > 1 && !this.benchmark && !this.renderingPass;+ const useCoverage = batch.alphaMode === 'mask' && this.samples > 1 && !this.benchmark && !this.renderingPass;if (useCoverage) {context.enable(context.SAMPLE_ALPHA_TO_COVERAGE);} else {diff --cc src/shaders.jsindex 0dde58b0,fa244cc8..cd6d6378--- a/src/shaders.js+++ b/src/shaders.js@@@ -1,8 -1,6 +1,7 @@@import { MAX_MORPH_TARGETS } from './morph.js';import { MAX_POINT_LIGHTS, MAX_SPOT_LIGHTS, MAX_AREA_LIGHTS } from './light-limits.js';- import { environmentLookupGlsl, environmentShadingGlsl } from './environment.js';- import { splatGlsl } from './splat-shader.js';+ import { environmentLookupGlsl, environmentShadingGlsl } from './environment-shading.js';+import { impostorGlsl } from './impostor-slots.js';const morphingShader = `uniform float morphEnabled;@@@ -127,16 -135,16 +136,17 @@@ flat out float instanceOrdinalout vec3 boxPosition;out vec3 boxNormal;flat out mat3 boxNormalMatrix;- ${skinningShader}+ ${skinningShader()}${morphingShader}${windShader}+${impostorGlsl.declarations}void main() {- vec2 uv = uvSets.xy;- mat4 deformation = USES_SKIN ? skinTransform() : mat4(1.0);+ // A crowd batch reads its joints and weights from the UV and colour attributes, which then carry no texture or tint.+ vec2 uv = USES_CROWD ? vec2(-1.0) : uvSets.xy;+ mat4 deformation = USES_CROWD ? crowdTransform() : (USES_SKIN ? skinTransform() : mat4(1.0));vec4 world = instanceMatrix * deformation * vec4(USES_MORPH ? morphedPosition(position) : position, 1.0);- ${impostorGlsl.colorHook} world.xyz += assemblyOffset * assemblyAmount + assemblyDetailOffset * smoothstep(0.3, 1.0, assemblyAmount);- if (USES_WIND) world.xyz += windOffset(position, world.xyz, uv, instanceSurface.w, time, wind);+ world.xyz += USES_CROWD ? vec3(0.0) : assemblyOffset * assemblyAmount + assemblyDetailOffset * smoothstep(0.3, 1.0, assemblyAmount);- if (USES_WIND) world.xyz += windOffset(position, world.xyz, uv, instanceSurface.w, time, wind);++${impostorGlsl.colorHook} if (USES_WIND) world.xyz += windOffset(position, world.xyz, uv, instanceSurface.w, time, wind);if (USES_WAVES && instanceSurface.w == 3.0) {world.y += sin(world.x * 1.4 + time * 0.8) * 0.025 + sin(world.z * 1.8 - time) * 0.02;}@@@ -145,9 -153,9 +155,9 @@@}worldPosition = world.xyz;vec3 localNormal = USES_MORPH ? morphedNormal(normal) : normal;- vec3 deformedNormal = USES_SKIN ? transpose(inverse(mat3(deformation))) * localNormal : localNormal;+ vec3 deformedNormal = (USES_SKIN || USES_CROWD) ? transpose(inverse(mat3(deformation))) * localNormal : localNormal;worldNormal = normalize(instanceNormal * deformedNormal);- // Metres along the object's own axes, so a pattern follows a moving node and is not stretched by its scale.+${impostorGlsl.normalHook} // Metres along the object's own axes, so a pattern follows a moving node and is not stretched by its scale.boxPosition = (USES_MORPH ? morphedPosition(position) : position) * vec3(length(instanceMatrix[0].xyz), length(instanceMatrix[1].xyz), length(instanceMatrix[2].xyz));boxNormal = deformedNormal;boxNormalMatrix = instanceNormal;@@@ -178,17 -189,16 +191,18 @@@ uniform float assemblyAmountuniform float time;uniform float wind;out vec2 textureUV;- ${skinningShader}+ ${skinningShader()}${morphingShader}${windShader}+${impostorGlsl.declarations}void main() {- vec4 world = instanceMatrix * skinTransform() * vec4(morphedPosition(position), 1.0);- world.xyz += assemblyOffset * assemblyAmount + assemblyDetailOffset * smoothstep(0.3, 1.0, assemblyAmount);+ vec2 uv = USES_CROWD ? vec2(-1.0) : uvSets.xy;+ vec4 world = instanceMatrix * (USES_CROWD ? crowdTransform() : skinTransform()) * vec4(morphedPosition(position), 1.0);+ world.xyz += USES_CROWD ? vec3(0.0) : assemblyOffset * assemblyAmount + assemblyDetailOffset * smoothstep(0.3, 1.0, assemblyAmount);// Same displacement as the colour pass, so shadows follow the swaying leaves.world.xyz += windOffset(position, world.xyz, uv, instanceSurface.w, time, wind);- textureUV = uv;+ vec2 shadowUv = uv;+${impostorGlsl.depthHook} textureUV = shadowUv;gl_Position = lightProjection * world;}`;}@@@ -1019,7 -887,7 +899,7 @@@ export const LIGHT_SHADING_MAXIMUM_SAMPexport const ENVIRONMENT_FEATURES =Object.freeze(['environmentMap', 'studioLighting']);// Features that only the vertex shader reads: a part with a skeleton or morph targets.- const VERTEX_ONLY_FEATURES = Object.freeze(['skin', 'morph', 'impostor']);-const VERTEX_ONLY_FEATURES = Object.freeze(['skin', 'morph', 'crowd']);++const VERTEX_ONLY_FEATURES = Object.freeze(['skin', 'morph', 'crowd', 'impostor']);function environmentCondition(enabled) {const hasMap = enabled.has('environmentMap');@@@ -1066,8 -986,8 +998,9 @@@ function vertexDefinitions(enabled)const condition = (active, expression) => (active ? `(${expression})` : 'false');return [`#define USES_SKIN ${condition(enabled.has('skin'), 'skinEnabled > 0.5')}`,+ `#define USES_CROWD ${condition(enabled.has('crowd'), 'crowdEnabled > 0.5')}`,`#define USES_MORPH ${condition(enabled.has('morph'), 'morphEnabled > 0.5')}`,+ `#define USES_IMPOSTOR ${condition(enabled.has('impostor') && impostorGlsl.colorHook !== '', 'true')}`,`#define USES_WIND ${condition(enabled.has('foliage') || enabled.has('grass'), 'true')}`,`#define USES_WAVES ${condition(enabled.has('water'), 'true')}`,`#define USES_EXPLOSION ${condition(enabled.has('fire') || enabled.has('smoke'), 'true')}`,