fixed lit thresholds

This commit is contained in:
anton.gurov
2019-11-07 13:30:37 +03:00
parent dd2e68a8e8
commit e9e6160f9e
6 changed files with 61 additions and 39 deletions

View File

@ -4,7 +4,6 @@ import (
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"lab.zaar.be/thefish/alchemyst-go/engine/ecs"
"lab.zaar.be/thefish/alchemyst-go/engine/ecs/systems"
"lab.zaar.be/thefish/alchemyst-go/engine/gamemap"
"lab.zaar.be/thefish/alchemyst-go/engine/gamemap/mapgens"
"lab.zaar.be/thefish/alchemyst-go/engine/gamestate"
@ -76,13 +75,29 @@ func main() {
State.Level = level
//Set up viewport
vp := mainwindow.NewViewPort(30, 0, 70, 47, mw.GetLayer("base"))
vp := mainwindow.NewViewPort(30, 0, (mw.W - 30), (mw.H - 0), mw.GetLayer("base"))
go vp.Listen(State)
//set up controller
controller := ecs.NewController()
controller.MapComponentClass("coords", types.Coords{})
controller.MapComponentClass("appearance", types.Appearance{})
controller.MapComponentClass("mob", mob.Mob{})
controller.MapComponentClass("moveable", movement.Moveable{})
moveable := movement.Moveable{
Controller: controller,
Level: level,
}
//Set up Screen Manager
screenMgr := types.NewScreenManager(mainCtx)
screenMgr.AddScreen("title", &screens.TitleScreen{})
screenMgr.AddScreen("game", screens.NewGameScreen(mw, &State, vp))
screenMgr.AddScreen("game", screens.NewGameScreen(mw, &State, vp, controller))
screenMgr.SetScreenByName("game")
@ -104,19 +119,6 @@ func main() {
//vp.PlayerCoords = player.Coords
//vp.Render(&State)
//set up controller
controller := ecs.NewController()
controller.MapComponentClass("coords", types.Coords{})
controller.MapComponentClass("appearance", types.Appearance{})
controller.MapComponentClass("mob", mob.Mob{})
controller.MapComponentClass("moveable", movement.Moveable{})
moveable := movement.Moveable{
Controller: controller,
Level: level,
}
//fixme set up (load / generate) player
player := controller.CreateEntity([]ecs.Component{})
@ -131,11 +133,6 @@ func main() {
controller.AddComponent(player, rooms[0].Center) //implicit Coords
controller.AddComponent(player, moveable)
render := systems.MobRenderSystem{EntityController: controller}
controller.AddSystem(render, 1)
State.Player = player
State.Controller = controller