mirror of
https://github.com/stevenhowes/GoRetro.git
synced 2026-05-26 15:53:31 +01:00
Introduce indirect file access (simple shim currently, .pak support etc soon)
This commit is contained in:
+2
-13
@@ -9,7 +9,6 @@ package GoRetro
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"os"
|
||||
"time"
|
||||
|
||||
"github.com/veandco/go-sdl2/sdl"
|
||||
@@ -32,8 +31,6 @@ func NewAnimator(
|
||||
renderer *sdl.Renderer) (*animator, error) {
|
||||
var an animator
|
||||
|
||||
imagepath = Config.DataDir + imagepath
|
||||
|
||||
tex, err := loadTextureFromBMP(imagepath, renderer)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -122,17 +119,9 @@ func NewSequence(
|
||||
|
||||
var seq Sequence
|
||||
|
||||
indexpath = Config.DataDir + indexpath
|
||||
jsonFile := GetFile(indexpath)
|
||||
|
||||
jsonFile, err := os.Open(indexpath)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
jsonParser := json.NewDecoder(jsonFile)
|
||||
if err = jsonParser.Decode(&seq.frames); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer jsonFile.Close()
|
||||
json.Unmarshal(jsonFile.Data, &seq.frames)
|
||||
|
||||
seq.frame = 0
|
||||
seq.sampleRate = sampleRate
|
||||
|
||||
Reference in New Issue
Block a user