Some refact.

devlog.md

@@ -1,4 +1,6 @@
-    function btnCoroPress()
+Расположить клетки в центре экрана
+
+    function btnCoroPress()
         local getTime = love.timer.getTime
         local time = getTime()
 

generator.lua

@@ -97,8 +97,8 @@ local function generateAll(sig_count, level, dim, soundsNum, map)
                 return a.x == b.x and a.y == b.y
             end)
 
-        print("map", inspect(map))
-        print("pos", inspect(signals.pos))
+        --print("map", inspect(map))
+        --print("pos", inspect(signals.pos))
 
         signals.form = generate(sig_count, level,
             function()

main.lua

@@ -248,7 +248,7 @@ function love.keypressed(_, scancode)
         languageSelector:keypressed(_, scancode)
     else
         keyconfig.checkPressedKeys(scancode)
-        menu:keypressed(_, scancode)
+        menu:keypressed(scancode, scancode)
     end
 end
 

nback.lua

@@ -291,9 +291,7 @@ function nback:init(save_name)
     print(getHexPolygonWidth(testHex))
     print(getHexPolygonHeight(testHex))
     self.startcx = (w - (getHexPolygonWidth(testHex) * fieldSize - rad * 2)) / 2
-        --getHexPolygonWidth(testHex) / 2
-    self.startcy = (h - (getHexPolygonHeight(testHex) * fieldSize - rad * 2)) / 2
-        --getHexPolygonHeight(testHex) / 2
+    self.startcy = (h - (getHexPolygonHeight(testHex) * fieldSize - rad * 3)) / 2
 
     print("self.startcx, self.startcy", self.startcx, self.startcy)
     self.hexField, self.hexMesh = newHexField(self.startcx,
@@ -790,20 +788,20 @@ function nback:keypressed(scancode)
         if self.is_run then
             if scancode == "a" then
                 self:check("sound")
-                self.processor:push("soundBtn", drawButtonClicked, self.namedButtons["soundBtn"], self)
-                self.processor:sendMessage("soundBtn", "exit")
+                --self.p3ocessor:push("soundBtn", drawButtonClicked, self.namedButtons["soundBtn"], self)
+                --self.processor:sendMessage("soundBtn", "exit")
             elseif scancode == "f" then
                 self:check("color")
-                self.processor:push("colorBtn", drawButtonClicked, self.namedButtons["colorBtn"], self)
-                self.processor:sendMessage("colorBtn", "exit")
+                --self.processor:push("colorBtn", drawButtonClicked, self.namedButtons["colorBtn"], self)
+                --self.processor:sendMessage("colorBtn", "exit")
             elseif scancode == "j" then
                 self:check("form")
-                self.processor:push("formBtn", drawButtonClicked, self.namedButtons["formBtn"], self)
-                self.processor:sendMessage("formBtn", "exit")
+                --self.processor:push("formBtn", drawButtonClicked, self.namedButtons["formBtn"], self)
+                --self.processor:sendMessage("formBtn", "exit")
             elseif scancode == ";" then
                 self:check("pos")
-                self.processor:push("posBtn", drawButtonClicked, self.namedButtons["posBtn"], self)
-                self.processor:sendMessage("posBtn", "exit")
+                --self.processor:push("posBtn", drawButtonClicked, self.namedButtons["posBtn"], self)
+                --self.processor:sendMessage("posBtn", "exit")
             end
         else
             if not self.show_statistic then
@@ -825,7 +823,6 @@ function nback:keypressed(scancode)
         elseif scancode == "=" then
             self:raiseVolume()
         end
-    else
         if scancode == "escape" or "achome" then
             if self.is_run then
                 print("stop by escape")

pviewer.lua

@@ -224,36 +224,18 @@ function pviewer:draw()
     g.pop()
 end
 
--- сместить курсор на строчку вверх
-function pviewer:scrollUp()
-    --[[if self.activeIndex - 1 >= 1 then]]
-        --[[self.activeIndex = self.activeIndex - 1]]
-        --[[self:updateRender(self.activeIndex)]]
-    --[[end]]
-    self.list:scrollUp()
-end
-
--- сместить курсор на строчку вниз
-function pviewer:scrollDown()
-    --[[if self.activeIndex + 1 <= #self.data then]]
-        --[[self.activeIndex = self.activeIndex + 1]]
-        --[[self:updateRender(self.activeIndex)]]
-    --[[end]]
-    self.list:scrollDown()
-end
-
 -- добавить клавиши управления для постраничной прокрутки списка результатов.
-function pviewer:keypressed(_, key)
+function pviewer:keypressed(key)
     if key == "escape" or key == "acback" then
         menu:goBack()
     elseif key == "return" or key == "space" then
         -- TODO по нажатию клавиши показать конечную таблицу игры
     elseif key == "home" or key == "kp7" then
     elseif key == "end" or key == "kp1" then
     elseif key == "up" or key == "k" then
-        self:scrollUp()
+        self.list:scrollUp()
     elseif key == "down" or key == "j" then
-        self:scrollDown()
+        self.list:scrollDown()
     end
 end
 
@@ -304,16 +286,6 @@ function pviewer:touchmoved(id, x, y, dx, dy)
 end
 
 function pviewer:update(dt)
-    local kb = love.keyboard
-    --if kb.isDown("up", "k") then
-        --self:scrollUp()
-    --elseif kb.isDown("down", "j") then
-        --self:scrollDown()
-    --elseif kb.isDown("pageup") then
-        --self:pageUp()
-    --elseif kb.isDown("pagedown") then
-        --self:pageDown()
-    --end
     gooi.update(dt)
     self.timer:update(dt)
 end

pviewer_list.lua

@@ -75,16 +75,6 @@ function List:update(dt)
             love.graphics.setColor{0.5, 0.5, 0.5, 0.5}
             love.graphics.circle("fill", first.x, first.y, 15)
         end)
-        --if inside(first.x, first.y, self.x + 2, self.y + 1, self.width - 3, self.height - 3) then
-            --local tx, ty = x - self.x, y + self:getOffset() - self.y
-            --local index = math.floor((ty / self.sum_item_height) * self.items.n)
-            --local item = self.items[index + 1]
-            --if item then
-                --print("onclick", index + 1)
-                --self.onclick(item, index + 1, b)
-            --end
-            --self.active = index + 1
-        --end
     end
 end