cont. refactor

scripts/api/graphics.lua

@@ -1,6 +0,0 @@
-
--- TODO(local): put these class types somewhere more common
----@class StrokeParams
----@field color number[]?
----@field alpha number?
----@field size number?

scripts/challengeresult.lua

@@ -1,4 +1,4 @@
-local Easing = require("lib.easing");
+local Easing = require("scripts.core.libb.easing");
 local Footer = require("components.footer");
 local DiffRectangle = require('components.diff_rectangle');
 local common = require('common.util');

scripts/common/util.lua

@@ -1,25 +1,14 @@
+--TODO: implement iton graphics object instead of free function
 local function areaOverlap(x, y, areaX, areaY, areaW, areaH)
     return x > areaX and y > areaY and x < areaX + areaW and y < areaY + areaH
 end
 
---modulo operation for index value
+--modulo operation for table index value
 local function modIndex(index, mod)
     return (index - 1) % mod + 1
 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 {
     areaOverlap = areaOverlap,
     modIndex = modIndex,
-    firstAlphaNum = firstAlphaNum,
 }

scripts/downloadscreen.lua

@@ -1,4 +1,4 @@
-json = require "lib.json"
+json = require "scripts.core.libb.json"
 local header = {}
 header["user-agent"] = "unnamed_sdvx_clone"
 

scripts/gameplay.lua

@@ -1,6 +1,6 @@
 
 local VolforceWindow = require('components.volforceWindow')
-local Dimensions = require 'common.dimensions';
+local Dimensions = require 'scripts.graphics.dimensions';
 
 do
     local resx, resy = game.GetResolution();
@@ -21,7 +21,7 @@ local HitFX = require 'gameplay.hitfx'
 
 local TrackEnd = require('gameplay.track_end')
 
-local json = require("lib.json")
+local json = require("scripts.core.libb.json")
 
 local showHitAnims = true;
 

scripts/gameplay/console.lua

@@ -1,5 +1,5 @@
 
-local Dimensions = require 'common.dimensions'
+local Dimensions = require 'scripts.graphics.dimensions'
 
 local consoleBaseImage = gfx.CreateSkinImage("gameplay/console/base.png", 0)
 
@@ -32,4 +32,4 @@ end
 
 return {
     render=render
-}
+}

scripts/gameplay/crit_line.lua

@@ -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)
 
@@ -111,4 +111,4 @@ end
 return {
     renderBase=renderBase,
     renderOverlay=renderOverlay
-}
+}

scripts/gameplay/hitfx.lua

@@ -1,9 +1,9 @@
 
 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 = {
     Crit = Animation.new('gameplay/hit_animation_frames/critical_taps', {

scripts/gameplay/track_end.lua

@@ -1,5 +1,5 @@
 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 bgHexTopImage = gfx.CreateSkinImage("gameplay/track_end/top_hex.png", gfx.IMAGE_REPEATX)

scripts/graphics/footer.lua

@@ -1,5 +1,5 @@
 local version = require("common.version")
-local Dim = require("common.dimensions")
+local Dim = require("scripts.graphics.dimensions")
 
 local BAR_ALPHA = 191
 

scripts/graphics/frameanimation.lua

@@ -3,7 +3,7 @@ require "common.class"
 
 require "api.graphics"
 
-local Image = require "api.image"
+local Image = require "scripts.graphics.image"
 
 ---@class AnimationParams
 ---@field fps number?

scripts/graphics/headers/challengeSelectHeader.lua

@@ -1,4 +1,4 @@
-local Dim = require("common.dimensions")
+local Dim = require("scripts.graphics.dimensions")
 
 local BAR_ALPHA = 191
 

scripts/graphics/headers/modeSelectHeader.lua

@@ -1,6 +1,6 @@
 require "common.globals"
-local Dim = require "common.dimensions"
-local Image = require "api.image"
+local Dim = require "scripts.graphics.dimensions"
+local Image = require "scripts.graphics.image"
 
 local BAR_ALPHA = 191
 local HEADER_HEIGHT = 100
@@ -30,4 +30,4 @@ local function draw()
     gfx.Restore()
 end
 
-return {draw = draw}
+return {draw = draw}

scripts/graphics/headers/songSelectHeader.lua

@@ -1,4 +1,4 @@
-local Dim = require("common.dimensions")
+local Dim = require("scripts.graphics.dimensions")
 
 local BAR_ALPHA = 191
 

scripts/graphics/sprite.lua

@@ -0,0 +1 @@
+--TODO: implement

scripts/graphics/wallpaper.lua

@@ -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 bgImageWidth, bgImageHeight = gfx.ImageSize(backgroundImage)
@@ -20,4 +20,4 @@ end
 
 return {
     render = render
-}
+}

scripts/multiplayerscreen.lua

@@ -1,4 +1,4 @@
-local json = require("lib.json")
+local json = require("scripts.core.libb.json")
 
 local common = require('common.util');
 local Sound = require("common.sound")

scripts/result.lua

@@ -1,4 +1,4 @@
-local Easing = require('lib.easing');
+local Easing = require('scripts.core.libb.easing');
 local Charting = require('common.charting');
 local Background = require('components.background');
 local Footer = require('components.footer');

scripts/songselect/filterwheel.lua

@@ -1,5 +1,5 @@
-local Easing = require('lib.easing')
-local Dim = require("common.dimensions")
+local Easing = require('scripts.core.libb.easing')
+local Dim = require("scripts.graphics.dimensions")
 local SongSelectHeader = require('components.headers.songSelectHeader')
 local Footer = require('components.footer')
 

scripts/songselect/songwheel.lua

@@ -1,7 +1,7 @@
 local Charting = require('common.charting')
-local Easing = require('lib.easing')
+local Easing = require('scripts.core.libb.easing')
 local Background = require('components.background')
-local Dim = require("common.dimensions")
+local Dim = require("scripts.graphics.dimensions")
 local Wallpaper = require("components.wallpaper")
 local common     = require('common.util')
 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)
 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) 
 	total = #songwheel.songs
 
