gamecore/world: make the world registerable directly by itself
This commit is contained in:
parent
5e95099af9
commit
23f17491ad
5 changed files with 24 additions and 3 deletions
|
@ -36,7 +36,8 @@ function TestScene:new()
|
|||
self.i = 0
|
||||
self.estImpair = false
|
||||
|
||||
self.world = World(self, "examples.basic.test_scene2.actors")
|
||||
World(self, "examples.basic.test_scene2.actors")
|
||||
|
||||
self.world:newActor("explosion", 12, 12)
|
||||
self.world:newActor("explosion", 1, 78)
|
||||
self.world:newActor("explosion", 40, 200)
|
||||
|
|
|
@ -29,7 +29,7 @@ local World = require "gamecore.modules.world.world2D"
|
|||
function MovePlayer:new()
|
||||
MovePlayer.super.new(self)
|
||||
|
||||
self.world = World(self, "examples.gameplay.moveplayer.actors", "examples/gameplay/moveplayer/assets/arena.lua")
|
||||
World(self, "examples.gameplay.moveplayer.actors", "examples/gameplay/moveplayer/assets/arena.lua")
|
||||
|
||||
self.world:setPlayerNumber(4)
|
||||
|
||||
|
|
|
@ -33,7 +33,8 @@ function Plateformer:new()
|
|||
|
||||
self.assets:batchImport("examples.gameplay.plateform.assets")
|
||||
|
||||
self.world = World(self, folder .. ".actors", "examples/gameplay/plateform/assets/platformer.lua")
|
||||
World(self, folder .. ".actors", "examples/gameplay/plateform/assets/platformer.lua")
|
||||
|
||||
self.world:loadMap()
|
||||
end
|
||||
|
||||
|
|
|
@ -43,6 +43,8 @@ function Scene:new()
|
|||
self.inputLocked = false
|
||||
self.inputLockedTimer = 0
|
||||
|
||||
self:initWorld()
|
||||
|
||||
self:register()
|
||||
end
|
||||
|
||||
|
@ -72,6 +74,17 @@ function Scene:mousepressed( x, y, button, istouch )
|
|||
-- Empty function, is just here to avoid crash
|
||||
end
|
||||
|
||||
-- WORLD FUNCTIONS
|
||||
-- Basic functions to manage the world
|
||||
|
||||
function Scene:initWorld()
|
||||
self.world = nil
|
||||
end
|
||||
|
||||
function Scene:registerWorld(world)
|
||||
self.world = world
|
||||
end
|
||||
|
||||
-- KEYBOARD FUNCTIONS
|
||||
-- Add send keys functions to the scene
|
||||
|
||||
|
|
|
@ -42,6 +42,8 @@ function BaseWorld:new(scene, actorlist, mapfile)
|
|||
self:setActorList(actorlist)
|
||||
self:initMap(mapfile)
|
||||
self:setGravity()
|
||||
|
||||
self:register()
|
||||
end
|
||||
|
||||
function BaseWorld:setActorList(actorlist)
|
||||
|
@ -69,6 +71,10 @@ function BaseWorld:setGravity(xgrav, ygrav, isDefault)
|
|||
self.gravity.isDefault = isDefault
|
||||
end
|
||||
|
||||
function BaseWorld:register()
|
||||
self.scene:registerWorld(self)
|
||||
end
|
||||
|
||||
-- ACTOR MANAGEMENT FUNCTIONS
|
||||
-- Basic function to handle actors
|
||||
|
||||
|
|
Loading…
Reference in a new issue