gravestench
/
OpenDiablo2
mirror of https://github.com/OpenDiablo2/OpenDiablo2
1
1
Fork 0
Code Issues Releases Wiki Activity

d2asset: init without terminal (#586) 

* cache getter and clear methods were not implemented

* asset manager handles a nil terminal pointer
This commit is contained in:
dk 2020-07-13 17:30:30 -07:00 committed by GitHub
parent 5fdbb6a094
commit 5458859faf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 50 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
d2core/d2asset/asset_manager.go
View File

@ -47,3 +47,51 @@ func loadCOF(cofPath string) (*d2cof.COF, error) {
return d2cof.Load(cofData)
}
func (am *assetManager) BindTerminalCommands(term d2interface.Terminal) error {
if err := term.BindAction("assetspam", "display verbose asset manager logs", func(verbose bool) {
if verbose {
term.OutputInfof("asset manager verbose logging enabled")
} else {
term.OutputInfof("asset manager verbose logging disabled")
}
am.archiveManager.GetCache().SetVerbose(verbose)
am.archivedFileManager.GetCache().SetVerbose(verbose)
am.paletteManager.GetCache().SetVerbose(verbose)
am.paletteTransformManager.cache.SetVerbose(verbose)
am.animationManager.GetCache().SetVerbose(verbose)
}); err != nil {
return err
}
if err := term.BindAction("assetstat", "display asset manager cache statistics", func() {
var cacheStatistics = func(c d2interface.Cache) float64 {
const percent = 100.0
return float64(c.GetWeight()) / float64(c.GetBudget()) * percent
}
term.OutputInfof("archive cache: %f", cacheStatistics(am.archiveManager.GetCache()))
term.OutputInfof("file cache: %f", cacheStatistics(am.archivedFileManager.GetCache()))
term.OutputInfof("palette cache: %f", cacheStatistics(am.paletteManager.GetCache()))
term.OutputInfof("palette transform cache: %f", cacheStatistics(am.paletteTransformManager.
cache))
term.OutputInfof("animation cache: %f", cacheStatistics(am.animationManager.GetCache()))
term.OutputInfof("font cache: %f", cacheStatistics(am.fontManager.GetCache()))
}); err != nil {
return err
}
if err := term.BindAction("assetclear", "clear asset manager cache", func() {
am.archiveManager.ClearCache()
am.archivedFileManager.GetCache().Clear()
am.paletteManager.ClearCache()
am.paletteTransformManager.cache.Clear()
am.animationManager.ClearCache()
am.fontManager.ClearCache()
}); err != nil {
return err
}
return nil
}

43
d2core/d2asset/d2asset.go
View File

@ -31,47 +31,8 @@ func Initialize(renderer d2interface.Renderer,
fontManager,
}
if err := term.BindAction("assetspam", "display verbose asset manager logs", func(verbose bool) {
if verbose {
term.OutputInfof("asset manager verbose logging enabled")
} else {
term.OutputInfof("asset manager verbose logging disabled")
}
archiveManager.GetCache().SetVerbose(verbose)
archivedFileManager.GetCache().SetVerbose(verbose)
paletteManager.GetCache().SetVerbose(verbose)
paletteTransformManager.cache.SetVerbose(verbose)
animationManager.cache.SetVerbose(verbose)
}); err != nil {
return err
}
if err := term.BindAction("assetstat", "display asset manager cache statistics", func() {
var cacheStatistics = func(c d2interface.Cache) float64 {
const percent = 100.0
return float64(c.GetWeight()) / float64(c.GetBudget()) * percent
}
term.OutputInfof("archive cache: %f", cacheStatistics(archiveManager.GetCache()))
term.OutputInfof("file cache: %f", cacheStatistics(archivedFileManager.GetCache()))
term.OutputInfof("palette cache: %f", cacheStatistics(paletteManager.GetCache()))
term.OutputInfof("palette transform cache: %f", cacheStatistics(paletteTransformManager.cache))
term.OutputInfof("animation cache: %f", cacheStatistics(animationManager.cache))
term.OutputInfof("font cache: %f", cacheStatistics(fontManager.GetCache()))
}); err != nil {
return err
}
if err := term.BindAction("assetclear", "clear asset manager cache", func() {
archiveManager.ClearCache()
archivedFileManager.GetCache().Clear()
paletteManager.ClearCache()
paletteTransformManager.cache.Clear()
animationManager.ClearCache()
fontManager.ClearCache()
}); err != nil {
return err
if term != nil {
return singleton.BindTerminalCommands(term)
}
return nil