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:
0x81c 2015-03-25 04:22:10 -04:00 committed by Your Name
parent b071e117fa
commit d690863b6f
5 changed files with 18 additions and 14 deletions

View file

@ -2,8 +2,9 @@ require "entity"
GenericMoveable = class("GenericMoveable", Entity) GenericMoveable = class("GenericMoveable", Entity)
function GenericMoveable:initialize(x, y, color, sprite) function GenericMoveable:initialize(x, y, color, sprite, name)
Entity.initialize(self, { Entity.initialize(self, {
name = name,
x = x, x = x,
y = y, y = y,
color = color, color = color,

View file

@ -14,7 +14,7 @@ local selectedFolder = nil
local selectedAsset = nil local selectedAsset = nil
local selectedRoom = nil local selectedRoom = nil
local selectedRow = 1 local selectedRow = 1
local gameAssets = getAllAssets() local gameAssets = {}
local inputText = "" local inputText = ""
local assetProperties = {} local assetProperties = {}
@ -31,7 +31,7 @@ local labels = {}
function _initLevelEditor() function _initLevelEditor()
assets = getAllAssets() gameAssets = getAllAssets()
--create folder buttons --create folder buttons
local counter = 1 local counter = 1

View file

@ -7,7 +7,6 @@ function get(folder)
end end
function getAllAssets() function getAllAssets()
local properties = TSerial.unpack(love.filesystem.read("assets.prop") or "{}")
local objectnames = {} local objectnames = {}
local topFolder = "art" local topFolder = "art"
local files = love.filesystem.getDirectoryItems(topFolder) local files = love.filesystem.getDirectoryItems(topFolder)
@ -28,21 +27,21 @@ function getAllAssets()
local name = fileToAnalyze:sub(1, fileToAnalyze:len() - 6) local name = fileToAnalyze:sub(1, fileToAnalyze:len() - 6)
if not properties[name] then if not globalAssetProperties[name] then
properties[name] = {} globalAssetProperties[name] = {}
properties[name].directory = folder globalAssetProperties[name].directory = folder
properties[name].sprites = {} globalAssetProperties[name].sprites = {}
properties[name].class = "unmoveable" globalAssetProperties[name].class = "unmoveable"
properties[name].preload = false globalAssetProperties[name].preload = false
end end
properties[name].sprites[color] = topFolder .. "/" .. folder .. "/" .. fileToAnalyze globalAssetProperties[name].sprites[color] = topFolder .. "/" .. folder .. "/" .. fileToAnalyze
end end
end end
end end
end end
end end
str = TSerial.pack(properties, nil, true) str = TSerial.pack(globalAssetProperties, nil, true)
love.filesystem.write("assets.prop", str) love.filesystem.write("assets.prop", str)
return properties return globalAssetProperties
end end

View file

@ -4,6 +4,7 @@ local utf8 = require("utf8")
class = require "libs/middleclass" class = require "libs/middleclass"
Timer = require "libs/hump/timer" Timer = require "libs/hump/timer"
sfxr = require "libs/sfxrlua/sfxr" sfxr = require "libs/sfxrlua/sfxr"
require "libs/TSerial"
require "_debug_helpers" require "_debug_helpers"
require "_helpers" require "_helpers"
require "input" require "input"
@ -14,11 +15,15 @@ require "sprite_manager"
require "level_editor/editor" require "level_editor/editor"
function love.load() function love.load()
globalAssetProperties = TSerial.unpack(love.filesystem.read("assets.prop") or "{}")
_initDefaults() _initDefaults()
_initGridVars() _initGridVars()
_initSounds() _initSounds()
_initGlobalColors() _initGlobalColors()
_initLevelEditor() _initLevelEditor()
processSprites() processSprites()
gameCanvas = love.graphics.newCanvas() gameCanvas = love.graphics.newCanvas()

View file

@ -36,7 +36,6 @@ sprites = {
spriteCells = {} spriteCells = {}
function processSprites() function processSprites()
getCellsFromSprite(sprites.player) getCellsFromSprite(sprites.player)