Compare commits

..

8 Commits

Author SHA1 Message Date
Dean Herbert
a7df4bc0e0 Merge pull request #111 from Wieku/heartbeat-fix 2020-08-11 15:17:25 +09:00
Dean Herbert
7ea62f7d79 Shorten in length 2020-08-11 15:17:00 +09:00
Sebastian Krajewski
6850dd5773 Trim silence at the beginning of osu-logo-heartbeat 2020-08-11 08:00:46 +02:00
Sebastian Krajewski
500f5f4f29 Replace osu-logo-heartbeat with WAV version of it 2020-08-11 07:51:50 +02:00
Dan Balasescu
760bbe0d18 Merge pull request #110 from peppy/add-banana-catch-sound
Add banana catch sound
2020-07-31 12:40:52 +09:00
Dean Herbert
e81f149d8d Add banana catch sound 2020-07-30 17:55:44 +09:00
Dean Herbert
3fbb90b2f2 Revert "Apply lightweight png compression"
This reverts commit 06d4fd2fb8.
2020-07-27 14:03:32 +09:00
jorolf
b4615aeed8 Grey logo animation (#109)
Co-authored-by: Dean Herbert <pe@ppy.sh>
2020-07-27 13:43:39 +09:00
7 changed files with 14 additions and 28 deletions

Binary file not shown.

Binary file not shown.

View File

@@ -1,28 +0,0 @@
#include "sh_Utils.h"
varying mediump vec2 v_TexCoord;
varying lowp vec4 v_Colour;
uniform lowp sampler2D m_Sampler;
uniform lowp float progress;
// Taken from http://lolengine.net/blog/2013/07/27/rgb-to-hsv-in-glsl
vec3 rgb2hsv(vec3 c)
{
vec4 K = vec4(0.0, -1.0 / 3.0, 2.0 / 3.0, -1.0);
vec4 p = c.g < c.b ? vec4(c.bg, K.wz) : vec4(c.gb, K.xy);
vec4 q = c.r < p.x ? vec4(p.xyw, c.r) : vec4(c.r, p.yzx);
float d = q.x - min(q.w, q.y);
float e = 1.0e-10;
return vec3(abs(q.z + (q.w - q.y) / (6.0 * d + e)), d / (q.x + e), q.x);
}
void main(void)
{
vec4 colour = toSRGB(texture2D(m_Sampler, v_TexCoord, -0.9));
vec3 hsv = rgb2hsv(colour.rgb);
gl_FragColor = hsv.x < progress ? toSRGB(vec4(v_Colour.rgb, v_Colour.a * colour.a * hsv.z)) : vec4(0);
}

View File

@@ -0,0 +1,14 @@
#include "sh_Utils.h"
varying mediump vec2 v_TexCoord;
varying lowp vec4 v_Colour;
uniform lowp sampler2D m_Sampler;
uniform lowp float progress;
void main(void)
{
vec4 colour = toSRGB(texture2D(m_Sampler, v_TexCoord, -0.9));
gl_FragColor = colour.r < progress ? toSRGB(vec4(v_Colour.rgb, v_Colour.a * colour.a)) : vec4(0);
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 117 KiB

After

Width:  |  Height:  |  Size: 224 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 112 KiB

After

Width:  |  Height:  |  Size: 180 KiB