diff --git a/packages/frontend/src/world/engine.ts b/packages/frontend/src/world/engine.ts index 663134e8cb..8658f0a7ae 100644 --- a/packages/frontend/src/world/engine.ts +++ b/packages/frontend/src/world/engine.ts @@ -570,8 +570,8 @@ export class WorldEngine extends EventEmitter { ps.isLocal = true; ps.minEmitBox = new BABYLON.Vector3(cm(-1000), 0, cm(-1000)); ps.maxEmitBox = new BABYLON.Vector3(cm(1000), 0, cm(1000)); - ps.minEmitPower = 100; - ps.maxEmitPower = 500; + ps.minEmitPower = cm(100); + ps.maxEmitPower = cm(500); ps.minLifeTime = 30; ps.maxLifeTime = 30; ps.minSize = cm(30); diff --git a/packages/frontend/src/world/room/engine.ts b/packages/frontend/src/world/room/engine.ts index f7d5056c70..03a39c9314 100644 --- a/packages/frontend/src/world/room/engine.ts +++ b/packages/frontend/src/world/room/engine.ts @@ -362,8 +362,8 @@ export class RoomEngine extends EventEmitter { this.putParticleSystem.createCylinderEmitter(cm(5), cm(1), cm(5)); this.putParticleSystem.minEmitBox = new BABYLON.Vector3(cm(-3), 0, cm(-3)); this.putParticleSystem.maxEmitBox = new BABYLON.Vector3(cm(3), 0, cm(3)); - this.putParticleSystem.minEmitPower = 700; - this.putParticleSystem.maxEmitPower = 1000; + this.putParticleSystem.minEmitPower = cm(700); + this.putParticleSystem.maxEmitPower = cm(1000); this.putParticleSystem.addVelocityGradient(0, 1); this.putParticleSystem.addVelocityGradient(1, 0); this.putParticleSystem.minLifeTime = 0.2; diff --git a/packages/frontend/src/world/room/objects/aquarium.ts b/packages/frontend/src/world/room/objects/aquarium.ts index 702d1c6e03..9114f6105c 100644 --- a/packages/frontend/src/world/room/objects/aquarium.ts +++ b/packages/frontend/src/world/room/objects/aquarium.ts @@ -34,8 +34,8 @@ export const aquarium = defineObject({ ps.isLocal = true; ps.minEmitBox = new BABYLON.Vector3(cm(-2), 0, cm(-2)); ps.maxEmitBox = new BABYLON.Vector3(cm(2), 0, cm(2)); - ps.minEmitPower = 40; - ps.maxEmitPower = 60; + ps.minEmitPower = cm(40); + ps.maxEmitPower = cm(60); ps.minLifeTime = 0.5; ps.maxLifeTime = 0.5; ps.minSize = cm(0.1); diff --git a/packages/frontend/src/world/room/objects/lavaLamp.ts b/packages/frontend/src/world/room/objects/lavaLamp.ts index ddc619ed0e..26d143872e 100644 --- a/packages/frontend/src/world/room/objects/lavaLamp.ts +++ b/packages/frontend/src/world/room/objects/lavaLamp.ts @@ -52,18 +52,18 @@ export const lavaLamp = defineObject({ ps.isLocal = true; ps.minEmitBox = new BABYLON.Vector3(cm(-1), 0, cm(-1)); ps.maxEmitBox = new BABYLON.Vector3(cm(1), 0, cm(1)); - ps.minEmitPower = 2; - ps.maxEmitPower = 3; - ps.minLifeTime = 9; - ps.maxLifeTime = 9; + ps.minEmitPower = cm(2); + ps.maxEmitPower = cm(3); + ps.minLifeTime = 10; + ps.maxLifeTime = 10; ps.minSize = cm(0.5); - ps.maxSize = cm(1); + ps.maxSize = cm(1.25); ps.direction1 = new BABYLON.Vector3(0, 1, 0); ps.direction2 = new BABYLON.Vector3(0, 1, 0); ps.emitRate = 1; ps.blendMode = BABYLON.ParticleSystem.BLENDMODE_ADD; - ps.color1 = new BABYLON.Color4(1, 1, 1, 0.3); - ps.color2 = new BABYLON.Color4(1, 1, 1, 0.2); + ps.color1 = new BABYLON.Color4(1, 1, 1, 1); + ps.color2 = new BABYLON.Color4(1, 1, 1, 0.75); ps.colorDead = new BABYLON.Color4(1, 1, 1, 0); ps.preWarmCycles = Math.random() * 1000; ps.start(); diff --git a/packages/frontend/src/world/room/utility.ts b/packages/frontend/src/world/room/utility.ts index b5e8994919..6aaf7f577d 100644 --- a/packages/frontend/src/world/room/utility.ts +++ b/packages/frontend/src/world/room/utility.ts @@ -19,8 +19,8 @@ export function yuge(scene: BABYLON.Scene, mesh: BABYLON.Mesh, offset: BABYLON.V ps.emitter = emitter; ps.minEmitBox = new BABYLON.Vector3(cm(-1), 0, cm(-1)); ps.maxEmitBox = new BABYLON.Vector3(cm(1), 0, cm(1)); - ps.minEmitPower = 10; - ps.maxEmitPower = 12; + ps.minEmitPower = cm(10); + ps.maxEmitPower = cm(12); ps.minLifeTime = 2; ps.maxLifeTime = 3; ps.addSizeGradient(0, cm(10), cm(12));