diff --git a/Assets/Scenes/Scene2.shade b/Assets/Scenes/Scene2.shade index 96d2e525..2cfa3fb7 100644 --- a/Assets/Scenes/Scene2.shade +++ b/Assets/Scenes/Scene2.shade @@ -164,9 +164,9 @@ Max Life: 20 Angular Min: {x: 2.29999995, y: 1.70000005, z: 2.9000001} Angular Max: {x: 0, y: 0, z: 0} - Minimum Velocity: {x: 2, y: 3, z: 4} - Maximum Velocity: {x: 0, y: 0, z: 0} - Minimum Size: 5 - Maximum Size: 10 + Minimum Velocity: {x: 1, y: 1, z: 0} + Maximum Velocity: {x: 2, y: 2, z: 0} + Minimum Size: 1 + Maximum Size: 3 IsActive: true Scripts: ~ \ No newline at end of file diff --git a/Assets/Shaders/Particle_VS.glsl b/Assets/Shaders/Particle_VS.glsl index d5703c82..e6f73eb2 100644 --- a/Assets/Shaders/Particle_VS.glsl +++ b/Assets/Shaders/Particle_VS.glsl @@ -78,8 +78,8 @@ void main() vec2 particleScaleData = particle.scaleAndDecay.xz; // x and y mat4 localModel = mat4 (1.0f); - localModel[0][0] = 1.0f; - localModel[1][1] = 1.0f; + localModel[0][0] = particleScaleData.x; + localModel[1][1] = particleScaleData.y; mat4 rotate = mat4(1.0f); rotate[0][0] = cos(angle); diff --git a/Assets/Shaders/Particle_VS.shshaderb b/Assets/Shaders/Particle_VS.shshaderb index 82cb3231..7afc0202 100644 Binary files a/Assets/Shaders/Particle_VS.shshaderb and b/Assets/Shaders/Particle_VS.shshaderb differ