Merge https://git.hersi.changeip.net/hersi/ExperimentalGear

Merge stuff

scripts/challengeresult.lua

@@ -1,4 +1,4 @@
-local Easing = require("common.easings");
+local Easing = require("common.easing");
 local Footer = require("components.footer");
 local DiffRectangle = require('components.diff_rectangle');
 local common = require('common.common');

scripts/common/easing.lua

@@ -41,16 +41,25 @@ local function linear(t, b, c, d)
 end
 
 local function inQuad(t, b, c, d)
+  b = b or 0
+  c = c or 1
+  d = d or 1
   t = t / d
   return c * (t ^ 2) + b
 end
 
 local function outQuad(t, b, c, d)
+  b = b or 0
+  c = c or 1
+  d = d or 1
   t = t / d
   return -c * t * (t - 2) + b
 end
 
 local function inOutQuad(t, b, c, d)
+  b = b or 0
+  c = c or 1
+  d = d or 1
   t = t / d * 2
   if t < 1 then
     return c / 2 * (t ^ 2) + b
@@ -60,6 +69,9 @@ local function inOutQuad(t, b, c, d)
 end
 
 local function outInQuad(t, b, c, d)
+  b = b or 0
+  c = c or 1
+  d = d or 1
   if t < d / 2 then
     return outQuad (t * 2, b, c / 2, d)
   else

scripts/common/easings.lua

@@ -1,58 +0,0 @@
---
--- Adapted from
--- Tweener's easing functions (Penner's Easing Equations)
--- and http://code.google.com/p/tweener/ (jstweener javascript version)
---
---[[
-Disclaimer for Robert Penner's Easing Equations license:
-TERMS OF USE - EASING EQUATIONS
-Open source under the BSD License.
-Copyright © 2001 Robert Penner
-All rights reserved.
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-    * Neither the name of the author nor the names of contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-]] -- For all easing functions:
--- t = elapsed time
--- b = begin
--- c = change == ending - beginning
--- d = duration (total time)
-local pow = function (a,b)
-    return a ^ b;
-end
-
-local function inQuad(t)
-    t = t / 1
-    return 1 * pow(t, 2) + 0
-end
-
-local function outQuad(t, b, c, d)
-    t = t / 1
-    return -1 * t * (t - 2) + 0
-end
-
-local function inOutQuad(t, b, c, d)
-    t = t / 1 * 2
-    if t < 1 then
-        return 1 / 2 * pow(t, 2)
-    else
-        return -1 / 2 * ((t - 1) * (t - 3) - 1)
-    end
-end
-
-local function outInQuad(t, b, c, d)
-    if t < d / 2 then
-        return outQuad(t * 2, b, c / 2, d)
-    else
-        return inQuad((t * 2) - d, b + c / 2, c / 2, d)
-    end
-end
-
-return {
-    inQuad = inQuad,
-    outQuad = outQuad,
-    inOutQuad = inOutQuad,
-    outInQuad = outInQuad
-}

scripts/gameplay/track_end.lua

@@ -1,5 +1,5 @@
 local Common = require('common.common')
-local Easing = require('common.easings')
+local Easing = require('common.easing')
 
 local bgImage = gfx.CreateSkinImage("gameplay/track_end/bg.png", 0)
 local bgHexTopImage = gfx.CreateSkinImage("gameplay/track_end/top_hex.png", gfx.IMAGE_REPEATX)

scripts/result.lua

@@ -1,5 +1,5 @@
 local Numbers = require('common.numbers')
-local Easing = require('common.easings');
+local Easing = require('common.easing');
 local Background = require('components.background');
 local Footer = require('components.footer');
 local DiffRectangle = require('components.diff_rectangle');

scripts/songselect/filterwheel.lua

@@ -1,5 +1,5 @@
 require('common')
-local Easing = require('common.easings');
+local Easing = require('common.easing');
 local SongSelectHeader = require('components.headers.songSelectHeader')
 local Footer = require('components.footer');
 

scripts/songselect/songwheel.lua

@@ -1,5 +1,5 @@
 require('common')
-local Easing = require('common.easings')
+local Easing = require('common.easing')
 local Background = require('components.background')
 local common     = require('common.common')
 local Numbers = require('common.numbers')

scripts/songselect/sortwheel.lua

@@ -1,5 +1,5 @@
 require('common')
-local Easing = require('common.easings');
+local Easing = require('common.easing');
 
 local resx, resy = game.GetResolution()
 local desw, desh = 1080, 1920