10000 Fix texture sheet and gravity bug by GuoLei1990 · Pull Request #2422 · galacean/engine · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix texture sheet and gravity bug #2422

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

Merged
merged 1 commit into from
Nov 5, 2024
Merged

Fix texture sheet and gravity bug #2422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions packages/core/src/particle/ParticleGenerator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { SetDataOptions } from "../graphic/enums/SetDataOptions";
import { VertexAttribute } from "../mesh";
import { ShaderData } from "../shader";
import { Buffer } from "./../graphic/Buffer";
import { ParticleBufferUtils } from "./ParticleBufferUtils";
import { ParticleRenderer, ParticleUpdateFlags } from "./ParticleRenderer";
import { ParticleCurveMode } from "./enums/ParticleCurveMode";
import { ParticleGradientMode } from "./enums/ParticleGradientMode";
Expand All @@ -23,12 +24,11 @@ import { ParticleStopMode } from "./enums/ParticleStopMode";
import { ColorOverLifetimeModule } from "./modules/ColorOverLifetimeModule";
import { EmissionModule } from "./modules/EmissionModule";
import { MainModule } from "./modules/MainModule";
import { ParticleCompositeCurve } from "./modules/ParticleCompositeCurve";
import { RotationOverLifetimeModule } from "./modules/RotationOverLifetimeModule";
import { SizeOverLifetimeModule } from "./modules/SizeOverLifetimeModule";
import { TextureSheetAnimationModule } from "./modules/TextureSheetAnimationModule";
import { VelocityOverLifetimeModule } from "./modules/VelocityOverLifetimeModule";
import { ParticleBufferUtils } from "./ParticleBufferUtils";
import { ParticleCompositeCurve } from "./modules/ParticleCompositeCurve";

