Merge pull request #1340 from uspgamedev/fix/animation-lag

Stop wasting frames on non-animations

Author: rilifon

game/domain/actor.lua

@@ -486,8 +486,12 @@ function Actor:canSee(target)
   if sector ~= target_sector then
     return false
   end
-  local fov = self:getFov(sector)
   local i, j = target:getPos()
+  return self:canSeePosition(i, j)
+end
+
+function Actor:canSeePosition(i, j)
+  local fov = self:getFov(self:getSector())
   local visible = fov[i][j]
   return visible and visible > 0
 end

game/gamestates/animation.lua

@@ -1,4 +1,5 @@
 
+local SWITCHER = require 'infra.switcher'
 local INPUT = require 'input'
 local Util  = require "steaming.util"
 local Draw  = require "draw"
@@ -11,23 +12,19 @@ local state = {}
 local _animation_task
 local _view
 local _alert
-local _route
-local _report
 
 --[[ LOCAL FUNCTIONS ]]--
 
 --[[ STATE FUNCTIONS ]]--
 
-function state:init()
+function state:init() -- luacheck: no self
   -- dunno
 end
 
-function state:enter(_, route, view, report)
+function state:enter(_, route, view, report) -- luacheck: no self
 
   _view = view
   _alert = false
-  _route = route
-  _report = report
 
   local ok, animation = pcall(function () return ANIMATIONS[report.type] end)
   if ok then
@@ -42,14 +39,13 @@ function state:enter(_, route, view, report)
 
 end
 
-function state:leave()
+function state:leave() -- luacheck: no self
 
-  _report = nil
   Util.destroyAll()
 
 end
 
-function state:update(dt)
+function state:update(_) -- luacheck: no self
 
   if INPUT.wasAnyPressed(0.5) then
     _alert = true
@@ -63,7 +59,7 @@ function state:update(dt)
 
 end
 
-function state:draw()
+function state:draw() -- luacheck: no self
 
     Draw.allTables()
 

game/gamestates/play.lua

@@ -61,10 +61,15 @@ local function _playTurns(...)
     _activity:changeSector(...)
   elseif request == "report" then
     local player = _route.getControlledActor()
-    if extra.actor ~= player then
-      _view.action_hud:disableTurn()
+    local body = extra.body or (extra.actor and extra.actor:getBody())
+    if body and player:canSee(body) then
+      if extra.actor ~= player then
+        _view.action_hud:disableTurn()
+      end
+      SWITCHER.push(GS.ANIMATION, _route, _view, extra)
+    else
+      return _playTurns()
     end
-    SWITCHER.push(GS.ANIMATION, _route, _view, extra)
   end
   _next_action = nil
 end

game/infra/switcher.lua

@@ -1,6 +1,5 @@
 
 local Gamestate = require "steaming.extra_libs.hump.gamestate"
-local Queue     = require 'lux.common.Queue'
 local INPUT     = require 'input'
 
 local SWITCHER = {}
@@ -22,7 +21,7 @@ local _switched = false
 
 function SWITCHER.init()
   for _,handle in ipairs(_INPUT_HANDLES) do
-    love[handle] = function (...)
+    love[handle] = function (...) -- luacheck: globals love
       return Gamestate[handle](...)
     end
   end

game/main.lua

@@ -85,6 +85,38 @@ function love.load(arg)
   })
 end
 
+--local SAMPLES = 10
+--local profiling = {}
+--local last_state
+--
+--function updateProfiling(dt)
+--  local state = last_state
+--  last_state = SWITCHER.current()
+--  if not state then return end
+--  local name = "???"
+--  for k,v in pairs(GS) do
+--    if v == state then
+--      name = k
+--      break
+--    end
+--  end
+--  if dt > 0.2 then
+--    print("lag on state", name)
+--  end
+--  local sample = profiling[name] or { times = {} , n = 1 }
+--  sample.times[sample.n] = dt
+--  sample.n = (sample.n % SAMPLES) + 1
+--  profiling[name] = sample
+--end
+--
+--function average(sample)
+--  local sum = 0
+--  for _,time in ipairs(sample.times) do
+--    sum = sum + time
+--  end
+--  return sum / math.max(#sample.times, SAMPLES)
+--end
+
 function love.update(dt)
   MAIN_TIMER:update(dt)
   if INPUT.wasActionReleased('QUIT') then
@@ -97,6 +129,7 @@ function love.update(dt)
     SWITCHER.push(GS.DEVMODE)
   end
   SWITCHER.update(dt)
+  --updateProfiling(dt)
   INPUT.flush() -- must be called afterwards
   Util.updateSubtype(dt, 'task')
   Draw.update(dt)
@@ -106,6 +139,16 @@ end
 
 function love.draw()
   SWITCHER.draw()
+  --local g = love.graphics
+  --g.push()
+  --g.origin()
+  --g.setColor(1,1,1)
+  --local i = 0
+  --for name,sample in pairs(profiling) do
+  --  g.print(("%s: %.2f"):format(name, 1 / average(sample)), 32, 32+i*32)
+  --  i = i + 1
+  --end
+  --g.pop()
 end
 
 function love.quit()

game/view/sector.lua

@@ -18,7 +18,6 @@ local DIALOGUEBOX = require 'view.dialoguebox'
 local SPRITEFX    = require 'lux.pack' 'view.spritefx'
 local PLAYSFX     = require 'helpers.playsfx'
 local vec2        = require 'cpml'.vec2
-local Util        = require "steaming.util"
 local Class       = require "steaming.extra_libs.hump.class"
 local ELEMENT     = require "steaming.classes.primitives.element"
 
@@ -159,19 +158,9 @@ function SectorView:startVFX(extra)
   if extra.type then
     local spritefx = SPRITEFX[extra.type]
     self.vfx = spritefx
-    MAIN_TIMER:script(function(wait)
-      local ann = Util.findId('announcement')
-      if ann:isLocked() then
-        while ann:isLocked() do wait(1) end
-        wait(0.2)
-      end
-      spritefx.apply(self, extra)
-      --Play SFX if any
-      if extra.sfx then
-        _playSFX(self.target, extra)
-      end
-    end)
-  elseif extra.sfx then
+    spritefx.apply(self, extra)
+  end
+  if extra.sfx then
     _playSFX(self.target, extra)
   end
 end