modules/menusystem: link a menusystem to a scene
This commit is contained in:
parent
946b446844
commit
faa12d4ff7
2 changed files with 6 additions and 2 deletions
|
@ -38,7 +38,8 @@ MenuSystem.Widget = require(cwd .. "widgets")
|
||||||
-- INIT FUNCTIONS
|
-- INIT FUNCTIONS
|
||||||
-- Initialize and configure the menu controller
|
-- Initialize and configure the menu controller
|
||||||
|
|
||||||
function MenuSystem:new()
|
function MenuSystem:new(scene)
|
||||||
|
self.scene = scene
|
||||||
self.menus = {}
|
self.menus = {}
|
||||||
self.focusedMenu = ""
|
self.focusedMenu = ""
|
||||||
self.isActive = true
|
self.isActive = true
|
||||||
|
@ -140,6 +141,9 @@ function MenuSystem:removeDestroyedMenus()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- SOUND FUNCTIONS
|
||||||
|
-- Add sounds to every menus
|
||||||
|
|
||||||
-- UPDATE FUNCTIONS
|
-- UPDATE FUNCTIONS
|
||||||
-- Update the menus of the menusystem
|
-- Update the menus of the menusystem
|
||||||
|
|
||||||
|
|
|
@ -37,7 +37,7 @@ function Scene:new()
|
||||||
self.mouse.x, self.mouse.y = core.screen:getMousePosition()
|
self.mouse.x, self.mouse.y = core.screen:getMousePosition()
|
||||||
|
|
||||||
self.assets = Assets()
|
self.assets = Assets()
|
||||||
self.menusystem = MenuSystem()
|
self.menusystem = MenuSystem(self)
|
||||||
self.sources = core.input:getSources()
|
self.sources = core.input:getSources()
|
||||||
|
|
||||||
self.inputLocked = false
|
self.inputLocked = false
|
||||||
|
|
Loading…
Reference in a new issue