/**
* Particle Generator.
Expand Down Expand Up @@ -758,8 +758,16 @@ export class ParticleGenerator {
// Start speed
instanceVertices[offset + 18] = startSpeed;

// Unused, Color, size, rotation,
// instanceVertices[offset + 19] = rand.random();
// Gravity, unused, size, rotation
switch (main.gravityModifier.mode) {
case ParticleCurveMode.Constant:
instanceVertices[offset + 19] = main.gravityModifier.constant;
break;
case ParticleCurveMode.TwoConstants:
instanceVertices[offset + 19] = main.gravityModifier.evaluate(undefined, main._gravityModifierRand.random());
break;
}
Comment on lines +762 to +769
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Handle all possible ParticleCurveMode cases or add a default case

The switch statement currently handles only ParticleCurveMode.Constant and ParticleCurveMode.TwoConstants. Other possible modes like ParticleCurveMode.Curve and ParticleCurveMode.TwoCurves are not handled, which may result in gravity not being applied correctly when these modes are used.

Consider adding cases for the missing modes or a default case to ensure that all possible ParticleCurveMode values are handled. Here's a suggested update:

 switch (main.gravityModifier.mode) {
   case ParticleCurveMode.Constant:
     instanceVertices[offset + 19] = main.gravityModifier.constant;
     break;
   case ParticleCurveMode.TwoConstants:
     instanceVertices[offset + 19] = main.gravityModifier.evaluate(undefined, main._gravityModifierRand.random());
     break;
+  case ParticleCurveMode.Curve:
+    instanceVertices[offset + 19] = main.gravityModifier.evaluate(0, main._gravityModifierRand.random());
+    break;
+  case ParticleCurveMode.TwoCurves:
+    instanceVertices[offset + 19] = main.gravityModifier.evaluate(0, main._gravityModifierRand.random());
+    break;
+  default:
+    instanceVertices[offset + 19] = 0;
+    break;
 }
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
8000
switch (main.gravityModifier.mode) {
case ParticleCurveMode.Constant:
instanceVertices[offset + 19] = main.gravityModifier.constant;
break;
case ParticleCurveMode.TwoConstants:
instanceVertices[offset + 19] = main.gravityModifier.evaluate(undefined, main._gravityModifierRand.random());
break;
}
switch (main.gravityModifier.mode) {
case ParticleCurveMode.Constant:
instanceVertices[offset + 19] = main.gravityModifier.constant;
break;
case ParticleCurveMode.TwoConstants:
instanceVertices[offset + 19] = main.gravityModifier.evaluate(undefined, main._gravityModifierRand.random());
break;
case ParticleCurveMode.Curve:
instanceVertices[offset + 19] = main.gravityModifier.evaluate(0, main._gravityModifierRand.random());
break;
case ParticleCurveMode.TwoCurves:
instanceVertices[offset + 19] = main.gravityModifier.evaluate(0, main._gravityModifierRand.random());
break;
default:
instanceVertices[offset + 19] = 0;
break;
}


const colorOverLifetime = this.colorOverLifetime;
if (colorOverLifetime.enabled && colorOverLifetime.color.mode === ParticleGradientMode.TwoGradients) {
instanceVertices[offset + 20] = colorOverLifetime._colorGradientRand.random();
Expand Down
10 changes: 2 additions & 8 deletions packages/core/src/particle/modules/MainModule.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Color, Rand, Vector3, Vector4 } from "@galacean/engine-math";
import { TransformModifyFlags } from "../../Transform";
import { deepClone, ignoreClone } from "../../clone/CloneManager";
import { ICustomClone } from "../../clone/ComponentCloner";
import { ShaderData } from "../../shader/ShaderData";
Expand All @@ -9,7 +10,6 @@ import { ParticleScaleMode } from "../enums/ParticleScaleMode";
import { ParticleSimulationSpace } from "../enums/ParticleSimulationSpace";
import { ParticleCompositeCurve } from "./ParticleCompositeCurve";
import { ParticleCompositeGradient } from "./ParticleCompositeGradient";
import { TransformModifyFlags } from "../../Transform";

export class MainModule implements ICustomClone {
private static _tempVector40 = new Vector4();
Expand Down Expand Up @@ -96,8 +96,6 @@ export class MainModule implements ICustomClone {
private _simulationSpace = ParticleSimulationSpace.Local;
@ignoreClone
private _generator: ParticleGenerator;
@ignoreClone
private _gravity = new Vector3();

/**
* The initial lifetime of particles when emitted.
Expand Down Expand Up @@ -322,11 +320,7 @@ export class MainModule implements ICustomClone {
break;
}

const particleGravity = this._gravity;
const gravityModifierValue = this.gravityModifier.evaluate(undefined, this._gravityModifierRand.random());
Vector3.scale(renderer.scene.physics.gravity, gravityModifierValue, particleGravity);

shaderData.setVector3(MainModule._gravity, particleGravity);
shaderData.setVector3(MainModule._gravity, renderer.scene.physics.gravity);
shaderData.setInt(MainModule._simulationSpace, this.simulationSpace);
shaderData.setFloat(MainModule._startRotation3D, +this.startRotation3D);
shaderData.setInt(MainModule._scaleMode, this.scalingMode);
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/shaderlib/extra/particle.vs.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ void main() {
lifeVelocity = computeParticleLifeVelocity(normalizedAge);
#endif

vec3 gravityVelocity = renderer_Gravity * age;
vec3 gravityVelocity = renderer_Gravity * a_Random0.x * age;

vec4 worldRotation;
if (renderer_SimulationSpace == 0) {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/shaderlib/particle/texture_sheet_animation_module.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ vec2 computeParticleUV(in vec2 uv, in float normalizedAge) {
float frame = floor(normalizedFrame * renderer_TSATillingParams.z);

float tileRow = frame * renderer_TSATillingParams.x;
float floorTotalULength = floor(tileRow);
float tileRowIndex = floor(tileRow);
uv.x += tileRow - tileRowIndex;
uv.y += tileRowIndex * renderer_TSATillingParams.y;
#endif
Expand Down
Loading
0