@@ -786,7 +797,7 @@ function drawScrollbar()
     gfx.TextAlign(gfx.TEXT_ALIGN_MIDDLE + gfx.TEXT_ALIGN_CENTER)
     if (songwheel.songs[selectedIndex] ~= nil) then
         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)
     end
 end

scripts/songselect/sortwheel.lua

@@ -1,4 +1,4 @@
-local Easing = require('lib.easing');
+local Easing = require('scripts.core.libb.easing');
 
 local resx, resy = game.GetResolution()
 local desw, desh = 1080, 1920

scripts/titlescreen.lua

@@ -1,6 +1,6 @@
 require "common.globals"
 local Common = require "common.util"
-local Dim = require "common.dimensions"
+local Dim = require "scripts.graphics.dimensions"
 local Wallpaper = require "components.wallpaper"
 
 local PageView = require "api.page.pageview"

scripts/titlescreen/boot.lua

@@ -1,7 +1,7 @@
 require "common.globals"
 require "common.class"
 require "common.filereader"
-local Dim = require "common.dimensions"
+local Dim = require "scripts.graphics.dimensions"
 local Version = require "common.version"
 
 local PageManager = require "api.page.pagemanager"

scripts/titlescreen/boot/checkupdatepage.lua

@@ -1,5 +1,5 @@
 require("common.class")
-local Dim = require("common.dimensions")
+local Dim = require("scripts.graphics.dimensions")
 local Page = require("api.page.page")
 local CheckUpdateField = require("titlescreen.boot.checkupdatefield")
 local DialogField = require("titlescreen.boot.dialogfield")

scripts/titlescreen/common/page/servicefield.lua

@@ -1,5 +1,5 @@
 require("common.class")
-local Dim = require("common.dimensions")
+local Dim = require("scripts.graphics.dimensions")
 local Field = require("api.page.field")
 
 ---@class ServiceField: Field

scripts/titlescreen/common/page/servicepage.lua

@@ -1,5 +1,5 @@
 require("common.class")
-local Dim = require("common.dimensions")
+local Dim = require("scripts.graphics.dimensions")
 local Util = require("common.util")
 local Page = require("api.page.page")
 local ServiceField = require("api.page.servicefield")

scripts/titlescreen/mainmenu.lua

@@ -4,7 +4,7 @@ require "common.class"
 local Footer = require("components.footer")
 local Wallpaper = require("components.wallpaper")
 local Background = require("components.background")
-local Dim = require("common.dimensions")
+local Dim = require("scripts.graphics.dimensions")
 local lang = require("language")
 local util = require("common.util")
 
@@ -472,7 +472,7 @@ end
 
 local Background = require "components.background"
 
-local Animation = require "api.animation"
+local Animation = require "scripts.graphics.frameanimation"
 local AudioSample = require "api.audiosample"
 
 local Page = require "api.page.page"

scripts/titlescreen/modeselect/modeselectpage.lua

@@ -1,6 +1,6 @@
 require "common.class"
 
-local Dim = require "common.dimensions"
+local Dim = require "scripts.graphics.dimensions"
 
 local Lang = require "language"
 

scripts/titlescreen/service/screencheckpage.lua

@@ -1,5 +1,5 @@
 require("common.class")
-local Dim = require("common.dimensions")
+local Dim = require("scripts.graphics.dimensions")
 local ServicePage = require("api.page.servicepage")
 
 ---@class ScreenCheckPage: ServicePage

scripts/titlescreen/splash.lua

@@ -1,5 +1,5 @@
 local Util = require("common.util")
-local Dim = require("common.dimensions")
+local Dim = require("scripts.graphics.dimensions")
 
 require "common.globals"
 require "common.class"

scripts/titlescreen/splash/creditspage.lua

@@ -1,9 +1,9 @@
 require "common.globals"
 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"
 
@@ -60,4 +60,4 @@ function CreditsPage:render(deltaTime)
     self._timer = self._timer + deltaTime
 end
 
-return CreditsPage
+return CreditsPage

scripts/titlescreen/splash/kshootmaniapage.lua

@@ -1,8 +1,8 @@
 require "common.globals"
 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 Page = require "api.page.page"
@@ -71,4 +71,4 @@ function KShootManiaPage:render(deltaTime)
     self._timer = self._timer + deltaTime
 end
 
-return KShootManiaPage
+return KShootManiaPage

scripts/titlescreen/splash/teamexceedpage.lua

@@ -1,9 +1,9 @@
 require "common.globals"
 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"
 
@@ -60,4 +60,4 @@ function TeamExceedPage:render(deltaTime)
     self._timer = self._timer + deltaTime
 end
 
-return TeamExceedPage
+return TeamExceedPage

scripts/titlescreen/splash/uscpage.lua

@@ -1,9 +1,9 @@
 require "common.globals"
 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"
 
@@ -60,4 +60,4 @@ function USCPage:render(deltaTime)
     self._timer = self._timer + deltaTime
 end
 
-return USCPage
+return USCPage

scripts/titlescreen/title.lua

@@ -1,9 +1,9 @@
 require "common.globals"
 
 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"