2020-02-01 18:55:56 -05:00
|
|
|
package d2asset
|
|
|
|
|
|
|
|
import (
|
2020-09-14 14:47:11 -04:00
|
|
|
"fmt"
|
2021-01-10 02:44:42 -05:00
|
|
|
"io"
|
|
|
|
"io/ioutil"
|
|
|
|
"path/filepath"
|
2020-12-21 15:46:58 -05:00
|
|
|
"strconv"
|
refactored logging in d2loader, d2record, and d2asset (#898)
* refactored logging in d2config, d2record, and d2asset
* asset manager, record manager, and file loader now utilitize d2util.Logger
* added colored logging to d2util.Logger (excluding windows platforms)
* removed mpq file verification from d2config; d2loader handles this
* record loaders now use the record manager's logger for printing info
* added command line argument for setting log level (`--loglevel 4`, `-l4`, or `-l 4`
* added `LogLevel` parameter to config file
* default log level will show errors, warnings, and info log messages
* specifying log level as an argument overrides setting from config file
* fixed log level tests
2020-11-02 21:23:07 -05:00
|
|
|
|
2021-01-10 02:44:42 -05:00
|
|
|
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2fileformats/d2cof"
|
|
|
|
|
|
|
|
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2fileformats/d2ds1"
|
|
|
|
|
|
|
|
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2fileformats/d2dt1"
|
|
|
|
|
2020-11-16 06:47:11 -05:00
|
|
|
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2resource"
|
refactored logging in d2loader, d2record, and d2asset (#898)
* refactored logging in d2config, d2record, and d2asset
* asset manager, record manager, and file loader now utilitize d2util.Logger
* added colored logging to d2util.Logger (excluding windows platforms)
* removed mpq file verification from d2config; d2loader handles this
* record loaders now use the record manager's logger for printing info
* added command line argument for setting log level (`--loglevel 4`, `-l4`, or `-l 4`
* added `LogLevel` parameter to config file
* default log level will show errors, warnings, and info log messages
* specifying log level as an argument overrides setting from config file
* fixed log level tests
2020-11-02 21:23:07 -05:00
|
|
|
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2util"
|
2020-09-12 16:51:30 -04:00
|
|
|
|
2020-09-19 14:33:40 -04:00
|
|
|
"github.com/OpenDiablo2/OpenDiablo2/d2core/d2records"
|
|
|
|
|
2021-02-08 07:21:50 -05:00
|
|
|
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2fileformats/d2font"
|
2020-09-19 14:33:40 -04:00
|
|
|
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2fileformats/d2txt"
|
|
|
|
|
2020-09-12 16:51:30 -04:00
|
|
|
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2enum"
|
2020-09-14 14:47:11 -04:00
|
|
|
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2fileformats/d2dat"
|
|
|
|
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2fileformats/d2dc6"
|
|
|
|
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2fileformats/d2dcc"
|
|
|
|
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2fileformats/d2pl2"
|
|
|
|
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2fileformats/d2tbl"
|
2020-07-04 22:37:13 -04:00
|
|
|
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2interface"
|
2020-09-14 14:47:11 -04:00
|
|
|
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2loader"
|
|
|
|
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2loader/asset/types"
|
|
|
|
)
|
|
|
|
|
|
|
|
const (
|
|
|
|
defaultCacheEntryWeight = 1
|
|
|
|
)
|
|
|
|
|
|
|
|
const (
|
|
|
|
animationBudget = 1024 * 1024 * 128
|
|
|
|
fontBudget = 128
|
|
|
|
paletteBudget = 64
|
|
|
|
paletteTransformBudget = 64
|
2021-01-10 02:44:42 -05:00
|
|
|
dt1Budget = 4096 * 2048 * 128
|
|
|
|
ds1Budget = 4096 * 2048 * 128
|
|
|
|
cofBudget = 4096 * 2048 * 128
|
|
|
|
dccBudget = 4096 * 2048 * 128
|
2020-02-01 18:55:56 -05:00
|
|
|
)
|
|
|
|
|
2020-11-03 07:54:15 -05:00
|
|
|
const (
|
2020-11-16 06:47:11 -05:00
|
|
|
defaultLanguage = "ENG"
|
2020-11-03 07:54:15 -05:00
|
|
|
logPrefix = "Asset Manager"
|
|
|
|
fmtLoadAsset = "could not load file stream %s (%v)"
|
|
|
|
fmtLoadAnimation = "loading animation %s with palette %s, draw effect %d"
|
|
|
|
fmtLoadComposite = "loading composite: type %d, token %s, palette %s"
|
|
|
|
fmtLoadFont = "loading font: table %s, sprite %s, palette %s"
|
|
|
|
fmtLoadPalette = "loading palette %s"
|
|
|
|
fmtLoadStringTable = "loading string table: %s"
|
|
|
|
fmtLoadTransform = "loading palette transform: %s"
|
|
|
|
fmtLoadDict = "loading data dictionary: %s"
|
|
|
|
)
|
|
|
|
|
2020-09-12 16:51:30 -04:00
|
|
|
// AssetManager loads files and game objects
|
|
|
|
type AssetManager struct {
|
2020-11-07 23:08:25 -05:00
|
|
|
*d2util.Logger
|
|
|
|
*d2loader.Loader
|
2021-02-03 10:28:10 -05:00
|
|
|
|
2021-02-25 08:11:13 -05:00
|
|
|
tables []d2tbl.TextDictionary
|
|
|
|
dt1s d2interface.Cache
|
|
|
|
ds1s d2interface.Cache
|
|
|
|
cofs d2interface.Cache
|
|
|
|
dccs d2interface.Cache
|
|
|
|
animations d2interface.Cache
|
|
|
|
fonts d2interface.Cache
|
|
|
|
palettes d2interface.Cache
|
|
|
|
transforms d2interface.Cache
|
|
|
|
Records *d2records.RecordManager
|
|
|
|
language string
|
|
|
|
languageModifier int
|
2020-09-19 14:33:40 -04:00
|
|
|
}
|
|
|
|
|
2020-11-03 07:54:15 -05:00
|
|
|
// SetLogLevel sets the log level for the asset manager, record manager, and file loader
|
|
|
|
func (am *AssetManager) SetLogLevel(level d2util.LogLevel) {
|
2020-11-07 23:08:25 -05:00
|
|
|
am.Logger.SetLevel(level)
|
2020-11-03 07:54:15 -05:00
|
|
|
am.Records.Logger.SetLevel(level)
|
2020-11-07 23:08:25 -05:00
|
|
|
am.Loader.Logger.SetLevel(level)
|
2020-02-01 18:55:56 -05:00
|
|
|
}
|
|
|
|
|
2020-09-14 14:47:11 -04:00
|
|
|
// LoadAsset loads an asset
|
2021-01-10 02:44:42 -05:00
|
|
|
func (am *AssetManager) LoadAsset(filePath string) (io.ReadSeeker, error) {
|
2020-11-07 23:08:25 -05:00
|
|
|
data, err := am.Loader.Load(filePath)
|
2020-02-01 18:55:56 -05:00
|
|
|
if err != nil {
|
refactored logging in d2loader, d2record, and d2asset (#898)
* refactored logging in d2config, d2record, and d2asset
* asset manager, record manager, and file loader now utilitize d2util.Logger
* added colored logging to d2util.Logger (excluding windows platforms)
* removed mpq file verification from d2config; d2loader handles this
* record loaders now use the record manager's logger for printing info
* added command line argument for setting log level (`--loglevel 4`, `-l4`, or `-l 4`
* added `LogLevel` parameter to config file
* default log level will show errors, warnings, and info log messages
* specifying log level as an argument overrides setting from config file
* fixed log level tests
2020-11-02 21:23:07 -05:00
|
|
|
errStr := fmt.Sprintf(fmtLoadAsset, filePath, err.Error())
|
|
|
|
|
2020-11-07 23:08:25 -05:00
|
|
|
am.Error(errStr)
|
2020-02-01 18:55:56 -05:00
|
|
|
}
|
|
|
|
|
2020-09-12 16:51:30 -04:00
|
|
|
return data, err
|
|
|
|
}
|
|
|
|
|
2020-09-14 14:47:11 -04:00
|
|
|
// LoadFileStream streams an MPQ file from a source file path
|
2021-01-10 02:44:42 -05:00
|
|
|
func (am *AssetManager) LoadFileStream(filePath string) (io.ReadSeeker, error) {
|
2020-11-07 23:08:25 -05:00
|
|
|
am.Logger.Debugf("Loading FileStream: %s", filePath)
|
2020-09-14 14:47:11 -04:00
|
|
|
return am.LoadAsset(filePath)
|
|
|
|
}
|
|
|
|
|
2020-09-12 16:51:30 -04:00
|
|
|
// LoadFile loads an entire file from a source file path as a []byte
|
2021-01-10 02:44:42 -05:00
|
|
|
func (am *AssetManager) LoadFile(filePath string) ([]byte, error) { // I DO NOT LIKE THIS! - Essial
|
2020-09-14 14:47:11 -04:00
|
|
|
fileAsset, err := am.LoadAsset(filePath)
|
2020-02-01 18:55:56 -05:00
|
|
|
if err != nil {
|
2020-09-14 14:47:11 -04:00
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
2021-01-10 02:44:42 -05:00
|
|
|
data, err := ioutil.ReadAll(fileAsset)
|
2020-09-14 14:47:11 -04:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
2020-02-01 18:55:56 -05:00
|
|
|
}
|
|
|
|
|
2020-09-12 16:51:30 -04:00
|
|
|
return data, err
|
2020-02-01 18:55:56 -05:00
|
|
|
}
|
|
|
|
|
2020-09-12 16:51:30 -04:00
|
|
|
// FileExists checks if a file exists on the underlying file system at the given file path.
|
|
|
|
func (am *AssetManager) FileExists(filePath string) (bool, error) {
|
2021-01-10 02:44:42 -05:00
|
|
|
filePath = filepath.Clean(filePath)
|
2020-11-07 23:08:25 -05:00
|
|
|
|
2021-01-10 02:44:42 -05:00
|
|
|
am.Logger.Debugf("Checking if file exists %s", filePath)
|
2020-09-14 14:47:11 -04:00
|
|
|
|
2021-01-10 02:44:42 -05:00
|
|
|
return am.Loader.Exists(filePath), nil
|
2020-09-12 16:51:30 -04:00
|
|
|
}
|
2020-02-01 18:55:56 -05:00
|
|
|
|
2020-11-16 06:47:11 -05:00
|
|
|
// LoadLanguage loads language from resource path
|
|
|
|
func (am *AssetManager) LoadLanguage(languagePath string) string {
|
|
|
|
languageByte, err := am.LoadFile(languagePath)
|
|
|
|
if err != nil {
|
|
|
|
am.Debugf("Unable to load language file: %s", err)
|
|
|
|
return defaultLanguage
|
|
|
|
}
|
|
|
|
|
|
|
|
languageCode := languageByte[0]
|
|
|
|
am.Debugf("Language code: %#02x", languageCode)
|
|
|
|
|
|
|
|
language := d2resource.GetLanguageLiteral(languageCode)
|
|
|
|
am.Infof("Language: %s", language)
|
|
|
|
|
2020-11-26 05:13:35 -05:00
|
|
|
am.language = language
|
2021-01-28 05:20:59 -05:00
|
|
|
am.languageModifier = d2resource.GetLabelModifier(language)
|
2020-11-26 05:30:11 -05:00
|
|
|
|
2020-11-16 06:47:11 -05:00
|
|
|
return language
|
|
|
|
}
|
|
|
|
|
Decouple asset manager from renderer (#730)
* improve AssetManager implementation
Notable changes are:
* removed the individual managers inside of d2asset, only one asset manager
* AssetManager now has caches for the types of files it loads
* created a type for TextDictionary (the txt file structs)
* fixed a file path bug in d2loader Source
* fixed a asset stream bug in d2loader Asset
* d2loader.Loader now needs a d2config.Config on creation (for resolving locale files)
* updated the mpq file in d2asset test data, added test case for "sub-directory"
* added a Data method to d2asset.Asset. The data is cached on first full read.
* renamed ArchiveDataStream to DataStream in d2interface
* moved palette utility func out of d2asset and into d2util
* bugfix for MacOS mpq loader issue
* lint fixes, added data caching to filesystem asset
* adding comment for mpq asset close
* Decouple d2asset from d2render
Notable changes in d2common:
* d2dcc.Load now fully decodes the dcc and stores the directions/frames in the dcc struct
* un-exported dcc.decodeDirection, it is only used in d2dcc
* removed font interface from d2interface, we only have one font implementation
* added `Renderer` method to d2interface.Surface, animations use this to bind to a renderer and create surfaces as they need
* added `BindRenderer` method to animation interface
Notable changes in d2common/d2asset:
* **d2asset.NewAssetManager only needs to be passed a d2config.Config**, it is decoupled from d2render
* exported Animation
* Animation implementation binds to the renderer to create surfaces only on the first time it is rendered
* font, dcc, dc6 initialization logic moved out of asset_manager.go
* for dc6 and dcc animations, the process of decoding and creating render surfaces has been broken into different methods
* the d2asset.Font struct now stores font table data for initialization purposes
Notable changes in d2core/d2render:
* Surfaces store a renderer reference, this allows animations to bind to the renderer and create a surface just-in-time
**These last changes should have been a separate PR, sorry.**
Notable changes in d2core/d2ui:
* ui.NewSprite now handles creating an animation internally, only needs image and palette path as arguments
Notable Changes in d2game:
Because of the change in d2ui, all instances of this code pattern...
```golang
animation, err := screen.asset.LoadAnimation(imgPath, palettePath)
sprite, err := screen.ui.NewSprite(animation)
```
... becomes this ...
```golang
sprite, err := screen.ui.NewSprite(imgPath, palettePath)
```
2020-09-14 17:31:45 -04:00
|
|
|
// LoadAnimation loads an Animation by its resource path and its palette path
|
2020-09-12 16:51:30 -04:00
|
|
|
func (am *AssetManager) LoadAnimation(animationPath, palettePath string) (d2interface.Animation, error) {
|
|
|
|
return am.LoadAnimationWithEffect(animationPath, palettePath, d2enum.DrawEffectNone)
|
2020-02-01 18:55:56 -05:00
|
|
|
}
|
|
|
|
|
Decouple asset manager from renderer (#730)
* improve AssetManager implementation
Notable changes are:
* removed the individual managers inside of d2asset, only one asset manager
* AssetManager now has caches for the types of files it loads
* created a type for TextDictionary (the txt file structs)
* fixed a file path bug in d2loader Source
* fixed a asset stream bug in d2loader Asset
* d2loader.Loader now needs a d2config.Config on creation (for resolving locale files)
* updated the mpq file in d2asset test data, added test case for "sub-directory"
* added a Data method to d2asset.Asset. The data is cached on first full read.
* renamed ArchiveDataStream to DataStream in d2interface
* moved palette utility func out of d2asset and into d2util
* bugfix for MacOS mpq loader issue
* lint fixes, added data caching to filesystem asset
* adding comment for mpq asset close
* Decouple d2asset from d2render
Notable changes in d2common:
* d2dcc.Load now fully decodes the dcc and stores the directions/frames in the dcc struct
* un-exported dcc.decodeDirection, it is only used in d2dcc
* removed font interface from d2interface, we only have one font implementation
* added `Renderer` method to d2interface.Surface, animations use this to bind to a renderer and create surfaces as they need
* added `BindRenderer` method to animation interface
Notable changes in d2common/d2asset:
* **d2asset.NewAssetManager only needs to be passed a d2config.Config**, it is decoupled from d2render
* exported Animation
* Animation implementation binds to the renderer to create surfaces only on the first time it is rendered
* font, dcc, dc6 initialization logic moved out of asset_manager.go
* for dc6 and dcc animations, the process of decoding and creating render surfaces has been broken into different methods
* the d2asset.Font struct now stores font table data for initialization purposes
Notable changes in d2core/d2render:
* Surfaces store a renderer reference, this allows animations to bind to the renderer and create a surface just-in-time
**These last changes should have been a separate PR, sorry.**
Notable changes in d2core/d2ui:
* ui.NewSprite now handles creating an animation internally, only needs image and palette path as arguments
Notable Changes in d2game:
Because of the change in d2ui, all instances of this code pattern...
```golang
animation, err := screen.asset.LoadAnimation(imgPath, palettePath)
sprite, err := screen.ui.NewSprite(animation)
```
... becomes this ...
```golang
sprite, err := screen.ui.NewSprite(imgPath, palettePath)
```
2020-09-14 17:31:45 -04:00
|
|
|
// LoadAnimationWithEffect loads an Animation by its resource path and its palette path with a given transparency value
|
2020-09-12 16:51:30 -04:00
|
|
|
func (am *AssetManager) LoadAnimationWithEffect(animationPath, palettePath string,
|
2020-09-14 14:47:11 -04:00
|
|
|
effect d2enum.DrawEffect) (d2interface.Animation, error) {
|
|
|
|
cachePath := fmt.Sprintf("%s;%s;%d", animationPath, palettePath, effect)
|
|
|
|
|
|
|
|
if animation, found := am.animations.Retrieve(cachePath); found {
|
|
|
|
return animation.(d2interface.Animation).Clone(), nil
|
|
|
|
}
|
|
|
|
|
2020-11-07 23:08:25 -05:00
|
|
|
am.Debugf(fmtLoadAnimation, animationPath, palettePath, effect)
|
refactored logging in d2loader, d2record, and d2asset (#898)
* refactored logging in d2config, d2record, and d2asset
* asset manager, record manager, and file loader now utilitize d2util.Logger
* added colored logging to d2util.Logger (excluding windows platforms)
* removed mpq file verification from d2config; d2loader handles this
* record loaders now use the record manager's logger for printing info
* added command line argument for setting log level (`--loglevel 4`, `-l4`, or `-l 4`
* added `LogLevel` parameter to config file
* default log level will show errors, warnings, and info log messages
* specifying log level as an argument overrides setting from config file
* fixed log level tests
2020-11-02 21:23:07 -05:00
|
|
|
|
2020-09-14 14:47:11 -04:00
|
|
|
palette, err := am.LoadPalette(palettePath)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
var animation d2interface.Animation
|
|
|
|
|
2021-01-10 02:44:42 -05:00
|
|
|
switch types.Ext2AssetType(filepath.Ext(animationPath)) {
|
2020-09-14 14:47:11 -04:00
|
|
|
case types.AssetTypeDC6:
|
Decouple asset manager from renderer (#730)
* improve AssetManager implementation
Notable changes are:
* removed the individual managers inside of d2asset, only one asset manager
* AssetManager now has caches for the types of files it loads
* created a type for TextDictionary (the txt file structs)
* fixed a file path bug in d2loader Source
* fixed a asset stream bug in d2loader Asset
* d2loader.Loader now needs a d2config.Config on creation (for resolving locale files)
* updated the mpq file in d2asset test data, added test case for "sub-directory"
* added a Data method to d2asset.Asset. The data is cached on first full read.
* renamed ArchiveDataStream to DataStream in d2interface
* moved palette utility func out of d2asset and into d2util
* bugfix for MacOS mpq loader issue
* lint fixes, added data caching to filesystem asset
* adding comment for mpq asset close
* Decouple d2asset from d2render
Notable changes in d2common:
* d2dcc.Load now fully decodes the dcc and stores the directions/frames in the dcc struct
* un-exported dcc.decodeDirection, it is only used in d2dcc
* removed font interface from d2interface, we only have one font implementation
* added `Renderer` method to d2interface.Surface, animations use this to bind to a renderer and create surfaces as they need
* added `BindRenderer` method to animation interface
Notable changes in d2common/d2asset:
* **d2asset.NewAssetManager only needs to be passed a d2config.Config**, it is decoupled from d2render
* exported Animation
* Animation implementation binds to the renderer to create surfaces only on the first time it is rendered
* font, dcc, dc6 initialization logic moved out of asset_manager.go
* for dc6 and dcc animations, the process of decoding and creating render surfaces has been broken into different methods
* the d2asset.Font struct now stores font table data for initialization purposes
Notable changes in d2core/d2render:
* Surfaces store a renderer reference, this allows animations to bind to the renderer and create a surface just-in-time
**These last changes should have been a separate PR, sorry.**
Notable changes in d2core/d2ui:
* ui.NewSprite now handles creating an animation internally, only needs image and palette path as arguments
Notable Changes in d2game:
Because of the change in d2ui, all instances of this code pattern...
```golang
animation, err := screen.asset.LoadAnimation(imgPath, palettePath)
sprite, err := screen.ui.NewSprite(animation)
```
... becomes this ...
```golang
sprite, err := screen.ui.NewSprite(imgPath, palettePath)
```
2020-09-14 17:31:45 -04:00
|
|
|
animation, err = am.loadDC6(animationPath, palette, effect)
|
2020-09-14 14:47:11 -04:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
case types.AssetTypeDCC:
|
Decouple asset manager from renderer (#730)
* improve AssetManager implementation
Notable changes are:
* removed the individual managers inside of d2asset, only one asset manager
* AssetManager now has caches for the types of files it loads
* created a type for TextDictionary (the txt file structs)
* fixed a file path bug in d2loader Source
* fixed a asset stream bug in d2loader Asset
* d2loader.Loader now needs a d2config.Config on creation (for resolving locale files)
* updated the mpq file in d2asset test data, added test case for "sub-directory"
* added a Data method to d2asset.Asset. The data is cached on first full read.
* renamed ArchiveDataStream to DataStream in d2interface
* moved palette utility func out of d2asset and into d2util
* bugfix for MacOS mpq loader issue
* lint fixes, added data caching to filesystem asset
* adding comment for mpq asset close
* Decouple d2asset from d2render
Notable changes in d2common:
* d2dcc.Load now fully decodes the dcc and stores the directions/frames in the dcc struct
* un-exported dcc.decodeDirection, it is only used in d2dcc
* removed font interface from d2interface, we only have one font implementation
* added `Renderer` method to d2interface.Surface, animations use this to bind to a renderer and create surfaces as they need
* added `BindRenderer` method to animation interface
Notable changes in d2common/d2asset:
* **d2asset.NewAssetManager only needs to be passed a d2config.Config**, it is decoupled from d2render
* exported Animation
* Animation implementation binds to the renderer to create surfaces only on the first time it is rendered
* font, dcc, dc6 initialization logic moved out of asset_manager.go
* for dc6 and dcc animations, the process of decoding and creating render surfaces has been broken into different methods
* the d2asset.Font struct now stores font table data for initialization purposes
Notable changes in d2core/d2render:
* Surfaces store a renderer reference, this allows animations to bind to the renderer and create a surface just-in-time
**These last changes should have been a separate PR, sorry.**
Notable changes in d2core/d2ui:
* ui.NewSprite now handles creating an animation internally, only needs image and palette path as arguments
Notable Changes in d2game:
Because of the change in d2ui, all instances of this code pattern...
```golang
animation, err := screen.asset.LoadAnimation(imgPath, palettePath)
sprite, err := screen.ui.NewSprite(animation)
```
... becomes this ...
```golang
sprite, err := screen.ui.NewSprite(imgPath, palettePath)
```
2020-09-14 17:31:45 -04:00
|
|
|
animation, err = am.loadDCC(animationPath, palette, effect)
|
2020-09-14 14:47:11 -04:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
default:
|
2021-01-10 02:44:42 -05:00
|
|
|
return nil, fmt.Errorf("unknown Animation format for file: %s", animationPath)
|
2020-09-14 14:47:11 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
err = am.animations.Insert(cachePath, animation, defaultCacheEntryWeight)
|
|
|
|
|
|
|
|
return animation, err
|
2020-09-12 16:51:30 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
// LoadComposite creates a composite object from a ObjectLookupRecord and palettePath describing it
|
|
|
|
func (am *AssetManager) LoadComposite(baseType d2enum.ObjectType, token, palettePath string) (*Composite, error) {
|
2020-11-07 23:08:25 -05:00
|
|
|
am.Debugf(fmtLoadComposite, baseType, token, palettePath)
|
refactored logging in d2loader, d2record, and d2asset (#898)
* refactored logging in d2config, d2record, and d2asset
* asset manager, record manager, and file loader now utilitize d2util.Logger
* added colored logging to d2util.Logger (excluding windows platforms)
* removed mpq file verification from d2config; d2loader handles this
* record loaders now use the record manager's logger for printing info
* added command line argument for setting log level (`--loglevel 4`, `-l4`, or `-l 4`
* added `LogLevel` parameter to config file
* default log level will show errors, warnings, and info log messages
* specifying log level as an argument overrides setting from config file
* fixed log level tests
2020-11-02 21:23:07 -05:00
|
|
|
|
2020-09-12 16:51:30 -04:00
|
|
|
c := &Composite{
|
|
|
|
AssetManager: am,
|
|
|
|
baseType: baseType,
|
|
|
|
basePath: baseString(baseType),
|
|
|
|
token: token,
|
|
|
|
palettePath: palettePath,
|
2020-02-01 18:55:56 -05:00
|
|
|
}
|
|
|
|
|
2020-09-20 20:30:27 -04:00
|
|
|
c.SetDirection(0)
|
|
|
|
|
2020-09-12 16:51:30 -04:00
|
|
|
return c, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// LoadFont loads a font the resource files
|
2021-02-08 07:21:50 -05:00
|
|
|
func (am *AssetManager) LoadFont(tablePath, spritePath, palettePath string) (*d2font.Font, error) {
|
2020-09-14 14:47:11 -04:00
|
|
|
cachePath := fmt.Sprintf("%s;%s;%s", tablePath, spritePath, palettePath)
|
|
|
|
|
|
|
|
if cached, found := am.fonts.Retrieve(cachePath); found {
|
2021-02-08 07:21:50 -05:00
|
|
|
return cached.(*d2font.Font), nil
|
2020-09-14 14:47:11 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
sheet, err := am.LoadAnimation(spritePath, palettePath)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
tableData, err := am.LoadFile(tablePath)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
2021-02-08 11:25:02 -05:00
|
|
|
am.Debugf(fmtLoadFont, tablePath, spritePath, palettePath)
|
|
|
|
|
2021-02-09 02:43:46 -05:00
|
|
|
font, err := d2font.Load(tableData)
|
2021-02-08 07:21:50 -05:00
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("error while loading font table %s: %v", tablePath, err)
|
2020-09-14 14:47:11 -04:00
|
|
|
}
|
|
|
|
|
2021-02-09 02:43:46 -05:00
|
|
|
font.SetBackground(sheet)
|
|
|
|
|
2020-09-14 14:47:11 -04:00
|
|
|
err = am.fonts.Insert(cachePath, font, defaultCacheEntryWeight)
|
|
|
|
|
|
|
|
return font, err
|
2020-09-12 16:51:30 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
// LoadPalette loads a palette from a given palette path
|
|
|
|
func (am *AssetManager) LoadPalette(palettePath string) (d2interface.Palette, error) {
|
2020-09-14 14:47:11 -04:00
|
|
|
if cached, found := am.palettes.Retrieve(palettePath); found {
|
|
|
|
return cached.(d2interface.Palette), nil
|
|
|
|
}
|
|
|
|
|
2021-01-10 02:44:42 -05:00
|
|
|
if types.Ext2AssetType(filepath.Ext(palettePath)) != types.AssetTypePalette {
|
2020-09-14 14:47:11 -04:00
|
|
|
return nil, fmt.Errorf("not an instance of a palette: %s", palettePath)
|
|
|
|
}
|
|
|
|
|
2020-11-07 23:08:25 -05:00
|
|
|
am.Debugf(fmtLoadPalette, palettePath)
|
refactored logging in d2loader, d2record, and d2asset (#898)
* refactored logging in d2config, d2record, and d2asset
* asset manager, record manager, and file loader now utilitize d2util.Logger
* added colored logging to d2util.Logger (excluding windows platforms)
* removed mpq file verification from d2config; d2loader handles this
* record loaders now use the record manager's logger for printing info
* added command line argument for setting log level (`--loglevel 4`, `-l4`, or `-l 4`
* added `LogLevel` parameter to config file
* default log level will show errors, warnings, and info log messages
* specifying log level as an argument overrides setting from config file
* fixed log level tests
2020-11-02 21:23:07 -05:00
|
|
|
|
2020-09-14 14:47:11 -04:00
|
|
|
data, err := am.LoadFile(palettePath)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
palette, err := d2dat.Load(data)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
err = am.palettes.Insert(palettePath, palette, defaultCacheEntryWeight)
|
|
|
|
|
|
|
|
return palette, err
|
|
|
|
}
|
|
|
|
|
|
|
|
// LoadStringTable loads a string table from the given path
|
2021-02-25 04:02:10 -05:00
|
|
|
func (am *AssetManager) LoadStringTable(tablePath string) (d2tbl.TextDictionary, error) {
|
2020-09-14 14:47:11 -04:00
|
|
|
data, err := am.LoadFile(tablePath)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
2021-01-11 04:12:46 -05:00
|
|
|
table, err := d2tbl.LoadTextDictionary(data)
|
|
|
|
if err != nil {
|
|
|
|
return table, err
|
2020-09-14 14:47:11 -04:00
|
|
|
}
|
|
|
|
|
2020-11-07 23:08:25 -05:00
|
|
|
am.Debugf(fmtLoadStringTable, tablePath)
|
refactored logging in d2loader, d2record, and d2asset (#898)
* refactored logging in d2config, d2record, and d2asset
* asset manager, record manager, and file loader now utilitize d2util.Logger
* added colored logging to d2util.Logger (excluding windows platforms)
* removed mpq file verification from d2config; d2loader handles this
* record loaders now use the record manager's logger for printing info
* added command line argument for setting log level (`--loglevel 4`, `-l4`, or `-l 4`
* added `LogLevel` parameter to config file
* default log level will show errors, warnings, and info log messages
* specifying log level as an argument overrides setting from config file
* fixed log level tests
2020-11-02 21:23:07 -05:00
|
|
|
|
2020-11-03 14:10:11 -05:00
|
|
|
am.tables = append(am.tables, table)
|
2020-09-14 14:47:11 -04:00
|
|
|
|
|
|
|
return table, err
|
|
|
|
}
|
|
|
|
|
2020-11-25 13:25:19 -05:00
|
|
|
// TranslateString returns the translation of the given string. The string is retrieved from
|
2021-01-28 05:20:59 -05:00
|
|
|
// the loaded string tables. If input value is int (e.g. from d2enum/numeric_labels.go)
|
|
|
|
// output string is translation for # + input
|
2020-11-25 06:37:16 -05:00
|
|
|
func (am *AssetManager) TranslateString(input interface{}) string {
|
|
|
|
var key string
|
|
|
|
|
|
|
|
switch s := input.(type) {
|
|
|
|
case string:
|
|
|
|
key = s
|
|
|
|
case fmt.Stringer:
|
|
|
|
key = s.String()
|
2021-01-28 05:20:59 -05:00
|
|
|
case int:
|
|
|
|
key = fmt.Sprintf("#%d", d2enum.BaseLabelNumbers(s+am.languageModifier))
|
2020-11-25 06:37:16 -05:00
|
|
|
}
|
|
|
|
|
2020-11-03 14:10:11 -05:00
|
|
|
for idx := range am.tables {
|
2021-02-25 04:02:10 -05:00
|
|
|
if value, found := am.tables[idx][key]; found {
|
2020-11-03 14:10:11 -05:00
|
|
|
return value
|
|
|
|
}
|
|
|
|
}
|
2020-11-25 06:37:16 -05:00
|
|
|
|
2020-11-03 14:10:11 -05:00
|
|
|
// Fix to allow v.setDescLabels("#123") to be bypassed for a patch in issue #360. Reenable later.
|
|
|
|
// log.Panicf("Could not find a string for the key '%s'", key)
|
|
|
|
return key
|
|
|
|
}
|
|
|
|
|
2020-09-14 14:47:11 -04:00
|
|
|
// LoadPaletteTransform loads a palette transform file
|
|
|
|
func (am *AssetManager) LoadPaletteTransform(path string) (*d2pl2.PL2, error) {
|
|
|
|
if pl2, found := am.transforms.Retrieve(path); found {
|
|
|
|
return pl2.(*d2pl2.PL2), nil
|
|
|
|
}
|
|
|
|
|
|
|
|
data, err := am.LoadFile(path)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
pl2, err := d2pl2.Load(data)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
2020-11-07 23:08:25 -05:00
|
|
|
am.Debugf(fmtLoadTransform, path)
|
refactored logging in d2loader, d2record, and d2asset (#898)
* refactored logging in d2config, d2record, and d2asset
* asset manager, record manager, and file loader now utilitize d2util.Logger
* added colored logging to d2util.Logger (excluding windows platforms)
* removed mpq file verification from d2config; d2loader handles this
* record loaders now use the record manager's logger for printing info
* added command line argument for setting log level (`--loglevel 4`, `-l4`, or `-l 4`
* added `LogLevel` parameter to config file
* default log level will show errors, warnings, and info log messages
* specifying log level as an argument overrides setting from config file
* fixed log level tests
2020-11-02 21:23:07 -05:00
|
|
|
|
2020-09-14 14:47:11 -04:00
|
|
|
if err := am.transforms.Insert(path, pl2, 1); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return pl2, nil
|
|
|
|
}
|
|
|
|
|
2020-09-19 14:33:40 -04:00
|
|
|
// LoadDataDictionary loads a txt data file
|
|
|
|
func (am *AssetManager) LoadDataDictionary(path string) (*d2txt.DataDictionary, error) {
|
|
|
|
// we purposefully do not cache data dictionaries because we are already
|
|
|
|
// caching the file data. The underlying csv.Reader does not implement io.Seeker,
|
|
|
|
// so after it has been iterated through, we cannot iterate through it again.
|
|
|
|
//
|
|
|
|
// The easy way around this is to not cache d2txt.DataDictionary objects, and just create
|
|
|
|
// a new instance from cached file data if/when we ever need to reload the data dict
|
2020-10-22 02:41:21 -04:00
|
|
|
data, err := am.LoadFile(path)
|
|
|
|
if err != nil {
|
2020-09-19 14:33:40 -04:00
|
|
|
return nil, err
|
|
|
|
}
|
2020-10-22 02:41:21 -04:00
|
|
|
|
2020-11-07 23:08:25 -05:00
|
|
|
am.Debugf(fmtLoadDict, path)
|
refactored logging in d2loader, d2record, and d2asset (#898)
* refactored logging in d2config, d2record, and d2asset
* asset manager, record manager, and file loader now utilitize d2util.Logger
* added colored logging to d2util.Logger (excluding windows platforms)
* removed mpq file verification from d2config; d2loader handles this
* record loaders now use the record manager's logger for printing info
* added command line argument for setting log level (`--loglevel 4`, `-l4`, or `-l 4`
* added `LogLevel` parameter to config file
* default log level will show errors, warnings, and info log messages
* specifying log level as an argument overrides setting from config file
* fixed log level tests
2020-11-02 21:23:07 -05:00
|
|
|
|
2020-10-22 02:41:21 -04:00
|
|
|
return d2txt.LoadDataDictionary(data), nil
|
2020-09-19 14:33:40 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
// LoadRecords will load the records for the given path into the record manager.
|
|
|
|
// This is dependant on the record manager having bound a loader for the given path.
|
|
|
|
func (am *AssetManager) LoadRecords(path string) error {
|
|
|
|
dict, err := am.LoadDataDictionary(path)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
err = am.Records.Load(path, dict)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
Decouple asset manager from renderer (#730)
* improve AssetManager implementation
Notable changes are:
* removed the individual managers inside of d2asset, only one asset manager
* AssetManager now has caches for the types of files it loads
* created a type for TextDictionary (the txt file structs)
* fixed a file path bug in d2loader Source
* fixed a asset stream bug in d2loader Asset
* d2loader.Loader now needs a d2config.Config on creation (for resolving locale files)
* updated the mpq file in d2asset test data, added test case for "sub-directory"
* added a Data method to d2asset.Asset. The data is cached on first full read.
* renamed ArchiveDataStream to DataStream in d2interface
* moved palette utility func out of d2asset and into d2util
* bugfix for MacOS mpq loader issue
* lint fixes, added data caching to filesystem asset
* adding comment for mpq asset close
* Decouple d2asset from d2render
Notable changes in d2common:
* d2dcc.Load now fully decodes the dcc and stores the directions/frames in the dcc struct
* un-exported dcc.decodeDirection, it is only used in d2dcc
* removed font interface from d2interface, we only have one font implementation
* added `Renderer` method to d2interface.Surface, animations use this to bind to a renderer and create surfaces as they need
* added `BindRenderer` method to animation interface
Notable changes in d2common/d2asset:
* **d2asset.NewAssetManager only needs to be passed a d2config.Config**, it is decoupled from d2render
* exported Animation
* Animation implementation binds to the renderer to create surfaces only on the first time it is rendered
* font, dcc, dc6 initialization logic moved out of asset_manager.go
* for dc6 and dcc animations, the process of decoding and creating render surfaces has been broken into different methods
* the d2asset.Font struct now stores font table data for initialization purposes
Notable changes in d2core/d2render:
* Surfaces store a renderer reference, this allows animations to bind to the renderer and create a surface just-in-time
**These last changes should have been a separate PR, sorry.**
Notable changes in d2core/d2ui:
* ui.NewSprite now handles creating an animation internally, only needs image and palette path as arguments
Notable Changes in d2game:
Because of the change in d2ui, all instances of this code pattern...
```golang
animation, err := screen.asset.LoadAnimation(imgPath, palettePath)
sprite, err := screen.ui.NewSprite(animation)
```
... becomes this ...
```golang
sprite, err := screen.ui.NewSprite(imgPath, palettePath)
```
2020-09-14 17:31:45 -04:00
|
|
|
// loadDC6 creates an Animation from d2dc6.DC6 and d2dat.DATPalette
|
|
|
|
func (am *AssetManager) loadDC6(path string,
|
2020-09-14 14:47:11 -04:00
|
|
|
palette d2interface.Palette, effect d2enum.DrawEffect) (d2interface.Animation, error) {
|
Decouple asset manager from renderer (#730)
* improve AssetManager implementation
Notable changes are:
* removed the individual managers inside of d2asset, only one asset manager
* AssetManager now has caches for the types of files it loads
* created a type for TextDictionary (the txt file structs)
* fixed a file path bug in d2loader Source
* fixed a asset stream bug in d2loader Asset
* d2loader.Loader now needs a d2config.Config on creation (for resolving locale files)
* updated the mpq file in d2asset test data, added test case for "sub-directory"
* added a Data method to d2asset.Asset. The data is cached on first full read.
* renamed ArchiveDataStream to DataStream in d2interface
* moved palette utility func out of d2asset and into d2util
* bugfix for MacOS mpq loader issue
* lint fixes, added data caching to filesystem asset
* adding comment for mpq asset close
* Decouple d2asset from d2render
Notable changes in d2common:
* d2dcc.Load now fully decodes the dcc and stores the directions/frames in the dcc struct
* un-exported dcc.decodeDirection, it is only used in d2dcc
* removed font interface from d2interface, we only have one font implementation
* added `Renderer` method to d2interface.Surface, animations use this to bind to a renderer and create surfaces as they need
* added `BindRenderer` method to animation interface
Notable changes in d2common/d2asset:
* **d2asset.NewAssetManager only needs to be passed a d2config.Config**, it is decoupled from d2render
* exported Animation
* Animation implementation binds to the renderer to create surfaces only on the first time it is rendered
* font, dcc, dc6 initialization logic moved out of asset_manager.go
* for dc6 and dcc animations, the process of decoding and creating render surfaces has been broken into different methods
* the d2asset.Font struct now stores font table data for initialization purposes
Notable changes in d2core/d2render:
* Surfaces store a renderer reference, this allows animations to bind to the renderer and create a surface just-in-time
**These last changes should have been a separate PR, sorry.**
Notable changes in d2core/d2ui:
* ui.NewSprite now handles creating an animation internally, only needs image and palette path as arguments
Notable Changes in d2game:
Because of the change in d2ui, all instances of this code pattern...
```golang
animation, err := screen.asset.LoadAnimation(imgPath, palettePath)
sprite, err := screen.ui.NewSprite(animation)
```
... becomes this ...
```golang
sprite, err := screen.ui.NewSprite(imgPath, palettePath)
```
2020-09-14 17:31:45 -04:00
|
|
|
dc6Data, err := am.LoadFile(path)
|
2020-09-14 14:47:11 -04:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
Decouple asset manager from renderer (#730)
* improve AssetManager implementation
Notable changes are:
* removed the individual managers inside of d2asset, only one asset manager
* AssetManager now has caches for the types of files it loads
* created a type for TextDictionary (the txt file structs)
* fixed a file path bug in d2loader Source
* fixed a asset stream bug in d2loader Asset
* d2loader.Loader now needs a d2config.Config on creation (for resolving locale files)
* updated the mpq file in d2asset test data, added test case for "sub-directory"
* added a Data method to d2asset.Asset. The data is cached on first full read.
* renamed ArchiveDataStream to DataStream in d2interface
* moved palette utility func out of d2asset and into d2util
* bugfix for MacOS mpq loader issue
* lint fixes, added data caching to filesystem asset
* adding comment for mpq asset close
* Decouple d2asset from d2render
Notable changes in d2common:
* d2dcc.Load now fully decodes the dcc and stores the directions/frames in the dcc struct
* un-exported dcc.decodeDirection, it is only used in d2dcc
* removed font interface from d2interface, we only have one font implementation
* added `Renderer` method to d2interface.Surface, animations use this to bind to a renderer and create surfaces as they need
* added `BindRenderer` method to animation interface
Notable changes in d2common/d2asset:
* **d2asset.NewAssetManager only needs to be passed a d2config.Config**, it is decoupled from d2render
* exported Animation
* Animation implementation binds to the renderer to create surfaces only on the first time it is rendered
* font, dcc, dc6 initialization logic moved out of asset_manager.go
* for dc6 and dcc animations, the process of decoding and creating render surfaces has been broken into different methods
* the d2asset.Font struct now stores font table data for initialization purposes
Notable changes in d2core/d2render:
* Surfaces store a renderer reference, this allows animations to bind to the renderer and create a surface just-in-time
**These last changes should have been a separate PR, sorry.**
Notable changes in d2core/d2ui:
* ui.NewSprite now handles creating an animation internally, only needs image and palette path as arguments
Notable Changes in d2game:
Because of the change in d2ui, all instances of this code pattern...
```golang
animation, err := screen.asset.LoadAnimation(imgPath, palettePath)
sprite, err := screen.ui.NewSprite(animation)
```
... becomes this ...
```golang
sprite, err := screen.ui.NewSprite(imgPath, palettePath)
```
2020-09-14 17:31:45 -04:00
|
|
|
dc6, err := d2dc6.Load(dc6Data)
|
2020-09-14 14:47:11 -04:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
Decouple asset manager from renderer (#730)
* improve AssetManager implementation
Notable changes are:
* removed the individual managers inside of d2asset, only one asset manager
* AssetManager now has caches for the types of files it loads
* created a type for TextDictionary (the txt file structs)
* fixed a file path bug in d2loader Source
* fixed a asset stream bug in d2loader Asset
* d2loader.Loader now needs a d2config.Config on creation (for resolving locale files)
* updated the mpq file in d2asset test data, added test case for "sub-directory"
* added a Data method to d2asset.Asset. The data is cached on first full read.
* renamed ArchiveDataStream to DataStream in d2interface
* moved palette utility func out of d2asset and into d2util
* bugfix for MacOS mpq loader issue
* lint fixes, added data caching to filesystem asset
* adding comment for mpq asset close
* Decouple d2asset from d2render
Notable changes in d2common:
* d2dcc.Load now fully decodes the dcc and stores the directions/frames in the dcc struct
* un-exported dcc.decodeDirection, it is only used in d2dcc
* removed font interface from d2interface, we only have one font implementation
* added `Renderer` method to d2interface.Surface, animations use this to bind to a renderer and create surfaces as they need
* added `BindRenderer` method to animation interface
Notable changes in d2common/d2asset:
* **d2asset.NewAssetManager only needs to be passed a d2config.Config**, it is decoupled from d2render
* exported Animation
* Animation implementation binds to the renderer to create surfaces only on the first time it is rendered
* font, dcc, dc6 initialization logic moved out of asset_manager.go
* for dc6 and dcc animations, the process of decoding and creating render surfaces has been broken into different methods
* the d2asset.Font struct now stores font table data for initialization purposes
Notable changes in d2core/d2render:
* Surfaces store a renderer reference, this allows animations to bind to the renderer and create a surface just-in-time
**These last changes should have been a separate PR, sorry.**
Notable changes in d2core/d2ui:
* ui.NewSprite now handles creating an animation internally, only needs image and palette path as arguments
Notable Changes in d2game:
Because of the change in d2ui, all instances of this code pattern...
```golang
animation, err := screen.asset.LoadAnimation(imgPath, palettePath)
sprite, err := screen.ui.NewSprite(animation)
```
... becomes this ...
```golang
sprite, err := screen.ui.NewSprite(imgPath, palettePath)
```
2020-09-14 17:31:45 -04:00
|
|
|
animation, err := newDC6Animation(dc6, palette, effect)
|
2020-09-14 14:47:11 -04:00
|
|
|
|
Decouple asset manager from renderer (#730)
* improve AssetManager implementation
Notable changes are:
* removed the individual managers inside of d2asset, only one asset manager
* AssetManager now has caches for the types of files it loads
* created a type for TextDictionary (the txt file structs)
* fixed a file path bug in d2loader Source
* fixed a asset stream bug in d2loader Asset
* d2loader.Loader now needs a d2config.Config on creation (for resolving locale files)
* updated the mpq file in d2asset test data, added test case for "sub-directory"
* added a Data method to d2asset.Asset. The data is cached on first full read.
* renamed ArchiveDataStream to DataStream in d2interface
* moved palette utility func out of d2asset and into d2util
* bugfix for MacOS mpq loader issue
* lint fixes, added data caching to filesystem asset
* adding comment for mpq asset close
* Decouple d2asset from d2render
Notable changes in d2common:
* d2dcc.Load now fully decodes the dcc and stores the directions/frames in the dcc struct
* un-exported dcc.decodeDirection, it is only used in d2dcc
* removed font interface from d2interface, we only have one font implementation
* added `Renderer` method to d2interface.Surface, animations use this to bind to a renderer and create surfaces as they need
* added `BindRenderer` method to animation interface
Notable changes in d2common/d2asset:
* **d2asset.NewAssetManager only needs to be passed a d2config.Config**, it is decoupled from d2render
* exported Animation
* Animation implementation binds to the renderer to create surfaces only on the first time it is rendered
* font, dcc, dc6 initialization logic moved out of asset_manager.go
* for dc6 and dcc animations, the process of decoding and creating render surfaces has been broken into different methods
* the d2asset.Font struct now stores font table data for initialization purposes
Notable changes in d2core/d2render:
* Surfaces store a renderer reference, this allows animations to bind to the renderer and create a surface just-in-time
**These last changes should have been a separate PR, sorry.**
Notable changes in d2core/d2ui:
* ui.NewSprite now handles creating an animation internally, only needs image and palette path as arguments
Notable Changes in d2game:
Because of the change in d2ui, all instances of this code pattern...
```golang
animation, err := screen.asset.LoadAnimation(imgPath, palettePath)
sprite, err := screen.ui.NewSprite(animation)
```
... becomes this ...
```golang
sprite, err := screen.ui.NewSprite(imgPath, palettePath)
```
2020-09-14 17:31:45 -04:00
|
|
|
return animation, err
|
2020-09-14 14:47:11 -04:00
|
|
|
}
|
|
|
|
|
Decouple asset manager from renderer (#730)
* improve AssetManager implementation
Notable changes are:
* removed the individual managers inside of d2asset, only one asset manager
* AssetManager now has caches for the types of files it loads
* created a type for TextDictionary (the txt file structs)
* fixed a file path bug in d2loader Source
* fixed a asset stream bug in d2loader Asset
* d2loader.Loader now needs a d2config.Config on creation (for resolving locale files)
* updated the mpq file in d2asset test data, added test case for "sub-directory"
* added a Data method to d2asset.Asset. The data is cached on first full read.
* renamed ArchiveDataStream to DataStream in d2interface
* moved palette utility func out of d2asset and into d2util
* bugfix for MacOS mpq loader issue
* lint fixes, added data caching to filesystem asset
* adding comment for mpq asset close
* Decouple d2asset from d2render
Notable changes in d2common:
* d2dcc.Load now fully decodes the dcc and stores the directions/frames in the dcc struct
* un-exported dcc.decodeDirection, it is only used in d2dcc
* removed font interface from d2interface, we only have one font implementation
* added `Renderer` method to d2interface.Surface, animations use this to bind to a renderer and create surfaces as they need
* added `BindRenderer` method to animation interface
Notable changes in d2common/d2asset:
* **d2asset.NewAssetManager only needs to be passed a d2config.Config**, it is decoupled from d2render
* exported Animation
* Animation implementation binds to the renderer to create surfaces only on the first time it is rendered
* font, dcc, dc6 initialization logic moved out of asset_manager.go
* for dc6 and dcc animations, the process of decoding and creating render surfaces has been broken into different methods
* the d2asset.Font struct now stores font table data for initialization purposes
Notable changes in d2core/d2render:
* Surfaces store a renderer reference, this allows animations to bind to the renderer and create a surface just-in-time
**These last changes should have been a separate PR, sorry.**
Notable changes in d2core/d2ui:
* ui.NewSprite now handles creating an animation internally, only needs image and palette path as arguments
Notable Changes in d2game:
Because of the change in d2ui, all instances of this code pattern...
```golang
animation, err := screen.asset.LoadAnimation(imgPath, palettePath)
sprite, err := screen.ui.NewSprite(animation)
```
... becomes this ...
```golang
sprite, err := screen.ui.NewSprite(imgPath, palettePath)
```
2020-09-14 17:31:45 -04:00
|
|
|
// loadDCC creates an Animation from d2dcc.DCC and d2dat.DATPalette
|
|
|
|
func (am *AssetManager) loadDCC(path string,
|
|
|
|
palette d2interface.Palette, effect d2enum.DrawEffect) (d2interface.Animation, error) {
|
2021-01-10 02:44:42 -05:00
|
|
|
dcc, err := am.LoadDCC(path)
|
2020-09-14 14:47:11 -04:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
Decouple asset manager from renderer (#730)
* improve AssetManager implementation
Notable changes are:
* removed the individual managers inside of d2asset, only one asset manager
* AssetManager now has caches for the types of files it loads
* created a type for TextDictionary (the txt file structs)
* fixed a file path bug in d2loader Source
* fixed a asset stream bug in d2loader Asset
* d2loader.Loader now needs a d2config.Config on creation (for resolving locale files)
* updated the mpq file in d2asset test data, added test case for "sub-directory"
* added a Data method to d2asset.Asset. The data is cached on first full read.
* renamed ArchiveDataStream to DataStream in d2interface
* moved palette utility func out of d2asset and into d2util
* bugfix for MacOS mpq loader issue
* lint fixes, added data caching to filesystem asset
* adding comment for mpq asset close
* Decouple d2asset from d2render
Notable changes in d2common:
* d2dcc.Load now fully decodes the dcc and stores the directions/frames in the dcc struct
* un-exported dcc.decodeDirection, it is only used in d2dcc
* removed font interface from d2interface, we only have one font implementation
* added `Renderer` method to d2interface.Surface, animations use this to bind to a renderer and create surfaces as they need
* added `BindRenderer` method to animation interface
Notable changes in d2common/d2asset:
* **d2asset.NewAssetManager only needs to be passed a d2config.Config**, it is decoupled from d2render
* exported Animation
* Animation implementation binds to the renderer to create surfaces only on the first time it is rendered
* font, dcc, dc6 initialization logic moved out of asset_manager.go
* for dc6 and dcc animations, the process of decoding and creating render surfaces has been broken into different methods
* the d2asset.Font struct now stores font table data for initialization purposes
Notable changes in d2core/d2render:
* Surfaces store a renderer reference, this allows animations to bind to the renderer and create a surface just-in-time
**These last changes should have been a separate PR, sorry.**
Notable changes in d2core/d2ui:
* ui.NewSprite now handles creating an animation internally, only needs image and palette path as arguments
Notable Changes in d2game:
Because of the change in d2ui, all instances of this code pattern...
```golang
animation, err := screen.asset.LoadAnimation(imgPath, palettePath)
sprite, err := screen.ui.NewSprite(animation)
```
... becomes this ...
```golang
sprite, err := screen.ui.NewSprite(imgPath, palettePath)
```
2020-09-14 17:31:45 -04:00
|
|
|
animation, err := newDCCAnimation(dcc, palette, effect)
|
2020-10-25 20:49:41 -04:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2020-09-14 14:47:11 -04:00
|
|
|
|
Decouple asset manager from renderer (#730)
* improve AssetManager implementation
Notable changes are:
* removed the individual managers inside of d2asset, only one asset manager
* AssetManager now has caches for the types of files it loads
* created a type for TextDictionary (the txt file structs)
* fixed a file path bug in d2loader Source
* fixed a asset stream bug in d2loader Asset
* d2loader.Loader now needs a d2config.Config on creation (for resolving locale files)
* updated the mpq file in d2asset test data, added test case for "sub-directory"
* added a Data method to d2asset.Asset. The data is cached on first full read.
* renamed ArchiveDataStream to DataStream in d2interface
* moved palette utility func out of d2asset and into d2util
* bugfix for MacOS mpq loader issue
* lint fixes, added data caching to filesystem asset
* adding comment for mpq asset close
* Decouple d2asset from d2render
Notable changes in d2common:
* d2dcc.Load now fully decodes the dcc and stores the directions/frames in the dcc struct
* un-exported dcc.decodeDirection, it is only used in d2dcc
* removed font interface from d2interface, we only have one font implementation
* added `Renderer` method to d2interface.Surface, animations use this to bind to a renderer and create surfaces as they need
* added `BindRenderer` method to animation interface
Notable changes in d2common/d2asset:
* **d2asset.NewAssetManager only needs to be passed a d2config.Config**, it is decoupled from d2render
* exported Animation
* Animation implementation binds to the renderer to create surfaces only on the first time it is rendered
* font, dcc, dc6 initialization logic moved out of asset_manager.go
* for dc6 and dcc animations, the process of decoding and creating render surfaces has been broken into different methods
* the d2asset.Font struct now stores font table data for initialization purposes
Notable changes in d2core/d2render:
* Surfaces store a renderer reference, this allows animations to bind to the renderer and create a surface just-in-time
**These last changes should have been a separate PR, sorry.**
Notable changes in d2core/d2ui:
* ui.NewSprite now handles creating an animation internally, only needs image and palette path as arguments
Notable Changes in d2game:
Because of the change in d2ui, all instances of this code pattern...
```golang
animation, err := screen.asset.LoadAnimation(imgPath, palettePath)
sprite, err := screen.ui.NewSprite(animation)
```
... becomes this ...
```golang
sprite, err := screen.ui.NewSprite(imgPath, palettePath)
```
2020-09-14 17:31:45 -04:00
|
|
|
return animation, nil
|
2020-02-01 18:55:56 -05:00
|
|
|
}
|
2020-07-13 20:30:30 -04:00
|
|
|
|
2020-09-14 14:47:11 -04:00
|
|
|
// BindTerminalCommands binds the in-game terminal comands for the asset manager.
|
2020-09-12 16:51:30 -04:00
|
|
|
func (am *AssetManager) BindTerminalCommands(term d2interface.Terminal) error {
|
2020-12-21 15:46:58 -05:00
|
|
|
if err := term.Bind("assetspam", "display verbose asset manager logs", nil, am.commandAssetSpam(term)); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
if err := term.Bind("assetstat", "display asset manager cache statistics", nil, am.commandAssetStat(term)); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
if err := term.Bind("assetclear", "clear asset manager cache", nil, am.commandAssetClear); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// UnbindTerminalCommands unbinds commands from the terminal
|
|
|
|
func (am *AssetManager) UnbindTerminalCommands(term d2interface.Terminal) error {
|
|
|
|
return term.Unbind("assetspam", "assetstat", "assetclear")
|
|
|
|
}
|
|
|
|
|
|
|
|
func (am *AssetManager) commandAssetSpam(term d2interface.Terminal) func([]string) error {
|
|
|
|
return func(args []string) error {
|
|
|
|
verbose, err := strconv.ParseBool(args[0])
|
|
|
|
if err != nil {
|
|
|
|
term.Errorf("asset manager verbose invalid argument")
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2020-07-13 20:30:30 -04:00
|
|
|
if verbose {
|
2020-12-21 15:46:58 -05:00
|
|
|
term.Infof("asset manager verbose logging enabled")
|
2020-07-13 20:30:30 -04:00
|
|
|
} else {
|
2020-12-21 15:46:58 -05:00
|
|
|
term.Infof("asset manager verbose logging disabled")
|
2020-07-13 20:30:30 -04:00
|
|
|
}
|
|
|
|
|
2020-09-14 14:47:11 -04:00
|
|
|
am.palettes.SetVerbose(verbose)
|
|
|
|
am.fonts.SetVerbose(verbose)
|
|
|
|
am.transforms.SetVerbose(verbose)
|
|
|
|
am.animations.SetVerbose(verbose)
|
2021-01-10 02:44:42 -05:00
|
|
|
am.dt1s.SetVerbose(verbose)
|
|
|
|
am.ds1s.SetVerbose(verbose)
|
|
|
|
am.dccs.SetVerbose(verbose)
|
|
|
|
am.cofs.SetVerbose(verbose)
|
2020-12-21 15:46:58 -05:00
|
|
|
|
|
|
|
return nil
|
2020-07-13 20:30:30 -04:00
|
|
|
}
|
2020-12-21 15:46:58 -05:00
|
|
|
}
|
2020-07-13 20:30:30 -04:00
|
|
|
|
2020-12-21 15:46:58 -05:00
|
|
|
func (am *AssetManager) commandAssetStat(term d2interface.Terminal) func([]string) error {
|
|
|
|
return func([]string) error {
|
2020-07-13 20:30:30 -04:00
|
|
|
var cacheStatistics = func(c d2interface.Cache) float64 {
|
|
|
|
const percent = 100.0
|
|
|
|
return float64(c.GetWeight()) / float64(c.GetBudget()) * percent
|
|
|
|
}
|
|
|
|
|
2020-12-21 15:46:58 -05:00
|
|
|
term.Infof("palette cache: %f", cacheStatistics(am.palettes))
|
|
|
|
term.Infof("palette transform cache: %f", cacheStatistics(am.transforms))
|
|
|
|
term.Infof("Animation cache: %f", cacheStatistics(am.animations))
|
|
|
|
term.Infof("font cache: %f", cacheStatistics(am.fonts))
|
2020-07-13 20:30:30 -04:00
|
|
|
|
2020-12-21 15:46:58 -05:00
|
|
|
return nil
|
2020-07-13 20:30:30 -04:00
|
|
|
}
|
2020-12-21 15:46:58 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
func (am *AssetManager) commandAssetClear([]string) error {
|
|
|
|
am.palettes.Clear()
|
|
|
|
am.transforms.Clear()
|
|
|
|
am.animations.Clear()
|
|
|
|
am.fonts.Clear()
|
2021-01-10 02:44:42 -05:00
|
|
|
am.dt1s.Clear()
|
|
|
|
am.ds1s.Clear()
|
|
|
|
am.dccs.Clear()
|
|
|
|
am.cofs.Clear()
|
2020-07-13 20:30:30 -04:00
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
2021-01-10 02:44:42 -05:00
|
|
|
|
2021-01-11 04:31:57 -05:00
|
|
|
// LoadDT1 loads and returns the given path as a DT1
|
2021-01-10 02:44:42 -05:00
|
|
|
func (am *AssetManager) LoadDT1(dt1Path string) (*d2dt1.DT1, error) {
|
|
|
|
if dt1Value, found := am.dt1s.Retrieve(dt1Path); found {
|
|
|
|
return dt1Value.(*d2dt1.DT1), nil
|
|
|
|
}
|
|
|
|
|
|
|
|
fileData, err := am.LoadFile("/data/global/tiles/" + dt1Path)
|
|
|
|
if err != nil {
|
2021-01-11 04:31:57 -05:00
|
|
|
return nil, fmt.Errorf("could not load /data/global/tiles/%s", dt1Path)
|
2021-01-10 02:44:42 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
dt1, err := d2dt1.LoadDT1(fileData)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
if err := am.dt1s.Insert(dt1Path, dt1, defaultCacheEntryWeight); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return dt1, nil
|
|
|
|
}
|
|
|
|
|
2021-01-11 04:31:57 -05:00
|
|
|
// LoadDS1 loads and returns the given path as a DS1
|
2021-01-10 02:44:42 -05:00
|
|
|
func (am *AssetManager) LoadDS1(ds1Path string) (*d2ds1.DS1, error) {
|
|
|
|
if ds1Value, found := am.dt1s.Retrieve(ds1Path); found {
|
|
|
|
return ds1Value.(*d2ds1.DS1), nil
|
|
|
|
}
|
|
|
|
|
|
|
|
fileData, err := am.LoadFile("/data/global/tiles/" + ds1Path)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
ds1, err := d2ds1.LoadDS1(fileData)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
if err := am.dt1s.Insert(ds1Path, ds1, defaultCacheEntryWeight); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return ds1, nil
|
|
|
|
}
|
|
|
|
|
2021-01-11 04:31:57 -05:00
|
|
|
// LoadCOF loads and returns the given path as a COF
|
2021-01-10 02:44:42 -05:00
|
|
|
func (am *AssetManager) LoadCOF(cofPath string) (*d2cof.COF, error) {
|
|
|
|
if cofValue, found := am.cofs.Retrieve(cofPath); found {
|
|
|
|
return cofValue.(*d2cof.COF), nil
|
|
|
|
}
|
|
|
|
|
|
|
|
fileData, err := am.LoadFile(cofPath)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
2021-02-05 17:43:42 -05:00
|
|
|
cof, err := d2cof.Unmarshal(fileData)
|
2021-01-10 02:44:42 -05:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
if err := am.cofs.Insert(cofPath, cof, defaultCacheEntryWeight); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return cof, nil
|
|
|
|
}
|
|
|
|
|
2021-01-11 04:31:57 -05:00
|
|
|
// LoadDCC loads and returns the given path as a DCC
|
2021-01-10 02:44:42 -05:00
|
|
|
func (am *AssetManager) LoadDCC(dccPath string) (*d2dcc.DCC, error) {
|
|
|
|
if dccValue, found := am.dccs.Retrieve(dccPath); found {
|
|
|
|
return dccValue.(*d2dcc.DCC), nil
|
|
|
|
}
|
|
|
|
|
|
|
|
fileData, err := am.LoadFile(dccPath)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
dcc, err := d2dcc.Load(fileData)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
if err := am.dccs.Insert(dccPath, dcc, defaultCacheEntryWeight); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return dcc, nil
|
|
|
|
}
|