From 1b614ddb3aae178740ddd6a8a1c34fb67b0bfad0 Mon Sep 17 00:00:00 2001 From: Tim Sarbin Date: Sun, 28 Jun 2020 12:10:25 -0400 Subject: [PATCH] Made animation loaders public. (#481) * Updated ebiten reference * Made animation loaders public --- d2core/d2asset/animation.go | 5 ++--- d2core/d2asset/animation_manager.go | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/d2core/d2asset/animation.go b/d2core/d2asset/animation.go index edeb817f..6315c6ca 100644 --- a/d2core/d2asset/animation.go +++ b/d2core/d2asset/animation.go @@ -53,7 +53,7 @@ type Animation struct { subEndingFrame int } -func createAnimationFromDCC(dcc *d2dcc.DCC, palette *d2dat.DATPalette, transparency int) (*Animation, error) { +func CreateAnimationFromDCC(dcc *d2dcc.DCC, palette *d2dat.DATPalette, transparency int) (*Animation, error) { animation := &Animation{ playLength: 1.0, playLoop: true, @@ -108,14 +108,13 @@ func createAnimationFromDCC(dcc *d2dcc.DCC, palette *d2dat.DATPalette, transpare offsetY: minY, image: image, }) - } } return animation, nil } -func createAnimationFromDC6(dc6 *d2dc6.DC6File, palette *d2dat.DATPalette) (*Animation, error) { +func CreateAnimationFromDC6(dc6 *d2dc6.DC6File, palette *d2dat.DATPalette) (*Animation, error) { animation := &Animation{ playLength: 1.0, playLoop: true, diff --git a/d2core/d2asset/animation_manager.go b/d2core/d2asset/animation_manager.go index 61cba0fd..fa9a2b3b 100644 --- a/d2core/d2asset/animation_manager.go +++ b/d2core/d2asset/animation_manager.go @@ -40,7 +40,7 @@ func (am *animationManager) loadAnimation(animationPath, palettePath string, tra return nil, err } - animation, err = createAnimationFromDC6(dc6, palette) + animation, err = CreateAnimationFromDC6(dc6, palette) if err != nil { return nil, err } @@ -55,7 +55,7 @@ func (am *animationManager) loadAnimation(animationPath, palettePath string, tra return nil, err } - animation, err = createAnimationFromDCC(dcc, palette, transparency) + animation, err = CreateAnimationFromDCC(dcc, palette, transparency) if err != nil { return nil, err }