рай эпилептика

Co-authored-by: Ivan Yuriev <ivanyr44@gmail.com>

assets/sprites/character/conf.lua

@@ -1,3 +0,0 @@
-return {
-
-}

assets/tiles/grass/manifest.lua

@@ -0,0 +1,6 @@
+return {
+    tilewidth = 32,
+    tileheight = 32,
+    spacing = 0,
+    margin = 0,
+}

lib/camera.lua

@@ -1,5 +1,5 @@
-local Vec3 = require "lib/vec3"
+local Vec3 = require "lib.utils.vec3"
-local utils = require "lib/utils"
+local utils = require "lib.utils.utils"
 
 local EPSILON = 0.001
 

lib/character/animation.lua

@@ -1,4 +1,4 @@
-local anim8 = require "lib/anim8"
+local anim8 = require "lib.utils.anim8"
 
 --- Скорость между кадрами в анимации
 local ANIMATION_SPEED = 0.1

lib/character/character.lua

@@ -1,5 +1,5 @@
-local anim8 = require "lib/anim8"
+local anim8 = require "lib.utils.anim8"
-require 'lib/vec3'
+require 'lib.utils.vec3'
 
 
 --- @alias Id integer

lib/controls.lua

@@ -1,4 +1,4 @@
-local utils = require "lib/utils"
+local utils = require "lib.utils.utils"
 
 --- @alias Device "mouse" | "key" | "pad"
 

lib/grid.lua

@@ -1,4 +1,4 @@
-local utils = require "lib/utils"
+local utils = require "lib.utils.utils"
 
 --- @class CharacterGrid
 --- @field __grid {string: Id|nil}

lib/level.lua

@@ -1,4 +1,4 @@
-local utils = require "lib/utils"
+local utils = require "lib.utils.utils"
 
 --- @class Level
 --- @field size Vec3

lib/panning.lua

@@ -1,4 +1,4 @@
-local Vec3 = require "lib/vec3"
+local Vec3 = require "lib.utils.vec3"
 
 --- @class PanningState
 --- @field pos Vec3 | nil

lib/tree.lua

@@ -5,7 +5,7 @@
 
 Tree = {
     panning = require "lib/panning",
-    assets = (require "lib/asset_bundle"):load(),
+    assets = (require "lib.utils.asset_bundle"):load(),
     controls = require "lib/controls",
     level = (require "lib/level"):new() -- для теста у нас только один уровень, который сразу же загружен
 }

lib/utils/asset_bundle.lua

@@ -48,8 +48,9 @@ function AssetBundle.loadFile(path)
             img
     elseif (ext == "glsl") then
         return love.graphics.newShader(path);
+    elseif (ext == "lua") then
+        return require(string.gsub(path, ".lua", ""))
     end
-
     return nil
 end
 

main.lua

@@ -3,6 +3,8 @@
 local character = require "lib/character/character"
 require "lib/tree"
 
+
+
 function love.conf(t)
     t.console = true
 end
@@ -11,6 +13,9 @@ function love.load()
     local char = character.spawn("Hero", "warrior", Tree.assets.files.sprites.character)
     char:runTo(Vec3 { 5, 5 })
 
+    Grass = Tree.assets.files.tiles.grass.atlas
+    Gr1 = love.graphics.newQuad(0, 32, 32, 32, Grass)
+
     -- PlayerFaction.characters = { Hero1, Hero2 }
     love.window.setMode(1080, 720, { resizable = true, msaa = 4, vsync = true })
 end
@@ -30,15 +35,14 @@ function love.draw()
 
     for y = 0, height - 1 do
         for x = 0, width - 1 do
-            if (x + y) % 2 == 0 then
+            love.graphics.draw(Grass, love.graphics.newQuad(math.random(0, 32), math.random(0, 32), 32, 32, Grass), x, y,
-                love.graphics.setColor(0, 0, 0)
+                nil, 1 / 32, 1 / 32)
-            else
-                love.graphics.setColor(1, 1, 1)
-            end
-            love.graphics.rectangle("fill", x, y, 1, 1)
         end
     end
-    love.graphics.setColor(1, 1, 1)
+
+
     Tree.level:draw()
+
+
     Tree.level.camera:detach()
 end