so we have a lot of it wor_ing properly, now we have to do the thing where it preloads necessary spritesgit add -A
This commit is contained in:
parent
b071e117fa
commit
d690863b6f
5 changed files with 18 additions and 14 deletions
|
|
@ -2,8 +2,9 @@ require "entity"
|
|||
|
||||
GenericMoveable = class("GenericMoveable", Entity)
|
||||
|
||||
function GenericMoveable:initialize(x, y, color, sprite)
|
||||
function GenericMoveable:initialize(x, y, color, sprite, name)
|
||||
Entity.initialize(self, {
|
||||
name = name,
|
||||
x = x,
|
||||
y = y,
|
||||
color = color,
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ local selectedFolder = nil
|
|||
local selectedAsset = nil
|
||||
local selectedRoom = nil
|
||||
local selectedRow = 1
|
||||
local gameAssets = getAllAssets()
|
||||
local gameAssets = {}
|
||||
local inputText = ""
|
||||
local assetProperties = {}
|
||||
|
||||
|
|
@ -31,7 +31,7 @@ local labels = {}
|
|||
|
||||
|
||||
function _initLevelEditor()
|
||||
assets = getAllAssets()
|
||||
gameAssets = getAllAssets()
|
||||
|
||||
--create folder buttons
|
||||
local counter = 1
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ function get(folder)
|
|||
end
|
||||
|
||||
function getAllAssets()
|
||||
local properties = TSerial.unpack(love.filesystem.read("assets.prop") or "{}")
|
||||
local objectnames = {}
|
||||
local topFolder = "art"
|
||||
local files = love.filesystem.getDirectoryItems(topFolder)
|
||||
|
|
@ -28,21 +27,21 @@ function getAllAssets()
|
|||
|
||||
local name = fileToAnalyze:sub(1, fileToAnalyze:len() - 6)
|
||||
|
||||
if not properties[name] then
|
||||
properties[name] = {}
|
||||
properties[name].directory = folder
|
||||
properties[name].sprites = {}
|
||||
properties[name].class = "unmoveable"
|
||||
properties[name].preload = false
|
||||
if not globalAssetProperties[name] then
|
||||
globalAssetProperties[name] = {}
|
||||
globalAssetProperties[name].directory = folder
|
||||
globalAssetProperties[name].sprites = {}
|
||||
globalAssetProperties[name].class = "unmoveable"
|
||||
globalAssetProperties[name].preload = false
|
||||
end
|
||||
properties[name].sprites[color] = topFolder .. "/" .. folder .. "/" .. fileToAnalyze
|
||||
globalAssetProperties[name].sprites[color] = topFolder .. "/" .. folder .. "/" .. fileToAnalyze
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
str = TSerial.pack(properties, nil, true)
|
||||
str = TSerial.pack(globalAssetProperties, nil, true)
|
||||
love.filesystem.write("assets.prop", str)
|
||||
return properties
|
||||
return globalAssetProperties
|
||||
end
|
||||
5
main.lua
5
main.lua
|
|
@ -4,6 +4,7 @@ local utf8 = require("utf8")
|
|||
class = require "libs/middleclass"
|
||||
Timer = require "libs/hump/timer"
|
||||
sfxr = require "libs/sfxrlua/sfxr"
|
||||
require "libs/TSerial"
|
||||
require "_debug_helpers"
|
||||
require "_helpers"
|
||||
require "input"
|
||||
|
|
@ -14,11 +15,15 @@ require "sprite_manager"
|
|||
require "level_editor/editor"
|
||||
|
||||
function love.load()
|
||||
globalAssetProperties = TSerial.unpack(love.filesystem.read("assets.prop") or "{}")
|
||||
|
||||
_initDefaults()
|
||||
_initGridVars()
|
||||
_initSounds()
|
||||
_initGlobalColors()
|
||||
_initLevelEditor()
|
||||
|
||||
|
||||
processSprites()
|
||||
|
||||
gameCanvas = love.graphics.newCanvas()
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@ sprites = {
|
|||
|
||||
spriteCells = {}
|
||||
|
||||
|
||||
function processSprites()
|
||||
getCellsFromSprite(sprites.player)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue