Skip to content

Fix particle system with unlit mesh emitter #7795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
liamdon wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix particle system with unlit mesh emitter #7795

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e2c6c0
Fix particle system with unlit mesh emitter
liamdon Jun 24, 2025
bfcc2ed
Fix typo
liamdon Jun 24, 2025
b1f0b7d
Merge branch 'main' into particleEmitterUnlitMesh
liamdon May 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/scene/particle-system/particle-material.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ class ParticleMaterial extends Material {
defines: ShaderUtils.getCoreDefines(this, params),
pass: SHADER_FORWARD,
useCpu: this.emitter.useCpu,
normal: emitter.lighting ? ((emitter.normalMap !== null) ? 2 : 1) : 0,
lighting: emitter.lighting,
Comment thread
mvaligursky marked this conversation as resolved.
normal: emitter.lighting ? ((emitter.normalMap !== null) ? 2 : 1) : (this.emitter.useMesh ? 1 : 0),
halflambert: this.emitter.halfLambert,
stretch: this.emitter.stretch,
alignToMotion: this.emitter.alignToMotion,
Expand Down
2 changes: 1 addition & 1 deletion src/scene/shader-lib/glsl/chunks/particle/frag/particle-shader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default /* glsl */`
#include "particle_normalMapPS"
#endif

#if NORMAL != NONE
#if LIGHTING && NORMAL != NONE
#ifdef HALF_LAMBERT
#include "particle_halflambertPS"
#else
Expand Down
1 change: 1 addition & 0 deletions src/scene/shader-lib/programs/particle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class ShaderGeneratorParticle extends ShaderGenerator {
const fDefines = new Map(options.defines);

if (options.soft > 0) fDefines.set('SOFT', '');
if (options.lighting) fDefines.set('LIGHTING', '');
if (options.halflambert) fDefines.set('HALF_LAMBERT', '');

fDefines.set('NORMAL', normalTypeNames[options.normal]);
Expand Down
2 changes: 1 addition & 1 deletion src/scene/shader-lib/wgsl/chunks/particle/frag/particle-shader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export default /* wgsl */`
#include "particle_normalMapPS"
#endif

#if NORMAL != NONE
#if LIGHTING && NORMAL != NONE
#ifdef HALF_LAMBERT
#include "particle_halflambertPS"
#else
Expand Down