Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sarrakitty/fireworks' into 'master'

Browse Source 
made firework explosions colorful

See merge request veloren/veloren!1851
This commit is contained in:
Imbris 2021-03-05 17:48:56 +00:00
commit e724ac072e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
assets/voxygen/shaders/particle-vert.glsl
View File

@ -221,7 +221,7 @@ void main() {
normalize(vec3(rand1, rand2, rand3)) * 40.0 + grav_vel(earth_gravity)
),
vec3(3.0 + rand0),
vec4(0.15, 0.4, 1, 1),
vec4(vec3(0, 0, 2), 1),
identity()
);
} else if (inst_mode == FIREWORK_GREEN) {
@ -232,7 +232,7 @@ void main() {
normalize(vec3(rand1, rand2, rand3)) * 40.0 + grav_vel(earth_gravity)
),
vec3(3.0 + rand0),
vec4(0, 1, 0, 1),
vec4(vec3(0, 2, 0), 1),
identity()
);
} else if (inst_mode == FIREWORK_PURPLE) {
@ -243,7 +243,7 @@ void main() {
normalize(vec3(rand1, rand2, rand3)) * 40.0 + grav_vel(earth_gravity)
),
vec3(3.0 + rand0),
vec4(0.7, 0.0, 1.0, 1.0),
vec4(vec3(2, 0, 2), 1),
identity()
);
} else if (inst_mode == FIREWORK_RED) {
@ -254,7 +254,7 @@ void main() {
normalize(vec3(rand1, rand2, rand3)) * 40.0 + grav_vel(earth_gravity)
),
vec3(3.0 + rand0),
vec4(1, 0, 0, 1),
vec4(vec3(2, 0, 0), 1),
identity()
);
} else if (inst_mode == FIREWORK_YELLOW) {
@ -265,7 +265,7 @@ void main() {
normalize(vec3(rand1, rand2, rand3)) * 40.0 + grav_vel(earth_gravity)
),
vec3(3.0 + rand0),
vec4(1, 1, 0, 1),
vec4(vec3(2, 2, 0), 1),
identity()
);
} else if (inst_mode == LEAF) {