From 8570e9754770e6987540d507045005b761ab8c35 Mon Sep 17 00:00:00 2001 From: baidwwy Date: Tue, 10 May 2022 07:23:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "ggelua/SDL/\345\212\250\347\224\273.lua" | 17 ++++++++--------- "ggelua/SDL/\350\257\273\345\206\231.lua" | 4 +++- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git "a/ggelua/SDL/\345\212\250\347\224\273.lua" "b/ggelua/SDL/\345\212\250\347\224\273.lua" index 738f70e..2ce305a 100644 --- "a/ggelua/SDL/\345\212\250\347\224\273.lua" +++ "b/ggelua/SDL/\345\212\250\347\224\273.lua" @@ -1,24 +1,25 @@ -- @Author : GGELUA -- @Date : 2022-03-07 18:52:00 -- @Last Modified by : baidwwy --- @Last Modified time : 2022-03-28 02:18:41 +-- @Last Modified time : 2022-05-06 09:10:13 local SDL = require('SDL') local IMG = SDL.IMG_Init() local ggetype = ggetype + local GGE动画 = require('GGE.动画') local SDL动画 = class('SDL动画', GGE动画) -function SDL动画:SDL动画(file) +function SDL动画:SDL动画(obj) GGE动画.GGE动画(self) - local tp = ggetype(file) + local tp = ggetype(obj) local info if tp == 'string' then - info = IMG.LoadAnimation(file) - elseif tp == 'SDL读写' and a:取对象() then - info = IMG.LoadAnimation_RW(a:取对象()) + info = assert(IMG.LoadAnimation(obj), SDL.GetError())) + elseif tp == 'SDL读写' and obj:取对象() then + info = assert(IMG.LoadAnimation_RW(obj:取对象()), SDL.GetError()) elseif tp == 'SDL_RWops' then - info = IMG.LoadAnimation_RW(a) + info = assert(IMG.LoadAnimation_RW(obj), SDL.GetError()) end if info then @@ -28,8 +29,6 @@ function SDL动画:SDL动画(file) for i, v in ipairs(info.frames) do self:添加帧(require('SDL.精灵')(v)) end - else - error(' 载入失败') end end diff --git "a/ggelua/SDL/\350\257\273\345\206\231.lua" "b/ggelua/SDL/\350\257\273\345\206\231.lua" index 5b9775f..fe86d46 100644 --- "a/ggelua/SDL/\350\257\273\345\206\231.lua" +++ "b/ggelua/SDL/\350\257\273\345\206\231.lua" @@ -1,9 +1,10 @@ -- @Author : GGELUA -- @Date : 2022-03-07 18:52:00 -- @Last Modified by : baidwwy --- @Last Modified time : 2022-03-28 02:28:24 +-- @Last Modified time : 2022-05-06 09:02:53 local SDL = require('SDL') +local ggetype = ggetype local SDL读写 = class 'SDL读写' @@ -24,6 +25,7 @@ function SDL读写:SDL读写(file, mode) if not self._rw then warn('打开失败->' .. file) warn(SDL.GetError()) + return false end end -- GitLab