cont. refactor
This commit is contained in:
parent
495f0dc68a
commit
bce246e5e1
|
@ -1,6 +0,0 @@
|
||||||
|
|
||||||
-- TODO(local): put these class types somewhere more common
|
|
||||||
---@class StrokeParams
|
|
||||||
---@field color number[]?
|
|
||||||
---@field alpha number?
|
|
||||||
---@field size number?
|
|
|
@ -1,4 +1,4 @@
|
||||||
local Easing = require("lib.easing");
|
local Easing = require("scripts.core.libb.easing");
|
||||||
local Footer = require("components.footer");
|
local Footer = require("components.footer");
|
||||||
local DiffRectangle = require('components.diff_rectangle');
|
local DiffRectangle = require('components.diff_rectangle');
|
||||||
local common = require('common.util');
|
local common = require('common.util');
|
||||||
|
|
|
@ -1,25 +1,14 @@
|
||||||
|
--TODO: implement iton graphics object instead of free function
|
||||||
local function areaOverlap(x, y, areaX, areaY, areaW, areaH)
|
local function areaOverlap(x, y, areaX, areaY, areaW, areaH)
|
||||||
return x > areaX and y > areaY and x < areaX + areaW and y < areaY + areaH
|
return x > areaX and y > areaY and x < areaX + areaW and y < areaY + areaH
|
||||||
end
|
end
|
||||||
|
|
||||||
--modulo operation for index value
|
--modulo operation for table index value
|
||||||
local function modIndex(index, mod)
|
local function modIndex(index, mod)
|
||||||
return (index - 1) % mod + 1
|
return (index - 1) % mod + 1
|
||||||
end
|
end
|
||||||
|
|
||||||
local function firstAlphaNum(s)
|
|
||||||
for i = 1, string.len(s) do
|
|
||||||
local byte = string.byte(s, i);
|
|
||||||
if ((byte >= 65 and byte <= 90) or (byte >= 97 and byte <= 122) or (byte >= 48 and byte <= 57)) then
|
|
||||||
return string.sub(s, i, i);
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
return '';
|
|
||||||
end
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
areaOverlap = areaOverlap,
|
areaOverlap = areaOverlap,
|
||||||
modIndex = modIndex,
|
modIndex = modIndex,
|
||||||
firstAlphaNum = firstAlphaNum,
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
json = require "lib.json"
|
json = require "scripts.core.libb.json"
|
||||||
local header = {}
|
local header = {}
|
||||||
header["user-agent"] = "unnamed_sdvx_clone"
|
header["user-agent"] = "unnamed_sdvx_clone"
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
|
|
||||||
local VolforceWindow = require('components.volforceWindow')
|
local VolforceWindow = require('components.volforceWindow')
|
||||||
local Dimensions = require 'common.dimensions';
|
local Dimensions = require 'scripts.graphics.dimensions';
|
||||||
|
|
||||||
do
|
do
|
||||||
local resx, resy = game.GetResolution();
|
local resx, resy = game.GetResolution();
|
||||||
|
@ -21,7 +21,7 @@ local HitFX = require 'gameplay.hitfx'
|
||||||
|
|
||||||
local TrackEnd = require('gameplay.track_end')
|
local TrackEnd = require('gameplay.track_end')
|
||||||
|
|
||||||
local json = require("lib.json")
|
local json = require("scripts.core.libb.json")
|
||||||
|
|
||||||
local showHitAnims = true;
|
local showHitAnims = true;
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
local Dimensions = require 'common.dimensions'
|
local Dimensions = require 'scripts.graphics.dimensions'
|
||||||
|
|
||||||
local consoleBaseImage = gfx.CreateSkinImage("gameplay/console/base.png", 0)
|
local consoleBaseImage = gfx.CreateSkinImage("gameplay/console/base.png", 0)
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
local Dimensions = require 'common.dimensions'
|
local Dimensions = require 'scripts.graphics.dimensions'
|
||||||
|
|
||||||
local blackGradientImage = gfx.CreateSkinImage('gameplay/crit_line/black_gradient.png', 0)
|
local blackGradientImage = gfx.CreateSkinImage('gameplay/crit_line/black_gradient.png', 0)
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
|
|
||||||
require 'common.globals'
|
require 'common.globals'
|
||||||
|
|
||||||
local Dimensions = require 'common.dimensions'
|
local Dimensions = require 'scripts.graphics.dimensions'
|
||||||
|
|
||||||
local Animation = require 'api.animation'
|
local Animation = require 'scripts.graphics.frameanimation'
|
||||||
|
|
||||||
local Animations = {
|
local Animations = {
|
||||||
Crit = Animation.new('gameplay/hit_animation_frames/critical_taps', {
|
Crit = Animation.new('gameplay/hit_animation_frames/critical_taps', {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
local Common = require('common.util')
|
local Common = require('common.util')
|
||||||
local Easing = require('lib.easing')
|
local Easing = require('scripts.core.libb.easing')
|
||||||
|
|
||||||
local bgImage = gfx.CreateSkinImage("gameplay/track_end/bg.png", 0)
|
local bgImage = gfx.CreateSkinImage("gameplay/track_end/bg.png", 0)
|
||||||
local bgHexTopImage = gfx.CreateSkinImage("gameplay/track_end/top_hex.png", gfx.IMAGE_REPEATX)
|
local bgHexTopImage = gfx.CreateSkinImage("gameplay/track_end/top_hex.png", gfx.IMAGE_REPEATX)
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
local version = require("common.version")
|
local version = require("common.version")
|
||||||
local Dim = require("common.dimensions")
|
local Dim = require("scripts.graphics.dimensions")
|
||||||
|
|
||||||
local BAR_ALPHA = 191
|
local BAR_ALPHA = 191
|
||||||
|
|
|
@ -3,7 +3,7 @@ require "common.class"
|
||||||
|
|
||||||
require "api.graphics"
|
require "api.graphics"
|
||||||
|
|
||||||
local Image = require "api.image"
|
local Image = require "scripts.graphics.image"
|
||||||
|
|
||||||
---@class AnimationParams
|
---@class AnimationParams
|
||||||
---@field fps number?
|
---@field fps number?
|
|
@ -1,4 +1,4 @@
|
||||||
local Dim = require("common.dimensions")
|
local Dim = require("scripts.graphics.dimensions")
|
||||||
|
|
||||||
local BAR_ALPHA = 191
|
local BAR_ALPHA = 191
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
require "common.globals"
|
require "common.globals"
|
||||||
local Dim = require "common.dimensions"
|
local Dim = require "scripts.graphics.dimensions"
|
||||||
local Image = require "api.image"
|
local Image = require "scripts.graphics.image"
|
||||||
|
|
||||||
local BAR_ALPHA = 191
|
local BAR_ALPHA = 191
|
||||||
local HEADER_HEIGHT = 100
|
local HEADER_HEIGHT = 100
|
|
@ -1,4 +1,4 @@
|
||||||
local Dim = require("common.dimensions")
|
local Dim = require("scripts.graphics.dimensions")
|
||||||
|
|
||||||
local BAR_ALPHA = 191
|
local BAR_ALPHA = 191
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
--TODO: implement
|
|
@ -1,4 +1,4 @@
|
||||||
local Dim = require("common.dimensions")
|
local Dim = require("scripts.graphics.dimensions")
|
||||||
|
|
||||||
local backgroundImage = gfx.CreateSkinImage("bg_pattern.png", gfx.IMAGE_REPEATX | gfx.IMAGE_REPEATY)
|
local backgroundImage = gfx.CreateSkinImage("bg_pattern.png", gfx.IMAGE_REPEATX | gfx.IMAGE_REPEATY)
|
||||||
local bgImageWidth, bgImageHeight = gfx.ImageSize(backgroundImage)
|
local bgImageWidth, bgImageHeight = gfx.ImageSize(backgroundImage)
|
|
@ -1,4 +1,4 @@
|
||||||
local json = require("lib.json")
|
local json = require("scripts.core.libb.json")
|
||||||
|
|
||||||
local common = require('common.util');
|
local common = require('common.util');
|
||||||
local Sound = require("common.sound")
|
local Sound = require("common.sound")
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
local Easing = require('lib.easing');
|
local Easing = require('scripts.core.libb.easing');
|
||||||
local Charting = require('common.charting');
|
local Charting = require('common.charting');
|
||||||
local Background = require('components.background');
|
local Background = require('components.background');
|
||||||
local Footer = require('components.footer');
|
local Footer = require('components.footer');
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
local Easing = require('lib.easing')
|
local Easing = require('scripts.core.libb.easing')
|
||||||
local Dim = require("common.dimensions")
|
local Dim = require("scripts.graphics.dimensions")
|
||||||
local SongSelectHeader = require('components.headers.songSelectHeader')
|
local SongSelectHeader = require('components.headers.songSelectHeader')
|
||||||
local Footer = require('components.footer')
|
local Footer = require('components.footer')
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
local Charting = require('common.charting')
|
local Charting = require('common.charting')
|
||||||
local Easing = require('lib.easing')
|
local Easing = require('scripts.core.libb.easing')
|
||||||
local Background = require('components.background')
|
local Background = require('components.background')
|
||||||
local Dim = require("common.dimensions")
|
local Dim = require("scripts.graphics.dimensions")
|
||||||
local Wallpaper = require("components.wallpaper")
|
local Wallpaper = require("components.wallpaper")
|
||||||
local common = require('common.util')
|
local common = require('common.util')
|
||||||
local Sound = require("common.sound")
|
local Sound = require("common.sound")
|
||||||
|
@ -193,6 +193,17 @@ local resolutionChange = function(x, y)
|
||||||
game.Log('resX:' .. resX .. ' // resY:' .. resY .. ' // fullX:' .. fullX .. ' // fullY:' .. fullY, game.LOGGER_ERROR)
|
game.Log('resX:' .. resX .. ' // resY:' .. resY .. ' // fullX:' .. fullX .. ' // fullY:' .. fullY, game.LOGGER_ERROR)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local function firstAlphaNum(s)
|
||||||
|
for i = 1, string.len(s) do
|
||||||
|
local byte = string.byte(s, i)
|
||||||
|
if ((byte >= 65 and byte <= 90) or (byte >= 97 and byte <= 122) or (byte >= 48 and byte <= 57)) then
|
||||||
|
return string.sub(s, i, i)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
return ""
|
||||||
|
end
|
||||||
|
|
||||||
function getCorrectedIndex(from, offset)
|
function getCorrectedIndex(from, offset)
|
||||||
total = #songwheel.songs
|
total = #songwheel.songs
|
||||||
|
|
||||||
|
@ -786,7 +797,7 @@ function drawScrollbar()
|
||||||
gfx.TextAlign(gfx.TEXT_ALIGN_MIDDLE + gfx.TEXT_ALIGN_CENTER)
|
gfx.TextAlign(gfx.TEXT_ALIGN_MIDDLE + gfx.TEXT_ALIGN_CENTER)
|
||||||
if (songwheel.songs[selectedIndex] ~= nil) then
|
if (songwheel.songs[selectedIndex] ~= nil) then
|
||||||
local title = songwheel.songs[selectedIndex].title;
|
local title = songwheel.songs[selectedIndex].title;
|
||||||
local letter = string.upper(common.firstAlphaNum(title))
|
local letter = string.upper(firstAlphaNum(title))
|
||||||
gfx.Text(letter, fillXPos-10, scrollbarYPos + 5)
|
gfx.Text(letter, fillXPos-10, scrollbarYPos + 5)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
local Easing = require('lib.easing');
|
local Easing = require('scripts.core.libb.easing');
|
||||||
|
|
||||||
local resx, resy = game.GetResolution()
|
local resx, resy = game.GetResolution()
|
||||||
local desw, desh = 1080, 1920
|
local desw, desh = 1080, 1920
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
require "common.globals"
|
require "common.globals"
|
||||||
local Common = require "common.util"
|
local Common = require "common.util"
|
||||||
local Dim = require "common.dimensions"
|
local Dim = require "scripts.graphics.dimensions"
|
||||||
local Wallpaper = require "components.wallpaper"
|
local Wallpaper = require "components.wallpaper"
|
||||||
|
|
||||||
local PageView = require "api.page.pageview"
|
local PageView = require "api.page.pageview"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
require "common.globals"
|
require "common.globals"
|
||||||
require "common.class"
|
require "common.class"
|
||||||
require "common.filereader"
|
require "common.filereader"
|
||||||
local Dim = require "common.dimensions"
|
local Dim = require "scripts.graphics.dimensions"
|
||||||
local Version = require "common.version"
|
local Version = require "common.version"
|
||||||
|
|
||||||
local PageManager = require "api.page.pagemanager"
|
local PageManager = require "api.page.pagemanager"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
require("common.class")
|
require("common.class")
|
||||||
local Dim = require("common.dimensions")
|
local Dim = require("scripts.graphics.dimensions")
|
||||||
local Page = require("api.page.page")
|
local Page = require("api.page.page")
|
||||||
local CheckUpdateField = require("titlescreen.boot.checkupdatefield")
|
local CheckUpdateField = require("titlescreen.boot.checkupdatefield")
|
||||||
local DialogField = require("titlescreen.boot.dialogfield")
|
local DialogField = require("titlescreen.boot.dialogfield")
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
require("common.class")
|
require("common.class")
|
||||||
local Dim = require("common.dimensions")
|
local Dim = require("scripts.graphics.dimensions")
|
||||||
local Field = require("api.page.field")
|
local Field = require("api.page.field")
|
||||||
|
|
||||||
---@class ServiceField: Field
|
---@class ServiceField: Field
|
|
@ -1,5 +1,5 @@
|
||||||
require("common.class")
|
require("common.class")
|
||||||
local Dim = require("common.dimensions")
|
local Dim = require("scripts.graphics.dimensions")
|
||||||
local Util = require("common.util")
|
local Util = require("common.util")
|
||||||
local Page = require("api.page.page")
|
local Page = require("api.page.page")
|
||||||
local ServiceField = require("api.page.servicefield")
|
local ServiceField = require("api.page.servicefield")
|
|
@ -4,7 +4,7 @@ require "common.class"
|
||||||
local Footer = require("components.footer")
|
local Footer = require("components.footer")
|
||||||
local Wallpaper = require("components.wallpaper")
|
local Wallpaper = require("components.wallpaper")
|
||||||
local Background = require("components.background")
|
local Background = require("components.background")
|
||||||
local Dim = require("common.dimensions")
|
local Dim = require("scripts.graphics.dimensions")
|
||||||
local lang = require("language")
|
local lang = require("language")
|
||||||
local util = require("common.util")
|
local util = require("common.util")
|
||||||
|
|
||||||
|
@ -472,7 +472,7 @@ end
|
||||||
|
|
||||||
local Background = require "components.background"
|
local Background = require "components.background"
|
||||||
|
|
||||||
local Animation = require "api.animation"
|
local Animation = require "scripts.graphics.frameanimation"
|
||||||
local AudioSample = require "api.audiosample"
|
local AudioSample = require "api.audiosample"
|
||||||
|
|
||||||
local Page = require "api.page.page"
|
local Page = require "api.page.page"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
require "common.class"
|
require "common.class"
|
||||||
|
|
||||||
local Dim = require "common.dimensions"
|
local Dim = require "scripts.graphics.dimensions"
|
||||||
|
|
||||||
local Lang = require "language"
|
local Lang = require "language"
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
require("common.class")
|
require("common.class")
|
||||||
local Dim = require("common.dimensions")
|
local Dim = require("scripts.graphics.dimensions")
|
||||||
local ServicePage = require("api.page.servicepage")
|
local ServicePage = require("api.page.servicepage")
|
||||||
|
|
||||||
---@class ScreenCheckPage: ServicePage
|
---@class ScreenCheckPage: ServicePage
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
local Util = require("common.util")
|
local Util = require("common.util")
|
||||||
local Dim = require("common.dimensions")
|
local Dim = require("scripts.graphics.dimensions")
|
||||||
|
|
||||||
require "common.globals"
|
require "common.globals"
|
||||||
require "common.class"
|
require "common.class"
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
require "common.globals"
|
require "common.globals"
|
||||||
require "common.class"
|
require "common.class"
|
||||||
|
|
||||||
local Dim = require "common.dimensions"
|
local Dim = require "scripts.graphics.dimensions"
|
||||||
|
|
||||||
local Image = require "api.image"
|
local Image = require "scripts.graphics.image"
|
||||||
|
|
||||||
local Page = require "api.page.page"
|
local Page = require "api.page.page"
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
require "common.globals"
|
require "common.globals"
|
||||||
require "common.class"
|
require "common.class"
|
||||||
local Dim = require "common.dimensions"
|
local Dim = require "scripts.graphics.dimensions"
|
||||||
|
|
||||||
local Image = require "api.image"
|
local Image = require "scripts.graphics.image"
|
||||||
local AudioSample = require "api.audiosample"
|
local AudioSample = require "api.audiosample"
|
||||||
|
|
||||||
local Page = require "api.page.page"
|
local Page = require "api.page.page"
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
require "common.globals"
|
require "common.globals"
|
||||||
require "common.class"
|
require "common.class"
|
||||||
|
|
||||||
local Dim = require "common.dimensions"
|
local Dim = require "scripts.graphics.dimensions"
|
||||||
|
|
||||||
local Image = require "api.image"
|
local Image = require "scripts.graphics.image"
|
||||||
|
|
||||||
local Page = require "api.page.page"
|
local Page = require "api.page.page"
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
require "common.globals"
|
require "common.globals"
|
||||||
require "common.class"
|
require "common.class"
|
||||||
|
|
||||||
local Dim = require "common.dimensions"
|
local Dim = require "scripts.graphics.dimensions"
|
||||||
|
|
||||||
local Image = require "api.image"
|
local Image = require "scripts.graphics.image"
|
||||||
|
|
||||||
local Page = require "api.page.page"
|
local Page = require "api.page.page"
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
require "common.globals"
|
require "common.globals"
|
||||||
|
|
||||||
local Version = require "common.version"
|
local Version = require "common.version"
|
||||||
local Dim = require "common.dimensions"
|
local Dim = require "scripts.graphics.dimensions"
|
||||||
|
|
||||||
local Image = require "api.image"
|
local Image = require "scripts.graphics.image"
|
||||||
|
|
||||||
local Page = require "api.page.page"
|
local Page = require "api.page.page"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue