Merge pull request #81 from LeNitrous/nightcore-samples

Add nightcore-related samples

README.md

@@ -1,14 +1,15 @@
-# osu-resources
-[osu! on the web](https://osu.ppy.sh) | [dev chat](https://discord.gg/ppy)
+# osu!resources
 
-Rhythm is just a *click* away. The future of osu! and the beginning of an open era!
+[![Build status](https://ci.appveyor.com/api/projects/status/github/ppy/osu?svg=true)](https://ci.appveyor.com/project/peppy/osu-resources) [![dev chat](https://discordapp.com/api/guilds/188630481301012481/widget.png?style=shield)](https://discord.gg/ppy)
 
-# Requirements
+Assets used by osu!.
 
-This is a dependency of [osu!](https://github.com/ppy/osu) and intended to be used as a submodule only.
+## Requirements
 
-# Licence
+This is a dependency of [osu!](https://github.com/ppy/osu) and intended to be used as a NuGet package only.
 
-The content of this repository is licensed under [CC-BY-NC 4.0](https://creativecommons.org/licenses/by-nc/4.0/legalcode). Please see [the licence file](LICENCE.md) for more information. [tl;dr](https://tldrlegal.com/license/creative-commons-attribution-noncommercial-4.0-international-(cc-by-nc-4.0)) you can use in a non-commercial manner.
+## Licence
+
+The majority of content in this repository is licensed under [CC-BY-NC 4.0](https://creativecommons.org/licenses/by-nc/4.0/legalcode). Please see [the licence file](LICENCE.md) for more information. [tl;dr](https://tldrlegal.com/license/creative-commons-attribution-noncommercial-4.0-international-(cc-by-nc-4.0)) you can use it in a non-commercial manner.
 
 Please note that this *does not cover* the usage of the "osu!" or "ppy" branding in any software, resources, advertising or promotion, as this is protected by trademark law. If you require clearance for the use of these terms, please [contact us](mailto:contact@ppy.sh).

appveyor_deploy.yml

@@ -0,0 +1,17 @@
+clone_depth: 1
+version: '{build}'
+skip_non_tags: true
+image: Visual Studio 2017
+configuration: Release
+platform: Any CPU
+before_build:
+- ps: if($env:appveyor_repo_tag -eq 'True') { Update-AppveyorBuild -Version $env:appveyor_repo_tag_name }
+build_script:
+  - cmd: dotnet pack osu.Game.Resources /p:Version=%APPVEYOR_BUILD_VERSION%
+artifacts:
+  - path: osu.Game.Resources/bin/Any CPU/Release/**/*.nupkg
+deploy:
+  - provider: Environment
+    name: nuget
+  - provider: Environment
+    name: github

osu.Game.Resources/Shaders/sh_CircularFlashlight.fs

@@ -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));
 }

osu.Game.Resources/Shaders/sh_Flashlight.h

@@ -1,18 +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 lowp float flashlightDim;
 
-const float smoothness = 1.1;
+const mediump float smoothness = 1.1;
 
-vec4 getColourAt(vec2, vec2, vec4);
+lowp vec4 getColourAt(highp vec2, highp vec2, lowp vec4);
 
 void main(void)
 {
-    gl_FragColor = getColourAt(flashlightPos - v_Position, flashlightSize, v_Colour);
-}
+    gl_FragColor = mix(getColourAt(flashlightPos - v_Position, flashlightSize, v_Colour), vec4(0.0, 0.0, 0.0, 1.0), flashlightDim);
+}

osu.Game.Resources/Shaders/sh_RectangularFlashlight.fs

@@ -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);
-}
+}