From 9937f56a4d653783c01591cdee9c363be1636254 Mon Sep 17 00:00:00 2001 From: Hersi Date: Wed, 27 Apr 2022 02:40:22 +0200 Subject: [PATCH] new() doesn't need to be a class method --- scripts/common/class.lua | 14 +++++++---- scripts/components/pager/containerfield.lua | 4 ++-- scripts/components/pager/field.lua | 4 ++-- scripts/components/pager/linkfield.lua | 4 ++-- scripts/components/pager/page.lua | 4 ++-- scripts/components/pager/pageview.lua | 4 ++-- scripts/titlescreen/boot.lua | 4 ++-- .../fields/boot/checkupdatefield.lua | 4 ++-- .../titlescreen/fields/boot/dialogfield.lua | 8 +++---- .../titlescreen/fields/boot/selftestfield.lua | 4 ++-- .../fields/service/colorgradientfield.lua | 4 ++-- .../fields/service/inputbuttonfield.lua | 4 ++-- .../fields/service/inputknobfield.lua | 4 ++-- .../titlescreen/fields/service/listfield.lua | 4 ++-- .../fields/service/servicefield.lua | 6 ++--- .../fields/service/servicelinkfield.lua | 4 ++-- .../fields/service/updatefield.lua | 4 ++-- scripts/titlescreen/pages/boot/bootpage.lua | 18 +++++++------- .../pages/boot/checkupdatepage.lua | 15 ++++++------ .../pages/service/colorcheckpage.lua | 22 ++++++++--------- .../pages/service/inputcheckpage.lua | 24 +++++++++---------- .../pages/service/mainmenupage.lua | 14 +++++------ .../pages/service/screencheckpage.lua | 4 ++-- .../titlescreen/pages/service/servicepage.lua | 6 ++--- .../pages/service/versioninfopage.lua | 22 ++++++++--------- scripts/titlescreen/service.lua | 6 ++--- 26 files changed, 111 insertions(+), 104 deletions(-) diff --git a/scripts/common/class.lua b/scripts/common/class.lua index 4c7f409..b3ed3ab 100644 --- a/scripts/common/class.lua +++ b/scripts/common/class.lua @@ -1,3 +1,7 @@ +---Member lookup helper function +---@param key string +---@param bases any +---@return any local function search(key, bases) for _, base in ipairs(bases) do local v = base[key] -- try `i'-th superclass @@ -5,25 +9,27 @@ local function search(key, bases) end end ----Declare table as polimorphic class +---Create polimorphic class ---@generic BaseT, T ---@param cls T # class metatable ---@param o? table # initial parameters ---@param ... BaseT # base class metatables (if any) ---@return T # class instance -function CreateClass(cls, o, ...) +function CreateInstance(cls, o, ...) o = o or {} local nargs = select("#", ...) local vargs = { select(1, ...) } cls.__index = cls if nargs == 1 then + -- single inheritance local base = vargs[1] setmetatable(cls, {__index = base}) - o = base:new(o) + o = base.new(o) elseif nargs > 1 then + -- multiple inheritance (note: slow(er) member lookup) setmetatable(cls, {__index = function(t, k) return search(k, vargs) end}) for _, base in ipairs(vargs) do - o = base:new(o) + o = base.new(o) end end setmetatable(o, cls) diff --git a/scripts/components/pager/containerfield.lua b/scripts/components/pager/containerfield.lua index bf912c0..49a1426 100644 --- a/scripts/components/pager/containerfield.lua +++ b/scripts/components/pager/containerfield.lua @@ -10,14 +10,14 @@ local ContainerField = { ---Create a new ContainerField instance ---@param o? table # initial parameters ---@return ContainerField -function ContainerField:new(o) +function ContainerField.new(o) o = o or {} --set instance members o.content = o.content or {} - local this = CreateClass(self, o, Field) + local this = CreateInstance(ContainerField, o, Field) this:refreshFields() diff --git a/scripts/components/pager/field.lua b/scripts/components/pager/field.lua index 14a292a..8e5ab0d 100644 --- a/scripts/components/pager/field.lua +++ b/scripts/components/pager/field.lua @@ -13,7 +13,7 @@ local Field = { ---Create a new Field instance ---@param o? table # initial parameters ---@return Field -function Field:new(o) +function Field.new(o) o = o or {} --set instance members @@ -24,7 +24,7 @@ function Field:new(o) o.aabbW = o.aabbW or 0 o.aabbH = o.aabbH or 0 - return CreateClass(self, o) + return CreateInstance(Field, o) end ---Get the containing top-level parent page diff --git a/scripts/components/pager/linkfield.lua b/scripts/components/pager/linkfield.lua index 19c85ba..107d9a1 100644 --- a/scripts/components/pager/linkfield.lua +++ b/scripts/components/pager/linkfield.lua @@ -10,12 +10,12 @@ local LinkField = { ---Create a new LinkField instance ---@param o? table # initial parameters ---@return LinkField -function LinkField:new(o) +function LinkField.new(o) o = o or {} o.link = o.link or nil - return CreateClass(self, o, Field) + return CreateInstance(LinkField, o, Field) end ---@param button integer # options are under the `game` table prefixed with `BUTTON` diff --git a/scripts/components/pager/page.lua b/scripts/components/pager/page.lua index b623603..8496f0f 100644 --- a/scripts/components/pager/page.lua +++ b/scripts/components/pager/page.lua @@ -11,7 +11,7 @@ local Page = { ---Create a new Page instance ---@param o? table # initial parameters ---@return Page -function Page:new(o) +function Page.new(o) o = o or {} --set instance members @@ -19,7 +19,7 @@ function Page:new(o) o.content = o.content or {} o.viewHandler = o.viewHandler or nil - return CreateClass(self, o) + return CreateInstance(Page, o) end ---Add field to page diff --git a/scripts/components/pager/pageview.lua b/scripts/components/pager/pageview.lua index 9d71a07..4fa2725 100644 --- a/scripts/components/pager/pageview.lua +++ b/scripts/components/pager/pageview.lua @@ -17,7 +17,7 @@ end ---Create a new PageView instance ---@param rootPage Page ---@return PageView -function PageView:new(rootPage) +function PageView.new(rootPage) local o = {} --set viewHandler as this instance for rootPage @@ -29,7 +29,7 @@ function PageView:new(rootPage) o.pageStack = {} pushStack(o.pageStack, rootPage) - return CreateClass(self, o) + return CreateInstance(PageView, o) end ---Get page from pageStack diff --git a/scripts/titlescreen/boot.lua b/scripts/titlescreen/boot.lua index 4cfe557..ce94260 100644 --- a/scripts/titlescreen/boot.lua +++ b/scripts/titlescreen/boot.lua @@ -3,8 +3,8 @@ local Wallpaper = require("components.wallpaper") local BootPage = require("titlescreen.pages.boot.bootpage") local PageView = require("components.pager.pageview") -local bootpage = BootPage:new() -local pageview = PageView:new(bootpage) +local bootpage = BootPage.new() +local pageview = PageView.new(bootpage) local function render(deltaTime) Dim.updateResolution() diff --git a/scripts/titlescreen/fields/boot/checkupdatefield.lua b/scripts/titlescreen/fields/boot/checkupdatefield.lua index fea7794..13b84e1 100644 --- a/scripts/titlescreen/fields/boot/checkupdatefield.lua +++ b/scripts/titlescreen/fields/boot/checkupdatefield.lua @@ -14,13 +14,13 @@ local CheckUpdateField = { ---Create a new CheckUpdateField instance ---@param o? table # initial parameters ---@return CheckUpdateField -function CheckUpdateField:new(o) +function CheckUpdateField.new(o) o = o or {} o._timer = o._timer or 0 o.onUpdateAvailable = o.onUpdateAvailable or nil - local this = CreateClass(self, o, ServiceField) + local this = CreateInstance(CheckUpdateField, o, ServiceField) this._url = nil this._version = nil diff --git a/scripts/titlescreen/fields/boot/dialogfield.lua b/scripts/titlescreen/fields/boot/dialogfield.lua index 417a065..6d1bc99 100644 --- a/scripts/titlescreen/fields/boot/dialogfield.lua +++ b/scripts/titlescreen/fields/boot/dialogfield.lua @@ -37,13 +37,13 @@ local DialogField = { ---Inherits from ContainerField ---@param o ContainerField ---@return DialogField -function DialogField:new(o) +function DialogField.new(o) o = o or {} - o.aabbW = o.aabbW or self.DEFAULT_WIDTH - o.aabbH = o.aabbH or self.DEFAULT_HEIGHT + o.aabbW = o.aabbW or DialogField.DEFAULT_WIDTH + o.aabbH = o.aabbH or DialogField.DEFAULT_HEIGHT - local this = CreateClass(self, o, ContainerField) + local this = CreateInstance(DialogField, o, ContainerField) this._symbolMargin = 8 this._symbolSize = 48 diff --git a/scripts/titlescreen/fields/boot/selftestfield.lua b/scripts/titlescreen/fields/boot/selftestfield.lua index 87f6bd9..3c955d1 100644 --- a/scripts/titlescreen/fields/boot/selftestfield.lua +++ b/scripts/titlescreen/fields/boot/selftestfield.lua @@ -34,7 +34,7 @@ local SelfTestField = { ---Create a new SelfTestField instance ---@param o? table ---@return SelfTestField -function SelfTestField:new(o) +function SelfTestField.new(o) o = o or {} o.status = o.status or SelfTestStatusEnum.IDLE @@ -45,7 +45,7 @@ function SelfTestField:new(o) "Failed to construct SelfTestField, checkTask is mandatory when onStatusChange is defined!\n" .. debug.traceback() ) - return CreateClass(self, o, ServiceField) + return CreateInstance(SelfTestField, o, ServiceField) end function SelfTestField:_closeThread() diff --git a/scripts/titlescreen/fields/service/colorgradientfield.lua b/scripts/titlescreen/fields/service/colorgradientfield.lua index 2c6366b..97302eb 100644 --- a/scripts/titlescreen/fields/service/colorgradientfield.lua +++ b/scripts/titlescreen/fields/service/colorgradientfield.lua @@ -13,12 +13,12 @@ local ColorGradientField = { ---Create a new ColorGradientField instance ---@param o? table # initial parameters ---@return ColorGradientField -function ColorGradientField:new(o) +function ColorGradientField.new(o) o = o or {} o.value = o.value or {0, 0, 0, 255} - return CreateClass(self, o, ServiceField) + return CreateInstance(ColorGradientField, o, ServiceField) end ---@param obj? any # message object for the field diff --git a/scripts/titlescreen/fields/service/inputbuttonfield.lua b/scripts/titlescreen/fields/service/inputbuttonfield.lua index a9af384..294a455 100644 --- a/scripts/titlescreen/fields/service/inputbuttonfield.lua +++ b/scripts/titlescreen/fields/service/inputbuttonfield.lua @@ -10,12 +10,12 @@ local InputButtonField = { ---Create a new InputButtonField instance ---@param o? table # initial parameters ---@return InputButtonField -function InputButtonField:new(o) +function InputButtonField.new(o) o = o or {} o.button = o.button or nil - return CreateClass(self, o, ServiceField) + return CreateInstance(InputButtonField, o, ServiceField) end ---@param obj? any # message object for the field diff --git a/scripts/titlescreen/fields/service/inputknobfield.lua b/scripts/titlescreen/fields/service/inputknobfield.lua index 2fde1cb..e2840c0 100644 --- a/scripts/titlescreen/fields/service/inputknobfield.lua +++ b/scripts/titlescreen/fields/service/inputknobfield.lua @@ -18,12 +18,12 @@ local InputKnobField = { ---Create a new InputKnobField instance ---@param o? table # initial parameters ---@return InputKnobField -function InputKnobField:new(o) +function InputKnobField.new(o) o = o or {} o.knob = o.knob or nil - return CreateClass(self, o, ServiceField) + return CreateInstance(InputKnobField, o, ServiceField) end ---@param obj? any # message object for the field diff --git a/scripts/titlescreen/fields/service/listfield.lua b/scripts/titlescreen/fields/service/listfield.lua index b25de81..554826b 100644 --- a/scripts/titlescreen/fields/service/listfield.lua +++ b/scripts/titlescreen/fields/service/listfield.lua @@ -15,14 +15,14 @@ local ListField = { ---Create a new ListField instance ---@param o? table # initial parameters ---@return ListField -function ListField:new(o) +function ListField.new(o) o = o or {} --set instance members o.selectedIndex = o.selectedIndex or 1 o.locked = o.locked or false - local this = CreateClass(self, o, ContainerField, ServiceField) + local this = CreateInstance(ListField, o, ContainerField, ServiceField) local minW = this.MARGIN[1] + this.PADDING[1] + this.PADDING[3] + this.MARGIN[3] local minH = this.MARGIN[2] + this.PADDING[2] + this.PADDING[4] + this.MARGIN[4] diff --git a/scripts/titlescreen/fields/service/servicefield.lua b/scripts/titlescreen/fields/service/servicefield.lua index 732d9f7..3c7f708 100644 --- a/scripts/titlescreen/fields/service/servicefield.lua +++ b/scripts/titlescreen/fields/service/servicefield.lua @@ -35,10 +35,10 @@ local ServiceField = { ---Create a new ServiceField instance ---@param o? table # initial parameters ---@return ServiceField -function ServiceField:new(o) +function ServiceField.new(o) o = o or {} - local h = self.FONT_SIZE + self.MARGIN[2] + self.MARGIN[4] + local h = ServiceField.FONT_SIZE + ServiceField.MARGIN[2] + ServiceField.MARGIN[4] o.aabbH = o.aabbH or h o.aabbW = o.aabbW or Dim.design.width --:shrug: @@ -49,7 +49,7 @@ function ServiceField:new(o) o._state = ServiceFieldState.INACTIVE - local this = CreateClass(self, o, Field) + local this = CreateInstance(ServiceField, o, Field) if this.aabbH < h then this.aabbH = h diff --git a/scripts/titlescreen/fields/service/servicelinkfield.lua b/scripts/titlescreen/fields/service/servicelinkfield.lua index b469ba4..384f10b 100644 --- a/scripts/titlescreen/fields/service/servicelinkfield.lua +++ b/scripts/titlescreen/fields/service/servicelinkfield.lua @@ -10,10 +10,10 @@ local ServiceLinkField = { ---Create a new ServiceLinkField instance ---@param o? table # initial parameters ---@return ServiceLinkField -function ServiceLinkField:new(o) +function ServiceLinkField.new(o) o = o or {} - return CreateClass(self, o, ServiceField, LinkField) + return CreateInstance(ServiceLinkField, o, ServiceField, LinkField) end ---@param deltaTime number # frametime in seconds diff --git a/scripts/titlescreen/fields/service/updatefield.lua b/scripts/titlescreen/fields/service/updatefield.lua index 530faf8..5564c4b 100644 --- a/scripts/titlescreen/fields/service/updatefield.lua +++ b/scripts/titlescreen/fields/service/updatefield.lua @@ -15,12 +15,12 @@ local UpdateField = { ---Create a new UpdateField instance ---@param o? table # initial parameters ---@return UpdateField -function UpdateField:new(o) +function UpdateField.new(o) o = o or {} o._timer = 0 - return CreateClass(self, o, ServiceField) + return CreateInstance(UpdateField, o, ServiceField) end ---@param obj? any # message object for the field diff --git a/scripts/titlescreen/pages/boot/bootpage.lua b/scripts/titlescreen/pages/boot/bootpage.lua index 5634930..770e3f0 100644 --- a/scripts/titlescreen/pages/boot/bootpage.lua +++ b/scripts/titlescreen/pages/boot/bootpage.lua @@ -16,18 +16,18 @@ local BootPage = { ---Create a new BootPage instance ---@param o? table # initial parameters ---@return BootPage -function BootPage:new(o) +function BootPage.new(o) o = o or {} - local this = CreateClass(self, o, Page) + local this = CreateInstance(BootPage, o, Page) this._networkResult = {} - this:addField(ServiceField:new{posX = 32, posY = 32, label = Version.getLongVersion(), value = ""}) - this:addField(ServiceField:new{posX = 64, posY = 64, label = "UNNAMED SDVX CLONE STARTUP...", value = ""}) + this:addField(ServiceField.new{posX = 32, posY = 32, label = Version.getLongVersion(), value = ""}) + this:addField(ServiceField.new{posX = 64, posY = 64, label = "UNNAMED SDVX CLONE STARTUP...", value = ""}) local valueOffX = 220 - this._mainIoTestField = SelfTestField:new{label = "MAIN I/O", VALUE_OFFSETX = valueOffX} + this._mainIoTestField = SelfTestField.new{label = "MAIN I/O", VALUE_OFFSETX = valueOffX} this._mainIoTestField.checkTask = function(obj) return SelfTestStatusEnum.OK end @@ -37,7 +37,7 @@ function BootPage:new(o) end end - this._skinConfigTestField = SelfTestField:new{label = "SKIN CONFIG", VALUE_OFFSETX = valueOffX} + this._skinConfigTestField = SelfTestField.new{label = "SKIN CONFIG", VALUE_OFFSETX = valueOffX} this._skinConfigTestField.checkTask = function(obj) local crewpath = "skins/" .. game.GetSkin() .. "/textures/crew/anim/" .. game.GetSkinSetting("single_idol") if not IsDir(crewpath) then @@ -51,7 +51,7 @@ function BootPage:new(o) end end - this._networkTestField = SelfTestField:new{label = "NETWORK", VALUE_OFFSETX = valueOffX} + this._networkTestField = SelfTestField.new{label = "NETWORK", VALUE_OFFSETX = valueOffX} -- set up async network check this._networkTestField.checkTask = function(obj) local status = SelfTestStatusEnum.INPROGRESS @@ -77,12 +77,12 @@ function BootPage:new(o) IR.Heartbeat(function(res) this._networkResult = res end) -- IR doesn't like being called in a coroutine elseif status == SelfTestStatusEnum.PASS or status == SelfTestStatusEnum.OK then if this.viewHandler then - this.viewHandler:navigate(CheckUpdatePage:new()) + this.viewHandler:navigate(CheckUpdatePage.new()) end end end - local list = ListField:new{posX = 64, posY = 96} + local list = ListField.new{posX = 64, posY = 96} list:addField(this._mainIoTestField) list:addField(this._skinConfigTestField) list:addField(this._networkTestField) diff --git a/scripts/titlescreen/pages/boot/checkupdatepage.lua b/scripts/titlescreen/pages/boot/checkupdatepage.lua index 620419f..a87fb3d 100644 --- a/scripts/titlescreen/pages/boot/checkupdatepage.lua +++ b/scripts/titlescreen/pages/boot/checkupdatepage.lua @@ -13,14 +13,14 @@ local CheckUpdatePage = { ---Create a new CheckUpdatePage instance ---@param o? table # initial parameters ---@return CheckUpdatePage -function CheckUpdatePage:new(o) - local this = CreateClass(self, o, Page) +function CheckUpdatePage.new(o) + local this = CreateInstance(CheckUpdatePage, o, Page) local width = DialogField.DEFAULT_WIDTH local height = DialogField.DEFAULT_HEIGHT local posX = (Dim.design.width - width) / 2 local posY = (Dim.design.height - height) / 2 - this._updateDialogField = DialogField:new{ + this._updateDialogField = DialogField.new{ posX = posX, posY = posY, aabbW = width, @@ -54,16 +54,17 @@ function CheckUpdatePage:new(o) return true elseif button == game.BUTTON_STA then -- NOTE: this is a huge ass hack, please rethink - local pageview = this.viewHandler local MainMenuPage = require("titlescreen.pages.service.mainmenupage") local VersionInfoPage = require("titlescreen.pages.service.versioninfopage") - pageview:replace(MainMenuPage:new()) - pageview:navigate(VersionInfoPage:new()) + this.viewHandler:replace(MainMenuPage.new()) + this.viewHandler:navigate(VersionInfoPage.new()) return true end + + return false end - this._checkUpdateField = CheckUpdateField:new{posX = 32, posY = 64, label = "update check"} + this._checkUpdateField = CheckUpdateField.new{posX = 32, posY = 64, label = "update check"} this._checkUpdateField.onUpdateAvailable = function(url, version) this:addField(this._updateDialogField) this._focusedField = this._updateDialogField diff --git a/scripts/titlescreen/pages/service/colorcheckpage.lua b/scripts/titlescreen/pages/service/colorcheckpage.lua index 1018bbc..5a3fdeb 100644 --- a/scripts/titlescreen/pages/service/colorcheckpage.lua +++ b/scripts/titlescreen/pages/service/colorcheckpage.lua @@ -21,7 +21,7 @@ local ColorCheckPage = { ---Create a new ColorCheckPage instance ---@param o? table # initial parameters ---@return ColorCheckPage -function ColorCheckPage:new(o) +function ColorCheckPage.new(o) o = o or {} o.title = o.title or "COLOR CHECK" @@ -30,17 +30,17 @@ function ColorCheckPage:new(o) "BACK BUTTON = EXIT" } - local this = CreateClass(self, o, ServicePage) + local this = CreateInstance(ColorCheckPage, o, ServicePage) - local height = self.GRADIENT_SPACING - local list = ListField:new() - list:addField(ColorGradientField:new{label = "RED", value = {255, 0, 0, 255}, aabbH = height}) - list:addField(ColorGradientField:new{label = "YELLOW", value = {255, 255, 0, 255}, aabbH = height}) - list:addField(ColorGradientField:new{label = "GREEN", value = {0, 255, 0, 255}, aabbH = height}) - list:addField(ColorGradientField:new{label = "CYAN", value = {0, 255, 255, 255}, aabbH = height}) - list:addField(ColorGradientField:new{label = "BLUE", value = {0, 0, 255, 255}, aabbH = height}) - list:addField(ColorGradientField:new{label = "MAGENTA", value = {255, 0, 255, 255}, aabbH = height}) - list:addField(ColorGradientField:new{label = "WHITE", value = {255, 255, 255, 255}, aabbH = height}) + local height = ColorCheckPage.GRADIENT_SPACING + local list = ListField.new() + list:addField(ColorGradientField.new{label = "RED", value = {255, 0, 0, 255}, aabbH = height}) + list:addField(ColorGradientField.new{label = "YELLOW", value = {255, 255, 0, 255}, aabbH = height}) + list:addField(ColorGradientField.new{label = "GREEN", value = {0, 255, 0, 255}, aabbH = height}) + list:addField(ColorGradientField.new{label = "CYAN", value = {0, 255, 255, 255}, aabbH = height}) + list:addField(ColorGradientField.new{label = "BLUE", value = {0, 0, 255, 255}, aabbH = height}) + list:addField(ColorGradientField.new{label = "MAGENTA", value = {255, 0, 255, 255}, aabbH = height}) + list:addField(ColorGradientField.new{label = "WHITE", value = {255, 255, 255, 255}, aabbH = height}) list:refreshFields() this:addField(list) diff --git a/scripts/titlescreen/pages/service/inputcheckpage.lua b/scripts/titlescreen/pages/service/inputcheckpage.lua index acf25be..0606ccc 100644 --- a/scripts/titlescreen/pages/service/inputcheckpage.lua +++ b/scripts/titlescreen/pages/service/inputcheckpage.lua @@ -12,24 +12,24 @@ local InputCheckPage = { ---Create a new InputCheckPage instance ---@param o? table # initial parameters ---@return InputCheckPage -function InputCheckPage:new(o) +function InputCheckPage.new(o) o = o or {} o.title = o.title or "INPUT CHECK" o.footer = o.footer or "BACK BUTTON = EXIT" - local this = CreateClass(self, o, ServicePage) + local this = CreateInstance(InputCheckPage, o, ServicePage) - local list = ListField:new() - list:addField(InputButtonField:new{label="START BUTTON", button=game.BUTTON_STA}) - list:addField(InputButtonField:new{label="A BUTTON", button=game.BUTTON_BTA}) - list:addField(InputButtonField:new{label="B BUTTON", button=game.BUTTON_BTB}) - list:addField(InputButtonField:new{label="C BUTTON", button=game.BUTTON_BTC}) - list:addField(InputButtonField:new{label="D BUTTON", button=game.BUTTON_BTD}) - list:addField(InputButtonField:new{label="FX L BUTTON", button=game.BUTTON_FXL}) - list:addField(InputButtonField:new{label="FX R BUTTON", button=game.BUTTON_FXR}) - list:addField(InputKnobField:new{label="ANALOG VOLUME L", knob=0}) - list:addField(InputKnobField:new{label="ANALOG VOLUME R", knob=1}) + local list = ListField.new() + list:addField(InputButtonField.new{label="START BUTTON", button=game.BUTTON_STA}) + list:addField(InputButtonField.new{label="A BUTTON", button=game.BUTTON_BTA}) + list:addField(InputButtonField.new{label="B BUTTON", button=game.BUTTON_BTB}) + list:addField(InputButtonField.new{label="C BUTTON", button=game.BUTTON_BTC}) + list:addField(InputButtonField.new{label="D BUTTON", button=game.BUTTON_BTD}) + list:addField(InputButtonField.new{label="FX L BUTTON", button=game.BUTTON_FXL}) + list:addField(InputButtonField.new{label="FX R BUTTON", button=game.BUTTON_FXR}) + list:addField(InputKnobField.new{label="ANALOG VOLUME L", knob=0}) + list:addField(InputKnobField.new{label="ANALOG VOLUME R", knob=1}) list:refreshFields() this:addField(list) diff --git a/scripts/titlescreen/pages/service/mainmenupage.lua b/scripts/titlescreen/pages/service/mainmenupage.lua index 61aa6ff..2613a79 100644 --- a/scripts/titlescreen/pages/service/mainmenupage.lua +++ b/scripts/titlescreen/pages/service/mainmenupage.lua @@ -15,18 +15,18 @@ local MainMenuPage = { ---Create a new MainMenuPage instance ---@param o? table # initial parameters ---@return MainMenuPage -function MainMenuPage:new(o) +function MainMenuPage.new(o) o = o or {} o.title = o.title or "MAIN MENU" - local this = CreateClass(self, o, ServicePage) + local this = CreateInstance(MainMenuPage, o, ServicePage) - local list = ListField:new() - list:addField(ServiceLinkField:new{label = "INPUT CHECK", link = InputCheckPage:new()}) - list:addField(ServiceLinkField:new{label = "SCREEN CHECK", link = ScreenCheckPage:new()}) - list:addField(ServiceLinkField:new{label = "COLOR CHECK", link = ColorCheckPage:new()}) - list:addField(ServiceLinkField:new{label = "VERSION INFORMATION", link = VersionInfoPage:new()}) + local list = ListField.new() + list:addField(ServiceLinkField.new{label = "INPUT CHECK", link = InputCheckPage.new()}) + list:addField(ServiceLinkField.new{label = "SCREEN CHECK", link = ScreenCheckPage.new()}) + list:addField(ServiceLinkField.new{label = "COLOR CHECK", link = ColorCheckPage.new()}) + list:addField(ServiceLinkField.new{label = "VERSION INFORMATION", link = VersionInfoPage.new()}) list:refreshFields() this:addField(list) diff --git a/scripts/titlescreen/pages/service/screencheckpage.lua b/scripts/titlescreen/pages/service/screencheckpage.lua index b70ef71..12f3806 100644 --- a/scripts/titlescreen/pages/service/screencheckpage.lua +++ b/scripts/titlescreen/pages/service/screencheckpage.lua @@ -19,7 +19,7 @@ local ScreenCheckPage = { ---Create a new ScreenCheckPage instance ---@param o? table # initial parameters ---@return ScreenCheckPage -function ScreenCheckPage:new(o) +function ScreenCheckPage.new(o) o = o or {} o.title = o.title or "SCREEN CHECK" @@ -28,7 +28,7 @@ function ScreenCheckPage:new(o) "BACK BUTTON = EXIT" } - return CreateClass(self, o, ServicePage) + return CreateInstance(ScreenCheckPage, o, ServicePage) end ---@param button integer # options are under the `game` table prefixed with `BUTTON` diff --git a/scripts/titlescreen/pages/service/servicepage.lua b/scripts/titlescreen/pages/service/servicepage.lua index 1dbf4f4..753dc65 100644 --- a/scripts/titlescreen/pages/service/servicepage.lua +++ b/scripts/titlescreen/pages/service/servicepage.lua @@ -36,14 +36,14 @@ local ServicePage = { ---Create a new ServicePage instance ---@param o? table # initial parameters ---@return ServicePage -function ServicePage:new(o) +function ServicePage.new(o) o = o or {} o.title = o.title or "" o.selectedIndex = o.selectedIndex or 1 - o.footer = o.footer or self.FOOTER + o.footer = o.footer or ServicePage.FOOTER - return CreateClass(self, o, Page) + return CreateInstance(ServicePage, o, Page) end ---Refresh content values diff --git a/scripts/titlescreen/pages/service/versioninfopage.lua b/scripts/titlescreen/pages/service/versioninfopage.lua index e1abe98..4aa9ef2 100644 --- a/scripts/titlescreen/pages/service/versioninfopage.lua +++ b/scripts/titlescreen/pages/service/versioninfopage.lua @@ -20,7 +20,7 @@ local VersionInfoPage = { ---Create a new VersionInfoPage instance ---@param o? table # initial parameters ---@return VersionInfoPage -function VersionInfoPage:new(o) +function VersionInfoPage.new(o) o = o or {} o.title = o.title or "SYSTEM INFORMATION" @@ -30,19 +30,19 @@ function VersionInfoPage:new(o) } o.selectedIndex = o.selectedIndex or 1 - local this = CreateClass(self, o, ServicePage) + local this = CreateInstance(VersionInfoPage, o, ServicePage) local logStr = ReadGameFile("log_usc-game.exe.txt") or ReadGameFile("log_usc-game.txt") - local list = ListField:new{selectedIndex = 2, locked = true} - list:addField(ServiceField:new{label = "SKIN ID CODE", value = Version.getLongVersion(), MARGIN = {0, 0, 0, 24}}) - list:addField(UpdateField:new{label = "USC VERSION", value = getGameLogValue("Version", logStr)}) - list:addField(ServiceField:new{label = "USC BRANCH", value = GameConfig["UpdateChannel"]}) - list:addField(ServiceField:new{label = "USC GIT COMMIT", value = getGameLogValue("Git commit", logStr), MARGIN = {0, 0, 0, 24}}) - list:addField(ServiceField:new{label = "GL VERSION", value = getGameLogValue("OpenGL Version", logStr)}) - list:addField(ServiceField:new{label = "GLSL VERSION", value = getGameLogValue("OpenGL Shading Language Version", logStr)}) - list:addField(ServiceField:new{label = "GL RENDERER", value = getGameLogValue("OpenGL Renderer", logStr)}) - list:addField(ServiceField:new{label = "GL VENDOR", value = getGameLogValue("OpenGL Vendor", logStr)}) + local list = ListField.new{selectedIndex = 2, locked = true} + list:addField(ServiceField.new{label = "SKIN ID CODE", value = Version.getLongVersion(), MARGIN = {0, 0, 0, 24}}) + list:addField(UpdateField.new{label = "USC VERSION", value = getGameLogValue("Version", logStr)}) + list:addField(ServiceField.new{label = "USC BRANCH", value = GameConfig["UpdateChannel"]}) + list:addField(ServiceField.new{label = "USC GIT COMMIT", value = getGameLogValue("Git commit", logStr), MARGIN = {0, 0, 0, 24}}) + list:addField(ServiceField.new{label = "GL VERSION", value = getGameLogValue("OpenGL Version", logStr)}) + list:addField(ServiceField.new{label = "GLSL VERSION", value = getGameLogValue("OpenGL Shading Language Version", logStr)}) + list:addField(ServiceField.new{label = "GL RENDERER", value = getGameLogValue("OpenGL Renderer", logStr)}) + list:addField(ServiceField.new{label = "GL VENDOR", value = getGameLogValue("OpenGL Vendor", logStr)}) list:refreshFields() this:addField(list) diff --git a/scripts/titlescreen/service.lua b/scripts/titlescreen/service.lua index 9b4e235..074869f 100644 --- a/scripts/titlescreen/service.lua +++ b/scripts/titlescreen/service.lua @@ -30,12 +30,12 @@ local rootMenu = { ]] -local currentpage = MainMenuPage:new() +local currentpage = MainMenuPage.new() -local pageview = PageView:new(currentpage) +local pageview = PageView.new(currentpage) local function reset() - pageview = PageView:new(currentpage) + pageview = PageView.new(currentpage) end local function render(deltaTime)