Compare commits
17 Commits
2019.701.0
...
2019.731.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f6d3057dcc | ||
|
|
fb90b1a668 | ||
|
|
6448d6051f | ||
|
|
8bc6f5a986 | ||
|
|
c12541bb28 | ||
|
|
96286f8c6f | ||
|
|
d58ad077c8 | ||
|
|
751ded4dd9 | ||
|
|
7675deb816 | ||
|
|
9ba9ae77b9 | ||
|
|
f36e765845 | ||
|
|
3a3d0c1984 | ||
|
|
b7f01508a0 | ||
|
|
3ade4a856c | ||
|
|
d79c12f663 | ||
|
|
f5a3de1e89 | ||
|
|
34448428fe |
@@ -1,9 +1,10 @@
|
||||
#include "sh_Flashlight.h"
|
||||
|
||||
vec4 getColourAt(vec2 diff, vec2 size, vec4 originalColour)
|
||||
// highp precision is necessary for vertex positions to prevent catastrophic failure on GL_ES platforms
|
||||
lowp vec4 getColourAt(highp vec2 diff, highp vec2 size, lowp vec4 originalColour)
|
||||
{
|
||||
float dist = length(diff);
|
||||
float flashlightRadius = length(size);
|
||||
highp float dist = length(diff);
|
||||
highp float flashlightRadius = length(size);
|
||||
|
||||
return originalColour * vec4(1.0, 1.0, 1.0, smoothstep(flashlightRadius, flashlightRadius * smoothness, dist));
|
||||
}
|
||||
@@ -1,20 +1,16 @@
|
||||
#ifdef GL_ES
|
||||
precision mediump float;
|
||||
#endif
|
||||
varying highp vec2 v_Position;
|
||||
varying lowp vec4 v_Colour;
|
||||
|
||||
varying vec2 v_Position;
|
||||
varying vec4 v_Colour;
|
||||
uniform highp vec2 flashlightPos;
|
||||
uniform highp vec2 flashlightSize;
|
||||
|
||||
uniform vec2 flashlightPos;
|
||||
uniform vec2 flashlightSize;
|
||||
|
||||
uniform float flashlightDim;
|
||||
uniform lowp float flashlightDim;
|
||||
|
||||
const float smoothness = 1.1;
|
||||
|
||||
vec4 getColourAt(vec2, vec2, vec4);
|
||||
lowp vec4 getColourAt(vec2, vec2, vec4);
|
||||
|
||||
void main(void)
|
||||
{
|
||||
gl_FragColor = mix(getColourAt(flashlightPos - v_Position, flashlightSize, v_Colour), vec4(0.0, 0.0, 0.0, 1.0), flashlightDim);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
#include "sh_Flashlight.h"
|
||||
|
||||
vec4 getColourAt(vec2 diff, vec2 size, vec4 originalColour)
|
||||
lowp vec4 getColourAt(highp vec2 diff, highp vec2 size, lowp vec4 originalColour)
|
||||
{
|
||||
diff = abs(diff);
|
||||
|
||||
float alpha = length(smoothstep(size, size * smoothness, diff));
|
||||
lowp float alpha = length(smoothstep(size, size * smoothness, diff));
|
||||
|
||||
return originalColour * vec4(1.0, 1.0, 1.0, alpha);
|
||||
}
|
||||
}
|
||||
|
||||
|
Before Width: | Height: | Size: 7.5 KiB |
|
Before Width: | Height: | Size: 7.0 KiB |
|
Before Width: | Height: | Size: 6.7 KiB |
|
Before Width: | Height: | Size: 6.2 KiB |
|
Before Width: | Height: | Size: 7.7 KiB |
|
Before Width: | Height: | Size: 7.7 KiB |
|
Before Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 9.9 KiB |
BIN
osu.Game.Resources/Textures/Menu/menu-background-1.jpg
Normal file → Executable file
|
Before Width: | Height: | Size: 600 KiB After Width: | Height: | Size: 717 KiB |
BIN
osu.Game.Resources/Textures/Menu/menu-background-2.jpg
Normal file → Executable file
|
Before Width: | Height: | Size: 644 KiB After Width: | Height: | Size: 724 KiB |
BIN
osu.Game.Resources/Textures/Menu/menu-background-3.jpg
Normal file → Executable file
|
Before Width: | Height: | Size: 537 KiB After Width: | Height: | Size: 837 KiB |
BIN
osu.Game.Resources/Textures/Menu/menu-background-4.jpg
Normal file → Executable file
|
Before Width: | Height: | Size: 487 KiB After Width: | Height: | Size: 739 KiB |
BIN
osu.Game.Resources/Textures/Menu/menu-background-5.jpg
Normal file → Executable file
|
Before Width: | Height: | Size: 586 KiB After Width: | Height: | Size: 745 KiB |
BIN
osu.Game.Resources/Textures/Menu/menu-background-6.jpg
Executable file
|
After Width: | Height: | Size: 832 KiB |
BIN
osu.Game.Resources/Textures/Menu/menu-background-7.jpg
Executable file
|
After Width: | Height: | Size: 653 KiB |